Merge commit '44a258b7cad6ab5c99f9d053dedfec70e35934ec' into Taptap

Assets/Res/Config/EventConfig.json

@@ -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,7 +4187,7 @@
         1003
       ],
       "PrizeNums": [
-        10,
+        1,
         1,
         2050
       ],
@@ -4226,8 +4226,8 @@
         1003
       ],
       "PrizeNums": [
-        10,
-        2,
+        1,
+        1,
         2050
       ],
       "RefreshProbability": 25,
@@ -4268,8 +4268,8 @@
         1003
       ],
       "PrizeNums": [
-        10,
-        3,
+        1,
+        2,
         2050
       ],
       "RefreshProbability": 20,
@@ -4303,13 +4303,13 @@
       "Score": 1,
       "EventQuality": 4,
       "PrizeIDs": [
-        1501,
+        1502,
         1601,
         1003
       ],
       "PrizeNums": [
-        10,
-        4,
+        1,
+        2,
         2100
       ],
       "RefreshProbability": 20,
@@ -4343,13 +4343,13 @@
       "Score": 1,
       "EventQuality": 4,
       "PrizeIDs": [
-        1501,
+        1502,
         1601,
         1003
       ],
       "PrizeNums": [
-        10,
-        5,
+        1,
+        2,
         2100
       ],
       "RefreshProbability": 20,
@@ -4386,13 +4386,13 @@
       "Score": 1,
       "EventQuality": 4,
       "PrizeIDs": [
-        1501,
+        1502,
         1601,
         1003
       ],
       "PrizeNums": [
-        10,
-        5,
+        1,
+        3,
         2150
       ],
       "RefreshProbability": 20,
@@ -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,

Assets/Res/Config/LanguageChineseConfig.json

@@ -1102,35 +1102,35 @@
     },
     {
       "ID": 276,
-      "txt": "增元丹"
+      "txt": "凡品增元丹"
     },
     {
       "ID": 277,
-      "txt": "增元丹"
+      "txt": "良品增元丹"
     },
     {
       "ID": 278,
-      "txt": "增元丹"
+      "txt": "上品增元丹"
     },
     {
       "ID": 279,
-      "txt": "增元丹"
+      "txt": "极品增元丹"
     },
     {
       "ID": 280,
-      "txt": "修为丹1描述"
+      "txt": "使用后可直接获得修为值。"
     },
     {
       "ID": 281,
-      "txt": "修为丹2描述"
+      "txt": "使用后可直接获得修为值。"
     },
     {
       "ID": 282,
-      "txt": "修为丹3描述"
+      "txt": "使用后可直接获得修为值。"
     },
     {
       "ID": 283,
-      "txt": "修为丹4描述"
+      "txt": "使用后可直接获得修为值。"
     },
     {
       "ID": 284,
@@ -7794,11 +7794,11 @@
     },
     {
       "ID": 1949,
-      "txt": "道具描述_清茶"
+      "txt": "使用后可提升道友的好感度。"
     },
     {
       "ID": 1950,
-      "txt": "道具描述_茉莉花茶"
+      "txt": "使用后可大幅提升道友的好感度。"
     },
     {
       "ID": 1951,
@@ -7806,7 +7806,7 @@
     },
     {
       "ID": 1952,
-      "txt": "道具描述_妃子笑"
+      "txt": "使用后可提升道友的心情值。"
     },
     {
       "ID": 1953,
@@ -13366,7 +13366,7 @@
     },
     {
       "ID": 4082,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4083,
@@ -13402,7 +13402,7 @@
     },
     {
       "ID": 4091,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4092,
@@ -13438,7 +13438,7 @@
     },
     {
       "ID": 4100,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4101,
@@ -39214,579 +39214,579 @@
     },
     {
       "ID": 10544,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10545,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10546,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10547,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10548,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10549,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10550,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10551,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10552,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10553,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10554,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10555,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10556,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10557,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10558,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10559,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10560,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10561,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10562,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10563,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10564,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10565,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10566,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10567,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10568,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10569,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10570,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10571,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10572,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10573,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10574,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10575,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10576,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10577,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10578,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10579,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10580,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10581,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10582,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10583,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10584,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10585,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10586,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10587,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10588,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10589,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10590,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10591,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10592,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10593,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10594,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10595,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10596,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10597,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10598,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10599,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10600,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10601,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10602,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10603,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10604,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10605,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10606,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10607,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10608,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10609,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10610,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10611,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10612,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10613,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10614,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10615,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10616,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10617,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10618,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10619,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10620,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10621,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10622,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10623,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10624,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10625,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10626,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10627,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10628,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10629,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10630,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10631,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10632,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10633,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10634,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10635,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10636,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10637,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10638,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10639,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10640,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10641,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10642,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10643,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10644,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10645,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10646,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10647,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10648,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10649,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10650,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10651,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10652,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10653,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10654,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10655,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10656,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10657,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10658,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10659,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10660,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10661,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10662,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10663,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10664,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10665,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10666,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10667,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10668,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10669,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10670,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10671,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10672,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10673,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10674,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10675,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10676,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10677,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10678,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10679,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10680,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10681,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10682,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10683,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10684,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10685,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10686,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10687,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10688,

Assets/Res/Config/LanguageChineseConfig_skill.json

@@ -4118,7 +4118,7 @@
     },
     {
       "ID": 1211012,
-      "txt": "生命+10%"
+      "txt": "人物生命永久+10%"
     },
     {
       "ID": 1211013,
@@ -4126,7 +4126,7 @@
     },
     {
       "ID": 1211014,
-      "txt": "生命+10%"
+      "txt": "人物生命永久+10%"
     },
     {
       "ID": 1211015,
@@ -4138,7 +4138,7 @@
     },
     {
       "ID": 1211022,
-      "txt": "攻击+10%"
+      "txt": "人物攻击永久+10%"
     },
     {
       "ID": 1211023,
@@ -4146,7 +4146,7 @@
     },
     {
       "ID": 1211024,
-      "txt": "攻击+10%"
+      "txt": "人物攻击永久+10%"
     },
     {
       "ID": 1211025,
@@ -4158,7 +4158,7 @@
     },
     {
       "ID": 1211032,
-      "txt": "防御+10%"
+      "txt": "人物防御永久+10%"
     },
     {
       "ID": 1211033,
@@ -4166,7 +4166,7 @@
     },
     {
       "ID": 1211034,
-      "txt": "防御+10%"
+      "txt": "人物防御永久+10%"
     },
     {
       "ID": 1211035,
@@ -4174,7 +4174,7 @@
     },
     {
       "ID": 1211041,
-      "txt": "攻击+5%"
+      "txt": "人物攻击永久+5%"
     },
     {
       "ID": 1211042,
@@ -4182,7 +4182,7 @@
     },
     {
       "ID": 1211043,
-      "txt": "攻击+5%"
+      "txt": "人物攻击永久+5%"
     },
     {
       "ID": 1211044,
@@ -4190,11 +4190,11 @@
     },
     {
       "ID": 1211045,
-      "txt": "攻击+5%"
+      "txt": "人物攻击永久+5%"
     },
     {
       "ID": 1211051,
-      "txt": "防御+5%"
+      "txt": "人物防御永久+5%"
     },
     {
       "ID": 1211052,
@@ -4202,7 +4202,7 @@
     },
     {
       "ID": 1211053,
-      "txt": "防御+5%"
+      "txt": "人物防御永久+5%"
     },
     {
       "ID": 1211054,
@@ -4210,7 +4210,7 @@
     },
     {
       "ID": 1211055,
-      "txt": "防御+5%"
+      "txt": "人物防御永久+5%"
     },
     {
       "ID": 1212011,
@@ -4218,7 +4218,7 @@
     },
     {
       "ID": 1212012,
-      "txt": "生命+10%"
+      "txt": "人物生命永久+10%"
     },
     {
       "ID": 1212013,
@@ -4226,7 +4226,7 @@
     },
     {
       "ID": 1212014,
-      "txt": "生命+10%"
+      "txt": "人物生命永久+10%"
     },
     {
       "ID": 1212015,
@@ -4238,7 +4238,7 @@
     },
     {
       "ID": 1212022,
-      "txt": "防御+10%"
+      "txt": "人物防御永久+10%"
     },
     {
       "ID": 1212023,
@@ -4246,7 +4246,7 @@
     },
     {
       "ID": 1212024,
-      "txt": "防御+10%"
+      "txt": "人物防御永久+10%"
     },
     {
       "ID": 1212025,
@@ -4254,7 +4254,7 @@
     },
     {
       "ID": 1212041,
-      "txt": "攻击+5%"
+      "txt": "人物攻击永久+5%"
     },
     {
       "ID": 1212042,
@@ -4262,7 +4262,7 @@
     },
     {
       "ID": 1212043,
-      "txt": "攻击+10%"
+      "txt": "人物攻击永久+10%"
     },
     {
       "ID": 1212044,
@@ -4270,11 +4270,11 @@
     },
     {
       "ID": 1212045,
-      "txt": "攻击+15%"
+      "txt": "人物攻击永久+15%"
     },
     {
       "ID": 1212051,
-      "txt": "防御+5%"
+      "txt": "人物防御永久+5%"
     },
     {
       "ID": 1212052,
@@ -4282,7 +4282,7 @@
     },
     {
       "ID": 1212053,
-      "txt": "防御+5%"
+      "txt": "人物防御永久+5%"
     },
     {
       "ID": 1212054,
@@ -4290,7 +4290,7 @@
     },
     {
       "ID": 1212055,
-      "txt": "防御+5%"
+      "txt": "人物防御永久+5%"
     },
     {
       "ID": 1213011,
@@ -4298,7 +4298,7 @@
     },
     {
       "ID": 1213012,
-      "txt": "生命+10%"
+      "txt": "人物生命永久+10%"
     },
     {
       "ID": 1213013,
@@ -4306,7 +4306,7 @@
     },
     {
       "ID": 1213014,
-      "txt": "生命+10%"
+      "txt": "人物生命永久+10%"
     },
     {
       "ID": 1213015,
@@ -4318,7 +4318,7 @@
     },
     {
       "ID": 1213022,
-      "txt": "防御+10%"
+      "txt": "人物防御永久+10%"
     },
     {
       "ID": 1213023,
@@ -4326,7 +4326,7 @@
     },
     {
       "ID": 1213024,
-      "txt": "防御+10%"
+      "txt": "人物防御永久+10%"
     },
     {
       "ID": 1213025,
@@ -4334,7 +4334,7 @@
     },
     {
       "ID": 1213041,
-      "txt": "生命+5%"
+      "txt": "人物生命永久+5%"
     },
     {
       "ID": 1213042,
@@ -4342,7 +4342,7 @@
     },
     {
       "ID": 1213043,
-      "txt": "生命+5%"
+      "txt": "人物生命永久+5%"
     },
     {
       "ID": 1213044,
@@ -4350,11 +4350,11 @@
     },
     {
       "ID": 1213045,
-      "txt": "生命+5%"
+      "txt": "人物生命永久+5%"
     },
     {
       "ID": 1213051,
-      "txt": "攻击+5%"
+      "txt": "人物攻击永久+5%"
     },
     {
       "ID": 1213052,
@@ -4362,7 +4362,7 @@
     },
     {
       "ID": 1213053,
-      "txt": "攻击+5%"
+      "txt": "人物攻击永久+5%"
     },
     {
       "ID": 1213054,
@@ -4370,7 +4370,7 @@
     },
     {
       "ID": 1213055,
-      "txt": "攻击+5%"
+      "txt": "人物攻击永久+5%"
     },
     {
       "ID": 1214011,
@@ -4378,7 +4378,7 @@
     },
     {
       "ID": 1214012,
-      "txt": "生命+10%"
+      "txt": "人物生命永久+10%"
     },
     {
       "ID": 1214013,
@@ -4386,7 +4386,7 @@
     },
     {
       "ID": 1214014,
-      "txt": "生命+10%"
+      "txt": "人物生命永久+10%"
     },
     {
       "ID": 1214015,
@@ -4398,7 +4398,7 @@
     },
     {
       "ID": 1214022,
-      "txt": "攻击+10%"
+      "txt": "人物攻击永久+10%"
     },
     {
       "ID": 1214023,
@@ -4406,7 +4406,7 @@
     },
     {
       "ID": 1214024,
-      "txt": "攻击+10%"
+      "txt": "人物攻击永久+10%"
     },
     {
       "ID": 1214025,
@@ -4418,7 +4418,7 @@
     },
     {
       "ID": 1214032,
-      "txt": "防御+10%"
+      "txt": "人物防御永久+10%"
     },
     {
       "ID": 1214033,
@@ -4426,7 +4426,7 @@
     },
     {
       "ID": 1214034,
-      "txt": "防御+10%"
+      "txt": "人物防御永久+10%"
     },
     {
       "ID": 1214035,
@@ -4434,7 +4434,7 @@
     },
     {
       "ID": 1214041,
-      "txt": "防御+5%"
+      "txt": "人物防御永久+5%"
     },
     {
       "ID": 1214042,
@@ -4442,7 +4442,7 @@
     },
     {
       "ID": 1214043,
-      "txt": "防御+5%"
+      "txt": "人物防御永久+5%"
     },
     {
       "ID": 1214044,
@@ -4450,11 +4450,11 @@
     },
     {
       "ID": 1214045,
-      "txt": "防御+5%"
+      "txt": "人物防御永久+5%"
     },
     {
       "ID": 1214051,
-      "txt": "生命+5%"
+      "txt": "人物生命永久+5%"
     },
     {
       "ID": 1214052,
@@ -4462,7 +4462,7 @@
     },
     {
       "ID": 1214053,
-      "txt": "生命+5%"
+      "txt": "人物生命永久+5%"
     },
     {
       "ID": 1214054,
@@ -4470,7 +4470,7 @@
     },
     {
       "ID": 1214055,
-      "txt": "生命+5%"
+      "txt": "人物生命永久+5%"
     },
     {
       "ID": 1215011,
@@ -4478,7 +4478,7 @@
     },
     {
       "ID": 1215012,
-      "txt": "生命+10%"
+      "txt": "人物生命永久+10%"
     },
     {
       "ID": 1215013,
@@ -4486,7 +4486,7 @@
     },
     {
       "ID": 1215014,
-      "txt": "生命+10%"
+      "txt": "人物生命永久+10%"
     },
     {
       "ID": 1215015,
@@ -4498,7 +4498,7 @@
     },
     {
       "ID": 1215022,
-      "txt": "攻击+10%"
+      "txt": "人物攻击永久+10%"
     },
     {
       "ID": 1215023,
@@ -4506,7 +4506,7 @@
     },
     {
       "ID": 1215024,
-      "txt": "攻击+10%"
+      "txt": "人物攻击永久+10%"
     },
     {
       "ID": 1215025,
@@ -4514,7 +4514,7 @@
     },
     {
       "ID": 1215041,
-      "txt": "攻击+5%"
+      "txt": "人物攻击永久+5%"
     },
     {
       "ID": 1215042,
@@ -4522,7 +4522,7 @@
     },
     {
       "ID": 1215043,
-      "txt": "攻击+5%"
+      "txt": "人物攻击永久+5%"
     },
     {
       "ID": 1215044,
@@ -4530,11 +4530,11 @@
     },
     {
       "ID": 1215045,
-      "txt": "攻击+5%"
+      "txt": "人物攻击永久+5%"
     },
     {
       "ID": 1215051,
-      "txt": "生命+5%"
+      "txt": "人物生命永久+5%"
     },
     {
       "ID": 1215052,
@@ -4542,7 +4542,7 @@
     },
     {
       "ID": 1215053,
-      "txt": "生命+5%"
+      "txt": "人物生命永久+5%"
     },
     {
       "ID": 1215054,
@@ -4550,23 +4550,23 @@
     },
     {
       "ID": 1215055,
-      "txt": "生命+5%"
+      "txt": "人物生命永久+5%"
     },
     {
       "ID": 1220011,
-      "txt": "防御+3%"
+      "txt": "人物防御永久+3%"
     },
     {
       "ID": 1220012,
-      "txt": "防御+3%"
+      "txt": "人物防御永久+3%"
     },
     {
       "ID": 1220013,
-      "txt": "防御+3%"
+      "txt": "人物防御永久+3%"
     },
     {
       "ID": 1220014,
-      "txt": "防御+3%"
+      "txt": "人物防御永久+3%"
     },
     {
       "ID": 1220015,
@@ -4574,19 +4574,19 @@
     },
     {
       "ID": 1220021,
-      "txt": "攻击+3%"
+      "txt": "人物攻击永久+3%"
     },
     {
       "ID": 1220022,
-      "txt": "攻击+3%"
+      "txt": "人物攻击永久+3%"
     },
     {
       "ID": 1220023,
-      "txt": "攻击+3%"
+      "txt": "人物攻击永久+3%"
     },
     {
       "ID": 1220024,
-      "txt": "攻击+3%"
+      "txt": "人物攻击永久+3%"
     },
     {
       "ID": 1220025,
@@ -4594,19 +4594,19 @@
     },
     {
       "ID": 1220031,
-      "txt": "防御+3%"
+      "txt": "人物防御永久+3%"
     },
     {
       "ID": 1220032,
-      "txt": "防御+3%"
+      "txt": "人物防御永久+3%"
     },
     {
       "ID": 1220033,
-      "txt": "防御+3%"
+      "txt": "人物防御永久+3%"
     },
     {
       "ID": 1220034,
-      "txt": "防御+3%"
+      "txt": "人物防御永久+3%"
     },
     {
       "ID": 1220035,
@@ -4614,19 +4614,19 @@
     },
     {
       "ID": 1220041,
-      "txt": "生命+3%"
+      "txt": "人物生命永久+3%"
     },
     {
       "ID": 1220042,
-      "txt": "生命+3%"
+      "txt": "人物生命永久+3%"
     },
     {
       "ID": 1220043,
-      "txt": "生命+3%"
+      "txt": "人物生命永久+3%"
     },
     {
       "ID": 1220044,
-      "txt": "生命+3%"
+      "txt": "人物生命永久+3%"
     },
     {
       "ID": 1220045,
@@ -4634,19 +4634,19 @@
     },
     {
       "ID": 1220051,
-      "txt": "攻击+3%"
+      "txt": "人物攻击永久+3%"
     },
     {
       "ID": 1220052,
-      "txt": "攻击+3%"
+      "txt": "人物攻击永久+3%"
     },
     {
       "ID": 1220053,
-      "txt": "攻击+3%"
+      "txt": "人物攻击永久+3%"
     },
     {
       "ID": 1220054,
-      "txt": "攻击+3%"
+      "txt": "人物攻击永久+3%"
     },
     {
       "ID": 1220055,
@@ -4654,19 +4654,19 @@
     },
     {
       "ID": 1220061,
-      "txt": "防御+3%"
+      "txt": "人物防御永久+3%"
     },
     {
       "ID": 1220062,
-      "txt": "防御+3%"
+      "txt": "人物防御永久+3%"
     },
     {
       "ID": 1220063,
-      "txt": "防御+3%"
+      "txt": "人物防御永久+3%"
     },
     {
       "ID": 1220064,
-      "txt": "防御+3%"
+      "txt": "人物防御永久+3%"
     },
     {
       "ID": 1220065,
@@ -4674,19 +4674,19 @@
     },
     {
       "ID": 1220071,
-      "txt": "生命+3%"
+      "txt": "人物生命永久+3%"
     },
     {
       "ID": 1220072,
-      "txt": "生命+3%"
+      "txt": "人物生命永久+3%"
     },
     {
       "ID": 1220073,
-      "txt": "生命+3%"
+      "txt": "人物生命永久+3%"
     },
     {
       "ID": 1220074,
-      "txt": "生命+3%"
+      "txt": "人物生命永久+3%"
     },
     {
       "ID": 1220075,
@@ -4694,19 +4694,19 @@
     },
     {
       "ID": 1220081,
-      "txt": "攻击+3%"
+      "txt": "人物攻击永久+3%"
     },
     {
       "ID": 1220082,
-      "txt": "攻击+3%"
+      "txt": "人物攻击永久+3%"
     },
     {
       "ID": 1220083,
-      "txt": "攻击+3%"
+      "txt": "人物攻击永久+3%"
     },
     {
       "ID": 1220084,
-      "txt": "攻击+3%"
+      "txt": "人物攻击永久+3%"
     },
     {
       "ID": 1220085,
@@ -4714,19 +4714,19 @@
     },
     {
       "ID": 1220091,
-      "txt": "攻击+3%"
+      "txt": "人物攻击永久+3%"
     },
     {
       "ID": 1220092,
-      "txt": "攻击+3%"
+      "txt": "人物攻击永久+3%"
     },
     {
       "ID": 1220093,
-      "txt": "攻击+3%"
+      "txt": "人物攻击永久+3%"
     },
     {
       "ID": 1220094,
-      "txt": "攻击+3%"
+      "txt": "人物攻击永久+3%"
     },
     {
       "ID": 1220095,
@@ -4734,19 +4734,19 @@
     },
     {
       "ID": 1220101,
-      "txt": "攻击+3%"
+      "txt": "人物攻击永久+3%"
     },
     {
       "ID": 1220102,
-      "txt": "攻击+3%"
+      "txt": "人物攻击永久+3%"
     },
     {
       "ID": 1220103,
-      "txt": "攻击+3%"
+      "txt": "人物攻击永久+3%"
     },
     {
       "ID": 1220104,
-      "txt": "攻击+3%"
+      "txt": "人物攻击永久+3%"
     },
     {
       "ID": 1220105,
@@ -4754,19 +4754,19 @@
     },
     {
       "ID": 1220111,
-      "txt": "生命+3%"
+      "txt": "人物生命永久+3%"
     },
     {
       "ID": 1220112,
-      "txt": "生命+3%"
+      "txt": "人物生命永久+3%"
     },
     {
       "ID": 1220113,
-      "txt": "生命+3%"
+      "txt": "人物生命永久+3%"
     },
     {
       "ID": 1220114,
-      "txt": "生命+3%"
+      "txt": "人物生命永久+3%"
     },
     {
       "ID": 1220115,
@@ -4774,19 +4774,19 @@
     },
     {
       "ID": 1220121,
-      "txt": "攻击+3%"
+      "txt": "人物攻击永久+3%"
     },
     {
       "ID": 1220122,
-      "txt": "攻击+3%"
+      "txt": "人物攻击永久+3%"
     },
     {
       "ID": 1220123,
-      "txt": "攻击+3%"
+      "txt": "人物攻击永久+3%"
     },
     {
       "ID": 1220124,
-      "txt": "攻击+3%"
+      "txt": "人物攻击永久+3%"
     },
     {
       "ID": 1220125,
@@ -4794,19 +4794,19 @@
     },
     {
       "ID": 1220131,
-      "txt": "防御+3%"
+      "txt": "人物防御永久+3%"
     },
     {
       "ID": 1220132,
-      "txt": "防御+3%"
+      "txt": "人物防御永久+3%"
     },
     {
       "ID": 1220133,
-      "txt": "防御+3%"
+      "txt": "人物防御永久+3%"
     },
     {
       "ID": 1220134,
-      "txt": "防御+3%"
+      "txt": "人物防御永久+3%"
     },
     {
       "ID": 1220135,
@@ -4814,19 +4814,19 @@
     },
     {
       "ID": 1220141,
-      "txt": "生命+3%"
+      "txt": "人物生命永久+3%"
     },
     {
       "ID": 1220142,
-      "txt": "生命+3%"
+      "txt": "人物生命永久+3%"
     },
     {
       "ID": 1220143,
-      "txt": "生命+3%"
+      "txt": "人物生命永久+3%"
     },
     {
       "ID": 1220144,
-      "txt": "生命+3%"
+      "txt": "人物生命永久+3%"
     },
     {
       "ID": 1220145,
@@ -4834,19 +4834,19 @@
     },
     {
       "ID": 1220151,
-      "txt": "攻击+3%"
+      "txt": "人物攻击永久+3%"
     },
     {
       "ID": 1220152,
-      "txt": "攻击+3%"
+      "txt": "人物攻击永久+3%"
     },
     {
       "ID": 1220153,
-      "txt": "攻击+3%"
+      "txt": "人物攻击永久+3%"
     },
     {
       "ID": 1220154,
-      "txt": "攻击+3%"
+      "txt": "人物攻击永久+3%"
     },
     {
       "ID": 1220155,
@@ -4854,19 +4854,19 @@
     },
     {
       "ID": 1220161,
-      "txt": "防御+3%"
+      "txt": "人物防御永久+3%"
     },
     {
       "ID": 1220162,
-      "txt": "防御+3%"
+      "txt": "人物防御永久+3%"
     },
     {
       "ID": 1220163,
-      "txt": "防御+3%"
+      "txt": "人物防御永久+3%"
     },
     {
       "ID": 1220164,
-      "txt": "防御+3%"
+      "txt": "人物防御永久+3%"
     },
     {
       "ID": 1220165,
@@ -4874,19 +4874,19 @@
     },
     {
       "ID": 1220171,
-      "txt": "生命+3%"
+      "txt": "人物生命永久+3%"
     },
     {
       "ID": 1220172,
-      "txt": "生命+3%"
+      "txt": "人物生命永久+3%"
     },
     {
       "ID": 1220173,
-      "txt": "生命+3%"
+      "txt": "人物生命永久+3%"
     },
     {
       "ID": 1220174,
-      "txt": "生命+3%"
+      "txt": "人物生命永久+3%"
     },
     {
       "ID": 1220175,
@@ -4894,19 +4894,19 @@
     },
     {
       "ID": 1220181,
-      "txt": "攻击+3%"
+      "txt": "人物攻击永久+3%"
     },
     {
       "ID": 1220182,
-      "txt": "攻击+3%"
+      "txt": "人物攻击永久+3%"
     },
     {
       "ID": 1220183,
-      "txt": "攻击+3%"
+      "txt": "人物攻击永久+3%"
     },
     {
       "ID": 1220184,
-      "txt": "攻击+3%"
+      "txt": "人物攻击永久+3%"
     },
     {
       "ID": 1220185,
@@ -4914,19 +4914,19 @@
     },
     {
       "ID": 1220191,
-      "txt": "防御+3%"
+      "txt": "人物防御永久+3%"
     },
     {
       "ID": 1220192,
-      "txt": "防御+3%"
+      "txt": "人物防御永久+3%"
     },
     {
       "ID": 1220193,
-      "txt": "防御+3%"
+      "txt": "人物防御永久+3%"
     },
     {
       "ID": 1220194,
-      "txt": "防御+3%"
+      "txt": "人物防御永久+3%"
     },
     {
       "ID": 1220195,
@@ -4938,7 +4938,7 @@
     },
     {
       "ID": 1231012,
-      "txt": "攻击+5%"
+      "txt": "人物攻击永久+5%"
     },
     {
       "ID": 1231013,
@@ -4946,7 +4946,7 @@
     },
     {
       "ID": 1231014,
-      "txt": "攻击+5%"
+      "txt": "人物攻击永久+5%"
     },
     {
       "ID": 1231015,
@@ -4982,7 +4982,7 @@
     },
     {
       "ID": 1232013,
-      "txt": "生命+5%"
+      "txt": "人物生命永久+5%"
     },
     {
       "ID": 1232014,
@@ -4998,7 +4998,7 @@
     },
     {
       "ID": 1232022,
-      "txt": "防御+5%"
+      "txt": "人物防御永久+5%"
     },
     {
       "ID": 1232023,
@@ -5082,7 +5082,7 @@
     },
     {
       "ID": 1234013,
-      "txt": "攻击+5%"
+      "txt": "人物攻击永久+5%"
     },
     {
       "ID": 1234014,
@@ -5102,7 +5102,7 @@
     },
     {
       "ID": 1234023,
-      "txt": "攻击+%"
+      "txt": "人物攻击永久+5%"
     },
     {
       "ID": 1234024,
@@ -5134,23 +5134,23 @@
     },
     {
       "ID": 1235021,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 1235022,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 1235023,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 1235024,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 1235025,
-      "txt": "0"
+      "txt": ""
     }
   ]
 }

Assets/Res/Config/SkillConfig.json

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

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/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
@@ -4834,7 +4834,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/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/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/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/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/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]));
             }
         }