Merge branch 'master' of http://git.mokasz.com/zouyong/tower_sanguo

# Conflicts:
#	tower_sanguo/assets/scripts/data/GameData.ts

tower_sanguo/assets/MOKA/manager/UIManager.ts

@@ -73,7 +73,7 @@ export default class UIManager {
             ui.tag = uiClass;
 
             callback && callback(ui);
-            cc.log('-----openUI----[   ', uiClass.getName(), '   ]----------');
+            //cc.log('-----openUI----[   ', uiClass.getName(), '   ]----------');
         });
     }
 

tower_sanguo/assets/MOKA/util/Utils.ts

@@ -327,6 +327,13 @@ export class Utils {
         return f;
     }
 
+    public static GetTimeLeft2BySecond(s: number): string {
+        let hours = Math.round((s - 30 * 60) / (60 * 60));
+        let minutes = Math.round((s - 30) / 60) % 60;
+        let seconds = s % 60;
+        return (hours > 0 ? (hours + "小时") : "") + (minutes > 0 ? (minutes + "分钟") : "") + (seconds > 0 ? (seconds + "秒") : "");
+    }
+
     // 随机生成32位字符串
     static randomString(len = 32) {
         let $chars =

tower_sanguo/assets/resources/data/skill_data.json

@@ -88,7 +88,7 @@
 		"name": "炎火星陨",
 		"res": "fight_skill_shitou",
 		"icon": "skill01",
-		"des": "[bro1=对全体目标造成最大生命][red1={40={0}}][bro1=的伤害（小怪秒杀）]",
+		"des": "[bro1=对全体造成最大生命][red1={26=$0}][bro1=的伤害(小怪秒杀)]",
 		"attType": "3",
 		"skillValue": "550,700,850"
 	},
@@ -97,7 +97,7 @@
 		"name": "暴雪寒流",
 		"res": "fight_skill_bing",
 		"icon": "skill02",
-		"des": "[bro1=对全体目标减速，并造成最大生命][red1={40={0}}][bro1=的伤害（小怪秒杀）]",
+		"des": "[bro1=对全体减速并造成最大生命][red1={26=$0}][bro1=的伤害(小怪秒杀)]",
 		"attType": "3",
 		"skillValue": "350,550,700",
 		"extra": "13"
@@ -106,7 +106,7 @@
 		"id": 110003,
 		"name": "铜墙铁壁",
 		"icon": "skill03",
-		"des": "[bro1=竖起兵墙，全体目标][red1={40={0}}][bro1=秒内不可通过]",
+		"des": "[bro1=竖起兵墙，全体目标][red1={26=$0}][bro1=秒内不可通过]",
 		"attType": "5",
 		"skillValue": "2.5,3,3.5"
 	},

tower_sanguo/assets/resources/module/marshalStage/marshalStage.prefab

@@ -39,20 +39,20 @@
         "__id__": 66
       },
       {
-        "__id__": 211
+        "__id__": 221
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 213
+        "__id__": 223
       },
       {
-        "__id__": 214
+        "__id__": 224
       }
     ],
     "_prefab": {
-      "__id__": 215
+      "__id__": 225
     },
     "_opacity": 255,
     "_color": {
@@ -2593,7 +2593,7 @@
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 210
+      "__id__": 220
     },
     "_opacity": 255,
     "_color": {
@@ -5157,13 +5157,13 @@
         "__id__": 184
       },
       {
-        "__id__": 206
+        "__id__": 216
       }
     ],
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 209
+      "__id__": 219
     },
     "_opacity": 255,
     "_color": {
@@ -6151,7 +6151,7 @@
     "asset": {
       "__uuid__": "5fe81515-8b08-4fba-97c9-4cc75544bb88"
     },
-    "fileId": "bfrjvuYrBAJ4d4OA0n5Sp9",
+    "fileId": "ac4UrhvzVNGaddEcfvodUt",
     "sync": false
   },
   {
@@ -6262,7 +6262,7 @@
     "asset": {
       "__uuid__": "5fe81515-8b08-4fba-97c9-4cc75544bb88"
     },
-    "fileId": "ae1EWFkoNLTpT7GqJP6fr8",
+    "fileId": "3eZtfpvmJM0ogIycCFvQFH",
     "sync": false
   },
   {
@@ -6336,7 +6336,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 385,
+      "width": 410.89999999999964,
       "height": 79.1
     },
     "_anchorPoint": {
@@ -6400,7 +6400,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 286,
+      "width": 234,
       "height": 44.1
     },
     "_anchorPoint": {
@@ -6453,8 +6453,8 @@
       }
     ],
     "_useOriginalSize": true,
-    "_string": "对全体目标造成最大生命",
-    "_N$string": "对全体目标造成最大生命",
+    "_string": "对全体造成最大生命",
+    "_N$string": "对全体造成最大生命",
     "_fontSize": 26,
     "_lineHeight": 35,
     "_enableWrapText": true,
@@ -6481,7 +6481,7 @@
     "asset": {
       "__uuid__": "5fe81515-8b08-4fba-97c9-4cc75544bb88"
     },
-    "fileId": "d72JS1MtRC5rjbfer2ocYz",
+    "fileId": "3dXk+Oie9KeYUoJTrkLG6s",
     "sync": false
   },
   {
@@ -6511,7 +6511,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 87.45,
+      "width": 167.17,
       "height": 44.1
     },
     "_anchorPoint": {
@@ -6523,7 +6523,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        286,
+        234,
         -44.099999999999994,
         0,
         0,
@@ -6564,8 +6564,8 @@
       }
     ],
     "_useOriginalSize": true,
-    "_string": "1%(+0.1)",
-    "_N$string": "1%(+0.1)",
+    "_string": "95.5%(+94.7%)",
+    "_N$string": "95.5%(+94.7%)",
     "_fontSize": 26,
     "_lineHeight": 35,
     "_enableWrapText": true,
@@ -6592,7 +6592,7 @@
     "asset": {
       "__uuid__": "5fe81515-8b08-4fba-97c9-4cc75544bb88"
     },
-    "fileId": "32gYQUJ/JHeIdlTl+tldY3",
+    "fileId": "4dfpxSGM5CMJvKKlk6Csta",
     "sync": false
   },
   {
@@ -6703,7 +6703,7 @@
     "asset": {
       "__uuid__": "5fe81515-8b08-4fba-97c9-4cc75544bb88"
     },
-    "fileId": "fenIrm5CNDf5jjruU8o3wC",
+    "fileId": "95YoutYeJG04U9Ktf9zkHO",
     "sync": false
   },
   {
@@ -6716,14 +6716,14 @@
     "_enabled": true,
     "_fontFamily": "Arial",
     "_isSystemFontUsed": false,
-    "_N$string": "<color=#4E301B>对全体目标造成最大生命<color=#E6181A>1%(+0.1)</color>的伤害，秒杀普通怪物</color>",
+    "_N$string": "<color=#4E301B>对全体造成最大生命<color=#E6181A>95.5%(+94.7%)</color>的伤害，秒杀普通怪物</color>",
     "_N$horizontalAlign": 0,
     "_N$fontSize": 26,
     "_N$font": {
       "__uuid__": "2bec5164-bd32-4719-bbbf-97e2c8b3ab1a"
     },
     "_N$cacheMode": 0,
-    "_N$maxWidth": 385,
+    "_N$maxWidth": 410.89999999999964,
     "_N$lineHeight": 35,
     "_N$imageAtlas": null,
     "_N$handleTouchEvent": true,
@@ -6865,12 +6865,24 @@
       "__id__": 143
     },
     "_enabled": true,
-    "graySrc": null,
-    "img_skill": null,
-    "txt_Time": null,
-    "txtRich_Name": null,
-    "txtRich_Des": null,
-    "lock": null,
+    "graySrc": {
+      "__id__": 181
+    },
+    "img_skill": {
+      "__id__": 145
+    },
+    "txt_Time": {
+      "__id__": 151
+    },
+    "txtRich_Name": {
+      "__id__": 164
+    },
+    "txtRich_Des": {
+      "__id__": 176
+    },
+    "lock": {
+      "__id__": 178
+    },
     "_id": ""
   },
   {
@@ -6896,13 +6908,16 @@
         "__id__": 185
       },
       {
-        "__id__": 196
+        "__id__": 197
+      },
+      {
+        "__id__": 206
       }
     ],
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 205
+      "__id__": 215
     },
     "_opacity": 255,
     "_color": {
@@ -6976,7 +6991,7 @@
       }
     ],
     "_prefab": {
-      "__id__": 195
+      "__id__": 196
     },
     "_opacity": 255,
     "_color": {
@@ -7308,7 +7323,11 @@
     "_grayMaterial": null,
     "duration": 0.1,
     "zoomScale": 1.2,
-    "clickEvents": [],
+    "clickEvents": [
+      {
+        "__id__": 195
+      }
+    ],
     "_N$interactable": true,
     "_N$enableAutoGrayEffect": false,
     "_N$transition": 3,
@@ -7365,6 +7384,16 @@
     "_id": ""
   },
   {
+    "__type__": "cc.ClickEvent",
+    "target": {
+      "__id__": 1
+    },
+    "component": "",
+    "_componentId": "b8effqNDadMir3VrWurZSXv",
+    "handler": "click_AdBtn",
+    "customEventData": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1
@@ -7377,27 +7406,355 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "layout",
+    "_name": "btn_ad_no",
     "_objFlags": 0,
     "_parent": {
       "__id__": 184
     },
     "_children": [
       {
-        "__id__": 197
+        "__id__": 198
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 202
+      },
+      {
+        "__id__": 203
+      }
+    ],
+    "_prefab": {
+      "__id__": 205
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 214,
+      "height": 86
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        -381.583,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "txt",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 197
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 199
       },
       {
         "__id__": 200
       }
     ],
