接入 武将奖励接口

修改 GeneralVO类 添加任务简介字段

tower_sanguo/assets/resources/module/drawRecruit/generalReward.prefab

@@ -27,14 +27,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 78
+        "__id__": 79
       },
       {
-        "__id__": 79
+        "__id__": 80
       }
     ],
     "_prefab": {
-      "__id__": 80
+      "__id__": 81
     },
     "_opacity": 255,
     "_color": {
@@ -315,13 +315,13 @@
         "__id__": 30
       },
       {
-        "__id__": 74
+        "__id__": 75
       }
     ],
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 77
+      "__id__": 78
     },
     "_opacity": 255,
     "_color": {
@@ -1172,20 +1172,17 @@
         "__id__": 46
       },
       {
-        "__id__": 59
+        "__id__": 61
       }
     ],
     "_active": false,
     "_components": [
       {
-        "__id__": 71
-      },
-      {
-        "__id__": 72
+        "__id__": 73
       }
     ],
     "_prefab": {
-      "__id__": 73
+      "__id__": 74
     },
     "_opacity": 255,
     "_color": {
@@ -1755,7 +1752,7 @@
     "_batchAsBitmap": false,
     "_styleFlags": 0,
     "_underlineHeight": 0,
-    "_N$horizontalAlign": 1,
+    "_N$horizontalAlign": 0,
     "_N$verticalAlign": 1,
     "_N$fontFamily": "Arial",
     "_N$overflow": 2,
@@ -1789,10 +1786,13 @@
     "_components": [
       {
         "__id__": 57
+      },
+      {
+        "__id__": 58
       }
     ],
     "_prefab": {
-      "__id__": 58
+      "__id__": 60
     },
     "_opacity": 255,
     "_color": {
@@ -2225,6 +2225,88 @@
     "_id": ""
   },
   {
+    "__type__": "cc.Button",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 46
+    },
+    "_enabled": true,
+    "_normalMaterial": null,
+    "_grayMaterial": null,
+    "duration": 0.1,
+    "zoomScale": 1.07,
+    "clickEvents": [
+      {
+        "__id__": 59
+      }
+    ],
+    "_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__": 30
+    },
+    "component": "",
+    "_componentId": "a477046hOJO/ZHA0+dZ4SaN",
+    "handler": "click_GetBtn",
+    "customEventData": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1
@@ -2244,19 +2326,19 @@
     },
     "_children": [
       {
-        "__id__": 60
+        "__id__": 62
       },
       {
-        "__id__": 63
+        "__id__": 65
       },
       {
-        "__id__": 66
+        "__id__": 68
       }
     ],
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 70
+      "__id__": 72
     },
     "_opacity": 255,
     "_color": {
@@ -2310,17 +2392,17 @@
     "_name": "icon_hb1",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 59
+      "__id__": 61
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 61
+        "__id__": 63
       }
     ],
     "_prefab": {
-      "__id__": 62
+      "__id__": 64
     },
     "_opacity": 255,
     "_color": {
@@ -2374,7 +2456,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 60
+      "__id__": 62
     },
     "_enabled": true,
     "_materials": [
@@ -2417,17 +2499,17 @@
     "_name": "txt copy",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 59
+      "__id__": 61
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 64
+        "__id__": 66
       }
     ],
     "_prefab": {
-      "__id__": 65
+      "__id__": 67
     },
     "_opacity": 255,
     "_color": {
@@ -2481,7 +2563,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 63
+      "__id__": 65
     },
     "_enabled": true,
     "_materials": [
@@ -2526,20 +2608,20 @@
     "_name": "txt_get_num",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 59
+      "__id__": 61
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 67
+        "__id__": 69
       },
       {
-        "__id__": 68
+        "__id__": 70
       }
     ],
     "_prefab": {
-      "__id__": 69
+      "__id__": 71
     },
     "_opacity": 255,
     "_color": {
@@ -2593,7 +2675,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 66
+      "__id__": 68
     },
     "_enabled": true,
     "_materials": [
@@ -2627,7 +2709,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 66
+      "__id__": 68
     },
     "_enabled": true,
     "_color": {
@@ -2663,38 +2745,6 @@
     "sync": false
   },
   {
-    "__type__": "cc.Sprite",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 30
-    },
-    "_enabled": true,
-    "_materials": [
-      {
-        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
-      }
-    ],
-    "_srcBlendFactor": 770,
-    "_dstBlendFactor": 771,
-    "_spriteFrame": {
-      "__uuid__": "a34eb3da-2554-43d2-b1bf-82520b5c586f"
-    },
-    "_type": 0,
-    "_sizeMode": 1,
-    "_fillType": 0,
-    "_fillCenter": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_atlas": null,
-    "_id": ""
-  },
-  {
     "__type__": "a477046hOJO/ZHA0+dZ4SaN",
     "_name": "",
     "_objFlags": 0,
@@ -2702,10 +2752,13 @@
       "__id__": 30
     },
     "_enabled": true,
+    "img_bg": {
+      "__id__": 32
+    },
     "img_hero": {
       "__id__": 35
     },
-    "node_hb": {
+    "img_camp": {
       "__id__": 38
     },
     "txt_name": {
@@ -2718,10 +2771,10 @@
       "__id__": 46
     },
     "node_geted": {
-      "__id__": 59
+      "__id__": 61
     },
     "txt_getedhb_num": {
-      "__id__": 67
+      "__id__": 69
     },
     "_id": ""
   },
@@ -2747,11 +2800,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 75
+        "__id__": 76
       }
     ],
     "_prefab": {
-      "__id__": 76
+      "__id__": 77
     },
     "_opacity": 255,
     "_color": {
@@ -2805,7 +2858,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 74
+      "__id__": 75
     },
     "_enabled": true,
     "_materials": [
@@ -2908,7 +2961,7 @@
       "__id__": 17
     },
     "generalItem": {
-      "__id__": 72
+      "__id__": 73
     },
     "_id": ""
   },

tower_sanguo/assets/resources/module/drawRecruit/texture/general/bg1.png.meta

@@ -1,6 +1,6 @@
 {
   "ver": "2.3.4",
-  "uuid": "472f1d9d-e4a6-4878-ac97-93aaaf5fad07",
+  "uuid": "c571d901-2602-4d71-b977-2fc611b84922",
   "type": "sprite",
   "wrapMode": "clamp",
   "filterMode": "bilinear",
@@ -13,8 +13,8 @@
   "subMetas": {
     "bg1": {
       "ver": "1.0.4",
-      "uuid": "a34eb3da-2554-43d2-b1bf-82520b5c586f",
-      "rawTextureUuid": "472f1d9d-e4a6-4878-ac97-93aaaf5fad07",
+      "uuid": "54c2331d-da26-4290-9bff-47c65e5d717d",
+      "rawTextureUuid": "c571d901-2602-4d71-b977-2fc611b84922",
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,

tower_sanguo/assets/resources/module/drawRecruit/texture/general/bg2.png.meta

@@ -1,6 +1,6 @@
 {
   "ver": "2.3.4",
-  "uuid": "cb52dc71-e70b-4c17-a4bc-ba458eb26f85",
+  "uuid": "56e8d582-ca9a-479c-a2f3-d69b3a90ef7a",
   "type": "sprite",
   "wrapMode": "clamp",
   "filterMode": "bilinear",
@@ -13,8 +13,8 @@
   "subMetas": {
     "bg2": {
       "ver": "1.0.4",
-      "uuid": "3b84957b-c2b0-4f4b-b2c5-6f37462e26cd",
-      "rawTextureUuid": "cb52dc71-e70b-4c17-a4bc-ba458eb26f85",
+      "uuid": "d59a581d-997c-4b37-b7a2-6b848cc458cc",
+      "rawTextureUuid": "56e8d582-ca9a-479c-a2f3-d69b3a90ef7a",
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,

tower_sanguo/assets/resources/module/drawRecruit/texture/general/bg3.png.meta

@@ -1,6 +1,6 @@
 {
   "ver": "2.3.4",
-  "uuid": "56e8d582-ca9a-479c-a2f3-d69b3a90ef7a",
+  "uuid": "cb52dc71-e70b-4c17-a4bc-ba458eb26f85",
   "type": "sprite",
   "wrapMode": "clamp",
   "filterMode": "bilinear",
@@ -13,8 +13,8 @@
   "subMetas": {
     "bg3": {
       "ver": "1.0.4",
-      "uuid": "d59a581d-997c-4b37-b7a2-6b848cc458cc",
-      "rawTextureUuid": "56e8d582-ca9a-479c-a2f3-d69b3a90ef7a",
+      "uuid": "3b84957b-c2b0-4f4b-b2c5-6f37462e26cd",
+      "rawTextureUuid": "cb52dc71-e70b-4c17-a4bc-ba458eb26f85",
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,

tower_sanguo/assets/resources/module/drawRecruit/texture/general/bg.png.meta → tower_sanguo/assets/resources/module/drawRecruit/texture/general/bg4.png.meta

@@ -1,6 +1,6 @@
 {
   "ver": "2.3.4",
-  "uuid": "c571d901-2602-4d71-b977-2fc611b84922",
+  "uuid": "472f1d9d-e4a6-4878-ac97-93aaaf5fad07",
   "type": "sprite",
   "wrapMode": "clamp",
   "filterMode": "bilinear",
@@ -11,10 +11,10 @@
   "height": 144,
   "platformSettings": {},
   "subMetas": {
-    "bg": {
+    "bg4": {
       "ver": "1.0.4",
-      "uuid": "54c2331d-da26-4290-9bff-47c65e5d717d",
-      "rawTextureUuid": "c571d901-2602-4d71-b977-2fc611b84922",
+      "uuid": "a34eb3da-2554-43d2-b1bf-82520b5c586f",
+      "rawTextureUuid": "472f1d9d-e4a6-4878-ac97-93aaaf5fad07",
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,

tower_sanguo/assets/scenes/Test_Znh.fire

@@ -216,7 +216,7 @@
       "array": [
         0,
         0,
-        482.37614990793236,
+        491.3205685313935,
         0,
         0,
         0,
@@ -5336,7 +5336,7 @@
     "_groupIndex": 0,
     "groupIndex": 0,
     "showInEditor": false,
-    "_id": "90ovaJ5AFDS5hT7YdMsKvO"
+    "_id": "00M6wiULtNXof1vVrHgEAI"
   },
   {
     "__type__": "cc.Label",
@@ -5368,7 +5368,7 @@
     "_N$fontFamily": "Arial",
     "_N$overflow": 0,
     "_N$cacheMode": 0,
-    "_id": "698SB5cpFHprVCdTaFlPMq"
+    "_id": "e8S058AGRHBJ7tNfxwRTD8"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -5378,7 +5378,7 @@
     "asset": {
       "__uuid__": "a0af5f5c-414f-4ec8-a8a9-ad4aaf6f82cc"
     },
-    "fileId": "90ovaJ5AFDS5hT7YdMsKvO",
+    "fileId": "00M6wiULtNXof1vVrHgEAI",
     "sync": false
   },
   {
@@ -5444,7 +5444,7 @@
     "_groupIndex": 0,
     "groupIndex": 0,
     "showInEditor": false,
-    "_id": "82trrrNxBChLjrQ4a8d8Cp"
+    "_id": "fbqG42V3tC4q2AiyET3Gyq"
   },
   {
     "__type__": "cc.Label",
@@ -5476,7 +5476,7 @@
     "_N$fontFamily": "Arial",
     "_N$overflow": 0,
     "_N$cacheMode": 0,
-    "_id": "4dgInOIYNNV5q+FSqqGEa7"
+    "_id": "9d2YjzC7JEjaP3haN/gUIo"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -5486,7 +5486,7 @@
     "asset": {
       "__uuid__": "a0af5f5c-414f-4ec8-a8a9-ad4aaf6f82cc"
     },
-    "fileId": "82trrrNxBChLjrQ4a8d8Cp",
+    "fileId": "fbqG42V3tC4q2AiyET3Gyq",
     "sync": false
   },
   {
@@ -5552,7 +5552,7 @@
     "_groupIndex": 0,
     "groupIndex": 0,
     "showInEditor": false,
-    "_id": "a55oX6UftJT5WSAK/JMHW8"
+    "_id": "076vAlkCVCOoTCyGKwxuZe"
   },
   {
     "__type__": "cc.Label",
@@ -5584,7 +5584,7 @@
     "_N$fontFamily": "Arial",
     "_N$overflow": 0,
     "_N$cacheMode": 0,
-    "_id": "5clvrMSDBEeImImM+BQDVg"
+    "_id": "55gsfZwHhEJIMn6Kwm7E1G"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -5594,7 +5594,7 @@
     "asset": {
       "__uuid__": "a0af5f5c-414f-4ec8-a8a9-ad4aaf6f82cc"
     },
-    "fileId": "a55oX6UftJT5WSAK/JMHW8",
+    "fileId": "076vAlkCVCOoTCyGKwxuZe",
     "sync": false
   },
   {
@@ -5660,7 +5660,7 @@
     "_groupIndex": 0,
     "groupIndex": 0,
     "showInEditor": false,
-    "_id": "14wJwzimhCab7cqTFrlYD7"
+    "_id": "13t0PHxnxIQ5/Gy75uxtWt"
   },
   {
     "__type__": "cc.Label",
@@ -5692,7 +5692,7 @@
     "_N$fontFamily": "Arial",
     "_N$overflow": 0,
     "_N$cacheMode": 0,
-    "_id": "36Z0jlgmtE36aiPSG5OdWh"
+    "_id": "e8zZDhapRAnL1O8/qE7oO9"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -5702,7 +5702,7 @@
     "asset": {
       "__uuid__": "a0af5f5c-414f-4ec8-a8a9-ad4aaf6f82cc"
     },
-    "fileId": "14wJwzimhCab7cqTFrlYD7",
+    "fileId": "13t0PHxnxIQ5/Gy75uxtWt",
     "sync": false
   },
   {
@@ -5768,7 +5768,7 @@
     "_groupIndex": 0,
     "groupIndex": 0,
     "showInEditor": false,
-    "_id": "6ckn3Lc4ZA7YdJxPfdF5c+"
+    "_id": "f5uHKmq0ZCDp/cgNAnOcbw"
   },
   {
     "__type__": "cc.Label",
@@ -5800,7 +5800,7 @@
     "_N$fontFamily": "Arial",
     "_N$overflow": 0,
     "_N$cacheMode": 0,
-    "_id": "325sDduLBOc4U4av9f/OP/"
+    "_id": "328vGqO3FMbIIO0/ffkr9V"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -5810,7 +5810,7 @@
     "asset": {
       "__uuid__": "a0af5f5c-414f-4ec8-a8a9-ad4aaf6f82cc"
     },
-    "fileId": "6ckn3Lc4ZA7YdJxPfdF5c+",
+    "fileId": "f5uHKmq0ZCDp/cgNAnOcbw",
     "sync": false
   },
   {
@@ -5876,7 +5876,7 @@
     "_groupIndex": 0,
     "groupIndex": 0,
     "showInEditor": false,
-    "_id": "3dgjoxgR9MebczF0tOlJ3/"
+    "_id": "c0s8IlXZdKc5LVu+3I6sxF"
   },
   {
     "__type__": "cc.Label",
@@ -5908,7 +5908,7 @@
     "_N$fontFamily": "Arial",
     "_N$overflow": 0,
     "_N$cacheMode": 0,
-    "_id": "8aiXeynKxEXq9xL7IByyMb"
+    "_id": "5c6VI+3RZO56nX3B9Qdhkh"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -5918,7 +5918,7 @@
     "asset": {
       "__uuid__": "a0af5f5c-414f-4ec8-a8a9-ad4aaf6f82cc"
     },
-    "fileId": "3dgjoxgR9MebczF0tOlJ3/",
+    "fileId": "c0s8IlXZdKc5LVu+3I6sxF",
     "sync": false
   },
   {
@@ -5984,7 +5984,7 @@
     "_groupIndex": 0,
     "groupIndex": 0,
     "showInEditor": false,
-    "_id": "4dex2da6dHm5MmH+++64aF"
+    "_id": "2b85j8b55FqJMN9lk8gocn"
   },
   {
     "__type__": "cc.Label",
@@ -6016,7 +6016,7 @@
     "_N$fontFamily": "Arial",
     "_N$overflow": 0,
     "_N$cacheMode": 0,
-    "_id": "04OajtDspO0rm2XHgoR5R4"
+    "_id": "beywcClxNM0Z25h9afFfaZ"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -6026,7 +6026,7 @@
     "asset": {
       "__uuid__": "a0af5f5c-414f-4ec8-a8a9-ad4aaf6f82cc"
     },
-    "fileId": "4dex2da6dHm5MmH+++64aF",
+    "fileId": "2b85j8b55FqJMN9lk8gocn",
     "sync": false
   },
   {
@@ -6092,7 +6092,7 @@
     "_groupIndex": 0,
     "groupIndex": 0,
     "showInEditor": false,
-    "_id": "050rng94BDfZE4eFiIzHdj"
+    "_id": "e0cmqqC2hIXYfiCtxvmIIP"
   },
   {
     "__type__": "cc.Label",
@@ -6124,7 +6124,7 @@
     "_N$fontFamily": "Arial",
     "_N$overflow": 0,
     "_N$cacheMode": 0,
-    "_id": "f5okhgu/hAXo29tqAHi/2B"
+    "_id": "18fSTNMrtKvopu9Q+pSec8"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -6134,7 +6134,7 @@
     "asset": {
       "__uuid__": "a0af5f5c-414f-4ec8-a8a9-ad4aaf6f82cc"
     },
-    "fileId": "050rng94BDfZE4eFiIzHdj",
+    "fileId": "e0cmqqC2hIXYfiCtxvmIIP",
     "sync": false
   },
   {
@@ -13950,7 +13950,7 @@
     "_groupIndex": 0,
     "groupIndex": 0,
     "showInEditor": false,
-    "_id": "318Yn7xOtCb7sI4McUhyr0"
+    "_id": "244nsQHTNDW5IVeZWW1wAk"
   },
   {
     "__type__": "cc.Label",
@@ -13984,7 +13984,7 @@
     "_N$fontFamily": "Arial",
     "_N$overflow": 0,
     "_N$cacheMode": 0,
-    "_id": "12RdpsuatMZphLAKyoE/Yq"
+    "_id": "9eVyWoAktIVZio4ToLyzhq"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -13994,7 +13994,7 @@
     "asset": {
       "__uuid__": "5fe81515-8b08-4fba-97c9-4cc75544bb88"
     },
-    "fileId": "318Yn7xOtCb7sI4McUhyr0",
+    "fileId": "244nsQHTNDW5IVeZWW1wAk",
     "sync": false
   },
   {
@@ -14060,7 +14060,7 @@
     "_groupIndex": 0,
     "groupIndex": 0,
     "showInEditor": false,
-    "_id": "47Tni8AKRHZoW0FE08T/A+"
+    "_id": "6a82gJO09K9Lq9NgtPB3m8"
   },
   {
     "__type__": "cc.Label",
@@ -14094,7 +14094,7 @@
     "_N$fontFamily": "Arial",
     "_N$overflow": 0,
     "_N$cacheMode": 0,
-    "_id": "d422vHVOpOtJE2Ly0ENjn1"
+    "_id": "6fDP+Pct1A3aG4y4T9qGR8"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -14104,7 +14104,7 @@
     "asset": {
       "__uuid__": "5fe81515-8b08-4fba-97c9-4cc75544bb88"
     },
-    "fileId": "47Tni8AKRHZoW0FE08T/A+",
+    "fileId": "6a82gJO09K9Lq9NgtPB3m8",
     "sync": false
   },
   {
@@ -14278,7 +14278,7 @@
     "_groupIndex": 0,
     "groupIndex": 0,
     "showInEditor": false,
-    "_id": "31UKFnPB9G0K3JTGUg42Zg"
+    "_id": "35zi/1GitOtbWANpjTNrqe"
   },
   {
     "__type__": "cc.Label",
@@ -14312,7 +14312,7 @@
     "_N$fontFamily": "Arial",
     "_N$overflow": 0,
     "_N$cacheMode": 0,
-    "_id": "8fjkG0CelH5r7v4sO2Fzm8"
+    "_id": "640FhYFslJR5kbLiHWpsEw"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -14322,7 +14322,7 @@
     "asset": {
       "__uuid__": "5fe81515-8b08-4fba-97c9-4cc75544bb88"
     },
-    "fileId": "31UKFnPB9G0K3JTGUg42Zg",
+    "fileId": "35zi/1GitOtbWANpjTNrqe",
     "sync": false
   },
   {
@@ -14388,7 +14388,7 @@
     "_groupIndex": 0,
     "groupIndex": 0,
     "showInEditor": false,
-    "_id": "79gf3/qu5P3bJ2XKFOjFqg"
+    "_id": "9b7YdZuyBEBLXEU/4mPhGB"
   },
   {
     "__type__": "cc.Label",
@@ -14422,7 +14422,7 @@
     "_N$fontFamily": "Arial",
     "_N$overflow": 0,
     "_N$cacheMode": 0,
-    "_id": "fc7snP9flERpfBLxQbD3Hk"
+    "_id": "49CbCnShxIZJquZhn4XbqQ"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -14432,7 +14432,7 @@
     "asset": {
       "__uuid__": "5fe81515-8b08-4fba-97c9-4cc75544bb88"
     },
-    "fileId": "79gf3/qu5P3bJ2XKFOjFqg",
+    "fileId": "9b7YdZuyBEBLXEU/4mPhGB",
     "sync": false
   },
   {
@@ -14498,7 +14498,7 @@
     "_groupIndex": 0,
     "groupIndex": 0,
     "showInEditor": false,
-    "_id": "79uhSRpgxJZZ8tQqCPry0k"
+    "_id": "a5y/z4B/VLpp4Mp5vvHYH2"
   },
   {
     "__type__": "cc.Label",
@@ -14532,7 +14532,7 @@
     "_N$fontFamily": "Arial",
     "_N$overflow": 0,
     "_N$cacheMode": 0,
-    "_id": "1d8nKbfKZFQoYUNU0ZEz/J"
+    "_id": "d4Yo5kUehKJbcT4cKvzsok"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -14542,7 +14542,7 @@
     "asset": {
       "__uuid__": "5fe81515-8b08-4fba-97c9-4cc75544bb88"
     },
-    "fileId": "79uhSRpgxJZZ8tQqCPry0k",
+    "fileId": "a5y/z4B/VLpp4Mp5vvHYH2",
     "sync": false
   },
   {
@@ -22544,7 +22544,7 @@
     "_groupIndex": 0,
     "groupIndex": 0,
     "showInEditor": false,
-    "_id": "92axJO+uNGy6IAVg+qP4BX"
+    "_id": "66HxYoSohMKIDti4vCzc+M"
   },
   {
     "__type__": "cc.Label",
@@ -22578,7 +22578,7 @@
     "_N$fontFamily": "Arial",
     "_N$overflow": 0,
     "_N$cacheMode": 0,
-    "_id": "b7ePwEW1ZC25t/MW2JrWih"
+    "_id": "2c/kiF3LpPbYAoCo93/e7E"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -22588,7 +22588,7 @@
     "asset": {
       "__uuid__": "cc76457d-03f3-4bbd-827b-52ccc936c335"
     },
-    "fileId": "92axJO+uNGy6IAVg+qP4BX",
+    "fileId": "66HxYoSohMKIDti4vCzc+M",
     "sync": false
   },
   {
@@ -22654,7 +22654,7 @@
     "_groupIndex": 0,
     "groupIndex": 0,
     "showInEditor": false,
-    "_id": "d08DAcaC9KBqyPaFPDeImM"
+    "_id": "e1dtx7/4JKRrh+UNqiqVIe"
   },
   {
     "__type__": "cc.Label",
@@ -22688,7 +22688,7 @@
     "_N$fontFamily": "Arial",
     "_N$overflow": 0,
     "_N$cacheMode": 0,
-    "_id": "17T85XPl1PjYSxKjr5QXj7"
+    "_id": "aesIbWPrlK45yroDaugRGM"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -22698,7 +22698,7 @@
     "asset": {
       "__uuid__": "cc76457d-03f3-4bbd-827b-52ccc936c335"
     },
-    "fileId": "d08DAcaC9KBqyPaFPDeImM",
+    "fileId": "e1dtx7/4JKRrh+UNqiqVIe",
     "sync": false
   },
   {
@@ -22764,7 +22764,7 @@
     "_groupIndex": 0,
     "groupIndex": 0,
     "showInEditor": false,
-    "_id": "c6oLNW5LBJD5jSDUXVZJhu"
+    "_id": "44D+/PKO9MJZ7aveWyf0az"
   },
   {
     "__type__": "cc.Label",
@@ -22798,7 +22798,7 @@
     "_N$fontFamily": "Arial",
     "_N$overflow": 0,
     "_N$cacheMode": 0,
-    "_id": "d6HFZsXKpG0ZeGI8/CPmQa"
+    "_id": "13QtyUdWtPLJmg/a/2F4Ed"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -22808,7 +22808,7 @@
     "asset": {
       "__uuid__": "cc76457d-03f3-4bbd-827b-52ccc936c335"
     },
-    "fileId": "c6oLNW5LBJD5jSDUXVZJhu",
+    "fileId": "44D+/PKO9MJZ7aveWyf0az",
     "sync": false
   },
   {
@@ -98621,14 +98621,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 2739
+        "__id__": 2740
       },
       {
-        "__id__": 2740
+        "__id__": 2741
       }
     ],
     "_prefab": {
-      "__id__": 2741
+      "__id__": 2742
     },
     "_opacity": 255,
     "_color": {
@@ -98909,13 +98909,13 @@
         "__id__": 2691
       },
       {
-        "__id__": 2735
+        "__id__": 2736
       }
     ],
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 2738
+      "__id__": 2739
     },
     "_opacity": 255,
     "_color": {
@@ -99766,20 +99766,17 @@
         "__id__": 2707
       },
       {
-        "__id__": 2720
+        "__id__": 2722
       }
     ],
     "_active": false,
     "_components": [
       {
-        "__id__": 2732
-      },
-      {
-        "__id__": 2733
+        "__id__": 2734
       }
     ],
     "_prefab": {
-      "__id__": 2734
+      "__id__": 2735
     },
     "_opacity": 255,
     "_color": {
@@ -100349,7 +100346,7 @@
     "_batchAsBitmap": false,
     "_styleFlags": 0,
     "_underlineHeight": 0,
-    "_N$horizontalAlign": 1,
+    "_N$horizontalAlign": 0,
     "_N$verticalAlign": 1,
     "_N$fontFamily": "Arial",
     "_N$overflow": 2,
@@ -100383,10 +100380,13 @@
     "_components": [
       {
         "__id__": 2718
+      },
+      {
+        "__id__": 2719
       }
     ],
     "_prefab": {
-      "__id__": 2719
+      "__id__": 2721
     },
     "_opacity": 255,
     "_color": {
@@ -100819,6 +100819,88 @@
     "_id": "6c5l5mSyhLJJYFse3/i20H"
   },
   {
+    "__type__": "cc.Button",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 2707
+    },
+    "_enabled": true,
+    "_normalMaterial": null,
+    "_grayMaterial": null,
+    "duration": 0.1,
+    "zoomScale": 1.07,
+    "clickEvents": [
+      {
+        "__id__": 2720
+      }
+    ],
+    "_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": "abUQC+7IhOSKP9oxCPbvf2"
+  },
+  {
+    "__type__": "cc.ClickEvent",
+    "target": {
+      "__id__": 2691
+    },
+    "component": "",
+    "_componentId": "a477046hOJO/ZHA0+dZ4SaN",
+    "handler": "click_GetBtn",
+    "customEventData": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 2662
@@ -100838,19 +100920,19 @@
     },
     "_children": [
       {
-        "__id__": 2721
+        "__id__": 2723
       },
       {
-        "__id__": 2724
+        "__id__": 2726
       },
       {
-        "__id__": 2727
+        "__id__": 2729
       }
     ],
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 2731
+      "__id__": 2733
     },
     "_opacity": 255,
     "_color": {
@@ -100904,17 +100986,17 @@
     "_name": "icon_hb1",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 2720
+      "__id__": 2722
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 2722
+        "__id__": 2724
       }
     ],
     "_prefab": {
-      "__id__": 2723
+      "__id__": 2725
     },
     "_opacity": 255,
     "_color": {
@@ -100968,7 +101050,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 2721
+      "__id__": 2723
     },
     "_enabled": true,
     "_materials": [
@@ -101011,17 +101093,17 @@
     "_name": "txt copy",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 2720
+      "__id__": 2722
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 2725
+        "__id__": 2727
       }
     ],
     "_prefab": {
-      "__id__": 2726
+      "__id__": 2728
     },
     "_opacity": 255,
     "_color": {
@@ -101075,7 +101157,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 2724
+      "__id__": 2726
     },
     "_enabled": true,
     "_materials": [
@@ -101120,20 +101202,20 @@
     "_name": "txt_get_num",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 2720
+      "__id__": 2722
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 2728
+        "__id__": 2730
       },
       {
-        "__id__": 2729
+        "__id__": 2731
       }
     ],
     "_prefab": {
-      "__id__": 2730
+      "__id__": 2732
     },
     "_opacity": 255,
     "_color": {
@@ -101187,7 +101269,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 2727
+      "__id__": 2729
     },
     "_enabled": true,
     "_materials": [
@@ -101221,7 +101303,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 2727
+      "__id__": 2729
     },
     "_enabled": true,
     "_color": {
@@ -101257,38 +101339,6 @@
     "sync": false
   },
   {
-    "__type__": "cc.Sprite",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 2691
-    },
-    "_enabled": true,
-    "_materials": [
-      {
-        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
-      }
-    ],
-    "_srcBlendFactor": 770,
-    "_dstBlendFactor": 771,
-    "_spriteFrame": {
-      "__uuid__": "a34eb3da-2554-43d2-b1bf-82520b5c586f"
-    },
-    "_type": 0,
-    "_sizeMode": 1,
-    "_fillType": 0,
-    "_fillCenter": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_atlas": null,
-    "_id": "86IXjDevFGNrQlA2A4GkFp"
-  },
-  {
     "__type__": "a477046hOJO/ZHA0+dZ4SaN",
     "_name": "",
     "_objFlags": 0,
@@ -101296,10 +101346,13 @@
       "__id__": 2691
     },
     "_enabled": true,
+    "img_bg": {
+      "__id__": 2693
+    },
     "img_hero": {
       "__id__": 2696
     },
-    "node_hb": {
+    "img_camp": {
       "__id__": 2699
     },
     "txt_name": {
@@ -101312,10 +101365,10 @@
       "__id__": 2707
     },
     "node_geted": {
-      "__id__": 2720
+      "__id__": 2722
     },
     "txt_getedhb_num": {
-      "__id__": 2728
+      "__id__": 2730
     },
     "_id": "18UDFSBZ9Gea9YY40WPEzx"
   },
@@ -101341,11 +101394,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 2736
+        "__id__": 2737
       }
     ],
     "_prefab": {
-      "__id__": 2737
+      "__id__": 2738
     },
     "_opacity": 255,
     "_color": {
@@ -101399,7 +101452,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 2735
+      "__id__": 2736
     },
     "_enabled": true,
     "_materials": [
@@ -101502,7 +101555,7 @@
       "__id__": 2678
     },
     "generalItem": {
-      "__id__": 2733
+      "__id__": 2734
     },
     "_id": "5eHdp0kHNM3bqYxHVV+XYA"
   },

tower_sanguo/assets/scripts/data/GameData.ts

@@ -183,6 +183,7 @@ export default class GameData {
             vo.resource = o.hero_res;
             vo.skillID = o.skillID;
             vo.upRatio = o.upRatio;
+            vo.introduce = o.introduce;
             this.general_data[i] = vo;
             g_max++;
         }

tower_sanguo/assets/scripts/module/drawRecruit/GeneralRewardItem.ts

@@ -5,16 +5,22 @@
 // Learn life-cycle callbacks:
 //  - https://docs.cocos.com/creator/manual/en/scripting/life-cycle-callbacks.html
 
-const {ccclass, property} = cc._decorator;
+import GameController from "../../GameController";
+
+const { ccclass, property } = cc._decorator;
 
 @ccclass
 export default class GeneralRewardItem extends cc.Component {
 
+
+    @property({ type: cc.Sprite, displayName: "图_框" })
+    img_bg: cc.Sprite = null;
+
     @property({ type: cc.Sprite, displayName: "图_武将" })
     img_hero: cc.Sprite = null;
 
     @property({ type: cc.Sprite, displayName: "图_阵营" })
-    node_hb: cc.Node = null;
+    img_camp: cc.Sprite = null;
 
     @property({ type: cc.Label, displayName: "文本_名称" })
     txt_name: cc.Label = null;
@@ -24,10 +30,43 @@ export default class GeneralRewardItem extends cc.Component {
 
     @property({ type: cc.Node, displayName: "节点_领取按钮" })
     node_get: cc.Node = null;
-    
+
     @property({ type: cc.Node, displayName: "节点_已领取" })
-    node_geted: cc.Node = null;    
-    
+    node_geted: cc.Node = null;
+
     @property({ type: cc.Label, displayName: "文本_已领取的红包数额" })
     txt_getedhb_num: cc.Label = null;
+
+    private general_id: number;
+
+    Init(data: any) {
+        this.general_id = data.id;
+        this.node_geted.active = data.receiveTimes == 2;
+        this.node_get.active = data.receiveTimes != 2;
+        if (data.rewardFirstOpen != null) {
+            //this.txt_getedhb_num.string=data
+        }
+        let general = GameController.gameData.getGeneralByID(data.id);
+        cc.loader.loadRes("module/drawRecruit/texture/general/bg" + general.color, cc.SpriteFrame, (errr, asset) => {
+            if (errr) { return; }
+            this.img_bg.spriteFrame = asset;
+        });
+        cc.loader.loadRes("module/general/texture/hero_img/" + general.resource, cc.SpriteFrame, (errr, asset) => {
+            if (errr) { return; }
+            this.img_hero.spriteFrame = asset;
+        });
+        cc.loader.loadRes("module/general/texture/icon_camp_" + general.camp, cc.SpriteFrame, (errr, asset) => {
+            if (errr) { return; }
+            this.img_camp.spriteFrame = asset;
+        });
+        this.txt_name.string = general.name;
+        this.txt_des.string = general.introduce;
+    }
+
+    click_GetBtn() {
+        console.log("you click get btn ");
+        GameController.http.openGeneralReward((data) => {
+            console.log("--->OpenGeneralReward Data: ", data);
+        }, { id: this.general_id });
+    }
 }

tower_sanguo/assets/scripts/module/drawRecruit/GeneralRewardUI.ts

@@ -1,4 +1,5 @@
 import BaseUI from "../../../MOKA/component/BaseUI";
+import GameController from "../../GameController";
 import GeneralRewardItem from "./GeneralRewardItem";
 
 const { ccclass, property } = cc._decorator;
@@ -15,6 +16,66 @@ export default class GeneralRewardUI extends BaseUI {
     @property({ type: GeneralRewardItem, displayName: "武将奖励Item" })
     generalItem: GeneralRewardItem = null;
 
-    start(){
+    start() {
+        GameController.http.getBackpackGeneral((data) => {
+            console.log("--->getBackpackGeneral Data:", data);
+            if (data.data.code == 1) {
+                this.parseData(data.data.generalpack);
+            } else {
+                GameController.uiM.showToast(data.data.msg);
+            }
+        });
+    }
+
+    parseData(data: any[]) {
+        let tempdata = data.sort(function (a, b) {
+            if (a.receiveTimes == b.receiveTimes && a.reveiveTimes == 2) {
+                //已领取
+                let ag = GameController.gameData.getGeneralByID(a.id);
+                let bg = GameController.gameData.getGeneralByID(b.id);
+                if (ag.color == bg.color) {
+                    if (ag.star == bg.star) {
+                        if (ag.camp == bg.camp) {
+                            return bg.id - ag.id;
+                        } else {
+                            return ag.camp - bg.camp;//正营 魏蜀吴群 1-4
+                        }
+                    } else {
+                        return bg.star - ag.star;
+                    }
+                } else {
+                    return bg.color - ag.color;
+                }
+            } else {
+                //未领取或未领取完
+                if (a.receiveTimes == b.receiveTimes) {
+                    let ag = GameController.gameData.getGeneralByID(a.id);
+                    let bg = GameController.gameData.getGeneralByID(b.id);
+                    if (ag.color == bg.color) {
+                        if (ag.star == bg.star) {
+                            if (ag.camp == bg.camp) {
+                                return bg.id - ag.id;
+                            } else {
+                                return ag.camp - bg.camp;//正营 魏蜀吴群 1-4
+                            }
+                        } else {
+                            return bg.star - ag.star;
+                        }
+                    } else {
+                        return bg.color - ag.color;
+                    }
+                } else {
+                    return -1;
+                }
+            }
+        });
+        for (let i = 0; i < tempdata.length; i++) {
+            if (tempdata[i].status == 1) {
+                let itemScr = cc.instantiate(this.generalItem.node).getComponent(GeneralRewardItem);
+                itemScr.Init(tempdata[i]);
+                itemScr.node.active = true;
+                this.content.addChild(itemScr.node);
+            }
+        }
     }
 }

tower_sanguo/assets/scripts/net/HttpCommand.ts

@@ -350,48 +350,48 @@ export default class HttpCommand {
         piggyBoxLastTime: 1621853915
         piggyBoxYesterday: 0
      */
-     getPiggyBox() {
+    getPiggyBox() {
         let data = {
 
         };
         this.sendData(HTTPTYPE.getPiggyBox, data, (data) => {
-            XXEvent.emit('http-piggyBox-getPiggyBox',data)
+            XXEvent.emit('http-piggyBox-getPiggyBox', data)
         });
     }
 
     /**
      * 存钱罐进账
      */
-     savePiggyBox() {
+    savePiggyBox() {
         let data = {
 
         };
         this.sendData(HTTPTYPE.savePiggyBox, data, (data) => {
-            XXEvent.emit('http-piggyBox-savePiggyBox',data)
+            XXEvent.emit('http-piggyBox-savePiggyBox', data)
         });
     }
 
     /**
      * 领取通关红包
      */
-     getStageReward() {
+    getStageReward() {
         let data = {
 
         };
         this.sendData(HTTPTYPE.getStageReward, data, (data) => {
-            XXEvent.emit('http-stage-getStageReward',data)
+            XXEvent.emit('http-stage-getStageReward', data)
         });
     }
 
     /**
      * 掉落通关红包
      */
-     saveStageReward() {
+    saveStageReward() {
         let data = {
 
         };
         this.sendData(HTTPTYPE.saveStageReward, data, (data) => {
-            XXEvent.emit('http-stage-saveStageReward',data)
+            XXEvent.emit('http-stage-saveStageReward', data)
         });
     }
 
@@ -428,6 +428,22 @@ export default class HttpCommand {
         this.sendData(HTTPTYPE.redBagToYb, {}, callback);
     }
 
+    /** 获取背景武将
+     * @param callback 回调
+     * @param data 传参
+    */
+    getBackpackGeneral(callback) {
+        this.sendData(HTTPTYPE.getBackpackGeneral, {}, callback);
+    }
+
+    /** 开启武将奖励
+     * @param callback 回调
+     * @param data 传参
+    */
+    openGeneralReward(callback, data) {
+        this.sendData(HTTPTYPE.openGeneralReward, data, callback);
+    }
+
 
     //--------------------------ZNH------------------------
 
@@ -553,6 +569,10 @@ export enum HTTPTYPE {
     drawCard = 'general/drawCard',
     /** 红包币兑换元宝*/
     redBagToYb = 'general/redBagToYb',
+    /** 获取背景武将*/
+    getBackpackGeneral = 'general/getBackpackGeneral',
+    /** 开启武将奖励*/
+    openGeneralReward = 'general/openGeneralReward',
     //-------ZNH
 
     updateKeyValueDemo = 'general/updateKeyValueDemo',

tower_sanguo/assets/scripts/vo/GeneralVO.ts

@@ -112,6 +112,7 @@ export default class GeneralVO {
     }
     growvalues: string[];
     skill: SkillVO;
+    introduce: string;
 
     /** ------------------------------ 服务器数据  ----------------------------- */
     /** 阵位 */
@@ -183,7 +184,7 @@ export default class GeneralVO {
             iscrit: iscrit,
             debuff: buff ? buff : null,
             damage: Math.ceil(damage),
-            isskill:false
+            isskill: false
         };
         return data as DamageData;
     }