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

# Conflicts:
#	Excel2Json/Excel/EventConfig.xlsx   resolved by master version

Assets/Res/Config/EventConfig.json

@@ -114,7 +114,7 @@
       ],
       "PrizeNums": [
         -6000,
-        -2000
+        -3000
       ],
       "RefreshProbability": 300,
       "RefreshCount": 0,
@@ -145,7 +145,7 @@
       ],
       "PrizeNums": [
         -6000,
-        -2000
+        -3000
       ],
       "RefreshProbability": 300,
       "RefreshCount": 0,
@@ -393,7 +393,7 @@
       ],
       "PrizeNums": [
         -9000,
-        -2500
+        -4000
       ],
       "RefreshProbability": 300,
       "RefreshCount": 0,
@@ -424,7 +424,7 @@
       ],
       "PrizeNums": [
         -9000,
-        -2500
+        -4000
       ],
       "RefreshProbability": 300,
       "RefreshCount": 0,
@@ -672,7 +672,7 @@
       ],
       "PrizeNums": [
         -12000,
-        -3000
+        -5000
       ],
       "RefreshProbability": 300,
       "RefreshCount": 0,
@@ -703,7 +703,7 @@
       ],
       "PrizeNums": [
         -12000,
-        -3000
+        -5000
       ],
       "RefreshProbability": 300,
       "RefreshCount": 0,
@@ -951,7 +951,7 @@
       ],
       "PrizeNums": [
         -20000,
-        -4000
+        -6000
       ],
       "RefreshProbability": 300,
       "RefreshCount": 0,
@@ -982,7 +982,7 @@
       ],
       "PrizeNums": [
         -20000,
-        -4000
+        -6000
       ],
       "RefreshProbability": 300,
       "RefreshCount": 0,
@@ -1230,7 +1230,7 @@
       ],
       "PrizeNums": [
         -30000,
-        -5000
+        -7500
       ],
       "RefreshProbability": 300,
       "RefreshCount": 0,
@@ -1261,7 +1261,7 @@
       ],
       "PrizeNums": [
         -30000,
-        -5000
+        -7500
       ],
       "RefreshProbability": 300,
       "RefreshCount": 0,

Assets/Res/Config/GroupConfig.json

