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

Assets/Res/Config/EventConfig.json

@@ -116,7 +116,7 @@
         -6000,
         -2000
       ],
-      "RefreshProbability": 200,
+      "RefreshProbability": 300,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -147,7 +147,7 @@
         -6000,
         -2000
       ],
-      "RefreshProbability": 200,
+      "RefreshProbability": 300,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -178,7 +178,7 @@
         -6000,
         1
       ],
-      "RefreshProbability": 40,
+      "RefreshProbability": 50,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -209,7 +209,7 @@
         -6000,
         1
       ],
-      "RefreshProbability": 20,
+      "RefreshProbability": 100,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -240,7 +240,7 @@
         -6000,
         1
       ],
-      "RefreshProbability": 40,
+      "RefreshProbability": 50,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -271,7 +271,7 @@
         -6000,
         1
       ],
-      "RefreshProbability": 40,
+      "RefreshProbability": 50,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -395,7 +395,7 @@
         -9000,
         -2500
       ],
-      "RefreshProbability": 200,
+      "RefreshProbability": 300,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -426,7 +426,7 @@
         -9000,
         -2500
       ],
-      "RefreshProbability": 200,
+      "RefreshProbability": 300,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -457,7 +457,7 @@
         -9000,
         2
       ],
-      "RefreshProbability": 40,
+      "RefreshProbability": 50,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -488,7 +488,7 @@
         -9000,
         1
       ],
-      "RefreshProbability": 20,
+      "RefreshProbability": 100,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -519,7 +519,7 @@
         -9000,
         1
       ],
-      "RefreshProbability": 40,
+      "RefreshProbability": 50,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -550,7 +550,7 @@
         -9000,
         1
       ],
-      "RefreshProbability": 40,
+      "RefreshProbability": 50,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -674,7 +674,7 @@
         -12000,
         -3000
       ],
-      "RefreshProbability": 200,
+      "RefreshProbability": 300,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -705,7 +705,7 @@
         -12000,
         -3000
       ],
-      "RefreshProbability": 200,
+      "RefreshProbability": 300,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -736,7 +736,7 @@
         -12000,
         1
       ],
-      "RefreshProbability": 40,
+      "RefreshProbability": 50,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -767,7 +767,7 @@
         -12000,
         1
       ],
-      "RefreshProbability": 20,
+      "RefreshProbability": 100,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -798,7 +798,7 @@
         -12000,
         2
       ],
-      "RefreshProbability": 40,
+      "RefreshProbability": 50,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -829,7 +829,7 @@
         -12000,
         2
       ],
-      "RefreshProbability": 40,
+      "RefreshProbability": 50,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -953,7 +953,7 @@
         -20000,
         -4000
       ],
-      "RefreshProbability": 200,
+      "RefreshProbability": 300,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -984,7 +984,7 @@
         -20000,
         -4000
       ],
-      "RefreshProbability": 200,
+      "RefreshProbability": 300,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -1015,7 +1015,7 @@
         -20000,
         1
       ],
-      "RefreshProbability": 40,
+      "RefreshProbability": 50,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -1046,7 +1046,7 @@
         -20000,
         1
       ],
-      "RefreshProbability": 20,
+      "RefreshProbability": 100,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -1077,7 +1077,7 @@
         -20000,
         2
       ],
-      "RefreshProbability": 40,
+      "RefreshProbability": 50,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -1108,7 +1108,7 @@
         -20000,
         2
       ],
-      "RefreshProbability": 40,
+      "RefreshProbability": 50,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -1232,7 +1232,7 @@
         -30000,
         -5000
       ],
-      "RefreshProbability": 200,
+      "RefreshProbability": 300,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -1263,7 +1263,7 @@
         -30000,
         -5000
       ],
-      "RefreshProbability": 200,
+      "RefreshProbability": 300,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -1294,7 +1294,7 @@
         -30000,
         1
       ],
-      "RefreshProbability": 40,
+      "RefreshProbability": 50,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -1325,7 +1325,7 @@
         -30000,
         1
       ],
-      "RefreshProbability": 20,
+      "RefreshProbability": 100,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -1356,7 +1356,7 @@
         -30000,
         3
       ],
-      "RefreshProbability": 40,
+      "RefreshProbability": 50,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -1387,7 +1387,7 @@
         -30000,
         3
       ],
-      "RefreshProbability": 40,
+      "RefreshProbability": 50,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -1478,7 +1478,7 @@
       ],
       "PrizeNums": [
         1,
-        2,
+        1,
         500
       ],
       "RefreshProbability": 0,
@@ -1510,7 +1510,7 @@
       ],
       "PrizeNums": [
         1,
-        2,
+        1,
         500
       ],
       "RefreshProbability": 0,
@@ -1548,7 +1548,7 @@
       ],
       "PrizeNums": [
         1,
-        2,
+        1,
         500
       ],
       "RefreshProbability": 0,
@@ -1581,7 +1581,7 @@
       ],
       "PrizeNums": [
         1,
-        2,
+        1,
         1
       ],
       "RefreshProbability": 0,
@@ -1624,7 +1624,7 @@
       ],
       "PrizeNums": [
         1,
-        2,
+        1,
         550
       ],
       "RefreshProbability": 0,
@@ -1658,7 +1658,7 @@
       ],
       "PrizeNums": [
         1,
-        2,
+        1,
         550
       ],
       "RefreshProbability": 0,
@@ -1692,7 +1692,7 @@
       ],
       "PrizeNums": [
         1,
-        2,
+        1,
         600
       ],
       "RefreshProbability": 0,
@@ -1735,7 +1735,7 @@
       ],
       "PrizeNums": [
         1,
-        2,
+        1,
         1
       ],
       "RefreshProbability": 0,
@@ -1767,7 +1767,7 @@
       ],
       "PrizeNums": [
         1,
-        2,
+        1,
         600
       ],
       "RefreshProbability": 0,
@@ -1803,7 +1803,7 @@
       ],
       "PrizeNums": [
         1,
-        2,
+        1,
         1
       ],
       "RefreshProbability": 0,
@@ -1843,7 +1843,7 @@
       ],
       "PrizeNums": [
         1,
-        2,
+        1,
         700
       ],
       "RefreshProbability": 0,
@@ -1877,7 +1877,7 @@
       ],
       "PrizeNums": [
         1,
-        2,
+        1,
         700
       ],
       "RefreshProbability": 0,
@@ -1918,7 +1918,7 @@
       ],
       "PrizeNums": [
         1,
-        2,
+        1,
         700
       ],
       "RefreshProbability": 0,
@@ -1964,7 +1964,7 @@
       ],
       "PrizeNums": [
         1,
-        2,
+        1,
         750
       ],
       "RefreshProbability": 0,
@@ -2001,7 +2001,7 @@
       ],
       "PrizeNums": [
         1,
-        2,
+        1,
         800
       ],
       "RefreshProbability": 0,
@@ -2040,7 +2040,7 @@
       ],
       "PrizeNums": [
         1,
-        2,
+        1,
         850
       ],
       "RefreshProbability": 0,
@@ -2082,7 +2082,7 @@
       ],
       "PrizeNums": [
         1,
-        2,
+        1,
         850
       ],
       "RefreshProbability": 0,
@@ -2121,7 +2121,7 @@
       ],
       "PrizeNums": [
         1,
-        2,
+        1,
         900
       ],
       "RefreshProbability": 0,
@@ -2170,7 +2170,7 @@
       ],
       "PrizeNums": [
         1,
-        2,
+        1,
         950
       ],
       "RefreshProbability": 0,
@@ -2201,7 +2201,7 @@
       ],
       "PrizeNums": [
         1,
-        2,
+        1,
         1000
       ],
       "RefreshProbability": 0,
@@ -2234,7 +2234,7 @@
       ],
       "PrizeNums": [
         1,
-        2,
+        1,
         1000
       ],
       "RefreshProbability": 0,
@@ -2276,7 +2276,7 @@
       ],
       "PrizeNums": [
         1,
-        2,
+        1,
         1100
       ],
       "RefreshProbability": 0,
@@ -2308,7 +2308,7 @@
       ],
       "PrizeNums": [
         1,
-        2,
+        1,
         1150
       ],
       "RefreshProbability": 0,
@@ -2351,7 +2351,7 @@
       ],
       "PrizeNums": [
         1,
-        2,
+        1,
         1150
       ],
       "RefreshProbability": 0,
@@ -2388,7 +2388,7 @@
       ],
       "PrizeNums": [
         1,
-        2,
+        1,
         1350
       ],
       "RefreshProbability": 0,
@@ -2426,7 +2426,7 @@
       ],
       "PrizeNums": [
         1,
-        2,
+        1,
         1500
       ],
       "RefreshProbability": 0,
@@ -2491,7 +2491,7 @@
       ],
       "PrizeNums": [
         1,
-        2,
+        1,
         1650
       ],
       "RefreshProbability": 0,
@@ -2521,7 +2521,7 @@
       ],
       "PrizeNums": [
         1,
-        2,
+        1,
         1750
       ],
       "RefreshProbability": 0,
@@ -2570,7 +2570,7 @@
       ],
       "PrizeNums": [
         1,
-        2,
+        1,
         1850
       ],
       "RefreshProbability": 0,
@@ -2607,7 +2607,7 @@
       ],
       "PrizeNums": [
         1,
-        2,
+        1,
         2050
       ],
       "RefreshProbability": 0,
@@ -2652,7 +2652,7 @@
       ],
       "PrizeNums": [
         1,
-        2,
+        1,
         2250
       ],
       "RefreshProbability": 0,
@@ -3394,7 +3394,7 @@
         1,
         550
       ],
-      "RefreshProbability": 35,
+      "RefreshProbability": 30,
       "RefreshCount": 1,
       "placeID": 1,
       "SmallPlacesId": 0,
@@ -3438,7 +3438,7 @@
         2,
         550
       ],
-      "RefreshProbability": 30,
+      "RefreshProbability": 25,
       "RefreshCount": 1,
       "placeID": 1,
       "SmallPlacesId": 0,
@@ -3490,7 +3490,7 @@
         3,
         600
       ],
-      "RefreshProbability": 25,
+      "RefreshProbability": 20,
       "RefreshCount": 1,
       "placeID": 1,
       "SmallPlacesId": 0,
@@ -3669,7 +3669,7 @@
         1,
         600
       ],
-      "RefreshProbability": 35,
+      "RefreshProbability": 30,
       "RefreshCount": 1,
       "placeID": 1,
       "SmallPlacesId": 0,
@@ -3714,7 +3714,7 @@
         2,
         600
       ],
-      "RefreshProbability": 30,
+      "RefreshProbability": 25,
       "RefreshCount": 1,
       "placeID": 1,
       "SmallPlacesId": 0,
@@ -3761,7 +3761,7 @@
         3,
         650
       ],
-      "RefreshProbability": 25,
+      "RefreshProbability": 20,
       "RefreshCount": 1,
       "placeID": 1,
       "SmallPlacesId": 0,
@@ -3939,7 +3939,7 @@
         1,
         650
       ],
-      "RefreshProbability": 35,
+      "RefreshProbability": 30,
       "RefreshCount": 1,
       "placeID": 1,
       "SmallPlacesId": 0,
@@ -3980,7 +3980,7 @@
         2,
         700
       ],
-      "RefreshProbability": 30,
+      "RefreshProbability": 25,
       "RefreshCount": 1,
       "placeID": 1,
       "SmallPlacesId": 0,
@@ -4020,7 +4020,7 @@
         3,
         700
       ],
-      "RefreshProbability": 25,
+      "RefreshProbability": 20,
       "RefreshCount": 1,
       "placeID": 1,
       "SmallPlacesId": 0,
@@ -4191,7 +4191,7 @@
         1,
         700
       ],
-      "RefreshProbability": 35,
+      "RefreshProbability": 30,
       "RefreshCount": 1,
       "placeID": 2,
       "SmallPlacesId": 0,
@@ -4230,7 +4230,7 @@
         2,
         800
       ],
-      "RefreshProbability": 30,
+      "RefreshProbability": 25,
       "RefreshCount": 1,
       "placeID": 2,
       "SmallPlacesId": 0,
@@ -4272,7 +4272,7 @@
         3,
         850
       ],
-      "RefreshProbability": 25,
+      "RefreshProbability": 20,
       "RefreshCount": 1,
       "placeID": 2,
       "SmallPlacesId": 0,
@@ -4436,7 +4436,7 @@
         1,
         850
       ],
-      "RefreshProbability": 35,
+      "RefreshProbability": 30,
       "RefreshCount": 1,
       "placeID": 2,
       "SmallPlacesId": 0,
@@ -4475,7 +4475,7 @@
         2,
         950
       ],
-      "RefreshProbability": 30,
+      "RefreshProbability": 25,
       "RefreshCount": 1,
       "placeID": 2,
       "SmallPlacesId": 0,
@@ -4515,7 +4515,7 @@
         3,
         1050
       ],
-      "RefreshProbability": 25,
+      "RefreshProbability": 20,
       "RefreshCount": 1,
       "placeID": 2,
       "SmallPlacesId": 0,
@@ -4677,7 +4677,7 @@
         1,
         1150
       ],
-      "RefreshProbability": 35,
+      "RefreshProbability": 30,
       "RefreshCount": 1,
       "placeID": 3,
       "SmallPlacesId": 0,
@@ -4716,7 +4716,7 @@
         2,
         1300
       ],
-      "RefreshProbability": 30,
+      "RefreshProbability": 25,
       "RefreshCount": 1,
       "placeID": 3,
       "SmallPlacesId": 0,
@@ -4757,7 +4757,7 @@
         3,
         1450
       ],
-      "RefreshProbability": 25,
+      "RefreshProbability": 20,
       "RefreshCount": 1,
       "placeID": 3,
       "SmallPlacesId": 0,

Assets/Res/Config/EventNPC.json

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

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,
@@ -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,
@@ -40206,7 +40206,7 @@
     },
     {
       "ID": 10792,
-      "txt": "0"
+      "txt": "突破失败，你因此损失了{0}点修为。尝试加入更多天材地宝来提升突破概率吧。"
     },
     {
       "ID": 10793,

Assets/Res/UI/HeroInformainPanel/ExpElixirItemWidget.prefab

@@ -689,7 +689,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 43.997498, y: -12.5}
-  m_SizeDelta: {x: 0, y: 23.1372}
+  m_SizeDelta: {x: 24, y: 23.1372}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7796567445027890541
 CanvasRenderer:

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

@@ -1,3 +1,4 @@
+using Core.Language;
 using Fort23.Core;
 
 namespace Fort23.Mono
@@ -35,7 +36,7 @@ namespace Fort23.Mono
                 Icon_Dj.gameObject.SetActive(true);
             }
 
-            Text_Xw.text = "修为-" + xw;
+            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

@@ -586,11 +586,11 @@ namespace Fort23.Mono
         {
             int succesAllBl = 0;
             int failAllBl = 0;
-            if (heroPowerUpConfig.DujieLevelbattleID != -1 && PlayerManager.Instance.myHero.heroData.isCombat)
+            if (heroPowerUpConfig.jingjie2 != nextHeroInfo.powerUpConfig.jingjie2)
             {
                 succesAllBl += heroPowerUpConfig.DujieRateviaBattle;
             }
-
+          
 
             foreach (var breakthroughItemWidget in breakthroughItemWidgets)
             {

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

@@ -125,10 +125,7 @@ namespace Fort23.Mono
 
         private async void OnClick(ItemWidgetBasic obj)
         {
-            if (PlayerGuideManager.Instance.GuideIsCanDo(7, 1))
-            {
-                PlayerGuideManager.Instance.NextGuide();
-            }
+       
 
             ShopBtnWidget shopBtnWidget = obj as ShopBtnWidget;
             TitlePanel.OpenPanel(shopBtnWidget.ShopGroupConfig.titleShowItemIds.ToList());
@@ -177,7 +174,10 @@ namespace Fort23.Mono
                 }
             }
 
-
+            if (PlayerGuideManager.Instance.GuideIsCanDo(7, 1))
+            {
+                PlayerGuideManager.Instance.NextGuide();
+            }
             if (PlayerGuideManager.Instance.GuideIsCanDo(7, 4))
             {
                 PlayerGuideManager.Instance.NextGuide();