Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

# Conflicts:
#	Assets/Scenes/testCombat.scene   resolved by origin/master(远端) version

Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_glow_add.mat

@@ -57,7 +57,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.56224924
+    - _Alpha: 0.9497664
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0

Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_quan.mat

@@ -57,7 +57,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.00092924875
+    - _Alpha: 0.9028065
     - _AlphaCutoff: 0.5
     - _ColorMask: 0
     - _EnableExternalAlpha: 0

Assets/Art/VFX/Materials/UIMat/ui_renwu_lg.mat

@@ -57,13 +57,13 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.3860619
+    - _Alpha: 0.20827067
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0
     - _MainSpeedU: 0.5
     - _MainSpeedV: 0.5
-    - _MainTexOffsetU: 0.00906992
+    - _MainTexOffsetU: 0.20219481
     - _MainTexOffsetV: 0
     - _MainTilingU: 0.8
     - _MainTilingV: 1

Assets/Res/Config/DropConfig.json

@@ -170,6 +170,226 @@
         1204
       ]
     },
+    {
+      "ID": 1205,
+      "dropGroupID": [
+        1205
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1205
+      ]
+    },
+    {
+      "ID": 1206,
+      "dropGroupID": [
+        1206
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1206
+      ]
+    },
+    {
+      "ID": 1207,
+      "dropGroupID": [
+        1207
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1207
+      ]
+    },
+    {
+      "ID": 1208,
+      "dropGroupID": [
+        1208
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1208
+      ]
+    },
+    {
+      "ID": 1209,
+      "dropGroupID": [
+        1209
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1209
+      ]
+    },
+    {
+      "ID": 1210,
+      "dropGroupID": [
+        1210
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1210
+      ]
+    },
+    {
+      "ID": 1211,
+      "dropGroupID": [
+        1211
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1211
+      ]
+    },
+    {
+      "ID": 1212,
+      "dropGroupID": [
+        1212
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1212
+      ]
+    },
+    {
+      "ID": 1213,
+      "dropGroupID": [
+        1213
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1213
+      ]
+    },
+    {
+      "ID": 1214,
+      "dropGroupID": [
+        1214
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1214
+      ]
+    },
+    {
+      "ID": 1215,
+      "dropGroupID": [
+        1215
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1215
+      ]
+    },
+    {
+      "ID": 1216,
+      "dropGroupID": [
+        1216
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1216
+      ]
+    },
+    {
+      "ID": 1217,
+      "dropGroupID": [
+        1217
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1217
+      ]
+    },
+    {
+      "ID": 1218,
+      "dropGroupID": [
+        1218
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1218
+      ]
+    },
+    {
+      "ID": 1219,
+      "dropGroupID": [
+        1219
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1219
+      ]
+    },
+    {
+      "ID": 1220,
+      "dropGroupID": [
+        1220
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1220
+      ]
+    },
+    {
+      "ID": 1221,
+      "dropGroupID": [
+        1221
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1221
+      ]
+    },
+    {
+      "ID": 1222,
+      "dropGroupID": [
+        1222
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1222
+      ]
+    },
+    {
+      "ID": 1223,
+      "dropGroupID": [
+        1223
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1223
+      ]
+    },
+    {
+      "ID": 1224,
+      "dropGroupID": [
+        1224
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1224
+      ]
+    },
+    {
+      "ID": 1225,
+      "dropGroupID": [
+        1225
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1225
+      ]
+    },
+    {
+      "ID": 1226,
+      "dropGroupID": [
+        1226
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1226
+      ]
+    },
     {
       "ID": 1301,
       "dropGroupID": [
@@ -260,6 +480,216 @@
         1309
       ]
     },
+    {
+      "ID": 1310,
+      "dropGroupID": [
+        1310
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1310
+      ]
+    },
+    {
+      "ID": 1311,
+      "dropGroupID": [
+        1311
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1311
+      ]
+    },
+    {
+      "ID": 1312,
+      "dropGroupID": [
+        1312
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1312
+      ]
+    },
+    {
+      "ID": 1313,
+      "dropGroupID": [
+        1313
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1313
+      ]
+    },
+    {
+      "ID": 1314,
+      "dropGroupID": [
+        1314
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1314
+      ]
+    },
+    {
+      "ID": 1315,
+      "dropGroupID": [
+        1315
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1315
+      ]
+    },
+    {
+      "ID": 1316,
+      "dropGroupID": [
+        1316
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1316
+      ]
+    },
+    {
+      "ID": 1317,
+      "dropGroupID": [
+        1317
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1317
+      ]
+    },
+    {
+      "ID": 1318,
+      "dropGroupID": [
+        1318
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1318
+      ]
+    },
+    {
+      "ID": 1319,
+      "dropGroupID": [
+        1319
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1319
+      ]
+    },
+    {
+      "ID": 1320,
+      "dropGroupID": [
+        1320
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1320
+      ]
+    },
+    {
+      "ID": 1321,
+      "dropGroupID": [
+        1321
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1321
+      ]
+    },
+    {
+      "ID": 1322,
+      "dropGroupID": [
+        1322
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1322
+      ]
+    },
+    {
+      "ID": 1323,
+      "dropGroupID": [
+        1323
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1323
+      ]
+    },
+    {
+      "ID": 1324,
+      "dropGroupID": [
+        1324
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1324
+      ]
+    },
+    {
+      "ID": 1325,
+      "dropGroupID": [
+        1325
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1325
+      ]
+    },
+    {
+      "ID": 1326,
+      "dropGroupID": [
+        1326
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1326
+      ]
+    },
+    {
+      "ID": 1327,
+      "dropGroupID": [
+        1327
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1327
+      ]
+    },
+    {
+      "ID": 1328,
+      "dropGroupID": [
+        1328
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1328
+      ]
+    },
+    {
+      "ID": 1329,
+      "dropGroupID": [
+        1329
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1329
+      ]
+    },
+    {
+      "ID": 1330,
+      "dropGroupID": [
+        1330
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1330
+      ]
+    },
     {
       "ID": 1401,
       "dropGroupID": [

Assets/Res/Config/EventConfig.json

@@ -1577,12 +1577,12 @@
       "PrizeIDs": [
         10001,
         1702,
-        1003
+        1301
       ],
       "PrizeNums": [
         1,
         1,
-        330
+        1
       ],
       "RefreshProbability": 0,
       "RefreshCount": 0,
@@ -1731,12 +1731,12 @@
       "PrizeIDs": [
         10003,
         1702,
-        1003
+        1302
       ],
       "PrizeNums": [
         1,
         1,
-        360
+        1
       ],
       "RefreshProbability": 0,
       "RefreshCount": 0,
@@ -1799,12 +1799,12 @@
       "PrizeIDs": [
         1301,
         1702,
-        1003
+        1303
       ],
       "PrizeNums": [
         1,
         1,
-        390
+        1
       ],
       "RefreshProbability": 0,
       "RefreshCount": 0,

Assets/Res/Config/ItemConfig.json

@@ -1367,7 +1367,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -1401,7 +1401,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -1435,7 +1435,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -1469,7 +1469,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -1503,7 +1503,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -1537,7 +1537,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -1571,7 +1571,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -1605,7 +1605,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -1639,7 +1639,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -1673,7 +1673,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -1707,7 +1707,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -1741,7 +1741,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -1775,7 +1775,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -1809,7 +1809,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -1843,7 +1843,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -1877,7 +1877,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -1911,7 +1911,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -1945,7 +1945,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -1979,7 +1979,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -2013,7 +2013,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -2047,7 +2047,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -2081,7 +2081,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -2115,7 +2115,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -2149,7 +2149,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -2183,7 +2183,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -2217,7 +2217,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -2251,7 +2251,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -2507,7 +2507,8 @@
       "isSell": false,
       "SkiptoID": [
         8,
-        7
+        7,
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -2538,7 +2539,8 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        8,
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -2570,7 +2572,8 @@
       "isSell": false,
       "SkiptoID": [
         8,
-        9
+        9,
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,

Assets/Res/Config/LanguageChineseConfig.json

@@ -13066,7 +13066,7 @@
     },
     {
       "ID": 4007,
-      "txt": "[资源]渡劫丹"
+      "txt": "[资源]灵血草"
     },
     {
       "ID": 4008,
@@ -13102,7 +13102,7 @@
     },
     {
       "ID": 4016,
-      "txt": "[资源]渡劫丹"
+      "txt": "[资源]灵血草"
     },
     {
       "ID": 4017,
@@ -14254,7 +14254,7 @@
     },
     {
       "ID": 4304,
-      "txt": "[资源]良品渡劫丹"
+      "txt": "[资源]玄玉髓"
     },
     {
       "ID": 4305,
@@ -14290,7 +14290,7 @@
     },
     {
       "ID": 4313,
-      "txt": "[资源]上品渡劫丹"
+      "txt": "[资源]赤阳砂"
     },
     {
       "ID": 4314,
@@ -14326,7 +14326,7 @@
     },
     {
       "ID": 4322,
-      "txt": "[资源]极品渡劫丹"
+      "txt": "[资源]火灵果"
     },
     {
       "ID": 4323,

Assets/Res/Config/ShopItemConfig.json

@@ -2096,52 +2096,6 @@
     {
       "ID": 801,
       "giftID": "",
-      "itemId": [
-        1201
-      ],
-      "itemCount": [
-        1
-      ],
-      "costItemId": 1004,
-      "price": 6,
-      "oldPrice": 1,
-      "buyCount": 4,
-      "maxBuyCount": -1,
-      "shopItemGroup": 8,
-      "continueTime": -1,
-      "shopName": 0,
-      "shopDesc": 0,
-      "shopShowTemplate": 3,
-      "shopShowTemplateParm": [
-        "icon_Gem_Star_Blue"
-      ]
-    },
-    {
-      "ID": 802,
-      "giftID": "",
-      "itemId": [
-        1202
-      ],
-      "itemCount": [
-        1
-      ],
-      "costItemId": 1004,
-      "price": 30,
-      "oldPrice": 1,
-      "buyCount": 2,
-      "maxBuyCount": -1,
-      "shopItemGroup": 8,
-      "continueTime": -1,
-      "shopName": 0,
-      "shopDesc": 0,
-      "shopShowTemplate": 3,
-      "shopShowTemplateParm": [
-        "icon_Gem_Star_Blue"
-      ]
-    },
-    {
-      "ID": 803,
-      "giftID": "",
       "itemId": [
         1701
       ],
@@ -2163,7 +2117,7 @@
       ]
     },
     {
-      "ID": 804,
+      "ID": 802,
       "giftID": "",
       "itemId": [
         12004
@@ -2186,7 +2140,7 @@
       ]
     },
     {
-      "ID": 805,
+      "ID": 803,
       "giftID": "",
       "itemId": [
         12510
@@ -2209,7 +2163,7 @@
       ]
     },
     {
-      "ID": 806,
+      "ID": 804,
       "giftID": "",
       "itemId": [
         10010

Assets/Res/Config/SkillConfig.json

@@ -433,7 +433,7 @@
         3.0,
         56.0,
         100.0,
-        30.0
+        15.0
       ],
       "intensifierIndex": [
         2
@@ -460,7 +460,7 @@
         3.0,
         64.0,
         100.0,
-        40.0
+        20.0
       ],
       "intensifierIndex": [
         2
@@ -496,7 +496,7 @@
         3.0,
         73.0,
         100.0,
-        50.0
+        25.0
       ],
       "intensifierIndex": [
         2
@@ -532,7 +532,7 @@
         3.0,
         84.0,
         100.0,
-        60.0
+        30.0
       ],
       "intensifierIndex": [
         2
@@ -568,7 +568,7 @@
         3.0,
         77.0,
         100.0,
-        70.0,
+        35.0,
         20.0
       ],
       "intensifierIndex": [
@@ -5976,7 +5976,7 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 1,
-      "effectUpK": 10,
+      "effectUpK": 20,
       "effectValue": [
         5.0,
         30.0,
@@ -6005,7 +6005,7 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 2,
-      "effectUpK": 10,
+      "effectUpK": 20,
       "effectValue": [
         5.0,
         40.0,
@@ -6043,7 +6043,7 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 3,
-      "effectUpK": 10,
+      "effectUpK": 20,
       "effectValue": [
         5.0,
         50.0,
@@ -6081,7 +6081,7 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 4,
-      "effectUpK": 10,
+      "effectUpK": 20,
       "effectValue": [
         5.0,
         60.0,
@@ -6119,7 +6119,7 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 5,
-      "effectUpK": 10,
+      "effectUpK": 20,
       "effectValue": [
         5.0,
         70.0,
@@ -6157,7 +6157,7 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 6,
-      "effectUpK": 10,
+      "effectUpK": 20,
       "effectValue": [
         5.0,
         100.0,
@@ -6193,7 +6193,7 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 1,
-      "effectUpK": 15,
+      "effectUpK": 45,
       "effectValue": [
         50.0,
         0.0
@@ -6218,7 +6218,7 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 2,
-      "effectUpK": 15,
+      "effectUpK": 45,
       "effectValue": [
         60.0,
         20.0,
@@ -6253,7 +6253,7 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 3,
-      "effectUpK": 15,
+      "effectUpK": 45,
       "effectValue": [
         70.0,
         20.0,
@@ -6288,7 +6288,7 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 4,
-      "effectUpK": 15,
+      "effectUpK": 45,
       "effectValue": [
         80.0,
         30.0,
@@ -6323,7 +6323,7 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 5,
-      "effectUpK": 15,
+      "effectUpK": 45,
       "effectValue": [
         90.0,
         30.0,
@@ -6358,7 +6358,7 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 6,
-      "effectUpK": 15,
+      "effectUpK": 45,
       "effectValue": [
         100.0,
         30.0,

Assets/Res/Config/TowerInfoConfig.json

@@ -11,7 +11,7 @@
         2001
       ],
       "reward": [
-        1402,
+        1401,
         1001
       ],
       "unlockValue": 0
@@ -27,7 +27,7 @@
         2002
       ],
       "reward": [
-        1702,
+        1701,
         1001
       ],
       "unlockValue": 0
@@ -59,7 +59,7 @@
         2004
       ],
       "reward": [
-        1402,
+        1304,
         1001
       ],
       "unlockValue": 0
@@ -75,7 +75,7 @@
         2005
       ],
       "reward": [
-        1702,
+        1401,
         1001
       ],
       "unlockValue": 0
@@ -91,7 +91,7 @@
         2006
       ],
       "reward": [
-        21012,
+        1701,
         1001
       ],
       "unlockValue": 0
@@ -107,7 +107,7 @@
         2007
       ],
       "reward": [
-        1402,
+        21012,
         1001
       ],
       "unlockValue": 0
@@ -123,7 +123,7 @@
         2008
       ],
       "reward": [
-        1702,
+        1305,
         1001
       ],
       "unlockValue": 0
@@ -139,7 +139,7 @@
         2009
       ],
       "reward": [
-        21012,
+        1402,
         1001
       ],
       "unlockValue": 0
@@ -155,7 +155,7 @@
         2010
       ],
       "reward": [
-        1402,
+        1702,
         1001
       ],
       "unlockValue": 0
@@ -171,7 +171,7 @@
         2011
       ],
       "reward": [
-        1702,
+        21012,
         1001
       ],
       "unlockValue": 0
@@ -187,7 +187,7 @@
         2012
       ],
       "reward": [
-        21012,
+        1306,
         1001
       ],
       "unlockValue": 0
@@ -251,7 +251,7 @@
         2016
       ],
       "reward": [
-        1402,
+        1307,
         1001
       ],
       "unlockValue": 0
@@ -267,7 +267,7 @@
         2017
       ],
       "reward": [
-        1702,
+        1402,
         1001
       ],
       "unlockValue": 0
@@ -283,7 +283,7 @@
         2018
       ],
       "reward": [
-        21012,
+        1702,
         1001
       ],
       "unlockValue": 0
@@ -299,7 +299,7 @@
         2019
       ],
       "reward": [
-        1402,
+        21012,
         1001
       ],
       "unlockValue": 0
@@ -315,7 +315,7 @@
         2020
       ],
       "reward": [
-        1702,
+        1308,
         1001
       ],
       "unlockValue": 0
@@ -331,7 +331,7 @@
         2021
       ],
       "reward": [
-        21012,
+        1402,
         1001
       ],
       "unlockValue": 0
@@ -347,7 +347,7 @@
         2022
       ],
       "reward": [
-        1402,
+        1702,
         1001
       ],
       "unlockValue": 0
@@ -363,7 +363,7 @@
         2023
       ],
       "reward": [
-        1702,
+        21012,
         1001
       ],
       "unlockValue": 0
@@ -379,7 +379,7 @@
         2024
       ],
       "reward": [
-        21012,
+        1309,
         1001
       ],
       "unlockValue": 0
@@ -443,7 +443,7 @@
         2028
       ],
       "reward": [
-        1402,
+        1310,
         1001
       ],
       "unlockValue": 0
@@ -459,7 +459,7 @@
         2029
       ],
       "reward": [
-        1702,
+        1402,
         1001
       ],
       "unlockValue": 0
@@ -475,7 +475,7 @@
         2030
       ],
       "reward": [
-        21012,
+        1702,
         1001
       ],
       "unlockValue": 0
@@ -491,7 +491,7 @@
         2031
       ],
       "reward": [
-        1403,
+        21012,
         1001
       ],
       "unlockValue": 0
@@ -507,7 +507,7 @@
         2032
       ],
       "reward": [
-        1702,
+        1311,
         1001
       ],
       "unlockValue": 0
@@ -523,7 +523,7 @@
         2033
       ],
       "reward": [
-        21012,
+        1403,
         1001
       ],
       "unlockValue": 0
@@ -539,7 +539,7 @@
         2034
       ],
       "reward": [
-        1403,
+        1702,
         1001
       ],
       "unlockValue": 0
@@ -555,7 +555,7 @@
         2035
       ],
       "reward": [
-        1702,
+        21012,
         1001
       ],
       "unlockValue": 0
@@ -571,7 +571,7 @@
         2036
       ],
       "reward": [
-        21012,
+        1312,
         1001
       ],
       "unlockValue": 0
@@ -635,7 +635,7 @@
         2040
       ],
       "reward": [
-        1403,
+        1313,
         1001
       ],
       "unlockValue": 0
@@ -651,7 +651,7 @@
         2041
       ],
       "reward": [
-        1702,
+        1403,
         1001
       ],
       "unlockValue": 0
@@ -667,7 +667,7 @@
         2042
       ],
       "reward": [
-        21012,
+        1702,
         1001
       ],
       "unlockValue": 0
@@ -683,7 +683,7 @@
         2043
       ],
       "reward": [
-        1403,
+        21012,
         1001
       ],
       "unlockValue": 0
@@ -699,7 +699,7 @@
         2044
       ],
       "reward": [
-        1702,
+        1314,
         1001
       ],
       "unlockValue": 0
@@ -715,7 +715,7 @@
         2045
       ],
       "reward": [
-        21012,
+        1403,
         1001
       ],
       "unlockValue": 0
@@ -731,7 +731,7 @@
         2046
       ],
       "reward": [
-        1403,
+        1702,
         1001
       ],
       "unlockValue": 0
@@ -747,7 +747,7 @@
         2047
       ],
       "reward": [
-        1702,
+        21012,
         1001
       ],
       "unlockValue": 0
@@ -763,7 +763,7 @@
         2048
       ],
       "reward": [
-        21012,
+        1315,
         1001
       ],
       "unlockValue": 0
@@ -827,7 +827,7 @@
         2052
       ],
       "reward": [
-        1403,
+        1316,
         1001
       ],
       "unlockValue": 0
@@ -843,7 +843,7 @@
         2053
       ],
       "reward": [
-        1702,
+        1403,
         1001
       ],
       "unlockValue": 0
@@ -859,7 +859,7 @@
         2054
       ],
       "reward": [
-        21012,
+        1702,
         1001
       ],
       "unlockValue": 0
@@ -875,7 +875,7 @@
         2055
       ],
       "reward": [
-        1403,
+        21012,
         1001
       ],
       "unlockValue": 0
@@ -891,7 +891,7 @@
         2056
       ],
       "reward": [
-        1702,
+        1317,
         1001
       ],
       "unlockValue": 0
@@ -907,7 +907,7 @@
         2057
       ],
       "reward": [
-        21012,
+        1403,
         1001
       ],
       "unlockValue": 0
@@ -923,7 +923,7 @@
         2058
       ],
       "reward": [
-        1403,
+        1702,
         1001
       ],
       "unlockValue": 0
@@ -939,7 +939,7 @@
         2059
       ],
       "reward": [
-        1702,
+        21012,
         1001
       ],
       "unlockValue": 0
@@ -955,7 +955,7 @@
         2060
       ],
       "reward": [
-        21012,
+        1318,
         1001
       ],
       "unlockValue": 0
@@ -971,7 +971,7 @@
         2061
       ],
       "reward": [
-        1404,
+        1403,
         1001
       ],
       "unlockValue": 0
@@ -1019,7 +1019,7 @@
         2064
       ],
       "reward": [
-        1404,
+        1319,
         1001
       ],
       "unlockValue": 0
@@ -1035,7 +1035,7 @@
         2065
       ],
       "reward": [
-        1702,
+        1403,
         1001
       ],
       "unlockValue": 0
@@ -1051,7 +1051,7 @@
         2066
       ],
       "reward": [
-        21012,
+        1702,
         1001
       ],
       "unlockValue": 0
@@ -1067,7 +1067,7 @@
         2067
       ],
       "reward": [
-        1404,
+        21012,
         1001
       ],
       "unlockValue": 0
@@ -1083,7 +1083,7 @@
         2068
       ],
       "reward": [
-        1702,
+        1320,
         1001
       ],
       "unlockValue": 0
@@ -1099,7 +1099,7 @@
         2069
       ],
       "reward": [
-        21012,
+        1404,
         1001
       ],
       "unlockValue": 0
@@ -1115,7 +1115,7 @@
         2070
       ],
       "reward": [
-        1404,
+        1702,
         1001
       ],
       "unlockValue": 0
@@ -1131,7 +1131,7 @@
         2071
       ],
       "reward": [
-        1702,
+        21012,
         1001
       ],
       "unlockValue": 0
@@ -1147,7 +1147,7 @@
         2072
       ],
       "reward": [
-        21012,
+        1321,
         1001
       ],
       "unlockValue": 0
@@ -1211,7 +1211,7 @@
         2076
       ],
       "reward": [
-        1404,
+        1322,
         1001
       ],
       "unlockValue": 0
@@ -1227,7 +1227,7 @@
         2077
       ],
       "reward": [
-        1702,
+        1404,
         1001
       ],
       "unlockValue": 0
@@ -1243,7 +1243,7 @@
         2078
       ],
       "reward": [
-        21012,
+        1702,
         1001
       ],
       "unlockValue": 0
@@ -1259,7 +1259,7 @@
         2079
       ],
       "reward": [
-        1404,
+        21012,
         1001
       ],
       "unlockValue": 0
@@ -1275,7 +1275,7 @@
         2080
       ],
       "reward": [
-        1702,
+        1323,
         1001
       ],
       "unlockValue": 0
@@ -1291,7 +1291,7 @@
         2081
       ],
       "reward": [
-        21012,
+        1404,
         1001
       ],
       "unlockValue": 0
@@ -1307,7 +1307,7 @@
         2082
       ],
       "reward": [
-        1404,
+        1702,
         1001
       ],
       "unlockValue": 0
@@ -1323,7 +1323,7 @@
         2083
       ],
       "reward": [
-        1702,
+        21012,
         1001
       ],
       "unlockValue": 0
@@ -1339,7 +1339,7 @@
         2084
       ],
       "reward": [
-        21012,
+        1324,
         1001
       ],
       "unlockValue": 0
@@ -1403,7 +1403,7 @@
         2088
       ],
       "reward": [
-        1404,
+        1325,
         1001
       ],
       "unlockValue": 0
@@ -1419,7 +1419,7 @@
         2089
       ],
       "reward": [
-        1702,
+        1404,
         1001
       ],
       "unlockValue": 0
@@ -1435,7 +1435,7 @@
         2090
       ],
       "reward": [
-        21012,
+        1702,
         1001
       ],
       "unlockValue": 0
@@ -1451,7 +1451,7 @@
         2091
       ],
       "reward": [
-        1404,
+        21012,
         1001
       ],
       "unlockValue": 0
@@ -1467,7 +1467,7 @@
         2092
       ],
       "reward": [
-        1702,
+        1326,
         1001
       ],
       "unlockValue": 0
@@ -1483,7 +1483,7 @@
         2093
       ],
       "reward": [
-        21012,
+        1703,
         1001
       ],
       "unlockValue": 0
@@ -1499,7 +1499,7 @@
         2094
       ],
       "reward": [
-        1404,
+        1327,
         1001
       ],
       "unlockValue": 0
@@ -1515,7 +1515,7 @@
         2095
       ],
       "reward": [
-        1702,
+        1703,
         1001
       ],
       "unlockValue": 0
@@ -1531,7 +1531,7 @@
         2096
       ],
       "reward": [
-        21012,
+        1328,
         1001
       ],
       "unlockValue": 0
@@ -1547,7 +1547,7 @@
         2097
       ],
       "reward": [
-        1404,
+        1703,
         1001
       ],
       "unlockValue": 0
@@ -1563,7 +1563,7 @@
         2098
       ],
       "reward": [
-        1702,
+        1329,
         1001
       ],
       "unlockValue": 0
@@ -1579,7 +1579,7 @@
         2099
       ],
       "reward": [
-        21012,
+        1703,
         1001
       ],
       "unlockValue": 0
@@ -1595,7 +1595,7 @@
         2100
       ],
       "reward": [
-        1404,
+        1330,
         1001
       ],
       "unlockValue": 0

Assets/Res/UI/HeroInformainPanel/BreakthroughItemWidget.prefab

@@ -398,7 +398,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: -0.000015258789, y: 0}
-  m_SizeDelta: {x: 100, y: 100}
+  m_SizeDelta: {x: 118.8268, y: 118.8268}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &380172200749822584
 CanvasRenderer:
@@ -438,15 +438,15 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: icon_eq_3_2_1
+  _icon_name: icon_item_20012
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 1ef03ad075d5c504196a7354786d23e8, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 77f77eea85838ad4b8734050364b4892, type: 3}
   packInfo:
-    packName: allIcon
-    packgJsonPath: /Art/UIAssets/TextrueJson/allIcon.txt
-    packgSpritePath: Assets/Res/UIAtlas/allIcon.spriteatlasv2
-    lasetJsonGUID: 4b54a953fcd0950cece7d4eeea1f40a9
-  imageH: 0
+    packName: daoju
+    packgJsonPath: /Art/UIAssets/TextrueJson\daoju.txt
+    packgSpritePath: Assets/Res/UIAtlas/daoju.spriteatlasv2
+    lasetJsonGUID: 738ec5908281e178b7c40618cc12b514
+  imageH: 100
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}

Assets/Res/UI/HeroInformainPanel/ElixirItemWidget.prefab

@@ -195,8 +195,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: -0, y: -64.9}
-  m_SizeDelta: {x: 58.8736, y: 58.874}
+  m_AnchoredPosition: {x: -0, y: -64.9001}
+  m_SizeDelta: {x: 105.49, y: 105.4875}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2951448184634106011
 CanvasRenderer:
@@ -236,14 +236,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: icon_eq_3_4_3
+  _icon_name: icon_item_20012
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 1ef03ad075d5c504196a7354786d23e8, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 77f77eea85838ad4b8734050364b4892, type: 3}
   packInfo:
-    packName: allIcon
-    packgJsonPath: /Art/UIAssets/TextrueJson/allIcon.txt
-    packgSpritePath: Assets/Res/UIAtlas/allIcon.spriteatlasv2
-    lasetJsonGUID: 4b54a953fcd0950cece7d4eeea1f40a9
+    packName: daoju
+    packgJsonPath: /Art/UIAssets/TextrueJson\daoju.txt
+    packgSpritePath: Assets/Res/UIAtlas/daoju.spriteatlasv2
+    lasetJsonGUID: 738ec5908281e178b7c40618cc12b514
   imageH: 58.874
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}

Assets/Res/UI/HeroInformainPanel/HeroBreakthroughPanel.prefab

@@ -3387,7 +3387,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 148, y: -22.3432}
-  m_SizeDelta: {x: 0, y: 43.2862}
+  m_SizeDelta: {x: 210, y: 43.2862}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8334097589539832799
 CanvasRenderer:

Assets/Res/UI/HeroInformainPanel/SelectBreakthroughItemPanel.prefab

@@ -391,8 +391,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0.0000050863, y: 4.2}
-  m_SizeDelta: {x: 70.4851, y: 70.4851}
+  m_AnchoredPosition: {x: 0.0000050863, y: 8.3}
+  m_SizeDelta: {x: 104.8072, y: 104.8072}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8151761943818166883
 CanvasRenderer:
@@ -432,14 +432,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: icon_eq_3_4_3
+  _icon_name: icon_shenshidan
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 1ef03ad075d5c504196a7354786d23e8, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 77f77eea85838ad4b8734050364b4892, type: 3}
   packInfo:
-    packName: allIcon
-    packgJsonPath: /Art/UIAssets/TextrueJson/allIcon.txt
-    packgSpritePath: Assets/Res/UIAtlas/allIcon.spriteatlasv2
-    lasetJsonGUID: 4b54a953fcd0950cece7d4eeea1f40a9
+    packName: daoju
+    packgJsonPath: /Art/UIAssets/TextrueJson\daoju.txt
+    packgSpritePath: Assets/Res/UIAtlas/daoju.spriteatlasv2
+    lasetJsonGUID: 738ec5908281e178b7c40618cc12b514
   imageH: 70.43144
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}

Assets/Res/UI/SkillSelectPanel/SkillSelectPanel.prefab

@@ -1822,7 +1822,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
   m_AnchoredPosition: {x: 55.200012, y: -168.2185}
-  m_SizeDelta: {x: 72.46, y: 30}
+  m_SizeDelta: {x: 72, y: 30}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &3243743412898019261
 CanvasRenderer:
@@ -3168,7 +3168,7 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
+  m_ConstrainProportionsScale: 1
   m_Children:
   - {fileID: 2347182967128371605}
   - {fileID: 50435170631078031}

Assets/Scenes/testCombat.scene

@@ -1267,221 +1267,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_ShowMaskGraphic: 1
---- !u!213 &564726597
-Sprite:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: dec_jianbian_tiao(Clone)
-  m_Rect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 115
-    height: 33
-  m_Offset: {x: 0, y: 0}
-  m_Border: {x: 0, y: 0, z: 0, w: 0}
-  m_PixelsToUnits: 100
-  m_Pivot: {x: 0.5, y: 0.5}
-  m_Extrude: 1
-  m_IsPolygon: 0
-  m_AtlasName: 
-  m_PackingTag: 
-  m_RenderDataKey:
-    c0c46614f24bc234b92e828eae8336c3: 21300000
-  m_AtlasTags:
-  - tongyong
-  m_SpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
-  m_RD:
-    serializedVersion: 3
-    texture: {fileID: 2800000, guid: c0c46614f24bc234b92e828eae8336c3, type: 3}
-    alphaTexture: {fileID: 0}
-    secondaryTextures: []
-    m_SubMeshes:
-    - serializedVersion: 2
-      firstByte: 0
-      indexCount: 6
-      topology: 0
-      baseVertex: 0
-      firstVertex: 0
-      vertexCount: 4
-      localAABB:
-        m_Center: {x: 0, y: 0, z: 0}
-        m_Extent: {x: 0, y: 0, z: 0}
-    m_IndexBuffer: 030000000100020001000000
-    m_VertexData:
-      serializedVersion: 3
-      m_VertexCount: 4
-      m_Channels:
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 3
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 1
-        offset: 0
-        format: 0
-        dimension: 2
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      m_DataSize: 80
-      _typelessdata: 333313bfc3f5283e000000003333133fc3f528be000000003333133fc3f5283e00000000333313bfc3f528be000000000000000000000000000000000000000000000000000000000000000000000000
-    m_Bindpose: []
-    textureRect:
-      serializedVersion: 2
-      x: 0
-      y: 0
-      width: 115
-      height: 33
-    textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: -1, y: -1}
-    settingsRaw: 64
-    uvTransform: {x: 100, y: 57.5, z: 100, w: 16.5}
-    downscaleMultiplier: 1
-  m_AtlasRD:
-    serializedVersion: 3
-    texture: {fileID: 8711939763936270973, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
-    alphaTexture: {fileID: 0}
-    secondaryTextures: []
-    m_SubMeshes:
-    - serializedVersion: 2
-      firstByte: 0
-      indexCount: 6
-      topology: 0
-      baseVertex: 0
-      firstVertex: 0
-      vertexCount: 4
-      localAABB:
-        m_Center: {x: 0, y: 0, z: 0}
-        m_Extent: {x: 0, y: 0, z: 0}
-    m_IndexBuffer: 030000000100020001000000
-    m_VertexData:
-      serializedVersion: 3
-      m_VertexCount: 4
-      m_Channels:
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 3
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 1
-        offset: 0
-        format: 0
-        dimension: 2
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      m_DataSize: 80
-      _typelessdata: 333313bfc3f5283e000000003333133fc3f528be000000003333133fc3f5283e00000000333313bfc3f528be000000000000000000000000000000000000000000000000000000000000000000000000
-    m_Bindpose: []
-    textureRect:
-      serializedVersion: 2
-      x: 389
-      y: 1229
-      width: 115
-      height: 33
-    textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 389, y: 1229}
-    settingsRaw: 67
-    uvTransform: {x: 100, y: 446.5, z: 100, w: 1245.5}
-    downscaleMultiplier: 1
-  m_PhysicsShape:
-  - - {x: 0.345, y: 0.16499999}
-    - {x: 0.345, y: -0.16499999}
-    - {x: 0.575, y: -0.16499999}
-    - {x: 0.575, y: 0.16499999}
-  m_Bones: []
-  m_SpriteID: 5e97eb03825dee720800000000000000
 --- !u!1 &753442135
 GameObject:
   m_ObjectHideFlags: 0
@@ -2525,6 +2310,221 @@ MonoBehaviour:
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
+--- !u!213 &1357740138
+Sprite:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: dec_jianbian_tiao(Clone)
+  m_Rect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 115
+    height: 33
+  m_Offset: {x: 0, y: 0}
+  m_Border: {x: 0, y: 0, z: 0, w: 0}
+  m_PixelsToUnits: 100
+  m_Pivot: {x: 0.5, y: 0.5}
+  m_Extrude: 1
+  m_IsPolygon: 0
+  m_AtlasName: 
+  m_PackingTag: 
+  m_RenderDataKey:
+    c0c46614f24bc234b92e828eae8336c3: 21300000
+  m_AtlasTags:
+  - tongyong
+  m_SpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  m_RD:
+    serializedVersion: 3
+    texture: {fileID: 2800000, guid: c0c46614f24bc234b92e828eae8336c3, type: 3}
+    alphaTexture: {fileID: 0}
+    secondaryTextures: []
+    m_SubMeshes:
+    - serializedVersion: 2
+      firstByte: 0
+      indexCount: 6
+      topology: 0
+      baseVertex: 0
+      firstVertex: 0
+      vertexCount: 4
+      localAABB:
+        m_Center: {x: 0, y: 0, z: 0}
+        m_Extent: {x: 0, y: 0, z: 0}
+    m_IndexBuffer: 030000000100020001000000
+    m_VertexData:
+      serializedVersion: 3
+      m_VertexCount: 4
+      m_Channels:
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 3
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 1
+        offset: 0
+        format: 0
+        dimension: 2
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      m_DataSize: 80
+      _typelessdata: 333313bfc3f5283e000000003333133fc3f528be000000003333133fc3f5283e00000000333313bfc3f528be000000000000000000000000000000000000000000000000000000000000000000000000
+    m_Bindpose: []
+    textureRect:
+      serializedVersion: 2
+      x: 0
+      y: 0
+      width: 115
+      height: 33
+    textureRectOffset: {x: 0, y: 0}
+    atlasRectOffset: {x: -1, y: -1}
+    settingsRaw: 64
+    uvTransform: {x: 100, y: 57.5, z: 100, w: 16.5}
+    downscaleMultiplier: 1
+  m_AtlasRD:
+    serializedVersion: 3
+    texture: {fileID: 8711939763936270973, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+    alphaTexture: {fileID: 0}
+    secondaryTextures: []
+    m_SubMeshes:
+    - serializedVersion: 2
+      firstByte: 0
+      indexCount: 6
+      topology: 0
+      baseVertex: 0
+      firstVertex: 0
+      vertexCount: 4
+      localAABB:
+        m_Center: {x: 0, y: 0, z: 0}
+        m_Extent: {x: 0, y: 0, z: 0}
+    m_IndexBuffer: 030000000100020001000000
+    m_VertexData:
+      serializedVersion: 3
+      m_VertexCount: 4
+      m_Channels:
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 3
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 1
+        offset: 0
+        format: 0
+        dimension: 2
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      m_DataSize: 80
+      _typelessdata: 333313bfc3f5283e000000003333133fc3f528be000000003333133fc3f5283e00000000333313bfc3f528be000000000000000000000000000000000000000000000000000000000000000000000000
+    m_Bindpose: []
+    textureRect:
+      serializedVersion: 2
+      x: 389
+      y: 1229
+      width: 115
+      height: 33
+    textureRectOffset: {x: 0, y: 0}
+    atlasRectOffset: {x: 389, y: 1229}
+    settingsRaw: 67
+    uvTransform: {x: 100, y: 446.5, z: 100, w: 1245.5}
+    downscaleMultiplier: 1
+  m_PhysicsShape:
+  - - {x: 0.345, y: 0.16499999}
+    - {x: 0.345, y: -0.16499999}
+    - {x: 0.575, y: -0.16499999}
+    - {x: 0.575, y: 0.16499999}
+  m_Bones: []
+  m_SpriteID: 5e97eb03825dee720800000000000000
 --- !u!224 &1469808077 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 4202026612452094680, guid: 2e16b8f8d28965a45ab1457a3656d5e2, type: 3}
@@ -2945,7 +2945,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 564726597}
+  m_Sprite: {fileID: 1357740138}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1

Assets/Scripts/GameLogic/Player/DropManager.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Reflection;
 using Excel2Json;
 using Fort23.UTool;
 using GameLogic.Bag;
@@ -168,6 +169,7 @@ namespace GameLogic.Player
                 itemInfo = new ItemInfo(dropItemConfig.itemID[itemIndex], c);
             }
 
+
             itemInfos.Add(itemInfo);
             // for (int j = 0; j < dropItemConfig.itemID.Length; j++)
             // {
@@ -254,17 +256,35 @@ namespace GameLogic.Player
         public List<ItemInfo> Drop(int itemID, int count)
         {
             List<ItemInfo> itemInfos = new List<ItemInfo>();
+            DropConfig dropConfig = ConfigComponent.Instance.Get<DropConfig>(itemID);
+
+
             if (count < 0)
             {
                 itemInfos.Add(DropResourceLevel(itemID, count));
             }
+
             else
             {
-                DropConfig dropConfig = ConfigComponent.Instance.Get<DropConfig>(itemID);
                 if (dropConfig.dropType == 3)
                 {
-                    ItemInfo itemInfo = new ItemInfo(dropConfig.dropGroupID[0], count);
-                    itemInfos.Add(itemInfo);
+                    ItemConfig itemConfig = ConfigComponent.Instance.Get<ItemConfig>(dropConfig.dropGroupID[0]);
+                    if (itemConfig.associateID == 14)
+                    {
+                        ResourceLevelConfig resourceLevelConfig =
+                            ConfigComponent.Instance.Get<ResourceLevelConfig>(PlayerManager.Instance.myHero
+                                .powerUpConfig.ID);
+                        FieldInfo scoreField =
+                            resourceLevelConfig.GetType().GetField("value" + itemConfig.associateVlaue);
+                        int itemId = (int)scoreField.GetValue(resourceLevelConfig);
+                        ItemInfo itemInfo = new ItemInfo(itemId, count);
+                        itemInfos.Add(itemInfo);
+                    }
+                    else
+                    {
+                        ItemInfo itemInfo = new ItemInfo(dropConfig.dropGroupID[0], count);
+                        itemInfos.Add(itemInfo);
+                    }
                 }
                 else
                 {
@@ -278,7 +298,8 @@ namespace GameLogic.Player
 
         public ItemInfo DropResourceLevel(int itemID, int count)
         {
-            ResourceLevelConfig resourceLevelConfig = ConfigComponent.Instance.Get<ResourceLevelConfig>(PlayerManager.Instance.myHero.powerUpConfig.ID);
+            ResourceLevelConfig resourceLevelConfig =
+                ConfigComponent.Instance.Get<ResourceLevelConfig>(PlayerManager.Instance.myHero.powerUpConfig.ID);
             ItemInfo itemInfo = null;
             float c = Math.Abs(count / (float)1000);
             switch (itemID)

Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -777,7 +777,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
 
         CurrentEventList = evt;
         CombatDrive.Instance.CombatController.ChangeState(CombatController.idle);
-        await DialogueManager.Instance.StartDialogue(CurrentEventList, dialogueID, eventConfig.ID, async() =>
+        await DialogueManager.Instance.StartDialogue(CurrentEventList, dialogueID, eventConfig.ID, async () =>
         {
             EventConfig eventConfig = ConfigComponent.Instance.Get<EventConfig>(CurrentEventList.eventID);
             if (eventConfig.EventTriggerType != 4)
@@ -796,7 +796,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
                     await UIManager.Instance.HideUIUIPanel<DivineSenceEventPreviewPanel>();
                     UIManager.Instance.HideUIUIPanel<DivineSenceInfoPanel>();
                 }
-     
+
                 EventManager.Instance.Dispatch(CustomEventType.CompleteUpdate, null);
             }
 
@@ -852,6 +852,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
         EventConditionConfig eventConditionConfig =
             ConfigComponent.Instance.Get<EventConditionConfig>(eventCondition.eventCondition);
 
+
         if (eventCondition != null)
         {
             return eventCondition.fishCount >= eventConditionConfig.finishCount;
@@ -930,7 +931,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
             ConfigComponent.Instance.Get<EventConditionConfig>(conditionData.eventCondition);
 
 
-        if (IsEvenkLinkComplete(conditionData))
+        if (IsEvenkLinkComplete(conditionData) && eventConditionConfig.ConditionType != 1)
             return;
 
         switch (type)
@@ -1066,17 +1067,33 @@ public class EventSystemManager : Singleton<EventSystemManager>
             {
                 //背包道具检测
                 case 1:
+                    if (evt.EventCount == null)
+                    {
+                        return false;
+                    }
                     return PlayerManager.Instance.BagController.GetItemCount(evt.EventValue[i]) >= evt.EventCount[i];
                 //境界判断
                 case 3:
+                    if (evt.EventValue == null)
+                    {
+                        return false;
+                    }
                     return PlayerManager.Instance.myHero.level >= evt.EventValue[i];
                 //概率判断
                 case 7:
+                    if (evt.EventValue == null)
+                    {
+                        return false;
+                    }
                     int randomValue1 = Random.Range(0, 1001);
 
                     return randomValue1 <= evt.EventValue[i];
                 //完成事件判断
                 case 10:
+                    if (evt.EventValue == null)
+                    {
+                        return false;
+                    }
                     AccountFileInfo.EventList eventList =
                         AccountFileInfo.Instance.playerData.completeEvents.FirstOrDefault(ce =>
                             ce.eventID == evt.EventValue[i]);
@@ -1285,7 +1302,6 @@ public class EventSystemManager : Singleton<EventSystemManager>
         EventConfig eventConfig = ConfigComponent.Instance.Get<EventConfig>(eventList.eventID);
         if (eventConfig.EventTriggerType == 4)
         {
-          
             await UIManager.Instance.HideUIUIPanel<DivineSenceEventPreviewPanel>();
             await UIManager.Instance.HideUIUIPanel<DivineSenceInfoPanel>();
         }

Assets/Scripts/GameUI/UI/CombatPanel/SkillSelectPanel.cs

@@ -782,7 +782,7 @@ namespace Fort23.Mono
                 Sort(type1, type2);
                 return;
             }
-
+            Btn_Info.GetComponent<RectTransform>().sizeDelta = new Vector2(72, 30);
             Btn_Info.transform.SetParent(transform);
             Btn_Info.gameObject.SetActive(false);
             currentSelectedSkill = skillKongWidget.SkillInfo;
@@ -905,6 +905,7 @@ namespace Fort23.Mono
                     dianjiSkillKongWidget = skillKongWidget;
                     Btn_RemoveGongFa.transform.position = dianjiSkillKongWidget.RemovePos.position;
                     Btn_RemoveGongFa.gameObject.SetActive(true);
+                    Btn_Info.GetComponent<RectTransform>().sizeDelta = new Vector2(72, 30);
                     Btn_Info.transform.position = dianjiSkillKongWidget.InfoPos.position;
                     Btn_Info.gameObject.SetActive(true);
                     SelectSkill(skillKongWidget.SkillInfo, false, false);
@@ -1369,6 +1370,7 @@ namespace Fort23.Mono
             else if (infoType == 2)
             {
                 CloseSelect();
+                Btn_Info.GetComponent<RectTransform>().sizeDelta = new Vector2(98, 36);
                 Btn_Info.transform.SetParent(ContentRoot);
                 Btn_Info.transform.position = skillWidget.InfoPos.position;
                 Btn_Info.gameObject.SetActive(true);

Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroBreakthroughPanel.cs

@@ -115,7 +115,7 @@ namespace Fort23.Mono
                         }
                     }
 
-                    for (var i = 0; i < PlayerManager.Instance.myHero.powerUpConfig.DujieItemIDs.Length; i++)
+                    for (var i = 0; i < PlayerManager.Instance.myHero.powerUpConfig.DujieItemIDs?.Length; i++)
                     {
                         PlayerManager.Instance.BagController.DeductItem(
                             PlayerManager.Instance.myHero.powerUpConfig.DujieItemIDs[i], 1);
@@ -326,16 +326,20 @@ namespace Fort23.Mono
                                     LanguageManager.Instance.Text(nextHeroInfo.powerUpConfig.jingjieLanIDs[2]);
 
 
-            LevelbattleConfig levelbattleConfig =
-                ConfigComponent.Instance.Get<LevelbattleConfig>(heroPowerUpConfig.DujieLevelbattleID);
-            GroupConfig groupConfig = ConfigComponent.Instance.Get<GroupConfig>(levelbattleConfig.Group[0]);
-            HeroModelConfig heroModelConfig =
-                ConfigComponent.Instance.Get<HeroModelConfig>(groupConfig.GroupMonster[0]);
-            MonsterPowerUpConfig monsterPowerUpConfig =
-                ConfigComponent.Instance.Get<MonsterPowerUpConfig>(PlayerManager.Instance.myHero.level.Value);
+            if (heroPowerUpConfig.DujieLevelbattleID != -1)
+            {
+                LevelbattleConfig levelbattleConfig =
+                    ConfigComponent.Instance.Get<LevelbattleConfig>(heroPowerUpConfig.DujieLevelbattleID);
+                GroupConfig groupConfig = ConfigComponent.Instance.Get<GroupConfig>(levelbattleConfig.Group[0]);
+                HeroModelConfig heroModelConfig =
+                    ConfigComponent.Instance.Get<HeroModelConfig>(groupConfig.GroupMonster[0]);
+                MonsterPowerUpConfig monsterPowerUpConfig =
+                    ConfigComponent.Instance.Get<MonsterPowerUpConfig>(PlayerManager.Instance.myHero.level.Value);
+
+                Text_CombatTitle.text =
+                    $"{LanguageManager.Instance.Text(heroModelConfig.name)}   {LanguageManager.Instance.Text(monsterPowerUpConfig.jingjie1)}{LanguageManager.Instance.Text(monsterPowerUpConfig.jingjie2)}{LanguageManager.Instance.Text(monsterPowerUpConfig.jingjie3)}";
+            }
 
-            Text_CombatTitle.text =
-                $"{LanguageManager.Instance.Text(heroModelConfig.name)}   {LanguageManager.Instance.Text(monsterPowerUpConfig.jingjie1)}{LanguageManager.Instance.Text(monsterPowerUpConfig.jingjie2)}{LanguageManager.Instance.Text(monsterPowerUpConfig.jingjie3)}";
 
             if (heroPowerUpConfig.jingjie1 != nextHeroInfo.powerUpConfig.jingjie1)
             {
@@ -424,8 +428,11 @@ namespace Fort23.Mono
                 using (CTaskAwaitBuffer<BreakthroughItemWidget> cTaskAwaitBuffer =
                        new CTaskAwaitBuffer<BreakthroughItemWidget>())
                 {
+                    int dujieItemCount = heroPowerUpConfig.DujieItemIDs == null
+                        ? 0
+                        : heroPowerUpConfig.DujieItemIDs.Length;
                     for (int i = 0;
-                         i < 1 + heroPowerUpConfig.DujieMustItemIDs.Length + heroPowerUpConfig.DujieItemIDs.Length;
+                         i < 1 + heroPowerUpConfig.DujieMustItemIDs.Length + dujieItemCount;
                          i++)
                     {
                         cTaskAwaitBuffer.AddTask(
@@ -444,7 +451,7 @@ namespace Fort23.Mono
                     }
 
                     //可选道具
-                    for (var i = 0; i < heroPowerUpConfig.DujieItemIDs.Length; i++)
+                    for (var i = 0; i < heroPowerUpConfig.DujieItemIDs?.Length; i++)
                     {
                         breakthroughItemWidgets[i + heroPowerUpConfig.DujieMustItemIDs.Length + 1]
                             .CustomInit(2, heroPowerUpConfig.DujieItemIDs[i], false);
@@ -541,7 +548,11 @@ namespace Fort23.Mono
             else
             {
                 //提示需要什么道具
-                string tips = "需要 破除心魔 ";
+                string tips = "需要";
+                if (heroPowerUpConfig.DujieLevelbattleID != -1 && !hero.heroData.isCombat)
+                {
+                    tips +=  " 破除心魔";
+                }
                 foreach (var dujieMustItemID in hero.powerUpConfig.DujieMustItemIDs)
                 {
                     ItemConfig itemConfig = ConfigComponent.Instance.Get<ItemConfig>(dujieMustItemID);
@@ -701,7 +712,7 @@ namespace Fort23.Mono
                    new CTaskAwaitBuffer<BreakthroughItemWidget>())
             {
                 for (int i = 0;
-                     i < 1 + heroPowerUpConfig.DujieMustItemIDs.Length + heroPowerUpConfig.DujieItemIDs.Length;
+                     i < 1 + heroPowerUpConfig.DujieMustItemIDs.Length + heroPowerUpConfig.DujieItemIDs?.Length;
                      i++)
                 {
                     cTaskAwaitBuffer.AddTask(
@@ -720,7 +731,7 @@ namespace Fort23.Mono
                 }
 
                 //可选道具
-                for (var i = 0; i < heroPowerUpConfig.DujieItemIDs.Length; i++)
+                for (var i = 0; i < heroPowerUpConfig.DujieItemIDs?.Length; i++)
                 {
                     breakthroughItemWidgets[i + heroPowerUpConfig.DujieMustItemIDs.Length + 1]
                         .CustomInit(2, heroPowerUpConfig.DujieItemIDs[i], false);

Assets/Scripts/GameUI/UI/HeroInformationPanel/SelectBreakthroughItemPanel.cs

@@ -13,7 +13,7 @@ namespace Fort23.Mono
     {
         ItemConfig itemConfig;
         private Action callBack;
-        
+
         private Transform weidgetFater;
 
         BreakthroughItemWidget breakthrough;
@@ -26,18 +26,22 @@ namespace Fort23.Mono
 
         protected override void AddEvent()
         {
+            EventManager.Instance.AddEventListener(CustomEventType.ItemUpdate, ItemUpdateEvent);
+        }
+
+        private void ItemUpdateEvent(IEventData e)
+        {
+            CustomInit(breakthrough, callBack);
         }
 
         protected override void DelEvent()
         {
+            EventManager.Instance.RemoveEventListener(CustomEventType.ItemUpdate, ItemUpdateEvent);
         }
 
         public override void AddButtonEvent()
         {
-            Btn_Close.onClick.AddListener(() =>
-            {
-                UIManager.Instance.HideUIUIPanel(this);
-            });
+            Btn_Close.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
             Btn_Affirm.onClick.AddListener(() =>
             {
                 this.callBack?.Invoke();
@@ -45,11 +49,8 @@ namespace Fort23.Mono
                 UIManager.Instance.HideUIUIPanel(this);
             });
             Btn_Cancel.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
-            
-            Btn_Source.onClick.AddListener(() =>
-            {
-                ItemSourcePanel.OpenPanel(itemConfig.ID);
-            });
+
+            Btn_Source.onClick.AddListener(() => { ItemSourcePanel.OpenPanel(itemConfig.ID); });
         }
 
         public void CustomInit(BreakthroughItemWidget breakthroughItemWidget, Action callBack)
@@ -97,8 +98,6 @@ namespace Fort23.Mono
                 Btn_Cancel.gameObject.SetActive(true);
                 Text_NoEnough.gameObject.SetActive(false);
             }
-
-          
         }
 
         public async override CTask Close()
@@ -111,9 +110,12 @@ namespace Fort23.Mono
             await base.Close();
         }
 
-        public async static CTask<SelectBreakthroughItemPanel> OpenPanel(BreakthroughItemWidget breakthroughItemWidget, Action callBack)
+        public async static CTask<SelectBreakthroughItemPanel> OpenPanel(BreakthroughItemWidget breakthroughItemWidget,
+            Action callBack)
         {
-            SelectBreakthroughItemPanel selectBreakthroughItemPanel = await UIManager.Instance.LoadAndOpenPanel<SelectBreakthroughItemPanel>(null,UILayer.Middle,isFocus:false);
+            SelectBreakthroughItemPanel selectBreakthroughItemPanel =
+                await UIManager.Instance.LoadAndOpenPanel<SelectBreakthroughItemPanel>(null, UILayer.Middle,
+                    isFocus: false);
 
             selectBreakthroughItemPanel.CustomInit(breakthroughItemWidget, callBack);
             return selectBreakthroughItemPanel;

Assets/Scripts/GameUI/UI/HeroInformationPanel/SelectElixirPanel.cs

@@ -30,10 +30,17 @@ namespace Fort23.Mono
 
         protected override void AddEvent()
         {
+            EventManager.Instance.AddEventListener(CustomEventType.ItemUpdate, ItemUpdateEvent);
+        }
+
+        private void ItemUpdateEvent(IEventData e)
+        {
+            CustomInit(breakthrough, callback);
         }
 
         protected override void DelEvent()
         {
+            EventManager.Instance.RemoveEventListener(CustomEventType.ItemUpdate, ItemUpdateEvent);
         }
 
         public override void AddButtonEvent()

Assets/Scripts/GameUI/UI/ItemDetailsPanel/ItemSourcePanel.cs

@@ -65,6 +65,7 @@ namespace Fort23.Mono
             SkipToWidget skipToWidget = obj as SkipToWidget;
             isSkipto = true;
             await UIManager.Instance.HideUIUIPanel(this);
+            
             SkiptoHelper.Skipto(skipToWidget.SkiptoConfig.ID);
         }
 

Assets/Scripts/GameUI/Utility/SkiptoHelper.cs

@@ -1,4 +1,6 @@
-using Excel2Json;
+using System.Collections.Generic;
+using System.Linq;
+using Excel2Json;
 using Fort23.Core;
 using Fort23.Mono;
 using Fort23.UTool;
@@ -36,6 +38,18 @@ namespace Mono.Utility
                     return;
                 //实用神识界面
                 case 5:
+                    List<UIPanel> TopUIPanels = UIManager.Instance.TopUIPanels.ToList();
+                    for (var i = TopUIPanels.Count - 1; i >= 0; i--)
+                    {
+                        if (!(TopUIPanels[i] is MainPanel))
+                        {
+                            await UIManager.Instance.HideUIUIPanel(TopUIPanels[i], isBreadcrumbBarPanel: false);
+                        }
+                    }
+
+
+                    await MainPanel.OpenPanel();
+
                     UIManager.Instance.GetComponent<AppBarPanel>().Bnt_ShengShi_Click();
                     return;
 
@@ -55,7 +69,7 @@ namespace Mono.Utility
                 case 9:
                     QiankundaiPanel.OpenPanel();
                     return;
-       
+
 
                 default:
                     return;