@@ -639,6 +639,9 @@
     },
     {
       "ID": 4026,
+      "GroupMonsterLevel": [
+        1
+      ],
       "GroupMonster": [
         1008
       ]

Assets/Res/Config/HeroPowerUpConfig.json

@@ -309,7 +309,7 @@
       "defK": 238,
       "ShenshiMax": 1000,
       "AutoXiuwei": 0.1,
-      "FailureExpReduce": 20,
+      "FailureExpReduce": 15,
       "MaxActiveGongfaNum": 2,
       "MaxPassiveGongfaNum": 1,
       "MaxFabaoNum": 1,
@@ -625,7 +625,7 @@
       "defK": 302,
       "ShenshiMax": 1000,
       "AutoXiuwei": 0.1,
-      "FailureExpReduce": 20,
+      "FailureExpReduce": 15,
       "MaxActiveGongfaNum": 2,
       "MaxPassiveGongfaNum": 1,
       "MaxFabaoNum": 1,
@@ -949,7 +949,7 @@
       "defK": 404,
       "ShenshiMax": 1000,
       "AutoXiuwei": 0.1,
-      "FailureExpReduce": 50,
+      "FailureExpReduce": 15,
       "MaxActiveGongfaNum": 3,
       "MaxPassiveGongfaNum": 1,
       "MaxFabaoNum": 1,
@@ -1271,7 +1271,7 @@
       "defK": 618,
       "ShenshiMax": 1100,
       "AutoXiuwei": 0.1,
-      "FailureExpReduce": 20,
+      "FailureExpReduce": 15,
       "MaxActiveGongfaNum": 3,
       "MaxPassiveGongfaNum": 2,
       "MaxFabaoNum": 1,
@@ -1593,7 +1593,7 @@
       "defK": 807,
       "ShenshiMax": 1100,
       "AutoXiuwei": 0.1,
-      "FailureExpReduce": 20,
+      "FailureExpReduce": 15,
       "MaxActiveGongfaNum": 3,
       "MaxPassiveGongfaNum": 2,
       "MaxFabaoNum": 2,
@@ -1917,7 +1917,7 @@
       "defK": 1106,
       "ShenshiMax": 1100,
       "AutoXiuwei": 0.11,
-      "FailureExpReduce": 50,
+      "FailureExpReduce": 15,
       "MaxActiveGongfaNum": 4,
       "MaxPassiveGongfaNum": 2,
       "MaxFabaoNum": 2,
@@ -2241,7 +2241,7 @@
       "defK": 1771,
       "ShenshiMax": 1200,
       "AutoXiuwei": 0.13,
-      "FailureExpReduce": 20,
+      "FailureExpReduce": 15,
       "MaxActiveGongfaNum": 4,
       "MaxPassiveGongfaNum": 3,
       "MaxFabaoNum": 2,
@@ -2565,7 +2565,7 @@
       "defK": 2421,
       "ShenshiMax": 1200,
       "AutoXiuwei": 0.15,
-      "FailureExpReduce": 20,
+      "FailureExpReduce": 15,
       "MaxActiveGongfaNum": 4,
       "MaxPassiveGongfaNum": 3,
       "MaxFabaoNum": 3,
@@ -2891,7 +2891,7 @@
       "defK": 3453,
       "ShenshiMax": 1200,
       "AutoXiuwei": 0.17,
-      "FailureExpReduce": 50,
+      "FailureExpReduce": 15,
       "MaxActiveGongfaNum": 4,
       "MaxPassiveGongfaNum": 4,
       "MaxFabaoNum": 3,
@@ -3215,7 +3215,7 @@
       "defK": 5405,
       "ShenshiMax": 1300,
       "AutoXiuwei": 0.19,
-      "FailureExpReduce": 20,
+      "FailureExpReduce": 15,
       "MaxActiveGongfaNum": 4,
       "MaxPassiveGongfaNum": 4,
       "MaxFabaoNum": 4,
@@ -3539,7 +3539,7 @@
       "defK": 7104,
       "ShenshiMax": 1300,
       "AutoXiuwei": 0.22,
-      "FailureExpReduce": 20,
+      "FailureExpReduce": 15,
       "MaxActiveGongfaNum": 4,
       "MaxPassiveGongfaNum": 4,
       "MaxFabaoNum": 4,
@@ -3865,7 +3865,7 @@
       "defK": 9308,
       "ShenshiMax": 1300,
       "AutoXiuwei": 0.23,
-      "FailureExpReduce": 50,
+      "FailureExpReduce": 15,
       "MaxActiveGongfaNum": 4,
       "MaxPassiveGongfaNum": 4,
       "MaxFabaoNum": 4,
@@ -4191,7 +4191,7 @@
       "defK": 14142,
       "ShenshiMax": 1400,
       "AutoXiuwei": 0.24,
-      "FailureExpReduce": 20,
+      "FailureExpReduce": 15,
       "MaxActiveGongfaNum": 4,
       "MaxPassiveGongfaNum": 4,
       "MaxFabaoNum": 4,
@@ -4517,7 +4517,7 @@
       "defK": 18135,
       "ShenshiMax": 1400,
       "AutoXiuwei": 0.25,
-      "FailureExpReduce": 20,
+      "FailureExpReduce": 15,
       "MaxActiveGongfaNum": 4,
       "MaxPassiveGongfaNum": 4,
       "MaxFabaoNum": 4,
@@ -4845,7 +4845,7 @@
       "defK": 23232,
       "ShenshiMax": 1400,
       "AutoXiuwei": 0.27,
-      "FailureExpReduce": 50,
+      "FailureExpReduce": 15,
       "MaxActiveGongfaNum": 4,
       "MaxPassiveGongfaNum": 4,
       "MaxFabaoNum": 4,
@@ -5171,7 +5171,7 @@
       "defK": 35139,
       "ShenshiMax": 1500,
       "AutoXiuwei": 0.28,
-      "FailureExpReduce": 20,
+      "FailureExpReduce": 15,
       "MaxActiveGongfaNum": 4,
       "MaxPassiveGongfaNum": 4,
       "MaxFabaoNum": 4,
@@ -5497,7 +5497,7 @@
       "defK": 44929,
       "ShenshiMax": 1500,
       "AutoXiuwei": 0.29,
-      "FailureExpReduce": 20,
+      "FailureExpReduce": 15,
       "MaxActiveGongfaNum": 4,
       "MaxPassiveGongfaNum": 4,
       "MaxFabaoNum": 4,
@@ -5825,7 +5825,7 @@
       "defK": 57399,
       "ShenshiMax": 1500,
       "AutoXiuwei": 0.31,
-      "FailureExpReduce": 50,
+      "FailureExpReduce": 15,
       "MaxActiveGongfaNum": 4,
       "MaxPassiveGongfaNum": 4,
       "MaxFabaoNum": 4,
@@ -6151,7 +6151,7 @@
       "defK": 87697,
       "ShenshiMax": 1600,
       "AutoXiuwei": 0.32,
-      "FailureExpReduce": 20,
+      "FailureExpReduce": 15,
       "MaxActiveGongfaNum": 4,
       "MaxPassiveGongfaNum": 4,
       "MaxFabaoNum": 4,
@@ -6477,7 +6477,7 @@
       "defK": 113286,
       "ShenshiMax": 1600,
       "AutoXiuwei": 0.34,
-      "FailureExpReduce": 20,
+      "FailureExpReduce": 15,
       "MaxActiveGongfaNum": 4,
       "MaxPassiveGongfaNum": 4,
       "MaxFabaoNum": 4,
@@ -6805,7 +6805,7 @@
       "defK": 146116,
       "ShenshiMax": 1600,
       "AutoXiuwei": 0.35,
-      "FailureExpReduce": 50,
+      "FailureExpReduce": 15,
       "MaxActiveGongfaNum": 4,
       "MaxPassiveGongfaNum": 4,
       "MaxFabaoNum": 4,
@@ -7131,7 +7131,7 @@
       "defK": 222410,
       "ShenshiMax": 1700,
       "AutoXiuwei": 0.38,
-      "FailureExpReduce": 20,
+      "FailureExpReduce": 15,
       "MaxActiveGongfaNum": 4,
       "MaxPassiveGongfaNum": 4,
       "MaxFabaoNum": 4,
@@ -7457,7 +7457,7 @@
       "defK": 286077,
       "ShenshiMax": 1700,
       "AutoXiuwei": 0.4,
-      "FailureExpReduce": 20,
+      "FailureExpReduce": 15,
       "MaxActiveGongfaNum": 4,
       "MaxPassiveGongfaNum": 4,
       "MaxFabaoNum": 4,
@@ -7785,7 +7785,7 @@
       "defK": 367517,
       "ShenshiMax": 1700,
       "AutoXiuwei": 0.42,
-      "FailureExpReduce": 50,
+      "FailureExpReduce": 15,
       "MaxActiveGongfaNum": 4,
       "MaxPassiveGongfaNum": 4,
       "MaxFabaoNum": 4,
@@ -8111,7 +8111,7 @@
       "defK": 544777,
       "ShenshiMax": 1800,
       "AutoXiuwei": 0.44,
-      "FailureExpReduce": 20,
+      "FailureExpReduce": 15,
       "MaxActiveGongfaNum": 4,
       "MaxPassiveGongfaNum": 4,
       "MaxFabaoNum": 4,
@@ -8437,7 +8437,7 @@
       "defK": 682365,
       "ShenshiMax": 1800,
       "AutoXiuwei": 0.46,
-      "FailureExpReduce": 20,
+      "FailureExpReduce": 15,
       "MaxActiveGongfaNum": 4,
       "MaxPassiveGongfaNum": 4,
       "MaxFabaoNum": 4,
@@ -8765,7 +8765,7 @@
       "defK": 854632,
       "ShenshiMax": 1800,
       "AutoXiuwei": 0.48,
-      "FailureExpReduce": 50,
+      "FailureExpReduce": 15,
       "MaxActiveGongfaNum": 4,
       "MaxPassiveGongfaNum": 4,
       "MaxFabaoNum": 4,
@@ -9093,7 +9093,7 @@
       "defK": 1264899,
       "ShenshiMax": 1900,
       "AutoXiuwei": 0.51,
-      "FailureExpReduce": 20,
+      "FailureExpReduce": 15,
       "MaxActiveGongfaNum": 4,
       "MaxPassiveGongfaNum": 4,
       "MaxFabaoNum": 4,
@@ -9421,7 +9421,7 @@
       "defK": 1583972,
       "ShenshiMax": 1900,
       "AutoXiuwei": 0.53,
-      "FailureExpReduce": 20,
+      "FailureExpReduce": 15,
       "MaxActiveGongfaNum": 4,
       "MaxPassiveGongfaNum": 4,
       "MaxFabaoNum": 4,
@@ -9750,7 +9750,7 @@
       "defK": 2021685,
       "ShenshiMax": 1900,
       "AutoXiuwei": 0.56,
-      "FailureExpReduce": 50,
+      "FailureExpReduce": 15,
       "MaxActiveGongfaNum": 4,
       "MaxPassiveGongfaNum": 4,
       "MaxFabaoNum": 4,

Assets/Res/Config/ItemConfig.json

@@ -2334,7 +2334,7 @@
       "stack_1": 0,
       "associateID": 2,
       "associateVlaue": [
-        900
+        800
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -2366,7 +2366,7 @@
       "stack_1": 0,
       "associateID": 2,
       "associateVlaue": [
-        1600
+        1200
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -2398,7 +2398,7 @@
       "stack_1": 0,
       "associateID": 2,
       "associateVlaue": [
-        2500
+        1700
       ],
       "sort": 0,
       "itemDesc2": 0

Assets/Res/Config/LanguageChineseConfig.json

@@ -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,
@@ -37766,7 +37766,7 @@
     },
     {
       "ID": 10182,
-      "txt": "100次探宝必定获得鲜品宝物"
+      "txt": "100次探宝必定获得乙级功法或法宝"
     },
     {
       "ID": 10183,
@@ -37802,7 +37802,7 @@
     },
     {
       "ID": 10191,
-      "txt": "累计达到"
+      "txt": "积分达到"
     },
     {
       "ID": 10192,
@@ -38522,7 +38522,7 @@
     },
     {
       "ID": 10371,
-      "txt": "少量功法法宝经验 ----- 50%\n一些功法法宝经验 ----- 17%\n大量功法法宝经验 ----- 5%\n蓝色功法 --------------- 20%\n紫色功法法宝 ---------- 6%\n橙色功法法宝 ---------- 2%"
+      "txt": "少量功法法宝经验 ----- 30%\n一些功法法宝经验 ----- 18%\n大量功法法宝经验 ----- 9%\n丙级功法 --------------- 29%\n乙级功法法宝 ---------- 10%\n甲级功法法宝 ---------- 4%"
     },
     {
       "ID": 10372,
@@ -38530,7 +38530,7 @@
     },
     {
       "ID": 10373,
-      "txt": "十次十连必出一个紫色功法或法宝"
+      "txt": "十次十连必出一个乙级功法或法宝"
     },
     {
       "ID": 10374,
@@ -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,
@@ -40230,7 +40230,7 @@
     },
     {
       "ID": 10798,
-      "txt": "0"
+      "txt": "每100抽必出328仙缘宝券"
     }
   ]
 }

Assets/Res/Config/LevelbattleConfig.json

@@ -40,6 +40,26 @@
       "MonsterGroupTruePower": 100,
       "MonsterGroupPower": 100
     },
+    {
+      "ID": 100005,
+      "Group": [
+        100005
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 100006,
+      "Group": [
+        100006
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
     {
       "ID": 1002,
       "Group": [

Assets/Res/UI/BoxPanel/OpenBoxScorePanel.prefab

@@ -177,7 +177,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: -3563, y: -182}
-  m_SizeDelta: {x: 750, y: 1334}
+  m_SizeDelta: {x: 750, y: 1624}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &8965272612517638377
 MonoBehaviour:
@@ -389,7 +389,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -1050,7 +1050,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -1318,7 +1318,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 0, g: 0, b: 0, a: 0.32941177}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -1954,7 +1954,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -2479,7 +2479,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 0.98823535, g: 0.93725497, b: 0.8235295, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:

Assets/Res/UI/ShopPanel/ShopBoxWidget.prefab

@@ -1895,7 +1895,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  id: 10237
+  id: 10798
 --- !u!1 &2720669039826339307
 GameObject:
   m_ObjectHideFlags: 0
@@ -3242,7 +3242,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &4352261052017720437
 RectTransform:
   m_ObjectHideFlags: 0

Assets/Scripts/GameUI/UI/AppBarPanel/AppBarPanel.cs

@@ -111,15 +111,15 @@ namespace Fort23.Mono
             await DivineSenceInfoPanel.OpenPanel((count, useItems) => { Bnt_shengShi_onClick(count, useItems); });
         }
 
-        public async void Btn_Shop_Click(int shopId = 0)
+        public async void Btn_Shop_Click(int shopId = 0,bool isQz = false)
         {
             CloseMenu();
-            if (currentOpenUIPanel is ShopPanel)
+            if (currentOpenUIPanel is ShopPanel && !isQz)
             {
                 return;
             }
 
-
+    
             UIPanel uiPanel = currentOpenUIPanel;
 
             CombatDrive.Instance.CombatController.isUpdate = false;
@@ -127,7 +127,11 @@ namespace Fort23.Mono
             if (uiPanel is CaveMainPanel || uiPanel is SkillSelectPanel || uiPanel is ShopPanel ||
                 uiPanel is MainHeroPanel)
             {
-                UIManager.Instance.HideUIUIPanel(uiPanel, isBreadcrumbBarPanel: false);
+                if (!(currentOpenUIPanel is ShopPanel))
+                {
+                     UIManager.Instance.HideUIUIPanel(uiPanel, isBreadcrumbBarPanel: false);
+                }
+               
             }
 
             if (!shopPanel.IsClose)

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

@@ -36,13 +36,13 @@ namespace Fort23.Mono
                 Icon_Dj.gameObject.SetActive(true);
             }
 
-            //扣除失败后的经验
-            float failbl = xw == 0
-                ? PlayerManager.Instance.myHero.powerUpConfig.FailureExpReduce
-                : (float)(PlayerManager.Instance.myHero.powerUpConfig.FailureExpReduce * xw * 0.01f);
-            int failXw = (int)(PlayerManager.Instance.myHero.powerUpConfig.levelUpExp * failbl * 0.01f);
+            // //扣除失败后的经验
+            // float failbl = xw == 0
+            //     ? PlayerManager.Instance.myHero.powerUpConfig.FailureExpReduce
+            //     : (float)(PlayerManager.Instance.myHero.powerUpConfig.FailureExpReduce * xw * 0.01f);
+            // int failXw = (int)(PlayerManager.Instance.myHero.powerUpConfig.levelUpExp * failbl * 0.01f);
 
-            Text_Xw.text = LanguageManager.Instance.Text(10792, failXw);
+            Text_Xw.text = LanguageManager.Instance.Text(10792, xw);
         }
 
         public static async CTask<HeroBreakthroughFailPanel> OpenPanel(int type, int xw)

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

@@ -154,10 +154,10 @@ namespace Fort23.Mono
                     //失败
                     else
                     {
-                        RemoveHeroItem(list[1]);
+                        int xw =RemoveHeroItem(list[1]);
                         AudioManager.Instance.PlayAudio("ui_tuposhibai.wav");
                         HeroBreakthroughFailPanel heroBreakthroughFailPanel =
-                            await HeroBreakthroughFailPanel.OpenPanel(2, list[1]);
+                            await HeroBreakthroughFailPanel.OpenPanel(2, xw);
                         await heroBreakthroughFailPanel.UIClosed();
                         heroInformationPanel.RecoverDujie();
                         UIManager.Instance.HideUIUIPanel(this);
@@ -186,10 +186,11 @@ namespace Fort23.Mono
                         if (ramdomValue >= PlayerManager.Instance.myHero.hp.Value)
                         {
                             AudioManager.Instance.PlayAudio("ui_tuposhibai.wav");
-                            RemoveHeroItem(100);
+                            var list = GetBl();
+                            int xw = RemoveHeroItem(list[1]);
 
                             HeroBreakthroughFailPanel heroBreakthroughFailPanel =
-                                await HeroBreakthroughFailPanel.OpenPanel(3, 100);
+                                await HeroBreakthroughFailPanel.OpenPanel(3, xw);
                             await heroBreakthroughFailPanel.UIClosed();
                             heroInformationPanel.RecoverDujie();
                             UIManager.Instance.HideUIUIPanel(this);
@@ -239,19 +240,22 @@ namespace Fort23.Mono
             });
         }
 
-        private void RemoveHeroItem(int failBl)
+        private int RemoveHeroItem(int failBl)
         {
+            float allexp = HeroHerlp.GetHeroExp();
+            PlayerManager.Instance.myHero.heroData.exp += allexp;
             //扣除失败后的经验
             float failbl = failBl == 0
                 ? PlayerManager.Instance.myHero.powerUpConfig.FailureExpReduce
                 : (float)(PlayerManager.Instance.myHero.powerUpConfig.FailureExpReduce * failBl * 0.01f);
-            int failXw = (int)(PlayerManager.Instance.myHero.powerUpConfig.levelUpExp * failbl * 0.01f);
-            float allexp = HeroHerlp.GetHeroExp();
-            PlayerManager.Instance.myHero.heroData.exp += allexp;
+            int failXw = (int)(PlayerManager.Instance.myHero.heroData.exp * failbl * 0.01f);
+
+
             PlayerManager.Instance.myHero.heroData.exp -= failXw;
             PlayerManager.Instance.myHero.heroData.upTime = TimeHelper.ClientNow();
             // PlayerManager.Instance.myHero.heroData.isCombat = false;
             AccountFileInfo.Instance.SavePlayerData();
+            return failXw;
         }
 
         // private async CTask UpHero(int type,HeroInfo nextHeroInfo)

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

@@ -97,6 +97,23 @@ namespace Fort23.Mono
         public async override CTask<bool> AsyncInit(object[] uiData)
         {
             shopId = int.Parse(uiData[0].ToString());
+            
+            foreach (var shopGroupWidgetType1 in _shopGroupWidgetType1s)
+            {
+                UIManager.Instance.DormancyGComponent(shopGroupWidgetType1);
+            }
+
+            _shopGroupWidgetType1s.Clear();
+  
+
+            foreach (var shopBtnWidget in _shopBtnWidgets)
+            {
+                UIManager.Instance.DormancyGComponent(shopBtnWidget);
+            }
+
+            _shopBtnWidgets.Clear();
+            currentSelectedShopBtnWidget = null;
+            
             List<ShopGroupConfig> shopGroupConfigs = ConfigComponent.Instance.GetAll<ShopGroupConfig>().ToList();
             shopGroupConfigs.Sort(Sort);
             foreach (var shopGroupConfig in shopGroupConfigs)
@@ -250,12 +267,7 @@ namespace Fort23.Mono
             }
 
             _shopGroupWidgetType1s.Clear();
-            // foreach (var widget in _energyWidgets)
-            // {
-            //     UIManager.Instance.DormancyGComponent(widget);
-            // }
-            //
-            // _energyWidgets.Clear();
+  
 
             foreach (var shopBtnWidget in _shopBtnWidgets)
             {

Assets/Scripts/GameUI/Utility/SkiptoHelper.cs

@@ -34,7 +34,7 @@ namespace Mono.Utility
                     return;
                 //商店界面
                 case 4:
-                    UIManager.Instance.GetComponent<AppBarPanel>().Btn_Shop_Click(skiptoConfig.SkipArguments[0]);
+                    UIManager.Instance.GetComponent<AppBarPanel>().Btn_Shop_Click(skiptoConfig.SkipArguments[0], true);
                     return;
                 //实用神识界面
                 case 5: