Merge commit '3cbcdd39df183f3c6f6f0d6de82fae60fad9d230' into Taptap

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.20774812
+    - _Alpha: 0.22028178
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0
     - _MainSpeedU: 0.5
     - _MainSpeedV: 0.5
-    - _MainTexOffsetU: 0.20282054
+    - _MainTexOffsetU: 0.18795288
     - _MainTexOffsetV: 0
     - _MainTilingU: 0.8
     - _MainTilingV: 1

Assets/Res/Config/EventConfig.json

@@ -4189,7 +4189,7 @@
       "PrizeNums": [
         10,
         1,
-        700
+        2050
       ],
       "RefreshProbability": 30,
       "RefreshCount": 1,
@@ -4197,10 +4197,10 @@
       "SmallPlacesId": 0,
       "XiantuID": 16,
       "EventConditionId": [
-        3
+        10
       ],
       "EventValue": [
-        31
+        10030
       ],
       "EventName": 4201,
       "Description": 4207
@@ -4228,7 +4228,7 @@
       "PrizeNums": [
         10,
         2,
-        800
+        2050
       ],
       "RefreshProbability": 25,
       "RefreshCount": 1,
@@ -4241,7 +4241,7 @@
       ],
       "EventValue": [
         6031,
-        46
+        142
       ],
       "EventName": 4202,
       "Description": 4208
@@ -4270,7 +4270,7 @@
       "PrizeNums": [
         10,
         3,
-        850
+        2050
       ],
       "RefreshProbability": 20,
       "RefreshCount": 1,
@@ -4283,7 +4283,7 @@
       ],
       "EventValue": [
         6032,
-        56
+        143
       ],
       "EventName": 4203,
       "Description": 4209
@@ -4310,7 +4310,7 @@
       "PrizeNums": [
         10,
         4,
-        950
+        2100
       ],
       "RefreshProbability": 20,
       "RefreshCount": 1,
@@ -4323,7 +4323,7 @@
       ],
       "EventValue": [
         6033,
-        66
+        144
       ],
       "EventName": 4204,
       "Description": 4210
@@ -4350,7 +4350,7 @@
       "PrizeNums": [
         10,
         5,
-        1050
+        2100
       ],
       "RefreshProbability": 20,
       "RefreshCount": 1,
@@ -4363,7 +4363,7 @@
       ],
       "EventValue": [
         6034,
-        76
+        145
       ],
       "EventName": 4205,
       "Description": 4211
@@ -4393,7 +4393,7 @@
       "PrizeNums": [
         10,
         5,
-        1150
+        2150
       ],
       "RefreshProbability": 20,
       "RefreshCount": 1,
@@ -4406,7 +4406,7 @@
       ],
       "EventValue": [
         6035,
-        86
+        146
       ],
       "EventName": 4206,
       "Description": 4212

Assets/Res/Config/EventLinkConfig.json

@@ -23527,10 +23527,7 @@
       "EventID": 9156,
       "step": 10,
       "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        915611
-      ]
+      "ResultType": 0
     },
     {
       "ID": 915611,

Assets/Res/Config/EventNPC.json

@@ -32,7 +32,7 @@
       "ID": 5,
       "name": 1956,
       "isNpc": true,
-      "icon": "bg_lh_fengyao",
+      "icon": "bg_lh_wanxi",
       "DaoyouID": 4
     },
     {

Assets/Res/Config/GroupConfig.json

@@ -334,7 +334,7 @@
     {
       "ID": 3009,
       "GroupMonsterLevel": [
-        66
+        144
       ],
       "GroupMonster": [
         5003
@@ -343,7 +343,7 @@
     {
       "ID": 3010,
       "GroupMonsterLevel": [
-        76
+        145
       ],
       "GroupMonster": [
         5002

Assets/Res/Config/ItemConfig.json

@@ -375,7 +375,7 @@
       "ID": 1201,
       "itemName": 250,
       "itemDesc": 259,
-      "icon": "icon_dujiedan",
+      "icon": "icon_item_1201",
       "itemTag": 3,
       "quality": 2,
       "stack": 0,
@@ -409,7 +409,7 @@
       "ID": 1202,
       "itemName": 251,
       "itemDesc": 260,
-      "icon": "icon_dujiedan",
+      "icon": "icon_item_1202",
       "itemTag": 3,
       "quality": 2,
       "stack": 0,
@@ -443,7 +443,7 @@
       "ID": 1203,
       "itemName": 252,
       "itemDesc": 261,
-      "icon": "icon_dujiedan",
+      "icon": "icon_item_1203",
       "itemTag": 3,
       "quality": 3,
       "stack": 0,
@@ -477,7 +477,7 @@
       "ID": 1204,
       "itemName": 253,
       "itemDesc": 262,
-      "icon": "icon_dujiedan",
+      "icon": "icon_item_1204",
       "itemTag": 3,
       "quality": 3,
       "stack": 0,
@@ -511,7 +511,7 @@
       "ID": 1205,
       "itemName": 254,
       "itemDesc": 263,
-      "icon": "icon_dujiedan",
+      "icon": "icon_item_1205",
       "itemTag": 3,
       "quality": 3,
       "stack": 0,
@@ -545,7 +545,7 @@
       "ID": 1206,
       "itemName": 255,
       "itemDesc": 264,
-      "icon": "icon_dujiedan",
+      "icon": "icon_item_1206",
       "itemTag": 3,
       "quality": 3,
       "stack": 0,
@@ -579,7 +579,7 @@
       "ID": 1207,
       "itemName": 256,
       "itemDesc": 265,
-      "icon": "icon_dujiedan",
+      "icon": "icon_item_1207",
       "itemTag": 3,
       "quality": 4,
       "stack": 0,
@@ -613,7 +613,7 @@
       "ID": 1208,
       "itemName": 257,
       "itemDesc": 266,
-      "icon": "icon_dujiedan",
+      "icon": "icon_item_1208",
       "itemTag": 3,
       "quality": 4,
       "stack": 0,
@@ -647,7 +647,7 @@
       "ID": 1209,
       "itemName": 258,
       "itemDesc": 267,
-      "icon": "icon_dujiedan",
+      "icon": "icon_item_1209",
       "itemTag": 3,
       "quality": 4,
       "stack": 0,
@@ -681,7 +681,7 @@
       "ID": 1210,
       "itemName": 10452,
       "itemDesc": 10486,
-      "icon": "icon_dujiedan",
+      "icon": "icon_item_1210",
       "itemTag": 3,
       "quality": 4,
       "stack": 0,
@@ -715,7 +715,7 @@
       "ID": 1211,
       "itemName": 10453,
       "itemDesc": 10487,
-      "icon": "icon_dujiedan",
+      "icon": "icon_item_1211",
       "itemTag": 3,
       "quality": 4,
       "stack": 0,
@@ -749,7 +749,7 @@
       "ID": 1212,
       "itemName": 10454,
       "itemDesc": 10488,
-      "icon": "icon_dujiedan",
+      "icon": "icon_item_1212",
       "itemTag": 3,
       "quality": 4,
       "stack": 0,
@@ -783,7 +783,7 @@
       "ID": 1213,
       "itemName": 10455,
       "itemDesc": 10489,
-      "icon": "icon_dujiedan",
+      "icon": "icon_item_1213",
       "itemTag": 3,
       "quality": 5,
       "stack": 0,
@@ -817,7 +817,7 @@
       "ID": 1214,
       "itemName": 10456,
       "itemDesc": 10490,
-      "icon": "icon_dujiedan",
+      "icon": "icon_item_1214",
       "itemTag": 3,
       "quality": 5,
       "stack": 0,
@@ -851,7 +851,7 @@
       "ID": 1215,
       "itemName": 10457,
       "itemDesc": 10491,
-      "icon": "icon_dujiedan",
+      "icon": "icon_item_1215",
       "itemTag": 3,
       "quality": 5,
       "stack": 0,
@@ -885,7 +885,7 @@
       "ID": 1216,
       "itemName": 10458,
       "itemDesc": 10492,
-      "icon": "icon_dujiedan",
+      "icon": "icon_item_1216",
       "itemTag": 3,
       "quality": 5,
       "stack": 0,
@@ -919,7 +919,7 @@
       "ID": 1217,
       "itemName": 10459,
       "itemDesc": 10493,
-      "icon": "icon_dujiedan",
+      "icon": "icon_item_1217",
       "itemTag": 3,
       "quality": 5,
       "stack": 0,
@@ -953,7 +953,7 @@
       "ID": 1218,
       "itemName": 10460,
       "itemDesc": 10494,
-      "icon": "icon_dujiedan",
+      "icon": "icon_item_1218",
       "itemTag": 3,
       "quality": 5,
       "stack": 0,
@@ -987,7 +987,7 @@
       "ID": 1219,
       "itemName": 10461,
       "itemDesc": 10495,
-      "icon": "icon_dujiedan",
+      "icon": "icon_item_1219",
       "itemTag": 3,
       "quality": 6,
       "stack": 0,
@@ -1021,7 +1021,7 @@
       "ID": 1220,
       "itemName": 10462,
       "itemDesc": 10496,
-      "icon": "icon_dujiedan",
+      "icon": "icon_item_1220",
       "itemTag": 3,
       "quality": 6,
       "stack": 0,
@@ -1055,7 +1055,7 @@
       "ID": 1221,
       "itemName": 10463,
       "itemDesc": 10497,
-      "icon": "icon_dujiedan",
+      "icon": "icon_item_1221",
       "itemTag": 3,
       "quality": 6,
       "stack": 0,
@@ -1089,7 +1089,7 @@
       "ID": 1222,
       "itemName": 10464,
       "itemDesc": 10498,
-      "icon": "icon_dujiedan",
+      "icon": "icon_item_1222",
       "itemTag": 3,
       "quality": 6,
       "stack": 0,
@@ -1123,7 +1123,7 @@
       "ID": 1223,
       "itemName": 10465,
       "itemDesc": 10499,
-      "icon": "icon_dujiedan",
+      "icon": "icon_item_1223",
       "itemTag": 3,
       "quality": 6,
       "stack": 0,
@@ -1157,7 +1157,7 @@
       "ID": 1224,
       "itemName": 10466,
       "itemDesc": 10500,
-      "icon": "icon_dujiedan",
+      "icon": "icon_item_1224",
       "itemTag": 3,
       "quality": 6,
       "stack": 0,
@@ -1191,7 +1191,7 @@
       "ID": 1225,
       "itemName": 10467,
       "itemDesc": 10501,
-      "icon": "icon_dujiedan",
+      "icon": "icon_item_1225",
       "itemTag": 3,
       "quality": 6,
       "stack": 0,
@@ -1225,7 +1225,7 @@
       "ID": 1226,
       "itemName": 10468,
       "itemDesc": 10502,
-      "icon": "icon_dujiedan",
+      "icon": "icon_item_1226",
       "itemTag": 3,
       "quality": 6,
       "stack": 0,
@@ -1701,7 +1701,7 @@
       "ID": 1314,
       "itemName": 10473,
       "itemDesc": 10507,
-      "icon": "icon_item_1314",
+      "icon": "icon_item_1218",
       "itemTag": 4,
       "quality": 4,
       "stack": 0,
@@ -7469,7 +7469,7 @@
       "stack": 0,
       "isSell": false,
       "rewardsNum": 0,
-      "isVisible": 1,
+      "isVisible": 0,
       "isUse": false,
       "useLimit": 0,
       "costItemNum": 0,

Assets/Res/Config/LanguageChineseConfig.json

@@ -13366,7 +13366,7 @@
     },
     {
       "ID": 4082,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4083,
@@ -13402,7 +13402,7 @@
     },
     {
       "ID": 4091,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4092,
@@ -13438,7 +13438,7 @@
     },
     {
       "ID": 4100,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4101,
@@ -17858,7 +17858,7 @@
     },
     {
       "ID": 5205,
-      "txt": "你已突破筑基前期达到中期，灵力通畅，是时候去会一会我的师弟了。"
+      "txt": "你已突破练气前期达到中期，灵力通畅，是时候去会一会我的师弟了。"
     },
     {
       "ID": 5206,
@@ -17990,7 +17990,7 @@
     },
     {
       "ID": 5238,
-      "txt": "达到筑基后期"
+      "txt": "达到练气后期"
     },
     {
       "ID": 5239,
@@ -20762,7 +20762,7 @@
     },
     {
       "ID": 5931,
-      "txt": "这些草拥有强大的灵力，复用后可增强力量，因此被妖兽盯上。"
+      "txt": "这些草拥有强大的灵力，服用后可增强力量，因此被妖兽盯上。"
     },
     {
       "ID": 5932,
@@ -22306,7 +22306,7 @@
     },
     {
       "ID": 6317,
-      "txt": "（对另外一个NPC说）你们先带个云雾秘钥快走，我来断后。"
+      "txt": "（对另一人说）你们先带个云雾秘钥快走，我来断后。"
     },
     {
       "ID": 6318,
@@ -38458,7 +38458,7 @@
     },
     {
       "ID": 10355,
-      "txt": "参悟天道"
+      "txt": "观悟机缘"
     },
     {
       "ID": 10356,
@@ -39214,579 +39214,579 @@
     },
     {
       "ID": 10544,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10545,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10546,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10547,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10548,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10549,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10550,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10551,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10552,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10553,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10554,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10555,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10556,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10557,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10558,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10559,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10560,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10561,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10562,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10563,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10564,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10565,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10566,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10567,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10568,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10569,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10570,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10571,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10572,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10573,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10574,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10575,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10576,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10577,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10578,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10579,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10580,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10581,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10582,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10583,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10584,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10585,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10586,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10587,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10588,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10589,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10590,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10591,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10592,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10593,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10594,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10595,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10596,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10597,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10598,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10599,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10600,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10601,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10602,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10603,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10604,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10605,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10606,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10607,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10608,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10609,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10610,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10611,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10612,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10613,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10614,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10615,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10616,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10617,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10618,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10619,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10620,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10621,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10622,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10623,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10624,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10625,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10626,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10627,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10628,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10629,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10630,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10631,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10632,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10633,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10634,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10635,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10636,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10637,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10638,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10639,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10640,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10641,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10642,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10643,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10644,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10645,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10646,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10647,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10648,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10649,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10650,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10651,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10652,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10653,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10654,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10655,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10656,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10657,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10658,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10659,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10660,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10661,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10662,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10663,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10664,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10665,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10666,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10667,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10668,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10669,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10670,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10671,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10672,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10673,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10674,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10675,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10676,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10677,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10678,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10679,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10680,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10681,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10682,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10683,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10684,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10685,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10686,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10687,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10688,

Assets/Res/UI/BoxPanel/GachaPanel.prefab

@@ -352,7 +352,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 750, y: 1624}
+  m_SizeDelta: {x: 750, y: 1334}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!225 &855192496587546533
 CanvasGroup:
@@ -3398,7 +3398,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 3529386165245114290, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 82.91
+      value: 95
       objectReference: {fileID: 0}
     - target: {fileID: 3555197382594190730, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_Pivot.x
@@ -3498,15 +3498,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 49
+      value: 48
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 58.41
+      value: 71
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -21.027552
+      value: -19.35
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchorMax.y
@@ -3518,11 +3518,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 13.5
+      value: 22.5
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -22.7
+      value: -19.35
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
@@ -3549,7 +3549,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 3529386165245114290, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 82.91
+      value: 95
       objectReference: {fileID: 0}
     - target: {fileID: 3555197382594190730, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_Pivot.x
@@ -3649,15 +3649,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 49
+      value: 48
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 58.41
+      value: 71
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -21.027552
+      value: -19.35
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchorMax.y
@@ -3669,11 +3669,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 13.5
+      value: 22.5
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -22.7
+      value: -19.35
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
@@ -3700,7 +3700,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 3529386165245114290, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 82.91
+      value: 95
       objectReference: {fileID: 0}
     - target: {fileID: 3555197382594190730, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_Pivot.x
@@ -3800,15 +3800,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 49
+      value: 48
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 58.41
+      value: 71
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -21.027552
+      value: -19.35
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchorMax.y
@@ -3820,11 +3820,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 13.5
+      value: 22.5
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -22.7
+      value: -19.35
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
@@ -3851,7 +3851,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 3529386165245114290, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 82.91
+      value: 95
       objectReference: {fileID: 0}
     - target: {fileID: 3555197382594190730, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_Pivot.x
@@ -3951,15 +3951,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 49
+      value: 48
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 58.41
+      value: 71
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -21.027552
+      value: -19.35
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchorMax.y
@@ -3971,11 +3971,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 13.5
+      value: 22.5
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -22.7
+      value: -19.35
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
@@ -4002,7 +4002,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 3529386165245114290, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 82.91
+      value: 95
       objectReference: {fileID: 0}
     - target: {fileID: 3555197382594190730, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_Pivot.x
@@ -4102,15 +4102,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 49
+      value: 48
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 58.41
+      value: 71
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -21.027552
+      value: -19.35
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchorMax.y
@@ -4122,11 +4122,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 13.5
+      value: 22.5
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -22.7
+      value: -19.35
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
@@ -4153,7 +4153,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 3529386165245114290, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 82.91
+      value: 95
       objectReference: {fileID: 0}
     - target: {fileID: 3555197382594190730, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_Pivot.x
@@ -4253,15 +4253,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 49
+      value: 48
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 58.41
+      value: 71
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -21.027552
+      value: -19.35
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchorMax.y
@@ -4273,11 +4273,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 13.5
+      value: 22.5
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -22.7
+      value: -19.35
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
@@ -4304,7 +4304,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 3529386165245114290, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 82.91
+      value: 95
       objectReference: {fileID: 0}
     - target: {fileID: 3555197382594190730, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_Pivot.x
@@ -4404,15 +4404,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 49
+      value: 48
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 58.41
+      value: 71
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -21.027552
+      value: -19.35
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchorMax.y
@@ -4424,11 +4424,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 13.5
+      value: 22.5
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -22.7
+      value: -19.35
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
@@ -4455,7 +4455,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 3529386165245114290, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 82.91
+      value: 95
       objectReference: {fileID: 0}
     - target: {fileID: 3555197382594190730, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_Pivot.x
@@ -4555,15 +4555,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 49
+      value: 48
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 58.41
+      value: 71
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -21.027552
+      value: -19.35
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchorMax.y
@@ -4575,11 +4575,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 13.5
+      value: 22.5
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -22.7
+      value: -19.35
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
@@ -4606,7 +4606,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 3529386165245114290, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 82.91
+      value: 95
       objectReference: {fileID: 0}
     - target: {fileID: 3555197382594190730, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_Pivot.x
@@ -4706,15 +4706,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 49
+      value: 48
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 58.41
+      value: 71
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -21.027552
+      value: -19.35
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchorMax.y
@@ -4726,11 +4726,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 13.5
+      value: 22.5
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -22.7
+      value: -19.35
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
@@ -4757,7 +4757,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 3529386165245114290, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 82.91
+      value: 95
       objectReference: {fileID: 0}
     - target: {fileID: 3555197382594190730, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_Pivot.x
@@ -4857,15 +4857,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 49
+      value: 48
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 58.41
+      value: 71
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -21.027552
+      value: -19.35
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchorMax.y
@@ -4877,11 +4877,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 13.5
+      value: 22.5
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -22.7
+      value: -19.35
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []

Assets/Res/UI/HeroInformainPanel/HeroInformationPanel.prefab

@@ -273,11 +273,11 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1772753141541214691}
-  m_Father: {fileID: 2859865283014944201}
+  m_Father: {fileID: 8034867944299354957}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 43.04831, y: -946.8596}
+  m_AnchoredPosition: {x: -351.30603, y: 81.694824}
   m_SizeDelta: {x: 563, y: 63.071}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &3703191467005982840
@@ -405,9 +405,9 @@ RectTransform:
   - {fileID: 7919928200524859861}
   m_Father: {fileID: 3296466721338208283}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 561.5101, y: -23}
   m_SizeDelta: {x: 36, y: 46}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &577437548784921467
@@ -630,9 +630,9 @@ RectTransform:
   - {fileID: 3175515234904838256}
   m_Father: {fileID: 3296466721338208283}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 18, y: -23}
   m_SizeDelta: {x: 36, y: 46}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &404717448016885080
@@ -959,9 +959,9 @@ RectTransform:
   - {fileID: 6349527074189271333}
   m_Father: {fileID: 3296466721338208283}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 319.95, y: -23}
   m_SizeDelta: {x: 36, y: 46}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2045175675939122853
@@ -1636,7 +1636,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
   m_AnchoredPosition: {x: 0, y: -281.5}
-  m_SizeDelta: {x: 0, y: 75.23102}
+  m_SizeDelta: {x: 579.5101, y: 75.23102}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7270342452893677775
 CanvasRenderer:
@@ -1720,9 +1720,9 @@ RectTransform:
   - {fileID: 1342635920967882127}
   m_Father: {fileID: 3296466721338208283}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 440.73004, y: -23}
   m_SizeDelta: {x: 36, y: 46}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3935559908781618714
@@ -2154,9 +2154,9 @@ RectTransform:
   - {fileID: 4783036684135195832}
   m_Father: {fileID: 3296466721338208283}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 380.34003, y: -23}
   m_SizeDelta: {x: 36, y: 46}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1103223725134899825
@@ -3039,7 +3039,6 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 3106622106931745522}
   - {fileID: 2663430401061570260}
   - {fileID: 5624694180497915839}
   - {fileID: 7058732367293901820}
@@ -3188,9 +3187,9 @@ RectTransform:
   - {fileID: 8003730315462188263}
   m_Father: {fileID: 3296466721338208283}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 138.78, y: -23}
   m_SizeDelta: {x: 36, y: 46}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1434731699087089794
@@ -3387,6 +3386,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2510253786452685598}
+  - {fileID: 3106622106931745522}
   m_Father: {fileID: 2859865283014944201}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
@@ -4122,9 +4122,9 @@ RectTransform:
   - {fileID: 8747249840944031461}
   m_Father: {fileID: 3296466721338208283}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 199.17, y: -23}
   m_SizeDelta: {x: 36, y: 46}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8487238967615647820
@@ -4212,9 +4212,9 @@ RectTransform:
   - {fileID: 4272035499011951705}
   m_Father: {fileID: 3296466721338208283}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 78.39, y: -23}
   m_SizeDelta: {x: 36, y: 46}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3120351680176860633
@@ -4418,9 +4418,9 @@ RectTransform:
   - {fileID: 2071376250323884100}
   m_Father: {fileID: 3296466721338208283}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 501.12006, y: -23}
   m_SizeDelta: {x: 36, y: 46}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7125985836412029960
@@ -4943,9 +4943,9 @@ RectTransform:
   - {fileID: 2351084085639383589}
   m_Father: {fileID: 3296466721338208283}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 259.56, y: -23}
   m_SizeDelta: {x: 36, y: 46}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2379505165480288718
@@ -5353,7 +5353,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 1200, y: 2670}
+  m_SizeDelta: {x: 750, y: 1334}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &4159330424245520485
 MonoBehaviour:

Assets/Res/UI/ItemDetailsPanel/GongFaDetailsPanel.prefab

@@ -122,10 +122,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 6694772361877173011}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: 0, y: 240}
-  m_SizeDelta: {x: 0, y: 60.1647}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: -507}
+  m_SizeDelta: {x: 750, y: 60.164673}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &8477265740368799667
 CanvasRenderer:
@@ -777,7 +777,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 750, y: 1624}
+  m_SizeDelta: {x: 750, y: 1334}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &3038665444609316863
 MonoBehaviour:
@@ -3342,7 +3342,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 9076459003287357443, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 99.084
+      value: 420.226
       objectReference: {fileID: 0}
     - target: {fileID: 9076459003287357443, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
       propertyPath: m_SizeDelta.y
@@ -3350,7 +3350,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 9076459003287357443, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 70.107
+      value: 230.678
       objectReference: {fileID: 0}
     - target: {fileID: 9076459003287357443, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
       propertyPath: m_AnchoredPosition.y

Assets/Res/UI/ItemDetailsPanel/ItemDetailsPanel.prefab

@@ -378,10 +378,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 9037135992368401232}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0}
-  m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 8, y: 369}
-  m_SizeDelta: {x: 399.8914, y: 69.9819}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 8, y: -443}
+  m_SizeDelta: {x: 399.8914, y: 69.98193}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &7485414286195926253
 CanvasRenderer:

Assets/Res/UI/QiankundaiPanel/QiankundaiInfoPanel.prefab

@@ -1561,10 +1561,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 9037135992368401232}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0}
-  m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 0, y: 364}
-  m_SizeDelta: {x: 399.8914, y: 69.9819}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: -448}
+  m_SizeDelta: {x: 399.8914, y: 69.98193}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &2597693103234350293
 CanvasRenderer:

Assets/Res/UI/QiankundaiPanel/QiankundaiPanel.prefab

@@ -945,10 +945,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 9037135992368401232}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0}
-  m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 0, y: 364}
-  m_SizeDelta: {x: 399.8914, y: 69.9819}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: -448}
+  m_SizeDelta: {x: 399.8914, y: 69.98193}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &7485414286195926253
 CanvasRenderer:

Assets/Res/UI/SkillSelectPanel/GongFaUpgradePanel.prefab

@@ -947,7 +947,6 @@ RectTransform:
   - {fileID: 1062516556747891371}
   - {fileID: 5964692562241983256}
   - {fileID: 1219834969852229682}
-  - {fileID: 918016307754855288}
   - {fileID: 2507585154746067127}
   - {fileID: 1896441137542441893}
   m_Father: {fileID: 0}
@@ -2956,11 +2955,11 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 499061870556061026}
-  m_Father: {fileID: 6694772361877173011}
+  m_Father: {fileID: 2507585154746067127}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0.5}
-  m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 268.2, y: -318.1}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 220.95001, y: 51.5}
   m_SizeDelta: {x: 152, y: 44.253418}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &9009643693355444852
@@ -3994,6 +3993,7 @@ RectTransform:
   m_Children:
   - {fileID: 3289851963449376272}
   - {fileID: 3549792637730888341}
+  - {fileID: 918016307754855288}
   m_Father: {fileID: 6694772361877173011}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}

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

@@ -61,6 +61,12 @@ namespace Fort23.Mono
             TitlePanel.ClosePanel();
             // AppBarPanel.OpenPanel(this);
             await base.GetFocus();
+
+
+            if (PlayerGuideManager.Instance.GuideIsCanDo(4, 1))
+            {
+                PlayerGuideManager.Instance.NextGuide();
+            }
         }
 
         public override CTask LoseFocus()
@@ -86,11 +92,6 @@ namespace Fort23.Mono
 
         public override CTask<bool> AsyncInit(object[] uiData)
         {
-            if (PlayerGuideManager.Instance.GuideIsCanDo(4, 1))
-            {
-                PlayerGuideManager.Instance.NextGuide();
-            }
-
             allUseSkill = PlayerManager.Instance.GongFaControl.allUseSkill.ToArray();
             currenRoadSkilId = PlayerManager.Instance.myHero.TaoismSkillId;
             UpdateSkillWidget();
@@ -102,12 +103,8 @@ namespace Fort23.Mono
 
         public override void AddButtonEvent()
         {
-            
-            Btn_Help.onClick.AddListener(() =>
-            {
-                HelpTipPanel.OpenTipMessagePanel(10788);
-            });
-            
+            Btn_Help.onClick.AddListener(() => { HelpTipPanel.OpenTipMessagePanel(10788); });
+
             Btn_OneKyChange.onClick.AddListener(() =>
             {
                 for (var i = 0; i < allUseSkill.Length; i++)

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

@@ -128,7 +128,7 @@ namespace Fort23.Mono
                         fx_ui_tupo1.gameObject.SetActive(true);
                         fx_ui_tupo1.Play();
                         await TimerComponent.Instance.WaitAsync(500);
-
+                        CustomInit();
                         for (var i = 0; i < JingJieIcons.Count; i++)
                         {
                             if (PlayerManager.Instance.myHero.powerUpConfig.jingjie3 - 1 == i)
@@ -141,6 +141,7 @@ namespace Fort23.Mono
                             }
                         }
 
+
                         await TimerComponent.Instance.WaitAsync(500);
 
                         fx_ui_tupo1.gameObject.SetActive(false);
@@ -153,7 +154,7 @@ namespace Fort23.Mono
                         HeroBreakthroughSuccessPanel heroBreakthroughSuccessPanel =
                             await HeroBreakthroughSuccessPanel.OpenPanel(1, heroAttributData);
                         await heroBreakthroughSuccessPanel.UIClosed();
-                        CustomInit();
+
 
                         AudioManager.Instance.PlayAudio("ui_shengji.wav");
                     }

Assets/Scripts/GameUI/UI/LevelChoosePanel/LevelChoosePanel.cs

@@ -168,6 +168,7 @@ namespace Fort23.Mono
             {
                 if (placesItemPlacesWidget.placesConfig.ID == smallPlacesConfig.PlacesId)
                 {
+                    Rect_BiaoJi.SetParent(placesItemPlacesWidget.transform);
                     // Rect_BiaoJi.anchoredPosition = transform.worldToLocalMatrix * placesItemPlacesWidget.Pos.position;
                     Rect_BiaoJi.position = placesItemPlacesWidget.Pos.position;
                 }
@@ -186,6 +187,7 @@ namespace Fort23.Mono
             placesItem = null;
             _bigMapItem?.Dispose();
             _bigMapItem = null;
+            Rect_BiaoJi.SetParent(transform);
             await base.Close();
         }
     }

Assets/Scripts/GameUI/UI/ShopPanel/EnergyWidget.cs

@@ -31,6 +31,8 @@ namespace Fort23.Mono
             if (data.ItemInfo.itemID == _itemConfig.ID)
             {
                 Text_Count.text = PlayerManager.Instance.BagController.GetItemCount(_itemConfig.ID).ToStringEx();
+                LayoutRebuilder.ForceRebuildLayoutImmediate(Text_Count.GetComponent<RectTransform>());
+                LayoutRebuilder.ForceRebuildLayoutImmediate(transform.GetComponent<RectTransform>());
             }
         }
 

Assets/StreamingAssets/assetBundle.zip.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: DSxJ43uoUH8kT0YwMiNbOE+4J0BQp6l+fEMrKmhKdWq4r0S/FEZZQeH4/d3n
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: