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

# Conflicts:
#	Assets/Art/VFX/Materials/UIMat/ui_renwu_lg.mat   resolved by origin/master(远端) version

Assets/Art/VFX/Materials/UIMat/ui fb kuang glow3 mask uv.mat

@@ -139,7 +139,7 @@ Material:
     - _MainSpeedU: 0
     - _MainSpeedV: 0
     - _MainTexOffsetU: 0
-    - _MainTexOffsetV: -0.3
+    - _MainTexOffsetV: 0.1276061
     - _MainTilingU: 1
     - _MainTilingV: 0.78
     - _MaskSpeedU: 0.5

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.20350951
+    - _Alpha: 0
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0
     - _MainSpeedU: 0.5
     - _MainSpeedV: 0.5
-    - _MainTexOffsetU: 0.20791519
+    - _MainTexOffsetU: 0.64
     - _MainTexOffsetV: 0
     - _MainTilingU: 0.8
     - _MainTilingV: 1

Assets/Res/Config/DropGroupConfig.json

@@ -135,175 +135,175 @@
     },
     {
       "ID": 20,
-      "dropRate": 1110,
+      "dropRate": 667,
       "dropItemID": [
         19
       ]
     },
     {
       "ID": 21,
-      "dropRate": 370,
+      "dropRate": 400,
       "dropItemID": [
         20
       ]
     },
     {
       "ID": 22,
-      "dropRate": 111,
+      "dropRate": 200,
       "dropItemID": [
         21
       ]
     },
     {
       "ID": 23,
-      "dropRate": 1110,
+      "dropRate": 667,
       "dropItemID": [
         22
       ]
     },
     {
       "ID": 24,
-      "dropRate": 370,
+      "dropRate": 400,
       "dropItemID": [
         23
       ]
     },
     {
       "ID": 25,
-      "dropRate": 111,
+      "dropRate": 200,
       "dropItemID": [
         24
       ]
     },
     {
       "ID": 26,
-      "dropRate": 618,
+      "dropRate": 1067,
       "dropItemID": [
         14
       ]
     },
     {
       "ID": 27,
-      "dropRate": 133,
+      "dropRate": 266,
       "dropItemID": [
         15
       ]
     },
     {
       "ID": 28,
-      "dropRate": 67,
+      "dropRate": 134,
       "dropItemID": [
         17
       ]
     },
     {
       "ID": 29,
-      "dropRate": 1110,
+      "dropRate": 667,
       "dropItemID": [
         19
       ]
     },
     {
       "ID": 30,
-      "dropRate": 370,
+      "dropRate": 400,
       "dropItemID": [
         20
       ]
     },
     {
       "ID": 31,
-      "dropRate": 111,
+      "dropRate": 200,
       "dropItemID": [
         21
       ]
     },
     {
       "ID": 32,
-      "dropRate": 1110,
+      "dropRate": 667,
       "dropItemID": [
         22
       ]
     },
     {
       "ID": 33,
-      "dropRate": 370,
+      "dropRate": 400,
       "dropItemID": [
         23
       ]
     },
     {
       "ID": 34,
-      "dropRate": 111,
+      "dropRate": 200,
       "dropItemID": [
         24
       ]
     },
     {
       "ID": 35,
-      "dropRate": 30,
+      "dropRate": 415,
       "dropItemID": [
         14
       ]
     },
     {
       "ID": 36,
-      "dropRate": 245,
+      "dropRate": 210,
       "dropItemID": [
         15
       ]
     },
     {
       "ID": 37,
-      "dropRate": 168,
+      "dropRate": 294,
       "dropItemID": [
         16
       ]
     },
     {
       "ID": 38,
-      "dropRate": 123,
+      "dropRate": 106,
       "dropItemID": [
         17
       ]
     },
     {
       "ID": 39,
-      "dropRate": 42,
+      "dropRate": 74,
       "dropItemID": [
         18
       ]
     },
     {
       "ID": 40,
-      "dropRate": 3212,
+      "dropRate": 2948,
       "dropItemID": [
         14
       ]
     },
     {
       "ID": 41,
-      "dropRate": 245,
+      "dropRate": 210,
       "dropItemID": [
         15
       ]
     },
     {
       "ID": 42,
-      "dropRate": 168,
+      "dropRate": 294,
       "dropItemID": [
         16
       ]
     },
     {
       "ID": 43,
-      "dropRate": 123,
+      "dropRate": 106,
       "dropItemID": [
         17
       ]
     },
     {
       "ID": 44,
-      "dropRate": 42,
+      "dropRate": 74,
       "dropItemID": [
         18
       ]

Assets/Res/Config/DropItemConfig.json

@@ -266,8 +266,8 @@
       "itemID": [
         1005
       ],
-      "dropMinV": 200,
-      "dropMaxV": 200,
+      "dropMinV": 300,
+      "dropMaxV": 300,
       "dropCountGoupID": -1
     },
     {
@@ -276,8 +276,8 @@
       "itemID": [
         1005
       ],
-      "dropMinV": 400,
-      "dropMaxV": 400,
+      "dropMinV": 600,
+      "dropMaxV": 600,
       "dropCountGoupID": -1
     },
     {
@@ -286,8 +286,8 @@
       "itemID": [
         1005
       ],
-      "dropMinV": 800,
-      "dropMaxV": 800,
+      "dropMinV": 1000,
+      "dropMaxV": 1000,
       "dropCountGoupID": -1
     },
     {
@@ -296,8 +296,8 @@
       "itemID": [
         1006
       ],
-      "dropMinV": 200,
-      "dropMaxV": 200,
+      "dropMinV": 300,
+      "dropMaxV": 300,
       "dropCountGoupID": -1
     },
     {
@@ -306,8 +306,8 @@
       "itemID": [
         1006
       ],
-      "dropMinV": 400,
-      "dropMaxV": 400,
+      "dropMinV": 600,
+      "dropMaxV": 600,
       "dropCountGoupID": -1
     },
     {
@@ -316,8 +316,8 @@
       "itemID": [
         1006
       ],
-      "dropMinV": 800,
-      "dropMaxV": 800,
+      "dropMinV": 1000,
+      "dropMaxV": 1000,
       "dropCountGoupID": -1
     },
     {

Assets/Res/Config/EventConditionConfig.json

@@ -117,7 +117,7 @@
       "Operation": 0,
       "ConditionType": 5,
       "ConditionPara": [
-        1004
+        1005
       ],
       "finishCount": 3,
       "RelatedEvents": [

Assets/Res/Config/EventConfig.json

@@ -83,7 +83,7 @@
       ],
       "PrizeNums": [
         -6000,
-        -5000
+        -10000
       ],
       "RefreshProbability": 200,
       "RefreshCount": 0,
@@ -362,7 +362,7 @@
       ],
       "PrizeNums": [
         -9000,
-        -7500
+        -15000
       ],
       "RefreshProbability": 200,
       "RefreshCount": 0,
@@ -641,7 +641,7 @@
       ],
       "PrizeNums": [
         -12000,
-        -15000
+        -20000
       ],
       "RefreshProbability": 200,
       "RefreshCount": 0,
@@ -3390,7 +3390,7 @@
         1003
       ],
       "PrizeNums": [
-        10,
+        1,
         1,
         550
       ],
@@ -3434,8 +3434,8 @@
         1003
       ],
       "PrizeNums": [
-        10,
-        2,
+        1,
+        1,
         550
       ],
       "RefreshProbability": 25,
@@ -3486,8 +3486,8 @@
         1003
       ],
       "PrizeNums": [
-        10,
-        3,
+        1,
+        2,
         600
       ],
       "RefreshProbability": 20,
@@ -3527,13 +3527,13 @@
       "Score": 1,
       "EventQuality": 4,
       "PrizeIDs": [
-        1501,
+        1502,
         1601,
         1003
       ],
       "PrizeNums": [
-        10,
-        4,
+        1,
+        2,
         600
       ],
       "RefreshProbability": 20,
@@ -3570,13 +3570,13 @@
       "Score": 1,
       "EventQuality": 4,
       "PrizeIDs": [
-        1501,
+        1502,
         1601,
         1003
       ],
       "PrizeNums": [
-        10,
-        5,
+        1,
+        2,
         650
       ],
       "RefreshProbability": 20,
@@ -3616,13 +3616,13 @@
       "Score": 1,
       "EventQuality": 4,
       "PrizeIDs": [
-        1501,
+        1502,
         1601,
         1003
       ],
       "PrizeNums": [
-        10,
-        5,
+        1,
+        3,
         700
       ],
       "RefreshProbability": 20,
@@ -3665,7 +3665,7 @@
         1003
       ],
       "PrizeNums": [
-        10,
+        1,
         1,
         600
       ],
@@ -3710,8 +3710,8 @@
         1003
       ],
       "PrizeNums": [
-        10,
-        2,
+        1,
+        1,
         600
       ],
       "RefreshProbability": 25,
@@ -3757,8 +3757,8 @@
         1003
       ],
       "PrizeNums": [
-        10,
-        3,
+        1,
+        2,
         650
       ],
       "RefreshProbability": 20,
@@ -3799,13 +3799,13 @@
       "Score": 1,
       "EventQuality": 4,
       "PrizeIDs": [
-        1501,
+        1502,
         1601,
         1003
       ],
       "PrizeNums": [
-        10,
-        4,
+        1,
+        2,
         700
       ],
       "RefreshProbability": 20,
@@ -3847,13 +3847,13 @@
       "Score": 1,
       "EventQuality": 4,
       "PrizeIDs": [
-        1501,
+        1502,
         1601,
         1003
       ],
       "PrizeNums": [
-        10,
-        5,
+        1,
+        2,
         700
       ],
       "RefreshProbability": 20,
@@ -3889,13 +3889,13 @@
       "Score": 1,
       "EventQuality": 4,
       "PrizeIDs": [
-        1501,
+        1502,
         1601,
         1003
       ],
       "PrizeNums": [
-        10,
-        5,
+        1,
+        3,
         750
       ],
       "RefreshProbability": 20,
@@ -3935,7 +3935,7 @@
         1003
       ],
       "PrizeNums": [
-        10,
+        1,
         1,
         650
       ],
@@ -3976,8 +3976,8 @@
         1003
       ],
       "PrizeNums": [
-        10,
-        2,
+        1,
+        1,
         700
       ],
       "RefreshProbability": 25,
@@ -4016,8 +4016,8 @@
         1003
       ],
       "PrizeNums": [
-        10,
-        3,
+        1,
+        2,
         700
       ],
       "RefreshProbability": 20,
@@ -4052,13 +4052,13 @@
       "Score": 1,
       "EventQuality": 4,
       "PrizeIDs": [
-        1501,
+        1502,
         1601,
         1003
       ],
       "PrizeNums": [
-        10,
-        4,
+        1,
+        2,
         750
       ],
       "RefreshProbability": 20,
@@ -4093,13 +4093,13 @@
       "Score": 1,
       "EventQuality": 4,
       "PrizeIDs": [
-        1501,
+        1502,
         1601,
         1003
       ],
       "PrizeNums": [
-        10,
-        5,
+        1,
+        2,
         800
       ],
       "RefreshProbability": 20,
@@ -4137,13 +4137,13 @@
       "Score": 1,
       "EventQuality": 4,
       "PrizeIDs": [
-        1501,
+        1502,
         1601,
         1003
       ],
       "PrizeNums": [
-        10,
-        5,
+        1,
+        3,
         850
       ],
       "RefreshProbability": 20,
@@ -4187,9 +4187,9 @@
         1003
       ],
       "PrizeNums": [
-        10,
         1,
-        700
+        1,
+        2050
       ],
       "RefreshProbability": 30,
       "RefreshCount": 1,
@@ -4197,10 +4197,10 @@
       "SmallPlacesId": 0,
       "XiantuID": 16,
       "EventConditionId": [
-        3
+        10
       ],
       "EventValue": [
-        31
+        10030
       ],
       "EventName": 4201,
       "Description": 4207
@@ -4226,9 +4226,9 @@
         1003
       ],
       "PrizeNums": [
-        10,
-        2,
-        800
+        1,
+        1,
+        2050
       ],
       "RefreshProbability": 25,
       "RefreshCount": 1,
@@ -4241,7 +4241,7 @@
       ],
       "EventValue": [
         6031,
-        46
+        142
       ],
       "EventName": 4202,
       "Description": 4208
@@ -4268,9 +4268,9 @@
         1003
       ],
       "PrizeNums": [
-        10,
-        3,
-        850
+        1,
+        2,
+        2050
       ],
       "RefreshProbability": 20,
       "RefreshCount": 1,
@@ -4283,7 +4283,7 @@
       ],
       "EventValue": [
         6032,
-        56
+        143
       ],
       "EventName": 4203,
       "Description": 4209
@@ -4303,14 +4303,14 @@
       "Score": 1,
       "EventQuality": 4,
       "PrizeIDs": [
-        1501,
+        1502,
         1601,
         1003
       ],
       "PrizeNums": [
-        10,
-        4,
-        950
+        1,
+        2,
+        2100
       ],
       "RefreshProbability": 20,
       "RefreshCount": 1,
@@ -4323,7 +4323,7 @@
       ],
       "EventValue": [
         6033,
-        66
+        144
       ],
       "EventName": 4204,
       "Description": 4210
@@ -4343,14 +4343,14 @@
       "Score": 1,
       "EventQuality": 4,
       "PrizeIDs": [
-        1501,
+        1502,
         1601,
         1003
       ],
       "PrizeNums": [
-        10,
-        5,
-        1050
+        1,
+        2,
+        2100
       ],
       "RefreshProbability": 20,
       "RefreshCount": 1,
@@ -4363,7 +4363,7 @@
       ],
       "EventValue": [
         6034,
-        76
+        145
       ],
       "EventName": 4205,
       "Description": 4211
@@ -4386,14 +4386,14 @@
       "Score": 1,
       "EventQuality": 4,
       "PrizeIDs": [
-        1501,
+        1502,
         1601,
         1003
       ],
       "PrizeNums": [
-        10,
-        5,
-        1150
+        1,
+        3,
+        2150
       ],
       "RefreshProbability": 20,
       "RefreshCount": 1,
@@ -4406,7 +4406,7 @@
       ],
       "EventValue": [
         6035,
-        86
+        146
       ],
       "EventName": 4206,
       "Description": 4212
@@ -4432,7 +4432,7 @@
         1003
       ],
       "PrizeNums": [
-        10,
+        1,
         1,
         850
       ],
@@ -4471,8 +4471,8 @@
         1003
       ],
       "PrizeNums": [
-        10,
-        2,
+        1,
+        1,
         950
       ],
       "RefreshProbability": 25,
@@ -4511,8 +4511,8 @@
         1003
       ],
       "PrizeNums": [
-        10,
-        3,
+        1,
+        2,
         1050
       ],
       "RefreshProbability": 20,
@@ -4547,13 +4547,13 @@
       "Score": 1,
       "EventQuality": 4,
       "PrizeIDs": [
-        1501,
+        1502,
         1601,
         1003
       ],
       "PrizeNums": [
-        10,
-        4,
+        1,
+        2,
         1150
       ],
       "RefreshProbability": 20,
@@ -4588,13 +4588,13 @@
       "Score": 1,
       "EventQuality": 4,
       "PrizeIDs": [
-        1501,
+        1502,
         1601,
         1003
       ],
       "PrizeNums": [
-        10,
-        5,
+        1,
+        2,
         1300
       ],
       "RefreshProbability": 20,
@@ -4627,13 +4627,13 @@
       "Score": 1,
       "EventQuality": 4,
       "PrizeIDs": [
-        1501,
+        1502,
         1601,
         1003
       ],
       "PrizeNums": [
-        10,
-        5,
+        1,
+        3,
         1450
       ],
       "RefreshProbability": 20,
@@ -4673,7 +4673,7 @@
         1003
       ],
       "PrizeNums": [
-        10,
+        1,
         1,
         1150
       ],
@@ -4712,8 +4712,8 @@
         1003
       ],
       "PrizeNums": [
-        10,
-        2,
+        1,
+        1,
         1300
       ],
       "RefreshProbability": 25,
@@ -4748,13 +4748,13 @@
       "Score": 1,
       "EventQuality": 4,
       "PrizeIDs": [
-        1501,
+        1502,
         1601,
         1003
       ],
       "PrizeNums": [
-        10,
-        3,
+        1,
+        2,
         1450
       ],
       "RefreshProbability": 20,
@@ -4789,13 +4789,13 @@
       "Score": 1,
       "EventQuality": 4,
       "PrizeIDs": [
-        1501,
+        1502,
         1601,
         1003
       ],
       "PrizeNums": [
-        10,
-        4,
+        1,
+        2,
         1600
       ],
       "RefreshProbability": 20,
@@ -4832,13 +4832,13 @@
       "Score": 1,
       "EventQuality": 4,
       "PrizeIDs": [
-        1501,
+        1502,
         1601,
         1003
       ],
       "PrizeNums": [
-        10,
-        5,
+        1,
+        3,
         1750
       ],
       "RefreshProbability": 20,
@@ -4891,7 +4891,7 @@
       ],
       "PrizeNums": [
         1,
-        3000,
+        5300,
         550
       ],
       "RefreshProbability": 35,
@@ -4933,7 +4933,7 @@
       ],
       "PrizeNums": [
         1,
-        3500,
+        5500,
         550
       ],
       "RefreshProbability": 35,
@@ -4975,7 +4975,7 @@
       ],
       "PrizeNums": [
         1,
-        4000,
+        5800,
         600
       ],
       "RefreshProbability": 30,
@@ -5020,7 +5020,7 @@
       ],
       "PrizeNums": [
         1,
-        4500,
+        6100,
         600
       ],
       "RefreshProbability": 25,
@@ -5059,7 +5059,7 @@
       ],
       "PrizeNums": [
         3,
-        5000,
+        6400,
         650
       ],
       "RefreshProbability": 20,
@@ -5116,7 +5116,7 @@
       ],
       "PrizeNums": [
         1,
-        5500,
+        6800,
         700
       ],
       "RefreshProbability": 15,
@@ -5163,7 +5163,7 @@
         1003
       ],
       "PrizeNums": [
-        6000,
+        5500,
         550
       ],
       "RefreshProbability": 40,
@@ -5206,7 +5206,7 @@
       ],
       "PrizeNums": [
         1,
-        6500,
+        5800,
         600
       ],
       "RefreshProbability": 35,
@@ -5254,7 +5254,7 @@
         1003
       ],
       "PrizeNums": [
-        7000,
+        6100,
         600
       ],
       "RefreshProbability": 30,
@@ -5299,7 +5299,7 @@
       ],
       "PrizeNums": [
         1,
-        7500,
+        6400,
         650
       ],
       "RefreshProbability": 25,
@@ -5340,7 +5340,7 @@
         1003
       ],
       "PrizeNums": [
-        8000,
+        6800,
         700
       ],
       "RefreshProbability": 20,
@@ -5392,7 +5392,7 @@
       ],
       "PrizeNums": [
         1,
-        8500,
+        7100,
         700
       ],
       "RefreshProbability": 15,
@@ -5456,7 +5456,7 @@
         1003
       ],
       "PrizeNums": [
-        9000,
+        6100,
         600
       ],
       "RefreshProbability": 40,
@@ -5494,7 +5494,7 @@
       ],
       "PrizeNums": [
         1,
-        9500,
+        6400,
         650
       ],
       "RefreshProbability": 35,
@@ -5534,7 +5534,7 @@
       ],
       "PrizeNums": [
         1,
-        10000,
+        6800,
         700
       ],
       "RefreshProbability": 30,
@@ -5575,7 +5575,7 @@
       ],
       "PrizeNums": [
         1,
-        10500,
+        7100,
         700
       ],
       "RefreshProbability": 25,
@@ -5619,7 +5619,7 @@
         1003
       ],
       "PrizeNums": [
-        11000,
+        6800,
         700
       ],
       "RefreshProbability": 30,
@@ -5661,7 +5661,7 @@
       ],
       "PrizeNums": [
         1,
-        11500,
+        7500,
         750
       ],
       "RefreshProbability": 20,
@@ -5711,7 +5711,7 @@
         1003
       ],
       "PrizeNums": [
-        12000,
+        8300,
         850
       ],
       "RefreshProbability": 15,
@@ -5755,7 +5755,7 @@
       ],
       "PrizeNums": [
         1,
-        12500,
+        7900,
         800
       ],
       "RefreshProbability": 30,
@@ -5792,7 +5792,7 @@
         1003
       ],
       "PrizeNums": [
-        13000,
+        8700,
         850
       ],
       "RefreshProbability": 20,
@@ -5842,7 +5842,7 @@
       ],
       "PrizeNums": [
         1,
-        13500,
+        9600,
         950
       ],
       "RefreshProbability": 15,
@@ -5886,7 +5886,7 @@
         1003
       ],
       "PrizeNums": [
-        14000,
+        9100,
         900
       ],
       "RefreshProbability": 40,
@@ -5938,7 +5938,7 @@
       ],
       "PrizeNums": [
         1,
-        14500,
+        9600,
         950
       ],
       "RefreshProbability": 35,
@@ -5977,7 +5977,7 @@
         1003
       ],
       "PrizeNums": [
-        15000,
+        10100,
         1000
       ],
       "RefreshProbability": 30,
@@ -6019,7 +6019,7 @@
       ],
       "PrizeNums": [
         1,
-        15500,
+        10600,
         1050
       ],
       "RefreshProbability": 25,
@@ -6061,7 +6061,7 @@
         1003
       ],
       "PrizeNums": [
-        16000,
+        11100,
         1100
       ],
       "RefreshProbability": 20,
@@ -6107,7 +6107,7 @@
       ],
       "PrizeNums": [
         1,
-        16500,
+        11700,
         1150
       ],
       "RefreshProbability": 15,
@@ -6151,7 +6151,7 @@
         1003
       ],
       "PrizeNums": [
-        17000,
+        10600,
         1050
       ],
       "RefreshProbability": 30,
@@ -6189,7 +6189,7 @@
       ],
       "PrizeNums": [
         1,
-        17500,
+        11700,
         1150
       ],
       "RefreshProbability": 20,
@@ -6232,7 +6232,7 @@
         1003
       ],
       "PrizeNums": [
-        18000,
+        12300,
         1250
       ],
       "RefreshProbability": 30,
@@ -6273,7 +6273,7 @@
       ],
       "PrizeNums": [
         1,
-        18500,
+        13600,
         1350
       ],
       "RefreshProbability": 20,
@@ -6320,7 +6320,7 @@
         1003
       ],
       "PrizeNums": [
-        19000,
+        15100,
         1500
       ],
       "RefreshProbability": 30,
@@ -6359,7 +6359,7 @@
       ],
       "PrizeNums": [
         1,
-        19500,
+        16600,
         1650
       ],
       "RefreshProbability": 25,
@@ -6407,7 +6407,7 @@
         1003
       ],
       "PrizeNums": [
-        20000,
+        18400,
         1850
       ],
       "RefreshProbability": 20,
@@ -6455,7 +6455,7 @@
       ],
       "PrizeNums": [
         1,
-        20500,
+        20300,
         2050
       ],
       "RefreshProbability": 15,

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
@@ -944,16 +944,16 @@
         1003
       ],
       "hpQiangDu": [
-        48,
-        48
+        64,
+        32
       ],
       "attQiangDu": [
-        64,
-        64
+        56,
+        29
       ],
       "duipingQiangDu": [
-        48,
-        48
+        54,
+        26
       ]
     },
     {
@@ -963,16 +963,16 @@
         1003
       ],
       "hpQiangDu": [
-        54,
-        54
+        72,
+        36
       ],
       "attQiangDu": [
-        72,
-        72
+        63,
+        32
       ],
       "duipingQiangDu": [
         54,
-        54
+        30
       ]
     },
     {
@@ -982,16 +982,16 @@
         1003
       ],
       "hpQiangDu": [
-        60,
-        60
+        80,
+        40
       ],
       "attQiangDu": [
-        80,
-        80
+        70,
+        36
       ],
       "duipingQiangDu": [
         60,
-        60
+        33
       ]
     },
     {
@@ -1001,16 +1001,16 @@
         1003
       ],
       "hpQiangDu": [
-        63,
-        63
+        84,
+        42
       ],
       "attQiangDu": [
-        84,
-        84
+        74,
+        38
       ],
       "duipingQiangDu": [
         63,
-        63
+        35
       ]
     },
     {
@@ -1020,16 +1020,16 @@
         1003
       ],
       "hpQiangDu": [
-        66,
-        66
+        88,
+        44
       ],
       "attQiangDu": [
-        88,
-        88
+        77,
+        40
       ],
       "duipingQiangDu": [
         66,
-        66
+        36
       ]
     },
     {

Assets/Res/Config/HeroModelConfig.json

@@ -1340,8 +1340,8 @@
       "model": "Nanzhu",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 72,
-      "hp": 102,
+      "attack": 77,
+      "hp": 115,
       "def": 100,
       "shield": 85,
       "speed_atk": 0.0,

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/SkillConfig.json

@@ -9745,7 +9745,10 @@
         5.0,
         5.0
       ],
-      "PromoteLan": 1234023
+      "PromoteLan": 1234023,
+      "PromoteLanPara": [
+        5.0
+      ]
     },
     {
       "ID": 34024,

Assets/Res/Config/SkillConstant.json

@@ -3,21 +3,21 @@
     {
       "ID": 3,
       "SkillPromoteNeedPieceNum": [
-        3,
-        6,
         9,
-        15,
-        24
+        18,
+        30,
+        45,
+        60
       ]
     },
     {
       "ID": 4,
       "SkillPromoteNeedPieceNum": [
-        10,
-        10,
         20,
         20,
-        30
+        30,
+        40,
+        50
       ]
     },
     {

Assets/Res/Config/TowerInfoConfig.json

@@ -16,7 +16,7 @@
       ],
       "rewardCount": [
         1,
-        4200
+        7000
       ],
       "unlockValue": 0
     },
@@ -36,7 +36,7 @@
       ],
       "rewardCount": [
         1,
-        4200
+        7000
       ],
       "unlockValue": 0
     },
@@ -56,7 +56,7 @@
       ],
       "rewardCount": [
         1,
-        4200
+        7000
       ],
       "unlockValue": 0
     },
@@ -76,7 +76,7 @@
       ],
       "rewardCount": [
         1,
-        4500
+        7500
       ],
       "unlockValue": 0
     },
@@ -96,7 +96,7 @@
       ],
       "rewardCount": [
         1,
-        4500
+        7500
       ],
       "unlockValue": 0
     },
@@ -116,7 +116,7 @@
       ],
       "rewardCount": [
         1,
-        4500
+        7500
       ],
       "unlockValue": 0
     },
@@ -136,7 +136,7 @@
       ],
       "rewardCount": [
         1,
-        4800
+        8000
       ],
       "unlockValue": 0
     },
@@ -156,7 +156,7 @@
       ],
       "rewardCount": [
         1,
-        4800
+        8000
       ],
       "unlockValue": 0
     },
@@ -176,7 +176,7 @@
       ],
       "rewardCount": [
         1,
-        5100
+        8500
       ],
       "unlockValue": 0
     },
@@ -196,7 +196,7 @@
       ],
       "rewardCount": [
         1,
-        5100
+        8500
       ],
       "unlockValue": 0
     },
@@ -216,7 +216,7 @@
       ],
       "rewardCount": [
         1,
-        5100
+        8500
       ],
       "unlockValue": 0
     },
@@ -236,7 +236,7 @@
       ],
       "rewardCount": [
         1,
-        5400
+        9000
       ],
       "unlockValue": 0
     },
@@ -256,7 +256,7 @@
       ],
       "rewardCount": [
         1,
-        5400
+        9000
       ],
       "unlockValue": 0
     },
@@ -276,7 +276,7 @@
       ],
       "rewardCount": [
         1,
-        5700
+        9500
       ],
       "unlockValue": 0
     },
@@ -296,7 +296,7 @@
       ],
       "rewardCount": [
         1,
-        5700
+        9500
       ],
       "unlockValue": 0
     },
@@ -316,7 +316,7 @@
       ],
       "rewardCount": [
         1,
-        6000
+        10000
       ],
       "unlockValue": 0
     },
@@ -336,7 +336,7 @@
       ],
       "rewardCount": [
         1,
-        6000
+        10000
       ],
       "unlockValue": 0
     },
@@ -356,7 +356,7 @@
       ],
       "rewardCount": [
         1,
-        6300
+        10500
       ],
       "unlockValue": 0
     },
@@ -376,7 +376,7 @@
       ],
       "rewardCount": [
         1,
-        6300
+        10500
       ],
       "unlockValue": 0
     },
@@ -396,7 +396,7 @@
       ],
       "rewardCount": [
         1,
-        6600
+        11000
       ],
       "unlockValue": 0
     },
@@ -416,7 +416,7 @@
       ],
       "rewardCount": [
         1,
-        6600
+        11000
       ],
       "unlockValue": 0
     },
@@ -436,7 +436,7 @@
       ],
       "rewardCount": [
         1,
-        6900
+        11500
       ],
       "unlockValue": 0
     },
@@ -456,7 +456,7 @@
       ],
       "rewardCount": [
         1,
-        6900
+        11500
       ],
       "unlockValue": 0
     },
@@ -476,7 +476,7 @@
       ],
       "rewardCount": [
         1,
-        7200
+        12000
       ],
       "unlockValue": 0
     },
@@ -496,7 +496,7 @@
       ],
       "rewardCount": [
         1,
-        7500
+        12500
       ],
       "unlockValue": 0
     },
@@ -516,7 +516,7 @@
       ],
       "rewardCount": [
         1,
-        7500
+        12500
       ],
       "unlockValue": 0
     },
@@ -536,7 +536,7 @@
       ],
       "rewardCount": [
         1,
-        7800
+        13000
       ],
       "unlockValue": 0
     },
@@ -556,7 +556,7 @@
       ],
       "rewardCount": [
         1,
-        8100
+        13500
       ],
       "unlockValue": 0
     },
@@ -576,7 +576,7 @@
       ],
       "rewardCount": [
         1,
-        8100
+        13500
       ],
       "unlockValue": 0
     },
@@ -596,7 +596,7 @@
       ],
       "rewardCount": [
         1,
-        8400
+        14000
       ],
       "unlockValue": 0
     },
@@ -616,7 +616,7 @@
       ],
       "rewardCount": [
         1,
-        8700
+        14500
       ],
       "unlockValue": 0
     },
@@ -636,7 +636,7 @@
       ],
       "rewardCount": [
         1,
-        9000
+        15000
       ],
       "unlockValue": 0
     },
@@ -656,7 +656,7 @@
       ],
       "rewardCount": [
         1,
-        9000
+        15000
       ],
       "unlockValue": 0
     },
@@ -676,7 +676,7 @@
       ],
       "rewardCount": [
         1,
-        9300
+        15500
       ],
       "unlockValue": 0
     },
@@ -696,7 +696,7 @@
       ],
       "rewardCount": [
         1,
-        9600
+        16000
       ],
       "unlockValue": 0
     },
@@ -716,7 +716,7 @@
       ],
       "rewardCount": [
         1,
-        9900
+        16500
       ],
       "unlockValue": 0
     },
@@ -736,7 +736,7 @@
       ],
       "rewardCount": [
         1,
-        9900
+        16500
       ],
       "unlockValue": 0
     },
@@ -756,7 +756,7 @@
       ],
       "rewardCount": [
         1,
-        10200
+        17000
       ],
       "unlockValue": 0
     },
@@ -776,7 +776,7 @@
       ],
       "rewardCount": [
         1,
-        10500
+        17500
       ],
       "unlockValue": 0
     },
@@ -796,7 +796,7 @@
       ],
       "rewardCount": [
         1,
-        10800
+        18000
       ],
       "unlockValue": 0
     },
@@ -816,7 +816,7 @@
       ],
       "rewardCount": [
         1,
-        11100
+        18500
       ],
       "unlockValue": 0
     },
@@ -836,7 +836,7 @@
       ],
       "rewardCount": [
         1,
-        11400
+        19000
       ],
       "unlockValue": 0
     },
@@ -856,7 +856,7 @@
       ],
       "rewardCount": [
         1,
-        11700
+        19500
       ],
       "unlockValue": 0
     },
@@ -876,7 +876,7 @@
       ],
       "rewardCount": [
         1,
-        12000
+        20000
       ],
       "unlockValue": 0
     },
@@ -896,7 +896,7 @@
       ],
       "rewardCount": [
         1,
-        12300
+        20500
       ],
       "unlockValue": 0
     },
@@ -916,7 +916,7 @@
       ],
       "rewardCount": [
         1,
-        12300
+        20500
       ],
       "unlockValue": 0
     },
@@ -936,7 +936,7 @@
       ],
       "rewardCount": [
         1,
-        12900
+        21500
       ],
       "unlockValue": 0
     },
@@ -956,7 +956,7 @@
       ],
       "rewardCount": [
         1,
-        13200
+        22000
       ],
       "unlockValue": 0
     },
@@ -976,7 +976,7 @@
       ],
       "rewardCount": [
         1,
-        13500
+        22500
       ],
       "unlockValue": 0
     },
@@ -996,7 +996,7 @@
       ],
       "rewardCount": [
         1,
-        13800
+        23000
       ],
       "unlockValue": 0
     },
@@ -1016,7 +1016,7 @@
       ],
       "rewardCount": [
         1,
-        14100
+        23500
       ],
       "unlockValue": 0
     },
@@ -1036,7 +1036,7 @@
       ],
       "rewardCount": [
         1,
-        14700
+        24500
       ],
       "unlockValue": 0
     },
@@ -1056,7 +1056,7 @@
       ],
       "rewardCount": [
         1,
-        15000
+        25000
       ],
       "unlockValue": 0
     },
@@ -1076,7 +1076,7 @@
       ],
       "rewardCount": [
         1,
-        15300
+        25500
       ],
       "unlockValue": 0
     },
@@ -1096,7 +1096,7 @@
       ],
       "rewardCount": [
         1,
-        15600
+        26000
       ],
       "unlockValue": 0
     },
@@ -1116,7 +1116,7 @@
       ],
       "rewardCount": [
         1,
-        16200
+        27000
       ],
       "unlockValue": 0
     },
@@ -1136,7 +1136,7 @@
       ],
       "rewardCount": [
         1,
-        16500
+        27500
       ],
       "unlockValue": 0
     },
@@ -1156,7 +1156,7 @@
       ],
       "rewardCount": [
         1,
-        16800
+        28000
       ],
       "unlockValue": 0
     },
@@ -1176,7 +1176,7 @@
       ],
       "rewardCount": [
         1,
-        17400
+        29000
       ],
       "unlockValue": 0
     },
@@ -1196,7 +1196,7 @@
       ],
       "rewardCount": [
         1,
-        18000
+        30000
       ],
       "unlockValue": 0
     },
@@ -1216,7 +1216,7 @@
       ],
       "rewardCount": [
         1,
-        18300
+        30500
       ],
       "unlockValue": 0
     },
@@ -1236,7 +1236,7 @@
       ],
       "rewardCount": [
         1,
-        18600
+        31000
       ],
       "unlockValue": 0
     },
@@ -1256,7 +1256,7 @@
       ],
       "rewardCount": [
         1,
-        19200
+        32000
       ],
       "unlockValue": 0
     },
@@ -1276,7 +1276,7 @@
       ],
       "rewardCount": [
         1,
-        19800
+        33000
       ],
       "unlockValue": 0
     },
@@ -1296,7 +1296,7 @@
       ],
       "rewardCount": [
         1,
-        20100
+        33500
       ],
       "unlockValue": 0
     },
@@ -1316,7 +1316,7 @@
       ],
       "rewardCount": [
         1,
-        20400
+        34000
       ],
       "unlockValue": 0
     },
@@ -1336,7 +1336,7 @@
       ],
       "rewardCount": [
         1,
-        21300
+        35500
       ],
       "unlockValue": 0
     },
@@ -1356,7 +1356,7 @@
       ],
       "rewardCount": [
         1,
-        21900
+        36500
       ],
       "unlockValue": 0
     },
@@ -1376,7 +1376,7 @@
       ],
       "rewardCount": [
         1,
-        22200
+        37000
       ],
       "unlockValue": 0
     },
@@ -1396,7 +1396,7 @@
       ],
       "rewardCount": [
         1,
-        22800
+        38000
       ],
       "unlockValue": 0
     },
@@ -1416,7 +1416,7 @@
       ],
       "rewardCount": [
         1,
-        23400
+        39000
       ],
       "unlockValue": 0
     },
@@ -1436,7 +1436,7 @@
       ],
       "rewardCount": [
         1,
-        24000
+        40000
       ],
       "unlockValue": 0
     },
@@ -1456,7 +1456,7 @@
       ],
       "rewardCount": [
         1,
-        24600
+        41000
       ],
       "unlockValue": 0
     },
@@ -1476,7 +1476,7 @@
       ],
       "rewardCount": [
         1,
-        25200
+        42000
       ],
       "unlockValue": 0
     },
@@ -1496,7 +1496,7 @@
       ],
       "rewardCount": [
         1,
-        25800
+        43000
       ],
       "unlockValue": 0
     },
@@ -1516,7 +1516,7 @@
       ],
       "rewardCount": [
         1,
-        26700
+        44500
       ],
       "unlockValue": 0
     },
@@ -1536,7 +1536,7 @@
       ],
       "rewardCount": [
         1,
-        27300
+        45500
       ],
       "unlockValue": 0
     },
@@ -1556,7 +1556,7 @@
       ],
       "rewardCount": [
         1,
-        27600
+        46000
       ],
       "unlockValue": 0
     },
@@ -1576,7 +1576,7 @@
       ],
       "rewardCount": [
         1,
-        28500
+        47500
       ],
       "unlockValue": 0
     },
@@ -1596,7 +1596,7 @@
       ],
       "rewardCount": [
         1,
-        29400
+        49000
       ],
       "unlockValue": 0
     },
@@ -1616,7 +1616,7 @@
       ],
       "rewardCount": [
         1,
-        30000
+        50000
       ],
       "unlockValue": 0
     },
@@ -1636,7 +1636,7 @@
       ],
       "rewardCount": [
         1,
-        30600
+        51000
       ],
       "unlockValue": 0
     },
@@ -1656,7 +1656,7 @@
       ],
       "rewardCount": [
         1,
-        31500
+        52500
       ],
       "unlockValue": 0
     },
@@ -1676,7 +1676,7 @@
       ],
       "rewardCount": [
         1,
-        32700
+        54500
       ],
       "unlockValue": 0
     },
@@ -1696,7 +1696,7 @@
       ],
       "rewardCount": [
         1,
-        33300
+        55500
       ],
       "unlockValue": 0
     },
@@ -1716,7 +1716,7 @@
       ],
       "rewardCount": [
         1,
-        33900
+        56500
       ],
       "unlockValue": 0
     },
@@ -1736,7 +1736,7 @@
       ],
       "rewardCount": [
         1,
-        34800
+        58000
       ],
       "unlockValue": 0
     },
@@ -1756,7 +1756,7 @@
       ],
       "rewardCount": [
         1,
-        36000
+        60000
       ],
       "unlockValue": 0
     },
@@ -1776,7 +1776,7 @@
       ],
       "rewardCount": [
         1,
-        36600
+        61000
       ],
       "unlockValue": 0
     },
@@ -1796,7 +1796,7 @@
       ],
       "rewardCount": [
         1,
-        37500
+        62500
       ],
       "unlockValue": 0
     },
@@ -1816,7 +1816,7 @@
       ],
       "rewardCount": [
         1,
-        38700
+        64500
       ],
       "unlockValue": 0
     },
@@ -1836,7 +1836,7 @@
       ],
       "rewardCount": [
         1,
-        40200
+        67000
       ],
       "unlockValue": 0
     },
@@ -1856,7 +1856,7 @@
       ],
       "rewardCount": [
         1,
-        42300
+        70500
       ],
       "unlockValue": 0
     },
@@ -1876,7 +1876,7 @@
       ],
       "rewardCount": [
         1,
-        44400
+        74000
       ],
       "unlockValue": 0
     },
@@ -1896,7 +1896,7 @@
       ],
       "rewardCount": [
         1,
-        46800
+        78000
       ],
       "unlockValue": 0
     },
@@ -1916,7 +1916,7 @@
       ],
       "rewardCount": [
         1,
-        49200
+        82000
       ],
       "unlockValue": 0
     },
@@ -1936,7 +1936,7 @@
       ],
       "rewardCount": [
         1,
-        51600
+        86000
       ],
       "unlockValue": 0
     },
@@ -1956,7 +1956,7 @@
       ],
       "rewardCount": [
         1,
-        54300
+        90500
       ],
       "unlockValue": 0
     },
@@ -1976,7 +1976,7 @@
       ],
       "rewardCount": [
         1,
-        57000
+        95000
       ],
       "unlockValue": 0
     },
@@ -1996,7 +1996,7 @@
       ],
       "rewardCount": [
         1,
-        60000
+        100000
       ],
       "unlockValue": 0
     }

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/BoxPanel/OpenBoxScorePanel.prefab

@@ -19,7 +19,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &8133080571240593798
 RectTransform:
   m_ObjectHideFlags: 0
@@ -445,10 +445,10 @@ RectTransform:
   - {fileID: 5428019602683763515}
   m_Father: {fileID: 7858018693182147813}
   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, y: -288.98627}
-  m_SizeDelta: {x: 646.872, y: 616.7927}
+  m_AnchorMin: {x: 0.5, y: 0.13338424}
+  m_AnchorMax: {x: 0.5, y: 0.51084733}
+  m_AnchoredPosition: {x: 0, y: 1.0136719}
+  m_SizeDelta: {x: 646.872, y: 0.7927246}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2564010822953909151
 CanvasRenderer:
@@ -538,8 +538,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.5809, y: -57.711}
-  m_SizeDelta: {x: 625.863, y: 424.8}
+  m_AnchoredPosition: {x: -0.5809021, y: -57.711}
+  m_SizeDelta: {x: 625.863, y: 320.8}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6748753096610578173
 CanvasRenderer:
@@ -643,10 +643,10 @@ RectTransform:
   - {fileID: 7237139809221645204}
   m_Father: {fileID: 5366739683216167502}
   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: 11.418977, y: 306.4947}
-  m_SizeDelta: {x: 228.0359, y: 55.1832}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 11.418977, y: -0.50531006}
+  m_SizeDelta: {x: 228.0359, y: 55.183197}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5341967818580382441
 CanvasRenderer:
@@ -828,10 +828,10 @@ RectTransform:
   - {fileID: 7883065359111312998}
   m_Father: {fileID: 5366739683216167502}
   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: 5.1745, y: -6.6163}
-  m_SizeDelta: {x: 633.25, y: 565.8463}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 5.1744995, y: -6.6163025}
+  m_SizeDelta: {x: -12.75, y: -48.153687}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1299575708875599391
 CanvasRenderer:
@@ -934,10 +934,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 5366739683216167502}
   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_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 643.5944, y: 613.34}
+  m_SizeDelta: {x: -2.4055786, y: -0.65997314}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5592096566782003340
 CanvasRenderer:
@@ -1389,10 +1389,10 @@ RectTransform:
   - {fileID: 7331267903340754230}
   m_Father: {fileID: 7858018693182147813}
   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, y: 331.11133}
-  m_SizeDelta: {x: 644.9078, y: 566.3665}
+  m_AnchorMin: {x: 0.5, y: 0.5271527}
+  m_AnchorMax: {x: 0.5, y: 0.87500006}
+  m_AnchoredPosition: {x: 0, y: 2.1113281}
+  m_SizeDelta: {x: 644.9078, y: -1.6334839}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6858452839668547294
 CanvasRenderer:
@@ -2087,10 +2087,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 3787544951613840147}
   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.0913, y: 2.5078}
-  m_SizeDelta: {x: 624.514, y: 545.241}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0.091308594, y: 2.5078125}
+  m_SizeDelta: {x: -19.486023, y: -18.758972}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8574758566871946628
 CanvasRenderer:

Assets/Res/UI/DivineSence/BossInfoPanel.prefab

@@ -1253,8 +1253,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: -32.4, y: 3.6}
-  m_SizeDelta: {x: 349.5654, y: 90.0548}
+  m_AnchoredPosition: {x: 44.569878, y: 3.6}
+  m_SizeDelta: {x: 504.1384, y: 90.0548}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5752223019001905554
 CanvasRenderer:
@@ -2837,8 +2837,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: -5.9401, y: 0.00011063}
-  m_SizeDelta: {x: 405.25, y: 107.3}
+  m_AnchoredPosition: {x: 43.5041, y: 0.00011063}
+  m_SizeDelta: {x: 504.1384, y: 107.3}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7447028169586020602
 CanvasRenderer:

Assets/Res/UI/DivineSence/DivineSenceRestoredWidget.prefab

@@ -222,7 +222,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 189.53296, y: -49.37755}
-  m_SizeDelta: {x: 0, y: 96.45}
+  m_SizeDelta: {x: 108, y: 96.45}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5304083428607473890
 CanvasRenderer:

Assets/Res/UI/DivineSence/GongFaWidgetType2.prefab

@@ -1,5 +1,94 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &498122000546911970
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6916979475307095600}
+  - component: {fileID: 3098553881310741778}
+  - component: {fileID: 4314374589381719289}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6916979475307095600
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 498122000546911970}
+  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_Children: []
+  m_Father: {fileID: 3154258649401657841}
+  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_SizeDelta: {x: 38, y: 36}
+  m_Pivot: {x: 1, y: 0}
+--- !u!222 &3098553881310741778
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 498122000546911970}
+  m_CullTransparentMesh: 1
+--- !u!114 &4314374589381719289
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 498122000546911970}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_gfxingji
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: ec7ecef974a85f145b7ba1bd986de220, type: 3}
+  packInfo:
+    packName: gongfa
+    packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
+    packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
+    lasetJsonGUID: 6f6d3dad490d22d3028cfa941e8122a5
+  imageH: 36
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &1671693449042742178
 GameObject:
   m_ObjectHideFlags: 0
@@ -35,8 +124,8 @@ RectTransform:
   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.0009498596, y: -29.9}
-  m_SizeDelta: {x: 68.466, y: 30}
+  m_AnchoredPosition: {x: 0.0000026226, y: -29.9}
+  m_SizeDelta: {x: 80, y: 31.1973}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &1237620596013164419
 CanvasRenderer:
@@ -59,7 +148,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -68,7 +157,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 20
+    m_FontSize: 24
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 2
@@ -80,6 +169,273 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "1\u7EA7"
+--- !u!1 &1916139475447988823
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2500376018970374053}
+  - component: {fileID: 9106823823273572709}
+  - component: {fileID: 5779671277336139395}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage (5)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2500376018970374053
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1916139475447988823}
+  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_Children: []
+  m_Father: {fileID: 3154258649401657841}
+  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_SizeDelta: {x: 38, y: 36}
+  m_Pivot: {x: 1, y: 0}
+--- !u!222 &9106823823273572709
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1916139475447988823}
+  m_CullTransparentMesh: 1
+--- !u!114 &5779671277336139395
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1916139475447988823}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_gfxingji
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: ec7ecef974a85f145b7ba1bd986de220, type: 3}
+  packInfo:
+    packName: gongfa
+    packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
+    packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
+    lasetJsonGUID: 6f6d3dad490d22d3028cfa941e8122a5
+  imageH: 36
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &2471961167470248917
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 216267843454775406}
+  - component: {fileID: 7113338127107576254}
+  - component: {fileID: 2940579089653344557}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage (3)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &216267843454775406
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2471961167470248917}
+  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_Children: []
+  m_Father: {fileID: 3154258649401657841}
+  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_SizeDelta: {x: 38, y: 36}
+  m_Pivot: {x: 1, y: 0}
+--- !u!222 &7113338127107576254
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2471961167470248917}
+  m_CullTransparentMesh: 1
+--- !u!114 &2940579089653344557
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2471961167470248917}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_gfxingji
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: ec7ecef974a85f145b7ba1bd986de220, type: 3}
+  packInfo:
+    packName: gongfa
+    packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
+    packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
+    lasetJsonGUID: 6f6d3dad490d22d3028cfa941e8122a5
+  imageH: 36
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &3858005826730162093
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2115646262538371135}
+  - component: {fileID: 7640830385333969459}
+  - component: {fileID: 6141892540767857241}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage (2)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2115646262538371135
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3858005826730162093}
+  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_Children: []
+  m_Father: {fileID: 3154258649401657841}
+  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_SizeDelta: {x: 38, y: 36}
+  m_Pivot: {x: 1, y: 0}
+--- !u!222 &7640830385333969459
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3858005826730162093}
+  m_CullTransparentMesh: 1
+--- !u!114 &6141892540767857241
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3858005826730162093}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_gfxingji
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: ec7ecef974a85f145b7ba1bd986de220, type: 3}
+  packInfo:
+    packName: gongfa
+    packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
+    packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
+    lasetJsonGUID: 6f6d3dad490d22d3028cfa941e8122a5
+  imageH: 36
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &3946302300112563901
 GameObject:
   m_ObjectHideFlags: 0
@@ -203,6 +559,7 @@ RectTransform:
   - {fileID: 4458728715945139816}
   - {fileID: 5381176108441561872}
   - {fileID: 3608208511281012576}
+  - {fileID: 3154258649401657841}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
@@ -246,6 +603,16 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: StarRoot
+    gameObject: {fileID: 8983252782158562355}
+    isAssetBundle: 0
+    isList: 1
+    ListCollectorDatas:
+    - gameObject: {fileID: 498122000546911970}
+    - gameObject: {fileID: 3858005826730162093}
+    - gameObject: {fileID: 2471961167470248917}
+    - gameObject: {fileID: 8604186990887004553}
+    - gameObject: {fileID: 1916139475447988823}
   isAssetBundle: 1
 --- !u!1 &7146904648124061661
 GameObject:
@@ -265,7 +632,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &5381176108441561872
 RectTransform:
   m_ObjectHideFlags: 0
@@ -426,3 +793,184 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!1 &8604186990887004553
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7245220674678169516}
+  - component: {fileID: 3417995764051712588}
+  - component: {fileID: 5012569221925056839}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage (4)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7245220674678169516
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8604186990887004553}
+  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_Children: []
+  m_Father: {fileID: 3154258649401657841}
+  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_SizeDelta: {x: 38, y: 36}
+  m_Pivot: {x: 1, y: 0}
+--- !u!222 &3417995764051712588
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8604186990887004553}
+  m_CullTransparentMesh: 1
+--- !u!114 &5012569221925056839
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8604186990887004553}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_gfxingji
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: ec7ecef974a85f145b7ba1bd986de220, type: 3}
+  packInfo:
+    packName: gongfa
+    packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
+    packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
+    lasetJsonGUID: 6f6d3dad490d22d3028cfa941e8122a5
+  imageH: 36
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &8983252782158562355
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3154258649401657841}
+  - component: {fileID: 4372224768594358457}
+  - component: {fileID: 615741272539858957}
+  - component: {fileID: 1812978112319568024}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: StarRoot
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3154258649401657841
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8983252782158562355}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.4, y: 0.4, z: 0.4}
+  m_ConstrainProportionsScale: 1
+  m_Children:
+  - {fileID: 6916979475307095600}
+  - {fileID: 2115646262538371135}
+  - {fileID: 216267843454775406}
+  - {fileID: 7245220674678169516}
+  - {fileID: 2500376018970374053}
+  m_Father: {fileID: 3138042374053727249}
+  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.7, y: -38.7}
+  m_SizeDelta: {x: 0, y: 30.610802}
+  m_Pivot: {x: 0.5, y: 0}
+--- !u!222 &4372224768594358457
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8983252782158562355}
+  m_CullTransparentMesh: 1
+--- !u!114 &615741272539858957
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8983252782158562355}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
+--- !u!114 &1812978112319568024
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8983252782158562355}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 0
+  m_Spacing: 0
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0

Assets/Res/UI/HeroInformainPanel/HeroBreakthroughFailPanel.prefab

@@ -124,8 +124,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, y: 0}
-  m_SizeDelta: {x: 334.3309, y: 62.687}
+  m_AnchoredPosition: {x: 0.0025177002, y: 0}
+  m_SizeDelta: {x: 750, y: 62.687}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5710891575198841785
 CanvasRenderer:
@@ -576,7 +576,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 &4159330424245520485
 MonoBehaviour:

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:
@@ -3782,7 +3782,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/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/LevelChoosePanel/PlacesInfoPanel.prefab

@@ -1042,7 +1042,6 @@ RectTransform:
   - {fileID: 3448986095428033778}
   - {fileID: 6705522348014208234}
   - {fileID: 3904336313667662518}
-  - {fileID: 2266508853877018442}
   - {fileID: 3035646753122329493}
   - {fileID: 7892632760807934045}
   - {fileID: 5693100649297059383}
@@ -1285,6 +1284,7 @@ GameObject:
   - component: {fileID: 3904336313667662518}
   - component: {fileID: 5325227394525925118}
   - component: {fileID: 2297732390318598695}
+  - component: {fileID: 1663606713194946654}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_PlacesName
@@ -1304,14 +1304,15 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 2266508853877018442}
   m_Father: {fileID: 4534880848114758260}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -203.78177, y: 221.8}
-  m_SizeDelta: {x: -507.6071, y: -798.3508}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 39.4, y: 217.5}
+  m_SizeDelta: {x: 0, y: 61.64917}
+  m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &5325227394525925118
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -1353,7 +1354,21 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u5317\u6D77"
+  m_Text: "\u5317\u6D77\u6D77"
+--- !u!114 &1663606713194946654
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7375659200628869323}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
 --- !u!1 &7911065620788399886
 GameObject:
   m_ObjectHideFlags: 0
@@ -1683,6 +1698,7 @@ GameObject:
   - component: {fileID: 2266508853877018442}
   - component: {fileID: 3013501019931846197}
   - component: {fileID: 2456649883462433114}
+  - component: {fileID: 2770893818892637768}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text_PlacesComplteProgress
@@ -1703,13 +1719,13 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 4534880848114758260}
+  m_Father: {fileID: 3904336313667662518}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -75.2, y: 216.5}
-  m_SizeDelta: {x: -442.781, y: -823.39984}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 1, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: 166.4, y: 0}
+  m_SizeDelta: {x: 163, y: 36.180115}
+  m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &3013501019931846197
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -1752,6 +1768,26 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u63A2\u7D22\u5EA6:0%"
+--- !u!114 &2770893818892637768
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8661358576281957541}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreLayout: 1
+  m_MinWidth: -1
+  m_MinHeight: -1
+  m_PreferredWidth: -1
+  m_PreferredHeight: -1
+  m_FlexibleWidth: -1
+  m_FlexibleHeight: -1
+  m_LayoutPriority: 1
 --- !u!1 &8994874510214016950
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/MainHeroPanel/SelectFaBaoPanel.prefab

@@ -794,7 +794,7 @@ 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: -11.6, y: -1.6}
+  m_AnchoredPosition: {x: -11.6, y: 16}
   m_SizeDelta: {x: 691.4804, y: 160.0778}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6929743905255865244

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/ShopPanel/ShopPanel.prefab

@@ -441,7 +441,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 2518, y: -1942}
-  m_SizeDelta: {x: 750, y: 1624}
+  m_SizeDelta: {x: 1200, y: 1241}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &6128091390146622782
 MonoBehaviour:

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/Res/UI/WidgetItem.prefab

@@ -534,8 +534,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: 19.04669, y: -34.6}
-  m_SizeDelta: {x: 45.5871, y: 25.5237}
+  m_AnchoredPosition: {x: -6.9, y: -33.979}
+  m_SizeDelta: {x: 101.4629, y: 25.5237}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3511437002229949790
 CanvasRenderer:
@@ -566,7 +566,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_FontSize: 22
     m_FontStyle: 1
     m_BestFit: 0
@@ -578,7 +578,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 3
+  m_Text: "3333.33\u4E07"
 --- !u!114 &3965198821937596680
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/Scripts/GameLogic/Bag/BagController.cs

@@ -242,7 +242,9 @@ namespace GameLogic.Bag
                 return AddItem(item.config.associateVlaue[0], item.config.associateVlaue[1]);
             }
 
+
             item.count += count;
+      
 
             EventManager.Instance.Dispatch(CustomEventType.ItemUpdate,
                 new ItemUpdateData() { ItemInfo = item, Count = (int)count });
@@ -250,6 +252,17 @@ namespace GameLogic.Bag
                 new ItemUpdateData() { ItemInfo = item, Count = (int)count });
             AccountFileInfo.Instance.SaveItemData(item);
             RedDotManager.Instance.AllRedDotUpDate();
+            
+            
+            //合成免广告道具
+            if (item.config.associateID == 10)
+            {
+                if (item.count >= item.config.associateVlaue[0])
+                {
+                    AddItem(item.config.associateVlaue[1], 1);
+                }
+            }
+            
             return true;
         }
 

Assets/Scripts/GameLogic/Player/SummonManager.cs

@@ -98,6 +98,8 @@ namespace GameLogic.Player
                         }
 
 #endif
+
+                        await TimerComponent.Instance.WaitAsync(1000);
                     }
                     else
                     {
@@ -105,7 +107,8 @@ namespace GameLogic.Player
                         if (PlayerManager.Instance.BagController.IsEnough(openBoxConfig.CostItemID,
                                 openBoxConfig.oneConsume) || openBoxConfig.CostItemID == 1007)
                         {
-                            PlayerManager.Instance.BagController.DeductItem(openBoxConfig.CostItemID,openBoxConfig.oneConsume);
+                            PlayerManager.Instance.BagController.DeductItem(openBoxConfig.CostItemID,
+                                openBoxConfig.oneConsume);
                         }
                         else
                         {
@@ -173,7 +176,8 @@ namespace GameLogic.Player
                         if (PlayerManager.Instance.BagController.IsEnough(openBoxConfig.CostItemID,
                                 openBoxConfig.tenConsume) || openBoxConfig.CostItemID == 1007)
                         {
-                            PlayerManager.Instance.BagController.DeductItem(openBoxConfig.CostItemID,openBoxConfig.tenConsume);
+                            PlayerManager.Instance.BagController.DeductItem(openBoxConfig.CostItemID,
+                                openBoxConfig.tenConsume);
                         }
                         else
                         {
@@ -202,111 +206,142 @@ namespace GameLogic.Player
                     summonData.tenPayCount++;
                 }
             }
-
+            
             AccountFileInfo.Instance.SavePlayerData();
             return allIitem;
         }
 
         public List<ItemInfo> Summon(AccountFileInfo.SummonData summonData, int count)
         {
-            List<ItemInfo> allIitem = new List<ItemInfo>();
+            List<ItemInfo> allItem = new List<ItemInfo>();
             OpenBoxConfig openBoxConfig = ConfigComponent.Instance.Get<OpenBoxConfig>(summonData.id);
 
-            bool isBoadi2 = false;
-            //找到保底池子所有道具
-            List<int> baodiItems = new List<int>();
-            DropConfig dropConfig = ConfigComponent.Instance.Get<DropConfig>(openBoxConfig.reward2);
-            for (var i = 0; i < dropConfig.dropGroupID.Length; i++)
-            {
-                DropGroupConfig dropGroupConfig =
-                    ConfigComponent.Instance.Get<DropGroupConfig>(dropConfig.dropGroupID[i]);
-                for (var i1 = 0; i1 < dropGroupConfig.dropItemID.Length; i1++)
-                {
-                    DropItemConfig dropItemConfig =
-                        ConfigComponent.Instance.Get<DropItemConfig>(dropGroupConfig.dropItemID[i1]);
-                    for (var i2 = 0; i2 < dropItemConfig.itemID.Length; i2++)
-                    {
-                        baodiItems.Add(dropItemConfig.itemID[i2]);
-                    }
-                }
-            }
+            // 预计算保底物品集合（性能优化）
+            HashSet<int> baodiItemSet = CalculateBaodiItems(openBoxConfig.reward2);
 
             int index = 0;
 
             for (int i = 0; i < count; i++)
             {
-                isBoadi2 = false;
-
-                //十连保底1 每10次十连必出这个池子
+                // 十连保底1
                 if (summonData.baodiCount1 >= 9)
                 {
-                    List<ItemInfo> addItem = DropManager.Instance.DropItem(openBoxConfig.reward1);
-                    PlayerManager.Instance.BagController.AddItem(addItem);
-
-                    allIitem.AddRange(addItem);
-                    summonData.baodiCount1 = 0;
-                    summonData.baodiCount2++;
-
-                    foreach (var baodiItem in baodiItems)
-                    {
-                        //除了保底2池子里的道具直接重置保底2
-                        if (addItem.FirstOrDefault(i => i.itemID == baodiItem) != null)
-                        {
-                            summonData.baodiCount2 = 0;
-                            break;
-                        }
-                    }
-
+                    var addItem = ProcessBaodi1(summonData, openBoxConfig, baodiItemSet);
+                    allItem.AddRange(addItem);
                     continue;
                 }
 
-                //十连保底2 每reward2para1次十连必出这个池子
+                // 十连保底2
                 if (summonData.baodiCount2 >= openBoxConfig.reward2para1)
                 {
-                    List<ItemInfo> addItem1 = DropManager.Instance.DropItem(openBoxConfig.reward2);
-                    PlayerManager.Instance.BagController.AddItem(addItem1);
-                    summonData.baodiCount2 = 0;
+                    var addItem = ProcessBaodi2(summonData, openBoxConfig);
+                    allItem.AddRange(addItem);
                     continue;
                 }
 
-                List<ItemInfo> addItem2;
-                if (count == 1)
-                {
-                    addItem2 = DropManager.Instance.DropItem(
-                        openBoxConfig.reward[Random.Range(0, openBoxConfig.reward.Length)]);
-                    PlayerManager.Instance.BagController.AddItem(addItem2);
-                    allIitem.AddRange(addItem2);
-                    summonData.baodiCount1++;
-                }
-                else
-                {
-                    addItem2 = DropManager.Instance.DropItem(openBoxConfig.reward[index]);
-                    PlayerManager.Instance.BagController.AddItem(addItem2);
-                    allIitem.AddRange(addItem2);
-                    summonData.baodiCount1++;
-                    index++;
-                }
+                // 正常抽卡
+                var normalItems = ProcessNormalSummon(summonData, openBoxConfig, count, ref index);
+                allItem.AddRange(normalItems);
+
+                // 检查是否触发保底2重置
+                CheckBaodi2Reset(summonData, normalItems, baodiItemSet);
+            }
 
+            PlayerManager.Instance.BagController.AddItem(allItem);
 
-                foreach (var baodiItem in baodiItems)
+
+            AccountFileInfo.Instance.SavePlayerData();
+            return allItem;
+        }
+
+        // 计算保底物品集合
+        private HashSet<int> CalculateBaodiItems(int rewardId)
+        {
+            HashSet<int> baodiSet = new HashSet<int>();
+            DropConfig dropConfig = ConfigComponent.Instance.Get<DropConfig>(rewardId);
+
+            foreach (int groupId in dropConfig.dropGroupID)
+            {
+                DropGroupConfig dropGroupConfig = ConfigComponent.Instance.Get<DropGroupConfig>(groupId);
+                foreach (int itemId in dropGroupConfig.dropItemID)
                 {
-                    //除了保底2池子里的道具直接重置保底2
-                    if (addItem2.FirstOrDefault(i => i.itemID == baodiItem) != null)
+                    DropItemConfig dropItemConfig = ConfigComponent.Instance.Get<DropItemConfig>(itemId);
+                    foreach (int item in dropItemConfig.itemID)
                     {
-                        summonData.baodiCount2 = 0;
-                        isBoadi2 = true;
-                        break;
+                        baodiSet.Add(item);
                     }
                 }
+            }
 
-                if (!isBoadi2)
-                {
-                    summonData.baodiCount2++;
-                }
+            return baodiSet;
+        }
+
+        // 处理十连保底1
+        private List<ItemInfo> ProcessBaodi1(AccountFileInfo.SummonData summonData, OpenBoxConfig config,
+            HashSet<int> baodiSet)
+        {
+            var addItem = DropManager.Instance.DropItem(config.reward1);
+
+            // AccountFileInfo.Instance.SavePlayerData();
+            summonData.baodiCount1 = 0;
+            summonData.baodiCount2++;
+
+            // 检查保底2重置
+            if (addItem.Any(i => baodiSet.Contains(i.itemID)))
+            {
+                summonData.baodiCount2 = 0;
             }
 
+            return addItem;
+        }
+
+        //处理十连保底2
+        private List<ItemInfo> ProcessBaodi2(AccountFileInfo.SummonData summonData, OpenBoxConfig config)
+        {
+            var addItem = DropManager.Instance.DropItem(config.reward2);
+            // PlayerManager.Instance.BagController.AddItem(addItem);
+            summonData.baodiCount2 = 0;
             AccountFileInfo.Instance.SavePlayerData();
-            return allIitem;
+            return addItem;
+        }
+
+        // 处理正常抽卡
+        private List<ItemInfo> ProcessNormalSummon(AccountFileInfo.SummonData summonData, OpenBoxConfig config,
+            int count, ref int index)
+        {
+            List<ItemInfo> addItem;
+
+            if (count == 1)
+            {
+                int randomIndex = Random.Range(0, config.reward.Length);
+                addItem = DropManager.Instance.DropItem(config.reward[randomIndex]);
+            }
+            else
+            {
+                int poolIndex = index % config.reward.Length;
+                addItem = DropManager.Instance.DropItem(config.reward[poolIndex]);
+                index++;
+            }
+
+            // AccountFileInfo.Instance.SavePlayerData();
+            // PlayerManager.Instance.BagController.AddItem(addItem);
+            summonData.baodiCount1++;
+
+            return addItem;
+        }
+
+        //检查保底2重置
+        private void CheckBaodi2Reset(AccountFileInfo.SummonData summonData, List<ItemInfo> items,
+            HashSet<int> baodiSet)
+        {
+            if (items.Any(i => baodiSet.Contains(i.itemID)))
+            {
+                summonData.baodiCount2 = 0;
+            }
+            else
+            {
+                summonData.baodiCount2++;
+            }
         }
 
 

Assets/Scripts/GameUI/UI/BoxPanel/GachaPanel.cs

@@ -43,6 +43,7 @@ namespace Fort23.Mono
             {
                 PlayerGuideManager.Instance.NextGuide();
             }
+
             // TitlePanel.OpenPanel(new List<int>() { GlobalParam.Item_Coin_ID, GlobalParam.Item_Diamond_ID });
             return base.GetFocus();
         }
@@ -66,18 +67,22 @@ namespace Fort23.Mono
             tenButton.onClick.AddListener(async () =>
             {
 #if UNITY_ANDROID && !UNITY_EDITOR&& Taptap
-                      if (TakuSDKManager.Instance.IsReady())
+                if (!PlayerManager.Instance.BagController.IsEnough(23001, 1))
                 {
-                    bool isOK = await TakuSDKManager.Instance.ShowAutoAd();
-                    if (!isOK)
+                    if (TakuSDKManager.Instance.IsReady())
+                    {
+                        bool isOK = await TakuSDKManager.Instance.ShowAutoAd();
+                        if (!isOK)
+                        {
+                            return;
+                        }
+                    }
+                    else
                     {
                         return;
                     }
                 }
-                else
-                {
-                    return;
-                }
+
 #endif
 
                 tenButton.gameObject.SetActive(false);
@@ -193,7 +198,6 @@ namespace Fort23.Mono
 
             await MarskPanel.ClosePanel();
             root.gameObject.SetActive(true);
-
         }
 
 

Assets/Scripts/GameUI/UI/BoxPanel/OpenBoxScorePanel.cs

@@ -2,6 +2,7 @@ using System.Collections.Generic;
 using Excel2Json;
 using Fort23.Core;
 using Fort23.UTool;
+using GameLogic.Bag;
 using GameLogic.Player;
 
 namespace Fort23.Mono
@@ -66,7 +67,7 @@ namespace Fort23.Mono
                     $"当前进度：{summonData.drawHistory.Count * 10}/{openBoxConfig.ProgressRewardChoukaCount}";
                 Text_Score.text = $"目前得分：{summonData.score}";
             }
-            
+
             using (CTaskAwaitBuffer cts =
                    new CTaskAwaitBuffer())
             {
@@ -137,6 +138,7 @@ namespace Fort23.Mono
 
         private void AwardSummonScore()
         {
+            List<ItemInfo> itemInfos = new List<ItemInfo>();
             //到达进度自动领取奖励
             if (openBoxConfig.ProgressRewardChoukaCount != -1 &&
                 summonData.drawHistory.Count * 10 >= openBoxConfig.ProgressRewardChoukaCount)
@@ -147,8 +149,8 @@ namespace Fort23.Mono
                     {
                         for (var i1 = 0; i1 < openBoxProgressRewards[i].PrizeID.Length; i1++)
                         {
-                            PlayerManager.Instance.BagController.AddItem(openBoxProgressRewards[i].PrizeID[i1],
-                                openBoxProgressRewards[i].PrizeCount[i1]);
+                            itemInfos.Add(new ItemInfo(openBoxProgressRewards[i].PrizeID[i1],
+                                openBoxProgressRewards[i].PrizeCount[i1]));
                         }
 
                         break;
@@ -163,8 +165,10 @@ namespace Fort23.Mono
                 {
                     summonSocreData.currentCount = 0;
                 }
-                // summonData.summonSocreData.Clear();
+
+                PlayerManager.Instance.BagController.AddItem(itemInfos);
                 AccountFileInfo.Instance.SavePlayerData();
+                RewardsPanel.OpenPanel(itemInfos);
             }
             else
             {

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/DivineSence/GongFaWidgetType2.cs

@@ -41,6 +41,8 @@ namespace Fort23.Mono
             {
                 this.transform.Gray();
             }
+
+            StarRoot[0].transform.parent.gameObject.SetActive(false);
         }
 
         public void CustomInit(SkillInfo skillInfo, bool isUlock = true)
@@ -58,6 +60,19 @@ namespace Fort23.Mono
             {
                 this.transform.Gray();
             }
+
+            StarRoot[0].transform.parent.gameObject.SetActive(true);
+            for (var i = 0; i < StarRoot.Count; i++)
+            {
+                if (i < skillInfo.skillConfig.level - 1)
+                {
+                    StarRoot[i].gameObject.SetActive(true);
+                }
+                else
+                {
+                    StarRoot[i].gameObject.SetActive(false);
+                }
+            }
         }
 
         public override void DormancyObj()

Assets/Scripts/GameUI/UI/DivineSence/GongFaWidgetType2Data.cs

@@ -41,6 +41,17 @@ namespace Fort23.Mono
 	      return _Icon_FabaoIcon;
 	     }
 	   }
+	  private List<GameObject> _StarRoot;
+	  public List<GameObject> StarRoot
+	   {
+	   get{
+	      if (_StarRoot == null)
+	       {
+	         _StarRoot  = GetUIUnit<List<GameObject>>("StarRoot"); 
+	       }
+	      return _StarRoot;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

Assets/Scripts/GameUI/UI/DivineSence/ShengShiEventWidgetType2.cs

@@ -216,15 +216,26 @@ namespace Fort23.Mono
             {
                 for (var i = 0; i < eventList.itemInfos.Count; i++)
                 {
+                    ItemConfig itemConfig = ConfigComponent.Instance.Get<ItemConfig>(eventList.itemInfos[i].itemId);
+                    if (itemConfig.isVisible == 0)
+                    {
+                        continue;
+                    }
                     cts.AddTask(UIManager.Instance.CreateGComponent<WidgetItem>(null, ItemRoot));
                 }
 
                 widgetList = await cts.WaitAll();
             }
 
+            int index = 0;
             for (var i = 0; i <  eventList.itemInfos.Count; i++)
             {
-                widgetList[i].InitWidget(new ItemInfo( eventList.itemInfos[i]));
+                ItemConfig itemConfig = ConfigComponent.Instance.Get<ItemConfig>(eventList.itemInfos[i].itemId);
+                if (itemConfig.isVisible == 0)
+                {
+                    continue;
+                }
+                widgetList[index++].InitWidget(new ItemInfo( eventList.itemInfos[i]));
             }
 
 

Assets/Scripts/GameUI/UI/GuidePanel/Phases/Phase2.cs

@@ -53,11 +53,12 @@ namespace Fort23.Mono.Phases
         {
             if (actionList.Count > guideIdx)
             {
+                pgm.SetOnClickMask(true);
                 pgm.ResetPlayerGuide();
                 guideIdx++;
                 SaveStep(guideIdx);
                 await actionList[guideIdx](null);
-
+                pgm.SetOnClickMask(false);
                 if (isCompleted)
                 {
                     EventManager.Instance.Dispatch(CustomEventType.GuideComplete, null);

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/ItemDetailsPanel/ItemDetailsPanel.cs

@@ -64,7 +64,7 @@ namespace Fort23.Mono
             ItemAssociateConfig itemAssociateConfig =
                 ConfigComponent.Instance.Get<ItemAssociateConfig>(itemInfo.config.associateID);
 
-            if (itemAssociateConfig.LanID != -1)
+            if (itemAssociateConfig.LanID != -1 || itemAssociateConfig.LanID != 0)
             {
                 ItemDetailsWidget itemDetailsWidge2 =
                     await UIManager.Instance.CreateGComponent<ItemDetailsWidget>(null, Connect);

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/RewardsPanel/RewardsPanel.cs

@@ -74,6 +74,11 @@ namespace Fort23.Mono
             widgetItems.Clear();
             foreach (ItemInfo reward in rewards)
             {
+              
+                if (reward.config.isVisible == 0)
+                {
+                    continue;
+                }
                 GenerateWidget(reward);
             }
         }

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/Scripts/GameUI/UI/ShopPanel/ShopGachaPanel.cs

@@ -59,18 +59,23 @@ namespace Fort23.Mono
             Btn_ShuangBei.onClick.AddListener(async () =>
             {
 #if UNITY_ANDROID && !UNITY_EDITOR&& Taptap
-                if (TakuSDKManager.Instance.IsReady())
+                if (!PlayerManager.Instance.BagController.IsEnough(23001, 1))
                 {
-                    bool isOK = await TakuSDKManager.Instance.ShowAutoAd();
-                    if (!isOK)
+                    if (TakuSDKManager.Instance.IsReady())
+                    {
+                        bool isOK = await TakuSDKManager.Instance.ShowAutoAd();
+                        if (!isOK)
+                        {
+                            return;
+                        }
+                    }
+                    else
                     {
                         return;
                     }
                 }
-                else
-                {
-                    return;
-                }
+
+        
 
 #endif
                 float beLv =

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

@@ -103,6 +103,16 @@ namespace Fort23.Mono
             {
                 if (!shopGroupConfig.isShow)
                     continue;
+
+#if UNITY_ANDROID && !UNITY_EDITOR
+                //gm商店不显示
+                if (shopGroupConfig.ID == 1 || shopGroupConfig.ID == 2 || shopGroupConfig.ID == 3)
+                {
+                    continue;
+                }
+#endif
+
+
                 ShopBtnWidget shopBtnWidget =
                     await UIManager.Instance.CreateGComponent<ShopBtnWidget>(null, ShopBtnContent);
                 shopBtnWidget.CustomInit(shopGroupConfig);
@@ -166,6 +176,14 @@ namespace Fort23.Mono
                     // }
                     else
                     {
+#if UNITY_ANDROID && !UNITY_EDITOR && Taptap
+                        //
+                //付费国内不显示
+                if (shopConfig.shopItemGroup == 5)
+                {
+                    continue;
+                }
+#endif
                         ShopGroupWidgetType1 shopGroupWidgetType1 =
                             await UIManager.Instance.CreateGComponentForObject<ShopGroupWidgetType1>(
                                 ShopGroupWidgetType2,

Assets/Scripts/GameUI/UI/Task/TaskInfoPanel.cs

@@ -98,15 +98,28 @@ namespace Fort23.Mono
             {
                 for (var i = 0; i < eventList.itemInfos.Count; i++)
                 {
+                    ItemConfig itemConfig = ConfigComponent.Instance.Get<ItemConfig>(eventList.itemInfos[i].itemId);
+                    if (itemConfig.isVisible == 0)
+                    {
+                        continue;
+                    }
+
                     cts.AddTask(UIManager.Instance.CreateGComponent<WidgetItem>(null, ItemRoot));
                 }
 
                 widgetItems = await cts.WaitAll();
             }
 
+            int index = 0;
             for (var i = 0; i < eventList.itemInfos.Count; i++)
             {
-                widgetItems[i].InitWidget(new ItemInfo(eventList.itemInfos[i]));
+                ItemConfig itemConfig = ConfigComponent.Instance.Get<ItemConfig>(eventList.itemInfos[i].itemId);
+                if (itemConfig.isVisible == 0)
+                {
+                    continue;
+                }
+
+                widgetItems[index++].InitWidget(new ItemInfo(eventList.itemInfos[i]));
             }
         }