+    "_prefab": {
+      "__id__": 201
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 122,
+      "height": 39.8
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        3.495,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 198
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_useOriginalSize": false,
+    "_string": "清除冷却",
+    "_N$string": "清除冷却",
+    "_fontSize": 30,
+    "_lineHeight": 30,
+    "_enableWrapText": true,
+    "_N$file": {
+      "__uuid__": "2bec5164-bd32-4719-bbbf-97e2c8b3ab1a"
+    },
+    "_isSystemFontUsed": false,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_styleFlags": 0,
+    "_underlineHeight": 0,
+    "_N$horizontalAlign": 1,
+    "_N$verticalAlign": 1,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 0,
+    "_N$cacheMode": 1,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.LabelOutline",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 198
+    },
+    "_enabled": true,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 99,
+      "g": 98,
+      "b": 98,
+      "a": 255
+    },
+    "_width": 1,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "5fe81515-8b08-4fba-97c9-4cc75544bb88"
+    },
+    "fileId": "f2e8NDTaFIB6sky1hhdtgc",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 197
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "0d53c864-ccea-4dc3-a907-e1f6d1c2dd2c"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Button",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 197
+    },
+    "_enabled": true,
+    "_normalMaterial": {
+      "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+    },
+    "_grayMaterial": null,
+    "duration": 0.1,
+    "zoomScale": 1.2,
+    "clickEvents": [
+      {
+        "__id__": 204
+      }
+    ],
+    "_N$interactable": true,
+    "_N$enableAutoGrayEffect": false,
+    "_N$transition": 3,
+    "transition": 3,
+    "_N$normalColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_N$pressedColor": {
+      "__type__": "cc.Color",
+      "r": 211,
+      "g": 211,
+      "b": 211,
+      "a": 255
+    },
+    "pressedColor": {
+      "__type__": "cc.Color",
+      "r": 211,
+      "g": 211,
+      "b": 211,
+      "a": 255
+    },
+    "_N$hoverColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "hoverColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_N$disabledColor": {
+      "__type__": "cc.Color",
+      "r": 124,
+      "g": 124,
+      "b": 124,
+      "a": 255
+    },
+    "_N$normalSprite": null,
+    "_N$pressedSprite": null,
+    "pressedSprite": null,
+    "_N$hoverSprite": null,
+    "hoverSprite": null,
+    "_N$disabledSprite": null,
+    "_N$target": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.ClickEvent",
+    "target": {
+      "__id__": 1
+    },
+    "component": "",
+    "_componentId": "b8effqNDadMir3VrWurZSXv",
+    "handler": "click_AdNoBtn",
+    "customEventData": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "5fe81515-8b08-4fba-97c9-4cc75544bb88"
+    },
+    "fileId": "bbz5uzsexAdKtrpZSd8rij",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "layout",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 184
+    },
+    "_children": [
+      {
+        "__id__": 207
+      },
+      {
+        "__id__": 210
+      }
+    ],
     "_active": true,
     "_components": [
       {
-        "__id__": 203
+        "__id__": 213
       }
     ],
     "_prefab": {
-      "__id__": 204
+      "__id__": 214
     },
     "_opacity": 255,
     "_color": {
@@ -7451,17 +7808,17 @@
     "_name": "tip",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 196
+      "__id__": 206
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 198
+        "__id__": 208
       }
     ],
     "_prefab": {
-      "__id__": 199
+      "__id__": 209
     },
     "_opacity": 255,
     "_color": {
@@ -7515,7 +7872,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 197
+      "__id__": 207
     },
     "_enabled": true,
     "_materials": [
@@ -7560,17 +7917,17 @@
     "_name": "txt_num",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 196
+      "__id__": 206
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 201
+        "__id__": 211
       }
     ],
     "_prefab": {
-      "__id__": 202
+      "__id__": 212
     },
     "_opacity": 255,
     "_color": {
@@ -7624,7 +7981,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 200
+      "__id__": 210
     },
     "_enabled": true,
     "_materials": [
@@ -7669,7 +8026,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 196
+      "__id__": 206
     },
     "_enabled": true,
     "_layoutSize": {
@@ -7729,11 +8086,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 207
+        "__id__": 217
       }
     ],
     "_prefab": {
-      "__id__": 208
+      "__id__": 218
     },
     "_opacity": 255,
     "_color": {
@@ -7787,7 +8144,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 206
+      "__id__": 216
     },
     "_enabled": true,
     "_materials": [
@@ -7860,7 +8217,7 @@
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 212
+      "__id__": 222
     },
     "_opacity": 255,
     "_color": {
@@ -8001,8 +8358,23 @@
     "node_ad": {
       "__id__": 184
     },
+    "btn_ad": {
+      "__id__": 185
+    },
+    "btn_ad_no": {
+      "__id__": 197
+    },
     "txt_remaind_adtimes": {
-      "__id__": 201
+      "__id__": 211
+    },
+    "node_skill": {
+      "__id__": 136
+    },
+    "window_marshal": {
+      "__id__": 66
+    },
+    "window_skill": {
+      "__id__": 221
     },
     "_id": ""
   },

tower_sanguo/assets/resources/module/task/texture/zy_head1.png.meta → tower_sanguo/assets/resources/module/marshalStage/texture/button.png.meta

@@ -1,20 +1,20 @@
 {
   "ver": "2.3.4",
-  "uuid": "f8a44976-29ed-4e35-b752-d642d02cb298",
+  "uuid": "4084b091-4185-453d-98c7-fa17cecd7cb0",
   "type": "sprite",
   "wrapMode": "clamp",
   "filterMode": "bilinear",
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 110,
-  "height": 110,
+  "width": 214,
+  "height": 86,
   "platformSettings": {},
   "subMetas": {
-    "zy_head1": {
+    "button": {
       "ver": "1.0.4",
-      "uuid": "8230a88b-bd36-4e99-9613-c6393037f051",
-      "rawTextureUuid": "f8a44976-29ed-4e35-b752-d642d02cb298",
+      "uuid": "0d53c864-ccea-4dc3-a907-e1f6d1c2dd2c",
+      "rawTextureUuid": "4084b091-4185-453d-98c7-fa17cecd7cb0",
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
@@ -22,10 +22,10 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 110,
-      "height": 110,
-      "rawWidth": 110,
-      "rawHeight": 110,
+      "width": 214,
+      "height": 86,
+      "rawWidth": 214,
+      "rawHeight": 86,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

tower_sanguo/assets/resources/module/task/hongbaoguang.meta

@@ -0,0 +1,7 @@
+{
+  "ver": "1.0.1",
+  "uuid": "ea215ad9-ce34-44ad-a659-1b4a5e60b672",
+  "isSubpackage": false,
+  "subpackageName": "",
+  "subMetas": {}
+}

tower_sanguo/assets/resources/module/task/hongbaoguang/skeleton.atlas

@@ -0,0 +1,41 @@
+
+skeleton.png
+size: 265,160
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+bianyuan
+  rotate: false
+  xy: 149, 2
+  size: 64, 79
+  orig: 64, 79
+  offset: 0, 0
+  index: -1
+dian
+  rotate: false
+  xy: 226, 143
+  size: 16, 15
+  orig: 16, 16
+  offset: 0, 1
+  index: -1
+hongbao
+  rotate: false
+  xy: 215, 18
+  size: 48, 63
+  orig: 48, 63
+  offset: 0, 0
+  index: -1
+light
+  rotate: false
+  xy: 2, 2
+  size: 145, 156
+  orig: 149, 163
+  offset: 4, 4
+  index: -1
+yuan
+  rotate: false
+  xy: 149, 83
+  size: 75, 75
+  orig: 75, 75
+  offset: 0, 0
+  index: -1

tower_sanguo/assets/resources/module/task/hongbaoguang/skeleton.atlas.meta

@@ -0,0 +1,5 @@
+{
+  "ver": "1.0.1",
+  "uuid": "03cbf425-76b2-4c3c-a36a-c7b14be7508b",
+  "subMetas": {}
+}

tower_sanguo/assets/resources/module/task/hongbaoguang/skeleton.json.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.2.3",
+  "uuid": "2ffff260-0fab-4a51-b498-6a721c853e12",
+  "textures": [
+    "be2cb44c-30eb-42f3-9fbb-12a45f6028bf"
+  ],
+  "scale": 1,
+  "subMetas": {}
+}

tower_sanguo/assets/resources/module/task/hongbaoguang/skeleton.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "be2cb44c-30eb-42f3-9fbb-12a45f6028bf",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 265,
+  "height": 160,
+  "platformSettings": {},
+  "subMetas": {
+    "skeleton": {
+      "ver": "1.0.4",
+      "uuid": "064b3d53-151f-4fbf-ba1a-2f2c0544f1b9",
+      "rawTextureUuid": "be2cb44c-30eb-42f3-9fbb-12a45f6028bf",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 2,
+      "trimY": 2,
+      "width": 261,
+      "height": 156,
+      "rawWidth": 265,
+      "rawHeight": 160,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/task/prefab/task_item.prefab.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.2.7",
-  "uuid": "a198f2c1-79ec-46f9-af1b-2e68fbf7cbc6",
+  "uuid": "6cdf02e2-4eca-4d4b-bd41-61dd87e596af",
   "optimizationPolicy": "AUTO",
   "asyncLoadAssets": false,
   "readonly": false,

tower_sanguo/assets/resources/module/task/texture/mrt_flag_1.png.meta → tower_sanguo/assets/resources/module/task/prefab_texture/bg1.png.meta

@@ -1,20 +1,20 @@
 {
   "ver": "2.3.4",
-  "uuid": "11194df4-a674-46d3-ac07-9176d0c30257",
+  "uuid": "9df281ac-a3ea-4128-9ad4-f8f13e48f25b",
   "type": "sprite",
   "wrapMode": "clamp",
   "filterMode": "bilinear",
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 170,
-  "height": 180,
+  "width": 701,
+  "height": 171,
   "platformSettings": {},
   "subMetas": {
-    "mrt_flag_1": {
+    "bg1": {
       "ver": "1.0.4",
-      "uuid": "110ea031-9216-4c0e-946f-fcba7a4ad8ab",
-      "rawTextureUuid": "11194df4-a674-46d3-ac07-9176d0c30257",
+      "uuid": "ce6f05c8-4ac0-44bb-b47b-5363ab923f43",
+      "rawTextureUuid": "9df281ac-a3ea-4128-9ad4-f8f13e48f25b",
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
@@ -22,10 +22,10 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 170,
-      "height": 180,
-      "rawWidth": 170,
-      "rawHeight": 180,
+      "width": 701,
+      "height": 171,
+      "rawWidth": 701,
+      "rawHeight": 171,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

tower_sanguo/assets/resources/module/task/prefab_texture/bg2.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "06db4080-6e03-46d8-8274-0eb8b5a8a0a7",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 697,
+  "height": 912,
+  "platformSettings": {},
+  "subMetas": {
+    "bg2": {
+      "ver": "1.0.4",
+      "uuid": "ceccddc1-8ff0-441c-8e64-821290016744",
+      "rawTextureUuid": "06db4080-6e03-46d8-8274-0eb8b5a8a0a7",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 697,
+      "height": 912,
+      "rawWidth": 697,
+      "rawHeight": 912,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/task/prefab_texture/bg3.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "88e0d50e-ebab-43b0-9d31-0446a683fe1d",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 626,
+  "height": 137,
+  "platformSettings": {},
+  "subMetas": {
+    "bg3": {
+      "ver": "1.0.4",
+      "uuid": "4990e8e2-7e06-4ebf-a251-221c25b9b5b0",
+      "rawTextureUuid": "88e0d50e-ebab-43b0-9d31-0446a683fe1d",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 626,
+      "height": 137,
+      "rawWidth": 626,
+      "rawHeight": 137,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/task/prefab_texture/bg_refresh.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "088f76f7-9480-4642-aa45-15415fa09dd8",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 240,
+  "height": 27,
+  "platformSettings": {},
+  "subMetas": {
+    "bg_refresh": {
+      "ver": "1.0.4",
+      "uuid": "0c9b0cc7-4738-4d22-ace1-47b9efae50bd",
+      "rawTextureUuid": "088f76f7-9480-4642-aa45-15415fa09dd8",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 240,
+      "height": 27,
+      "rawWidth": 240,
+      "rawHeight": 27,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/task/prefab_texture/bg_title.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "f60168f5-9022-4641-952d-5f804a75f522",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 314,
+  "height": 72,
+  "platformSettings": {},
+  "subMetas": {
+    "bg_title": {
+      "ver": "1.0.4",
+      "uuid": "fbccce43-f72a-41a1-b98b-f2962ed6cb1e",
+      "rawTextureUuid": "f60168f5-9022-4641-952d-5f804a75f522",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 314,
+      "height": 72,
+      "rawWidth": 314,
+      "rawHeight": 72,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/task/prefab_texture/button1.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "4ba4d7d4-588b-43b3-a555-89dc07efbd8f",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 186,
+  "height": 74,
+  "platformSettings": {},
+  "subMetas": {
+    "button1": {
+      "ver": "1.0.4",
+      "uuid": "8ae147b9-3a78-475f-86a8-955e0eefd909",
+      "rawTextureUuid": "4ba4d7d4-588b-43b3-a555-89dc07efbd8f",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 186,
+      "height": 74,
+      "rawWidth": 186,
+      "rawHeight": 74,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/task/prefab_texture/button2.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "b5db1990-d429-401b-ba84-4e5e20e4941f",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 186,
+  "height": 74,
+  "platformSettings": {},
+  "subMetas": {
+    "button2": {
+      "ver": "1.0.4",
+      "uuid": "a067a92d-6233-48d5-b0c4-ffcd618470d4",
+      "rawTextureUuid": "b5db1990-d429-401b-ba84-4e5e20e4941f",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 186,
+      "height": 74,
+      "rawWidth": 186,
+      "rawHeight": 74,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/task/prefab_texture/button3.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "d748554e-1218-4776-b14e-faee0fc8794e",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 186,
+  "height": 74,
+  "platformSettings": {},
+  "subMetas": {
+    "button3": {
+      "ver": "1.0.4",
+      "uuid": "349d7560-d3a6-4f12-8507-fa3bffa810f0",
+      "rawTextureUuid": "d748554e-1218-4776-b14e-faee0fc8794e",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 186,
+      "height": 74,
+      "rawWidth": 186,
+      "rawHeight": 74,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/task/prefab_texture/button_big.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "8befdd9d-7acf-4a0d-9769-a507a6d2c420",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 345,
+  "height": 138,
+  "platformSettings": {},
+  "subMetas": {
+    "button_big": {
+      "ver": "1.0.4",
+      "uuid": "71a39748-03b3-4fb6-9c53-f4c30b8ebd84",
+      "rawTextureUuid": "8befdd9d-7acf-4a0d-9769-a507a6d2c420",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 345,
+      "height": 138,
+      "rawWidth": 345,
+      "rawHeight": 138,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/task/prefab_texture/button_big_tv.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "3c4b31b1-cbc6-4ded-8831-afe38720afad",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 61,
+  "height": 73,
+  "platformSettings": {},
+  "subMetas": {
+    "button_big_tv": {
+      "ver": "1.0.4",
+      "uuid": "83451451-7c57-4c21-b771-112d7752d6f8",
+      "rawTextureUuid": "3c4b31b1-cbc6-4ded-8831-afe38720afad",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 61,
+      "height": 73,
+      "rawWidth": 61,
+      "rawHeight": 73,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/task/prefab_texture/bx_big.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "603a1273-8789-437b-a656-dd7e598ce3d7",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 274,
+  "height": 235,
+  "platformSettings": {},
+  "subMetas": {
+    "bx_big": {
+      "ver": "1.0.4",
+      "uuid": "b3b5645b-5045-46b7-a43c-0676bbab787d",
+      "rawTextureUuid": "603a1273-8789-437b-a656-dd7e598ce3d7",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 274,
+      "height": 235,
+      "rawWidth": 274,
+      "rawHeight": 235,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/task/prefab_texture/bx_big1.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "468d2961-8526-4b09-9611-05847e8efa5c",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 249,
+  "height": 202,
+  "platformSettings": {},
+  "subMetas": {
+    "bx_big1": {
+      "ver": "1.0.4",
+      "uuid": "c3f6c704-c0a5-4634-bb58-ad5196a8a1b3",
+      "rawTextureUuid": "468d2961-8526-4b09-9611-05847e8efa5c",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 249,
+      "height": 202,
+      "rawWidth": 249,
+      "rawHeight": 202,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/task/prefab_texture/gongxi.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "322e68e3-365f-45d7-b627-9911aa005f78",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 543,
+  "height": 193,
+  "platformSettings": {},
+  "subMetas": {
+    "gongxi": {
+      "ver": "1.0.4",
+      "uuid": "7539b7a5-e50f-4849-8344-3c8a899e68ac",
+      "rawTextureUuid": "322e68e3-365f-45d7-b627-9911aa005f78",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 543,
+      "height": 193,
+      "rawWidth": 543,
+      "rawHeight": 193,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/task/prefab_texture/guang.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "7440ca48-08ad-4d4d-8fb7-7c5b83a9b720",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 406,
+  "height": 406,
+  "platformSettings": {},
+  "subMetas": {
+    "guang": {
+      "ver": "1.0.4",
+      "uuid": "b81d8a5a-6f76-4fd7-a2e0-97dc57a273cc",
+      "rawTextureUuid": "7440ca48-08ad-4d4d-8fb7-7c5b83a9b720",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 406,
+      "height": 406,
+      "rawWidth": 406,
+      "rawHeight": 406,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/task/prefab_texture/guang1.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "a8013cae-6b56-42c8-9686-ecd43c46ae93",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 426,
+  "height": 234,
+  "platformSettings": {},
+  "subMetas": {
+    "guang1": {
+      "ver": "1.0.4",
+      "uuid": "81e82fb7-b368-401a-bf94-01510ed0ef16",
+      "rawTextureUuid": "a8013cae-6b56-42c8-9686-ecd43c46ae93",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 426,
+      "height": 234,
+      "rawWidth": 426,
+      "rawHeight": 234,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/task/prefab_texture/hbb_title_bg.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "daa4d84b-b19e-44f7-8d70-145ccc9417bd",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 490,
+  "height": 65,
+  "platformSettings": {},
+  "subMetas": {
+    "hbb_title_bg": {
+      "ver": "1.0.4",
+      "uuid": "73101f06-17c1-421e-8a86-263afc264b32",
+      "rawTextureUuid": "daa4d84b-b19e-44f7-8d70-145ccc9417bd",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 490,
+      "height": 65,
+      "rawWidth": 490,
+      "rawHeight": 65,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/task/prefab_texture/icon_bg_hy.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "18b62f43-7b8f-445b-918a-e00d14b66bd4",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 116,
+  "height": 116,
+  "platformSettings": {},
+  "subMetas": {
+    "icon_bg_hy": {
+      "ver": "1.0.4",
+      "uuid": "fe6c099e-03bd-4daa-b56c-33eaab47ab52",
+      "rawTextureUuid": "18b62f43-7b8f-445b-918a-e00d14b66bd4",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 116,
+      "height": 116,
+      "rawWidth": 116,
+      "rawHeight": 116,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/task/prefab_texture/icon_bg_lc.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "fd9e72e7-3251-4b00-8779-f1d7f28bb767",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 149,
+  "height": 149,
+  "platformSettings": {},
+  "subMetas": {
+    "icon_bg_lc": {
+      "ver": "1.0.4",
+      "uuid": "9322d04d-8242-4b94-bf67-cc6e1abd4971",
+      "rawTextureUuid": "fd9e72e7-3251-4b00-8779-f1d7f28bb767",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 149,
+      "height": 149,
+      "rawWidth": 149,
+      "rawHeight": 149,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/task/prefab_texture/icon_bx.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "6c0ce7c4-bdd9-4b76-88e2-2ebce6510540",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 67,
+  "height": 58,
+  "platformSettings": {},
+  "subMetas": {
+    "icon_bx": {
+      "ver": "1.0.4",
+      "uuid": "219f405a-d993-4417-8fca-d35a5a8bd8ff",
+      "rawTextureUuid": "6c0ce7c4-bdd9-4b76-88e2-2ebce6510540",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 67,
+      "height": 58,
+      "rawWidth": 67,
+      "rawHeight": 58,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/task/prefab_texture/icon_bx1.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "a98601b2-a97d-443f-a823-ff7f563e3039",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 61,
+  "height": 50,
+  "platformSettings": {},
+  "subMetas": {
+    "icon_bx1": {
+      "ver": "1.0.4",
+      "uuid": "e02593f6-d797-4e30-91b2-e1b5e0417e70",
+      "rawTextureUuid": "a98601b2-a97d-443f-a823-ff7f563e3039",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 61,
+      "height": 50,
+      "rawWidth": 61,
+      "rawHeight": 50,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/task/prefab_texture/icon_hb.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "130b5d10-3ace-4065-bf0e-2f9e43c3d9c9",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 60,
+  "height": 75,
+  "platformSettings": {},
+  "subMetas": {
+    "icon_hb": {
+      "ver": "1.0.4",
+      "uuid": "65149bc2-b41c-4eb7-8c31-b2f7896f9d59",
+      "rawTextureUuid": "130b5d10-3ace-4065-bf0e-2f9e43c3d9c9",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 60,
+      "height": 75,
+      "rawWidth": 60,
+      "rawHeight": 75,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/task/prefab_texture/icon_hb1.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "dbb67ea3-5447-4f39-bcab-85cb97e1c1d2",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 48,
+  "height": 63,
+  "platformSettings": {},
+  "subMetas": {
+    "icon_hb1": {
+      "ver": "1.0.4",
+      "uuid": "abeddfa8-fd38-4c57-93e6-0f30f6e381a6",
+      "rawTextureUuid": "dbb67ea3-5447-4f39-bcab-85cb97e1c1d2",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 48,
+      "height": 63,
+      "rawWidth": 48,
+      "rawHeight": 63,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/task/prefab_texture/icon_hb2.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "a74cd1d5-638f-445c-8684-d39e06774028",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 48,
+  "height": 70,
+  "platformSettings": {},
+  "subMetas": {
+    "icon_hb2": {
+      "ver": "1.0.4",
+      "uuid": "825b0186-8ef1-4835-9d37-df4d88ffabf5",
+      "rawTextureUuid": "a74cd1d5-638f-445c-8684-d39e06774028",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 48,
+      "height": 70,
+      "rawWidth": 48,
+      "rawHeight": 70,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/task/prefab_texture/icon_hbb.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "21493938-a304-440d-bb23-cdca72d615a3",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 215,
+  "height": 221,
+  "platformSettings": {},
+  "subMetas": {
+    "icon_hbb": {
+      "ver": "1.0.4",
+      "uuid": "661d39b0-930a-4df6-8cd6-27ca093ea1f3",
+      "rawTextureUuid": "21493938-a304-440d-bb23-cdca72d615a3",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 215,
+      "height": 221,
+      "rawWidth": 215,
+      "rawHeight": 221,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/task/prefab_texture/icon_huoyue.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "14237e12-f271-4a6a-b0b4-48d06bdc9c91",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 93,
+  "height": 116,
+  "platformSettings": {},
+  "subMetas": {
+    "icon_huoyue": {
+      "ver": "1.0.4",
+      "uuid": "4ff49106-0773-48e2-bb54-6e4ba2df47ff",
+      "rawTextureUuid": "14237e12-f271-4a6a-b0b4-48d06bdc9c91",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 93,
+      "height": 116,
+      "rawWidth": 93,
+      "rawHeight": 116,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/task/prefab_texture/icon_hy.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "b51b1447-cc5a-46ef-9cc0-d6e1c0b3911e",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 94,
+  "height": 90,
+  "platformSettings": {},
+  "subMetas": {
+    "icon_hy": {
+      "ver": "1.0.4",
+      "uuid": "6f96ad43-6f5c-4351-802e-7063f0381cb1",
+      "rawTextureUuid": "b51b1447-cc5a-46ef-9cc0-d6e1c0b3911e",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 94,
+      "height": 90,
+      "rawWidth": 94,
+      "rawHeight": 90,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/task/prefab_texture/icon_lc.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "1d6e914a-f78a-438c-8b78-c045df0e1c63",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 95,
+  "height": 111,
+  "platformSettings": {},
+  "subMetas": {
+    "icon_lc": {
+      "ver": "1.0.4",
+      "uuid": "ba13f79d-e278-4bd6-8467-e69a995abaf8",
+      "rawTextureUuid": "1d6e914a-f78a-438c-8b78-c045df0e1c63",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 95,
+      "height": 111,
+      "rawWidth": 95,
+      "rawHeight": 111,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/task/prefab_texture/progress_hy.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "1ef3b4b7-a1dd-4dff-9d26-4081a0a24490",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 600,
+  "height": 41,
+  "platformSettings": {},
+  "subMetas": {
+    "progress_hy": {
+      "ver": "1.0.4",
+      "uuid": "ce906e18-65c3-449e-bbde-0419490838bb",
+      "rawTextureUuid": "1ef3b4b7-a1dd-4dff-9d26-4081a0a24490",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 600,
+      "height": 41,
+      "rawWidth": 600,
+      "rawHeight": 41,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/task/texture/kapai_name4.png.meta → tower_sanguo/assets/resources/module/task/prefab_texture/progress_hy1.png.meta

@@ -1,20 +1,20 @@
 {
   "ver": "2.3.4",
-  "uuid": "4e6ea33a-56c8-4fbd-9311-327f07e4020c",
+  "uuid": "1adc1b39-971a-4063-a6a5-31e33d5b7693",
   "type": "sprite",
   "wrapMode": "clamp",
   "filterMode": "bilinear",
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 161,
+  "width": 594,
   "height": 35,
   "platformSettings": {},
   "subMetas": {
-    "kapai_name4": {
+    "progress_hy1": {
       "ver": "1.0.4",
-      "uuid": "4d57be2c-9fe7-4d82-89ae-fe012b55400d",
-      "rawTextureUuid": "4e6ea33a-56c8-4fbd-9311-327f07e4020c",
+      "uuid": "1f4d5b35-a40f-4e2d-bc51-acf6377566c9",
+      "rawTextureUuid": "1adc1b39-971a-4063-a6a5-31e33d5b7693",
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
@@ -22,9 +22,9 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 161,
+      "width": 594,
       "height": 35,
-      "rawWidth": 161,
+      "rawWidth": 594,
       "rawHeight": 35,
       "borderTop": 0,
       "borderBottom": 0,

tower_sanguo/assets/resources/module/task/prefab_texture/progress_rw.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "e90be282-86a3-432e-aef0-4394e3958b95",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 229,
+  "height": 34,
+  "platformSettings": {},
+  "subMetas": {
+    "progress_rw": {
+      "ver": "1.0.4",
+      "uuid": "70bd0ff9-6041-487b-b7d2-2b2dd93b64bd",
+      "rawTextureUuid": "e90be282-86a3-432e-aef0-4394e3958b95",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 229,
+      "height": 34,
+      "rawWidth": 229,
+      "rawHeight": 34,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/task/prefab_texture/progress_rw1.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "1dc4ed4e-91c7-45c3-aa77-1d369844a3db",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 221,
+  "height": 26,
+  "platformSettings": {},
+  "subMetas": {
+    "progress_rw1": {
+      "ver": "1.0.4",
+      "uuid": "24eca533-441e-49e8-bcd1-54f286d27123",
+      "rawTextureUuid": "1dc4ed4e-91c7-45c3-aa77-1d369844a3db",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 221,
+      "height": 26,
+      "rawWidth": 221,
+      "rawHeight": 26,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/task/prefab_texture/qipao.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "95b2b93d-0874-4269-ac0c-565a0b24933c",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 283,
+  "height": 45,
+  "platformSettings": {},
+  "subMetas": {
+    "qipao": {
+      "ver": "1.0.4",
+      "uuid": "d24be7c7-6560-4f3e-aa4a-1c419f4ccfeb",
+      "rawTextureUuid": "95b2b93d-0874-4269-ac0c-565a0b24933c",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 283,
+      "height": 45,
+      "rawWidth": 283,
+      "rawHeight": 45,
+      "borderTop": 20,
+      "borderBottom": 21,
+      "borderLeft": 136,
+      "borderRight": 138,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/task/prefab_texture/qipao1.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "0717c93c-607e-4d38-9ff7-fe97b2d3aa14",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 23,
+  "height": 13,
+  "platformSettings": {},
+  "subMetas": {
+    "qipao1": {
+      "ver": "1.0.4",
+      "uuid": "b78e80fa-4429-4a88-a3cc-f1d12238c93a",
+      "rawTextureUuid": "0717c93c-607e-4d38-9ff7-fe97b2d3aa14",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 23,
+      "height": 13,
+      "rawWidth": 23,
+      "rawHeight": 13,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/task/prefab_texture/title_bz.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "a1bb6915-bf5c-4328-832a-e187b7c2ead8",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 103,
+  "height": 46,
+  "platformSettings": {},
+  "subMetas": {
+    "title_bz": {
+      "ver": "1.0.4",
+      "uuid": "b5b7cd7f-549c-4204-975a-76b5ad57e694",
+      "rawTextureUuid": "a1bb6915-bf5c-4328-832a-e187b7c2ead8",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 103,
+      "height": 46,
+      "rawWidth": 103,
+      "rawHeight": 46,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/task/prefab_texture/title_hbb.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "e1eb8af8-fd7d-4823-874d-3d5cbd0fc0cb",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 157,
+  "height": 46,
+  "platformSettings": {},
+  "subMetas": {
+    "title_hbb": {
+      "ver": "1.0.4",
+      "uuid": "1ac80619-e76a-40eb-8746-8687940ade78",
+      "rawTextureUuid": "e1eb8af8-fd7d-4823-874d-3d5cbd0fc0cb",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 157,
+      "height": 46,
+      "rawWidth": 157,
+      "rawHeight": 46,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/resources/module/task/prefab_texture/title_rw.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.4",
+  "uuid": "1ab294bd-b8d6-4e27-9877-041f55d5ebd1",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 111,
+  "height": 46,
+  "platformSettings": {},
+  "subMetas": {
+    "title_rw": {
+      "ver": "1.0.4",
+      "uuid": "4f3f68a0-47e2-49b4-b04d-05c97d0ec99b",
+      "rawTextureUuid": "1ab294bd-b8d6-4e27-9877-041f55d5ebd1",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 111,
+      "height": 46,
+      "rawWidth": 111,
+      "rawHeight": 46,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

tower_sanguo/assets/scripts/data/GameData.ts

@@ -10,6 +10,7 @@ import PlayerUpdateResponse from "../net/msg/PlayerUpdateResponse";
 import { Dictionary } from "../utils/Dictionary";
 import BarrackVO from "../vo/BarrackVO";
 import BuffVO from "../vo/BuffVO";
+import CommanderSkillVO from "../vo/CommanderSkillVO";
 import FetterVO from "../vo/FetterVO";
 import GeneralVO from "../vo/GeneralVO";
 import MissionVO from "../vo/MissionVO";
@@ -17,6 +18,7 @@ import MonsterVO from "../vo/MonsterVO";
 import PlayerVO from "../vo/PlayerVO";
 import Prop from "../vo/Prop";
 import SkillVO from "../vo/SkillVO";
+import TaskVO from "../vo/TaskVO";
 import { GENERALPROP, GENERALSTATUS, ITEMTYPE, PLAYERPROP } from "./GameDefinition";
 
 const { ccclass } = cc._decorator;
@@ -56,11 +58,16 @@ export default class GameData {
     help_data: any;
     serverConfig_data: any;
     commanderskill_data: any;
+    private task_data: any;
 
     fullskillId: number[];
 
     async initLocalConfigs() {
+        console.log('initLocalConfigs');
+
         if (cc.sys.os == cc.sys.OS_WINDOWS) {
+            console.log('initLocalConfigs...windows');
+
             this.buff_data = await GameController.resM.loadRemoteJson('https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/h5game/tower_sanguo/data/buff_data.json?v=' + new Date().getTime());
             this.fetter_data = await GameController.resM.loadRemoteJson('https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/h5game/tower_sanguo/data/fetter_data.json?v=' + new Date().getTime());
             this.skill_data = await GameController.resM.loadRemoteJson('https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/h5game/tower_sanguo/data/skill_data.json?v=' + new Date().getTime());
@@ -74,26 +81,29 @@ 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;
-            this.serverConfig_data = cc.loader.getRes("data/serverConfig_data", cc.JsonAsset).json;
-            this.fetter_data = cc.loader.getRes("data/fetter_data", cc.JsonAsset).json;
-            this.buff_data = cc.loader.getRes("data/buff_data", cc.JsonAsset).json;
-            this.skill_data = cc.loader.getRes("data/skill_data", cc.JsonAsset).json;
-            this.general_data = cc.loader.getRes("data/general_data", cc.JsonAsset).json;
-            this.monster_data = cc.loader.getRes("data/monster_data", cc.JsonAsset).json;
-            this.mission_data = cc.loader.getRes("data/mission_data", cc.JsonAsset).json;
-            this.item_data = cc.loader.getRes("data/item_data", cc.JsonAsset).json;
-            this.barrack_data = cc.loader.getRes("data/barrack_data", cc.JsonAsset).json;
-            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.commanderskill_data = cc.loader.getRes("data/commanderskill_data", cc.JsonAsset).json;
+             this.db_data = cc.loader.getRes("data/db_data", cc.JsonAsset).json;
+             this.serverConfig_data = cc.loader.getRes("data/serverConfig_data", cc.JsonAsset).json;
+             this.fetter_data = cc.loader.getRes("data/fetter_data", cc.JsonAsset).json;
+             this.buff_data = cc.loader.getRes("data/buff_data", cc.JsonAsset).json;
+             this.skill_data = cc.loader.getRes("data/skill_data", cc.JsonAsset).json;
+             this.general_data = cc.loader.getRes("data/general_data", cc.JsonAsset).json;
+             this.monster_data = cc.loader.getRes("data/monster_data", cc.JsonAsset).json;
+             this.mission_data = cc.loader.getRes("data/mission_data", cc.JsonAsset).json;
+             this.item_data = cc.loader.getRes("data/item_data", cc.JsonAsset).json;
+             this.barrack_data = cc.loader.getRes("data/barrack_data", cc.JsonAsset).json;
+             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();
         }
         else {
+            console.log('initLocalConfigs...zip');
             let data = cc.loader.getRes('data/1.bin', cc.BufferAsset);
             this.initZip(data._buffer);
         }
@@ -283,11 +293,44 @@ export default class GameData {
             this.barrack_data.setValue(vo.campLv, vo);
         }
 
-        turntableModel.Instance.turntable_data = this.turntable_data;
+        for (let i in this.commanderskill_data) {
+            let o = this.commanderskill_data[i];
+            let csvo = new CommanderSkillVO();
+            csvo.id = o.id;
+            let tempstars = o.starcount.split(":");
+            for (let i = 0; i < tempstars.length; i++) {
+                csvo.unlockstarcount.push(parseInt(tempstars[i]));
+            }
+            this.commanderskill_data[i] = csvo;
+            console.log("index: " + i + " d: ", o);
+        }
+
+        //console.log("commanderskill_data: ", this.commanderskill_data);
+        //console.log("skill_data: ", this.skill_data);
 
+
+        turntableModel.Instance.turntable_data = this.turntable_data;
+        // 任务
+        this.initTaskData();
         GameController.initSDK();
     }
-
+    /** 初始化任务 */
+    private initTaskData() {
+        for (let i in this.task_data) {
+            let o = this.task_data[i];
+            let vo = new TaskVO();
+            vo.id = o.id;
+            vo.description = o.description;
+            vo.count1 = o.count1;
+            vo.activevalue1 = o.activevalue1;
+            vo.count2 = o.count2;
+            vo.activevalue2 = o.activevalue2;
+            vo.task_stage = 1;// 测试，此处应当取服务器值
+            vo.state = 1;
+            vo.bar = 0;
+            this.task_data[i] = vo;
+        }
+    }
     getAllGeneral() {
         return this.general_data;
     }
@@ -328,6 +371,12 @@ export default class GameData {
     getNextStarByID(id) {
         return this.star_data[id];
     }
+    getTaskById(id): TaskVO {
+        return this.task_data[id];
+    }
+    getAllTask(): Array<TaskVO> {
+        return this.task_data;
+    }
 
     createMonsterVOByID(id): MonsterVO {
         let o = this.monster_data[id];
@@ -342,6 +391,76 @@ export default class GameData {
         return vo;
     }
 
+    /**
+     * 获取技能效果值字符串
+     * @param skill 技能
+     * @param lv 等级
+     * @param add 加成值
+    */
+    getSkillValueStr(skill: SkillVO, lv: number,add:number=0) {
+        switch (skill.attackType) {
+            case 1:
+                return;
+            case 2:
+                return;
+            case 3:
+                return ((skill.skillValue[lv - 1] +add)/ 10000 * 100).toFixed(1)+"%";
+            case 4:
+                return;
+            case 5:
+                return skill.skillValue[lv - 1]+add;
+        }
+    }
+
+    /**
+     * 获取技能效果值
+     * @param skill 技能
+     * @param lv 等级
+    */
+     getSkillValue(skill: SkillVO, lv: number) {
+        switch (skill.attackType) {
+            case 1:
+                return;
+            case 2:
+                return;
+            case 3:
+                return (skill.skillValue[lv - 1])/ 10000;
+            case 4:
+                return;
+            case 5:
+                return skill.skillValue[lv - 1];
+        }
+    }
+
+    /** 
+     * 获取技能统帅加成值
+     * @param general 统帅
+    */
+    getSkillAddValue(general:GeneralVO){
+        return Math.pow(general.commander/100,1.9);
+    }
+
+    /** 
+     * 获取技能统帅加成值字符串
+     * @param skill 技能
+     * @param general 统帅
+    */
+     getSkillAddValueStr(skill: SkillVO,general:GeneralVO,skillvalue:number){
+         let addcommander=Math.pow(general.commander/100,1.9);
+        switch (skill.attackType) {
+            case 1:
+                return;
+            case 2:
+                return;
+            case 3:
+                return (addcommander*skillvalue * 100).toFixed(1)+"%";
+            case 4:
+                return;
+            case 5:
+                return (addcommander*skillvalue)+"";
+        }
+    }
+
 
     /** --------------------------------------------   serverData ---------------------------------------------- */
 
@@ -351,6 +470,7 @@ export default class GameData {
         this.fightData.font2 = cc.loader.getRes("font/font2", cc.Font);
         this.fightData.font3 = cc.loader.getRes("font/font3", cc.Font);
 
+
         GameController.setLoadingTips('正在获取玩家数据...');
         GameController.http.getServerConfig(this.getServerConfig.bind(this));
     }
@@ -361,6 +481,7 @@ export default class GameData {
             return;
         }
 
+        //console.log("------->ServerConfig: ", response);
 
         let open_arr = response.data.embattle_open.split(',');
         let arr = [];
@@ -382,6 +503,8 @@ export default class GameData {
         }
         let data = response.data as PlayerProp;
 
+        console.log("PlayerInfo: ", response);
+
 
         this.player.coins.set(PLAYERPROP.FOOD, new Prop(PLAYERPROP.FOOD, data.food));
         this.player.coins.set(PLAYERPROP.YB, new Prop(PLAYERPROP.YB, data.yb));
@@ -420,9 +543,36 @@ export default class GameData {
             }
         }
 
+        this.initScheduler();
+        this.updateSkillData();
+
         GameController.loadMain();
+        console.log("____________loadMain");    }
+
+    private updateSkillData() {
+        let stars = this.player.getAllStars();
+        let judge = false;
+        for (let i in this.commanderskill_data) {
+            let tempSkillCfg = this.commanderskill_data[i];
+            let tempSkillLv = -1;
+            for (let j = 0; j < tempSkillCfg.unlockstarcount.length; j++) {
+                if (tempSkillCfg.unlockstarcount[j] <= stars) {
+                    tempSkillLv = j + 1;
+                }
+                this.player.skill_lv_data.set(tempSkillCfg.id, tempSkillLv);
+            }
+            if (!judge && tempSkillLv != -1) {
+                judge = true;
+                this.player.skill_default_id = tempSkillCfg.id;
+            }
+        }
+        //console.log("------>update Skill default skill id: ", this.player.skill_default_id);
+        //console.log("------>update Skill All Stars: ", stars);
+        //console.log("------>update Skill SkillData: ", this.player.skill_lv_data);
     }
 
+
+
     /**
      * 
      * @param id 
@@ -503,6 +653,19 @@ export default class GameData {
         }
     }
 
+    private initScheduler() {
+        let self = this;
+        let count = 0;
+        let a = cc.director.getScheduler().schedule(() => {
+            count++;
+            if (count % 5 == 0) {
+                count = 1;
+                let vo: MissionVO = self.getMissionByID(self.player.current_mission);
+                self.updateProp(PLAYERPROP.FOOD, Math.floor(vo.foodRecover * 5), true);
+            }
+        }, this, 1);
+    }
+
     /**
      * 兵营等级更新后，更新开放武将及下个开放武将
      * @param barrackLv 
@@ -684,6 +847,7 @@ export enum DAMAGE_TYPE {
     NORMAL = 1,
     CRIT = 2,
     FATAL = 3,
+
 }
 
 export enum CAMP {

tower_sanguo/assets/scripts/module/marshalStage/DefaultSkill.ts

@@ -5,7 +5,11 @@
 // Learn life-cycle callbacks:
 //  - https://docs.cocos.com/creator/manual/en/scripting/life-cycle-callbacks.html
 
+import { Utils } from "../../../MOKA/util/Utils";
 import GrayEffectNode from "../../effects/GrayEffectNode";
+import GameController from "../../GameController";
+import StringUtil from "../../utils/StringUtil";
+import GeneralVO from "../../vo/GeneralVO";
 
 const { ccclass, property } = cc._decorator;
 
@@ -26,17 +30,63 @@ export default class DefaultSkill extends cc.Component {
     @property(cc.Node)
     lock: cc.Node = null;
 
-    Init(){
+    id: number;
+    lv: number
 
+    private updateDelta=0;
 
+    Init(id: number, lv: number, genenral: GeneralVO) {
+        this.id = id;
+        this.lv = lv;
+        this.txt_Time.string = Utils.ParseTime2Format(GameController.gameData.player.skill_cooling_time);
+        let skill_vo = GameController.gameData.getSkillByID(id);
+        cc.loader.loadRes("module/fight/texture/skill/" + skill_vo.icon, cc.SpriteFrame, (err, asset) => {
+            if (err) {
+                console.log("err:" + JSON.stringify(err));
+                return;
+            }
+            this.img_skill = asset;
+        });
+        this.txtRich_Name.string = "<color=#4E301B>" + skill_vo.name + "</c><color=#E6181A>Lv." + lv + "</color>";
+        let des = StringUtil.getTextByStringInData2(skill_vo.des);
+        let skillvalue=GameController.gameData.getSkillValue(skill_vo,lv);
+        let add = GameController.gameData.getSkillAddValueStr(skill_vo,genenral,skillvalue);
+        let totalskillvaluestr = GameController.gameData.getSkillValueStr(skill_vo, lv) + "(+" + add + ")";
+        des = des.replace("$0", totalskillvaluestr);
+        this.txtRich_Des.string = des;//StringUtil.getTextByStringInData2(skill_vo.des);
+
+
+        //console.log("-->Default Skill:" + id + " lv:" + lv + "\n"
+        //    + skill_vo.extra + "\n"
+        //    + " Add: " + add + "\n"
+        //    + " AddValue: " + add + "\n"
+        //    + des);
+//
+        //console.log("Time: "+Utils.GetTimeLeft2BySecond(80));
+
+        if (lv < 0) {
+            this.lockSkill();
+        }
+    }
+
+    update(dt){
+        if(GameController.gameData.player.skill_cooling_time!=0){
+            this.updateDelta+=dt;
+            if(this.updateDelta>=1){
+                this.updateDelta=0;
+                this.txt_Time.string=Utils.ParseTime2Format(GameController.gameData.player.skill_cooling_time);
+            }
+        }else{
+            this.txt_Time.string="";
+        }
     }
 
-    unLockSkill(){
+    unLockSkill() {
         this.graySrc.Revert();
 
     }
 
-    lockSkill(){
+    lockSkill() {
         this.graySrc.SetGray();
     }
 }

tower_sanguo/assets/scripts/module/marshalStage/marshalStageUI.ts

@@ -1,4 +1,5 @@
 import BaseUI from "../../../MOKA/component/BaseUI";
+import UIManager from "../../../MOKA/manager/UIManager";
 import GameController from "../../GameController";
 import DefaultSkill from "./DefaultSkill";
 
@@ -34,12 +35,16 @@ export default class marshalStageUI extends BaseUI {
 
     @property({ type: cc.Node, displayName: "广告节点" })
     node_ad: cc.Node = null;
+    @property({ type: cc.Node, displayName: "广告按钮" })
+    btn_ad: cc.Node = null;
+    @property({ type: cc.Node, displayName: "广告按钮灰色" })
+    btn_ad_no: cc.Node = null;
     @property({ type: cc.Label, displayName: "剩余广告次数" })
     txt_remaind_adtimes: cc.Label = null;
 
     @property({ type: cc.Node, displayName: "统帅台技能节点" })
     node_skill: cc.Node = null;
-    
+
     @property({ type: cc.Node, displayName: "窗口_统帅台" })
     window_marshal: cc.Node = null;
     @property({ type: cc.Node, displayName: "窗口_技能" })
@@ -47,22 +52,64 @@ export default class marshalStageUI extends BaseUI {
 
     onLoad() {
 
-        let data = GameController.gameData.player.generals_bag;
+        //let data = GameController.gameData.player.generals_bag;
+
+        //console.log("PlayData:", data);
+        //console.log("data1:", data["113013"]);
+        //console.log("Generals:", GameController.gameData.player.generals);
+
+        let isExistMarshal = GameController.gameData.player.isExistMarshalGeneral();
+        this.node_add.active = !isExistMarshal;
+        this.node_stage.active = isExistMarshal;
+        this.node_skill.active = isExistMarshal;
+
+        if (isExistMarshal) {
+            let general = GameController.gameData.player.getMarshalGeneral();
+            this.txt_commander.string = general.commander + "";
+            this.txt_name.string = general.name + "";
+            this.txt_commander_detiale.string = general.commander + "";
+
+
+            let skillid = GameController.gameData.player.skill_default_id;
+            let skilllv = GameController.gameData.player.skill_lv_data.get(skillid);  //-1表示未解锁
+            this.txt_eft.string = (GameController.gameData.getSkillAddValue(general) * 100).toFixed(1) + "%";
+            this.default_skill.Init(skillid, skilllv, general);
 
-        console.log("PlayData:", data);
-        console.log("data1:", data["113013"]);
-        console.log("Generals:", GameController.gameData.player.generals);
 
-        let isExistMarshal=GameController.gameData.player.isExistMarshalGeneral();
-        this.node_add.active=isExistMarshal;
-        this.node_stage.active=!isExistMarshal;
+            let spinePath = "spine/person/" + general.resource;
+            XXLoader.loadAssetByType(spinePath, sp.SkeletonData, (asset) => {
+                this.spine.skeletonData = asset;
+                this.spine.animation = "idle";
+            });
 
+            this.updateAdInfo();
+        }
 
+
+    }
+
+    stageSkillInit() {
+        let skillid = GameController.gameData.player.skill_default_id;
+        let skilllv = GameController.gameData.player.skill_lv_data.get(skillid);  //-1表示未解锁
+        this.default_skill.Init(skillid, skilllv, null);
+    }
+
+    updateAdInfo() {
+        this.node_ad.active = GameController.gameData.player.skill_cooling_time > 0;
+        this.btn_ad.active = GameController.gameData.player.remaind_times > 0;
+        this.btn_ad_no.active = GameController.gameData.player.remaind_times == 0;
+        this.txt_remaind_adtimes.string = GameController.gameData.player.remaind_times > 0 ? GameController.gameData.player.remaind_times + "次" : "今日次数已用完";
     }
 
-    stageSkillInit(){
-        
 
+    click_AdBtn() {
+        //看广告
+        GameController.gameData.player.remaind_times--;
+        GameController.gameData.player.skill_cooling_time = 0;
+        this.updateAdInfo();
     }
 
+    click_AdNoBtn() {
+        GameController.uiM.showToast("今日次数已用完");
+    }
 }

tower_sanguo/assets/scripts/module/task/TaskUI.ts

@@ -27,6 +27,9 @@ export default class TaskUI extends BaseUI {
 
     @property({ type: cc.Node, displayName: 'node奖励描述' })
     private node_reward_desc: cc.Node = null;
+    @property({ type: cc.Node, displayName: 'node奖励描述箭头' })
+    private qipao1_jiantou: cc.Node = null;
+
     @property({ type: cc.RichText, displayName: 'lbl奖励描述' })
     private lbl_reward_desc: cc.RichText = null;
 
@@ -59,6 +62,9 @@ export default class TaskUI extends BaseUI {
     }
     /** 初始化样式 */
     private initStyle() {
+        // 数值初始化
+        this.spr_pro_bar.fillRange = 0;
+        this.lbl_pro_value.string = `${Math.ceil(this.spr_pro_bar.fillRange * 100)}`;
         this.hideRewardNode();
         this.initList();
     }
@@ -89,16 +95,6 @@ export default class TaskUI extends BaseUI {
         }
         if (box_state === RewardState.none) {
             this.lbl_reward_desc.string = '奖励已领取';
-            // 防止文字超出屏幕边界，改变锚点
-            if (_reward_id === 4) {
-                this.node_reward_desc.anchorX = 0.9;
-            } else {
-                this.node_reward_desc.anchorX = 0.5;
-            }
-            let world_pos = comp_btn.node.parent.parent.convertToWorldSpaceAR(comp_btn.node.parent.getPosition());
-            let node_pos = this.node_reward_desc.parent.convertToNodeSpaceAR(world_pos);
-            this.node_reward_desc.x = node_pos.x;
-            this.btn_reward_node.node.active = true;// 说明文字的隐藏按钮
 
         } else if (box_state === RewardState.unlock) {
             if (_reward_id === 4) {
@@ -124,6 +120,10 @@ export default class TaskUI extends BaseUI {
             }
         } else if (box_state === RewardState.lock) {
             this.lbl_reward_desc.string = '奖励描述';
+        }
+
+        // 进度奖励描述显示
+        if (box_state === RewardState.lock || box_state === RewardState.none) {
             // 防止文字超出屏幕边界，改变锚点
             if (_reward_id === 4) {
                 this.node_reward_desc.anchorX = 0.9;
@@ -132,6 +132,7 @@ export default class TaskUI extends BaseUI {
             }
             let world_pos = comp_btn.node.parent.parent.convertToWorldSpaceAR(comp_btn.node.parent.getPosition());
             let node_pos = this.node_reward_desc.parent.convertToNodeSpaceAR(world_pos);
+            this.qipao1_jiantou.x = node_pos.x;
             this.node_reward_desc.x = node_pos.x;
             this.btn_reward_node.node.active = true;// 说明文字的隐藏按钮
         }
@@ -148,14 +149,13 @@ export default class TaskUI extends BaseUI {
     }
     /** 任务列表数据 */
     private getData(): Array<any> {
-        let test_arr = []
-        for (let i = 0; i < 100; i++) {
-            let content = {
-                index: i,
-            };
-            test_arr.push(content);
+        let list_data = [];
+        let obj_data = GameController.gameData.getAllTask();
+        for (const key in obj_data) {
+            list_data.push(obj_data[key]);
         }
-        return test_arr;
+        cc.log(list_data)
+        return list_data;
     }
     // 获得奖励回调
     private onEventGetReward(_data) {
@@ -199,7 +199,7 @@ export default class TaskUI extends BaseUI {
     private flyCompleteCall() {
         this.lbl_pro_value.node.getComponent(cc.Animation).play();
         this.spr_pro_bar.fillRange += 0.1;
-        this.lbl_pro_value.string = `${this.spr_pro_bar.fillRange * 100}`
+        this.lbl_pro_value.string = `${Math.ceil(this.spr_pro_bar.fillRange * 100)}`;
     }
     // update (dt) {}
 }

tower_sanguo/assets/scripts/module/task/task_item.ts

@@ -5,6 +5,9 @@
 // Learn life-cycle callbacks:
 //  - https://docs.cocos.com/creator/manual/en/scripting/life-cycle-callbacks.html
 
+import { RewardState } from "../../data/GameDefinition";
+import TaskVO from "../../vo/TaskVO";
+
 const { ccclass, property } = cc._decorator;
 
 @ccclass
@@ -16,26 +19,27 @@ export default class task_item extends cc.Component {
     lbl_reward_icon: cc.Label = null;
     @property({ type: cc.Label, displayName: '奖励描述' })
     lbl_task_desc: cc.Label = null;
-    @property({ type: cc.Label, displayName: '按钮描述' })
-    lbl_btn_desc: cc.Label = null;
-    @property({ type: cc.Button, displayName: '操作按钮' })
-    btn_op: cc.Button = null;
+    // @property({ type: cc.Label, displayName: '按钮描述' })
+    // lbl_btn_desc: cc.Label = null;
     @property({ type: cc.Sprite, displayName: '进度条' })
     node_bar: cc.Sprite = null;
+    @property({ type: cc.Button, displayName: '领取按钮' })
+    btn_unlock: cc.Button = null;
+    @property({ type: cc.Button, displayName: '前往按钮' })
+    btn_lock: cc.Button = null;
 
 
     /** 数据 */
-    private item_data = {
-        index: 0,
-    };
+    private item_data: TaskVO = null;
     /** 动画组件 */
     private comp_ani: cc.Animation = null;
     /** 是否正在移除中 */
     private is_removing: boolean = false;
     onLoad() {
-        this.comp_ani = this.node.getComponent(cc.Animation);
-        XXEvent.addClickEvent(this.btn_op, this.onClickOp, this);
+        XXEvent.addClickEvent(this.btn_lock, this.onClocGotoUI, this);
+        XXEvent.addClickEvent(this.btn_unlock, this.onClickOp, this);
         this.node.on('ui-playanim-hide', this.playHide, this);
+        this.comp_ani = this.node.getComponent(cc.Animation);
         this.comp_ani.on(cc.Animation.EventType.FINISHED, () => {
             this.removeSelf();
         })
@@ -48,7 +52,7 @@ export default class task_item extends cc.Component {
     /** ScrollList数据更新
      * - 自动初始化，onLoad之后，start之前
      */
-    async setItemData(data: any, tableviewUtils) {
+    async setItemData(data: TaskVO, tableviewUtils) {
         this.item_data = data;
         this.node.opacity = 255;
         this.node.x = 0;
@@ -56,9 +60,48 @@ export default class task_item extends cc.Component {
         this.initItemStyle();
     }
     private initItemStyle() {
-        this.lbl_reward_icon.string = `${this.item_data.index}`;
+        // 按钮描述
+        if (this.item_data.state === RewardState.lock) {
+            this.btn_unlock.node.active = false;
+            this.btn_lock.node.active = true;
+        } else if (this.item_data.state === RewardState.unlock) {
+            this.btn_unlock.node.active = true;
+            this.btn_lock.node.active = false;
+        } else if (this.item_data.state === RewardState.none) {
+            this.btn_unlock.node.active = false;
+            this.btn_lock.node.active = false;
+        }
+        // 任务进度
+        if (this.item_data.task_stage === 1) {
+            // 奖励数量
+            this.lbl_reward_icon.string = `${this.item_data.activevalue1}`;
+            // 任务描述
+            this.lbl_task_desc.string = XXI18n.replace(this.item_data.description, { 0: this.item_data.count1 });
+            // 任务进度
+            let range = this.item_data.bar / this.item_data.count1;
+            range = range >= 1 ? 1 : range;
+            this.node_bar.fillRange = range;
+        } else if (this.item_data.task_stage === 2) {
+            this.lbl_reward_icon.string = `${this.item_data.activevalue2}`;
+
+            this.lbl_task_desc.string = XXI18n.replace(this.item_data.description, { 0: this.item_data.count2 });
+
+            let range = this.item_data.bar / this.item_data.count2;
+            range = range >= 1 ? 1 : range;
+            this.node_bar.fillRange = range;
+        }
     }
+    /** 前往某某界面 */
+    private onClocGotoUI() {
+
+    }
+    /** 领取奖励 */
     private onClickOp() {
+        if (this.item_data.state === RewardState.lock) {
+            // 跳转页面 的逻辑
+        } else if (this.item_data.state === RewardState.none) {
+            return;
+        }
         if (this.is_removing) return;
         let _data = {
             node: this.node_reward_icon.node,

tower_sanguo/assets/scripts/net/servertest/ServerManager.ts

@@ -48,6 +48,7 @@ export default class ServerManager {
     sendRequest(url: HTTPTYPE, method: string = 'POST', data: string = null, callback: any = null, isRsa: boolean = true, errorPop = true, async = true, params = null) {
         switch (url) {
             case HTTPTYPE.getServerConfig:
+                console.log("------ServerMng: ",data);
                 this.getServerConfig(url, data, callback);
                 break;
             case HTTPTYPE.player:
@@ -478,4 +479,8 @@ export default class ServerManager {
         msg.errmsg = errmsg;
         callback && callback(msg);
     }
+
+
+    //---------ZNH----------
+    
 }

tower_sanguo/assets/scripts/vo/PlayerVO.ts

@@ -62,7 +62,12 @@ export default class PlayerVO {
     /**默认技能id -1统帅位无武将*/
     skill_default_id: number = -1;
     /**技能等级数据  key 技能id value 等级 -1表示未解锁*/
-    skill_lv_data: Map<number,number>=new Map<number,number>();
+    skill_lv_data: Map<number, number> = new Map<number, number>();
+    /**技能冷却时间（剩余时间 秒）*/
+    skill_cooling_time:number=0;
+    /**剩余清除冷却次数*/
+    remaind_times:number=3;
+
 
     /** 到达的最大关卡，如果=current_mission+1，表示打前面一关没有通过 */
     set max_mission(v: number) {
@@ -84,4 +89,20 @@ export default class PlayerVO {
     isExistMarshalGeneral() {
         return this.generals[4].id > 0;
     }
+
+    getMarshalGeneral(){
+        return this.generals[4];
+    }
+
+    /** 获取status=3(可以使用的武将)总星数*/
+    getAllStars() {
+        let star=0;
+        for (let i in this.generals_bag) {
+            let o = this.generals_bag[i];
+            if(o.status==3){
+                star+=o.star;
+            }
+        }
+        return star;
+    }
 }