薛鸿潇 5 лет назад
Родитель
Сommit
4c8550b412

+ 47 - 47
tower_sanguo/assets/resources/module/redEnvelopes/redEnvelopes.prefab

@@ -726,7 +726,7 @@
         "__id__": 26
       },
       {
-        "__id__": 30
+        "__id__": 29
       },
       {
         "__id__": 33
@@ -1022,7 +1022,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "hb1",
+    "_name": "hb5",
     "_objFlags": 0,
     "_parent": {
       "__id__": 15
@@ -1047,20 +1047,20 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 584,
-      "height": 578
+      "width": 586,
+      "height": 437
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
       "x": 0.5,
-      "y": 0.5
+      "y": 0
     },
     "_trs": {
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
         0,
-        0,
+        -289,
         0,
         0,
         0,
@@ -1100,7 +1100,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "1824f01b-115d-4d1c-a30b-3d62c7798f84"
+      "__uuid__": "4a110797-9064-4e58-9b44-402d3af993b3"
     },
     "_type": 0,
     "_sizeMode": 1,
@@ -1124,12 +1124,12 @@
     "asset": {
       "__uuid__": "9c445f3e-7e34-4c6c-b217-4b83d09dad47"
     },
-    "fileId": "224vu+buJOgKMWLZAWfykO",
+    "fileId": "26nUlPC0NA26JwdIzPX47v",
     "sync": false
   },
   {
     "__type__": "cc.Node",
-    "_name": "hb2",
+    "_name": "hb1",
     "_objFlags": 0,
     "_parent": {
       "__id__": 15
@@ -1139,13 +1139,10 @@
     "_components": [
       {
         "__id__": 27
-      },
-      {
-        "__id__": 28
       }
     ],
     "_prefab": {
-      "__id__": 29
+      "__id__": 28
     },
     "_opacity": 255,
     "_color": {
@@ -1157,20 +1154,20 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 602,
-      "height": 325
+      "width": 584,
+      "height": 578
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
       "x": 0.5,
-      "y": 1
+      "y": 0.5
     },
     "_trs": {
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
         0,
-        417.049,
+        -4.814,
         0,
         0,
         0,
@@ -1210,7 +1207,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "5f1c4259-1a08-410a-8a64-87b1fc0bf79c"
+      "__uuid__": "1824f01b-115d-4d1c-a30b-3d62c7798f84"
     },
     "_type": 0,
     "_sizeMode": 1,
@@ -1227,25 +1224,6 @@
     "_id": ""
   },
   {
-    "__type__": "cc.Animation",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 26
-    },
-    "_enabled": true,
-    "_defaultClip": {
-      "__uuid__": "7212db11-a5ca-4073-8180-a5d89d3b88a8"
-    },
-    "_clips": [
-      {
-        "__uuid__": "7212db11-a5ca-4073-8180-a5d89d3b88a8"
-      }
-    ],
-    "playOnLoad": false,
-    "_id": ""
-  },
-  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1
@@ -1253,20 +1231,23 @@
     "asset": {
       "__uuid__": "9c445f3e-7e34-4c6c-b217-4b83d09dad47"
     },
-    "fileId": "1cJVKSUGdHQYNqjGIenfTh",
+    "fileId": "224vu+buJOgKMWLZAWfykO",
     "sync": false
   },
   {
     "__type__": "cc.Node",
-    "_name": "hb5",
+    "_name": "hb2",
     "_objFlags": 0,
     "_parent": {
       "__id__": 15
     },
     "_children": [],
-    "_active": false,
+    "_active": true,
     "_components": [
       {
+        "__id__": 30
+      },
+      {
         "__id__": 31
       }
     ],
@@ -1283,20 +1264,20 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 586,
-      "height": 437
+      "width": 602,
+      "height": 325
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
       "x": 0.5,
-      "y": 0
+      "y": 1
     },
     "_trs": {
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
         0,
-        -289,
+        437.83,
         0,
         0,
         0,
@@ -1325,7 +1306,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 30
+      "__id__": 29
     },
     "_enabled": true,
     "_materials": [
@@ -1336,7 +1317,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "4a110797-9064-4e58-9b44-402d3af993b3"
+      "__uuid__": "5f1c4259-1a08-410a-8a64-87b1fc0bf79c"
     },
     "_type": 0,
     "_sizeMode": 1,
@@ -1353,6 +1334,25 @@
     "_id": ""
   },
   {
+    "__type__": "cc.Animation",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 29
+    },
+    "_enabled": true,
+    "_defaultClip": {
+      "__uuid__": "7212db11-a5ca-4073-8180-a5d89d3b88a8"
+    },
+    "_clips": [
+      {
+        "__uuid__": "7212db11-a5ca-4073-8180-a5d89d3b88a8"
+      }
+    ],
+    "playOnLoad": false,
+    "_id": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1
@@ -1360,7 +1360,7 @@
     "asset": {
       "__uuid__": "9c445f3e-7e34-4c6c-b217-4b83d09dad47"
     },
-    "fileId": "26nUlPC0NA26JwdIzPX47v",
+    "fileId": "1cJVKSUGdHQYNqjGIenfTh",
     "sync": false
   },
   {

+ 4 - 1
tower_sanguo/assets/scripts/data/GameData.ts

@@ -80,6 +80,7 @@ export default class GameData {
             this.serverConfig_data = await GameController.resM.loadRemoteJson('https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/h5game/tower_sanguo/data/serverConfig_data.json?v=' + new Date().getTime());
             this.help_data = await GameController.resM.loadRemoteJson('https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/h5game/tower_sanguo/data/help_data.json?v=' + new Date().getTime());
             this.commanderskill_data = await GameController.resM.loadRemoteJson('https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/h5game/tower_sanguo/data/commanderskill_data.json?v=' + new Date().getTime());
+            this.task_data = await GameController.resM.loadRemoteJson('https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/h5game/tower_sanguo/data/task_data.json?v=' + new Date().getTime());
             this.turntable_data = await GameController.resM.loadRemoteJson('https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/h5game/tower_sanguo/data/turntable_data.json?v=' + new Date().getTime());
 
             // this.db_data = cc.loader.getRes("data/db_data", cc.JsonAsset).json;
@@ -95,6 +96,7 @@ export default class GameData {
             // this.star_data = cc.loader.getRes("data/star_data", cc.JsonAsset).json;
             // this.help_data = cc.loader.getRes("data/help_data", cc.JsonAsset).json;
             // this.turntable_data = cc.loader.getRes("data/turntable_data", cc.JsonAsset).json;
+            // this.task_data = cc.loader.getRes("data/task_data", cc.JsonAsset).json;
             // this.commanderskill_data = cc.loader.getRes("data/commanderskill_data", cc.JsonAsset).json;
 
             this.initJsonData();
@@ -291,7 +293,8 @@ export default class GameData {
         }
 
         turntableModel.Instance.turntable_data = this.turntable_data;
-
+        // 任务
+        this.initTaskData();
         GameController.initSDK();
     }
     /** 初始化任务 */