调整

assets/module_storm_sunder/FBX/Textures/tex2.png.meta

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "2a5dd959-e7bb-4469-9b3a-9df65afd25f6",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "2a5dd959-e7bb-4469-9b3a-9df65afd25f6@6c48a",
-      "displayName": "tex2",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "2a5dd959-e7bb-4469-9b3a-9df65afd25f6",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "nearest",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "2a5dd959-e7bb-4469-9b3a-9df65afd25f6@f9941",
-      "displayName": "tex2",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 0,
-        "trimY": 0,
-        "width": 256,
-        "height": 256,
-        "rawWidth": 256,
-        "rawHeight": 256,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -128,
-            -128,
-            0,
-            128,
-            -128,
-            0,
-            -128,
-            128,
-            0,
-            128,
-            128,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            0,
-            256,
-            256,
-            256,
-            0,
-            0,
-            256,
-            0
-          ],
-          "nuv": [
-            0,
-            0,
-            1,
-            0,
-            0,
-            1,
-            1,
-            1
-          ],
-          "minPos": [
-            -128,
-            -128,
-            0
-          ],
-          "maxPos": [
-            128,
-            128,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "2a5dd959-e7bb-4469-9b3a-9df65afd25f6@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": false,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "2a5dd959-e7bb-4469-9b3a-9df65afd25f6@f9941"
-  }
-}

assets/module_storm_sunder/Materials/ocean.mtl

@@ -85,7 +85,7 @@
         "w": -0.2
       },
       "mainTexture": {
-        "__uuid__": "dcce145c-3058-4209-abfb-81471f2a318b@6c48a",
+        "__uuid__": "3ebebdf2-140b-481c-87bb-af4dbe5362a3@6c48a",
         "__expectedType__": "cc.Texture2D"
       }
     },

assets/module_storm_sunder/Prefabs/UI/Gambit/UI_BattleGambit.prefab

@@ -35,10 +35,13 @@
       },
       {
         "__id__": 82
+      },
+      {
+        "__id__": 84
       }
     ],
     "_prefab": {
-      "__id__": 84
+      "__id__": 86
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -108,9 +111,9 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
+      "x": 360,
+      "y": 360,
+      "z": 0
     },
     "_mobility": 0,
     "_layer": 33554432,
@@ -136,8 +139,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 720,
-      "height": 1280
+      "width": 2,
+      "height": 3.5555555555555554
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1969,6 +1972,24 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "ednyPR60FHWbMO4gZheGld"
   },
+  {
+    "__type__": "bcfe4/4KSpNzoVcKH/PLlmr",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 85
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "caADCP7dNAWZ12lmDWpBds"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {

assets/module_storm_sunder/Prefabs/UI/Match/UI_BattleMatch.prefab

@@ -35,10 +35,13 @@
       },
       {
         "__id__": 28
+      },
+      {
+        "__id__": 30
       }
     ],
     "_prefab": {
-      "__id__": 30
+      "__id__": 32
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -674,6 +677,24 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "97eZDc7tZMUYi0PTtTYmdF"
   },
+  {
+    "__type__": "bcfe4/4KSpNzoVcKH/PLlmr",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 31
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "3956hJug5DrZOGCmnjwPlv"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {

assets/module_storm_sunder/Prefabs/UI/Revive/UI_BattleRevive.prefab

@@ -35,10 +35,13 @@
       },
       {
         "__id__": 70
+      },
+      {
+        "__id__": 72
       }
     ],
     "_prefab": {
-      "__id__": 72
+      "__id__": 74
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1691,6 +1694,24 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "6d/XoCLB9Gx4ZyPs2dMG9d"
   },
+  {
+    "__type__": "bcfe4/4KSpNzoVcKH/PLlmr",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 73
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "5dbE6dsftFbZs2dX8X0u4K"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {

assets/module_storm_sunder/Script/Manager/TimerMgr.ts

@@ -102,6 +102,6 @@ export class TimerMgr {
 
         const mapConfig = MapMgr.Instance.getMapConfig(1);
         this.countDownTime = mapConfig.time;
-        this.countDownTime = 5; //测试
+        // this.countDownTime = 5; //测试
     }
 }

assets/module_storm_sunder/rooster_stormsunder.scene

@@ -6545,7 +6545,7 @@
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -6654,7 +6654,7 @@
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -6763,7 +6763,7 @@
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -6872,7 +6872,7 @@
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,