Merge commit 'e0b6df55d8026cb0c2ab96f364a3d3751813152f' into Taptap

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

@@ -1035,7 +1035,7 @@
     {
       "ID": 2001,
       "GroupMonsterLevel": [
-        1
+        31
       ],
       "GroupMonster": [
         5001
@@ -1044,7 +1044,7 @@
     {
       "ID": 2002,
       "GroupMonsterLevel": [
-        1
+        33
       ],
       "GroupMonster": [
         5002
@@ -1053,7 +1053,7 @@
     {
       "ID": 2003,
       "GroupMonsterLevel": [
-        1
+        36
       ],
       "GroupMonster": [
         5003
@@ -1062,7 +1062,7 @@
     {
       "ID": 2004,
       "GroupMonsterLevel": [
-        1
+        39
       ],
       "GroupMonster": [
         5004
@@ -1071,7 +1071,7 @@
     {
       "ID": 2005,
       "GroupMonsterLevel": [
-        1
+        41
       ],
       "GroupMonster": [
         9001
@@ -1080,7 +1080,7 @@
     {
       "ID": 2006,
       "GroupMonsterLevel": [
-        1
+        43
       ],
       "GroupMonster": [
         5004
@@ -1089,7 +1089,7 @@
     {
       "ID": 2007,
       "GroupMonsterLevel": [
-        1
+        46
       ],
       "GroupMonster": [
         5005
@@ -1098,7 +1098,7 @@
     {
       "ID": 2008,
       "GroupMonsterLevel": [
-        1
+        49
       ],
       "GroupMonster": [
         5006
@@ -1107,7 +1107,7 @@
     {
       "ID": 2009,
       "GroupMonsterLevel": [
-        1
+        51
       ],
       "GroupMonster": [
         5007
@@ -1116,7 +1116,7 @@
     {
       "ID": 2010,
       "GroupMonsterLevel": [
-        1
+        53
       ],
       "GroupMonster": [
         9002
@@ -1125,7 +1125,7 @@
     {
       "ID": 2011,
       "GroupMonsterLevel": [
-        1
+        56
       ],
       "GroupMonster": [
         5001
@@ -1134,7 +1134,7 @@
     {
       "ID": 2012,
       "GroupMonsterLevel": [
-        1
+        59
       ],
       "GroupMonster": [
         5002
@@ -1143,7 +1143,7 @@
     {
       "ID": 2013,
       "GroupMonsterLevel": [
-        1
+        61
       ],
       "GroupMonster": [
         5003
@@ -1152,7 +1152,7 @@
     {
       "ID": 2014,
       "GroupMonsterLevel": [
-        1
+        63
       ],
       "GroupMonster": [
         5004
@@ -1161,7 +1161,7 @@
     {
       "ID": 2015,
       "GroupMonsterLevel": [
-        1
+        66
       ],
       "GroupMonster": [
         9003
@@ -1170,7 +1170,7 @@
     {
       "ID": 2016,
       "GroupMonsterLevel": [
-        1
+        69
       ],
       "GroupMonster": [
         5004
@@ -1179,7 +1179,7 @@
     {
       "ID": 2017,
       "GroupMonsterLevel": [
-        1
+        71
       ],
       "GroupMonster": [
         5005
@@ -1188,7 +1188,7 @@
     {
       "ID": 2018,
       "GroupMonsterLevel": [
-        1
+        73
       ],
       "GroupMonster": [
         5006
@@ -1197,7 +1197,7 @@
     {
       "ID": 2019,
       "GroupMonsterLevel": [
-        1
+        76
       ],
       "GroupMonster": [
         5007
@@ -1206,7 +1206,7 @@
     {
       "ID": 2020,
       "GroupMonsterLevel": [
-        1
+        79
       ],
       "GroupMonster": [
         9004
@@ -1215,7 +1215,7 @@
     {
       "ID": 2021,
       "GroupMonsterLevel": [
-        1
+        81
       ],
       "GroupMonster": [
         5001
@@ -1224,7 +1224,7 @@
     {
       "ID": 2022,
       "GroupMonsterLevel": [
-        1
+        83
       ],
       "GroupMonster": [
         5002
@@ -1233,7 +1233,7 @@
     {
       "ID": 2023,
       "GroupMonsterLevel": [
-        1
+        86
       ],
       "GroupMonster": [
         5003
@@ -1242,7 +1242,7 @@
     {
       "ID": 2024,
       "GroupMonsterLevel": [
-        1
+        89
       ],
       "GroupMonster": [
         5004
@@ -1251,7 +1251,7 @@
     {
       "ID": 2025,
       "GroupMonsterLevel": [
-        1
+        91
       ],
       "GroupMonster": [
         9005
@@ -1260,7 +1260,7 @@
     {
       "ID": 2026,
       "GroupMonsterLevel": [
-        1
+        93
       ],
       "GroupMonster": [
         5004
@@ -1269,7 +1269,7 @@
     {
       "ID": 2027,
       "GroupMonsterLevel": [
-        1
+        96
       ],
       "GroupMonster": [
         5005
@@ -1278,7 +1278,7 @@
     {
       "ID": 2028,
       "GroupMonsterLevel": [
-        1
+        99
       ],
       "GroupMonster": [
         5006
@@ -1287,7 +1287,7 @@
     {
       "ID": 2029,
       "GroupMonsterLevel": [
-        1
+        101
       ],
       "GroupMonster": [
         5007
@@ -1296,7 +1296,7 @@
     {
       "ID": 2030,
       "GroupMonsterLevel": [
-        1
+        103
       ],
       "GroupMonster": [
         9002
@@ -1305,7 +1305,7 @@
     {
       "ID": 2031,
       "GroupMonsterLevel": [
-        1
+        106
       ],
       "GroupMonster": [
         5001
@@ -1314,7 +1314,7 @@
     {
       "ID": 2032,
       "GroupMonsterLevel": [
-        1
+        109
       ],
       "GroupMonster": [
         5002
@@ -1323,7 +1323,7 @@
     {
       "ID": 2033,
       "GroupMonsterLevel": [
-        1
+        111
       ],
       "GroupMonster": [
         5003
@@ -1332,7 +1332,7 @@
     {
       "ID": 2034,
       "GroupMonsterLevel": [
-        1
+        113
       ],
       "GroupMonster": [
         5004
@@ -1341,7 +1341,7 @@
     {
       "ID": 2035,
       "GroupMonsterLevel": [
-        1
+        116
       ],
       "GroupMonster": [
         9001
@@ -1350,7 +1350,7 @@
     {
       "ID": 2036,
       "GroupMonsterLevel": [
-        1
+        119
       ],
       "GroupMonster": [
         5004
@@ -1359,7 +1359,7 @@
     {
       "ID": 2037,
       "GroupMonsterLevel": [
-        1
+        121
       ],
       "GroupMonster": [
         5005
@@ -1368,7 +1368,7 @@
     {
       "ID": 2038,
       "GroupMonsterLevel": [
-        1
+        123
       ],
       "GroupMonster": [
         5006
@@ -1377,7 +1377,7 @@
     {
       "ID": 2039,
       "GroupMonsterLevel": [
-        1
+        126
       ],
       "GroupMonster": [
         5007
@@ -1386,7 +1386,7 @@
     {
       "ID": 2040,
       "GroupMonsterLevel": [
-        1
+        129
       ],
       "GroupMonster": [
         9002
@@ -1395,7 +1395,7 @@
     {
       "ID": 2041,
       "GroupMonsterLevel": [
-        1
+        131
       ],
       "GroupMonster": [
         5001
@@ -1404,7 +1404,7 @@
     {
       "ID": 2042,
       "GroupMonsterLevel": [
-        1
+        133
       ],
       "GroupMonster": [
         5002
@@ -1413,7 +1413,7 @@
     {
       "ID": 2043,
       "GroupMonsterLevel": [
-        1
+        136
       ],
       "GroupMonster": [
         5003
@@ -1422,7 +1422,7 @@
     {
       "ID": 2044,
       "GroupMonsterLevel": [
-        1
+        139
       ],
       "GroupMonster": [
         5004
@@ -1431,7 +1431,7 @@
     {
       "ID": 2045,
       "GroupMonsterLevel": [
-        1
+        141
       ],
       "GroupMonster": [
         9003
@@ -1440,7 +1440,7 @@
     {
       "ID": 2046,
       "GroupMonsterLevel": [
-        1
+        143
       ],
       "GroupMonster": [
         5004
@@ -1449,7 +1449,7 @@
     {
       "ID": 2047,
       "GroupMonsterLevel": [
-        1
+        146
       ],
       "GroupMonster": [
         5005
@@ -1458,7 +1458,7 @@
     {
       "ID": 2048,
       "GroupMonsterLevel": [
-        1
+        149
       ],
       "GroupMonster": [
         5006
@@ -1467,7 +1467,7 @@
     {
       "ID": 2049,
       "GroupMonsterLevel": [
-        1
+        151
       ],
       "GroupMonster": [
         5007
@@ -1476,7 +1476,7 @@
     {
       "ID": 2050,
       "GroupMonsterLevel": [
-        1
+        153
       ],
       "GroupMonster": [
         9004
@@ -1485,7 +1485,7 @@
     {
       "ID": 2051,
       "GroupMonsterLevel": [
-        1
+        156
       ],
       "GroupMonster": [
         5001
@@ -1494,7 +1494,7 @@
     {
       "ID": 2052,
       "GroupMonsterLevel": [
-        1
+        159
       ],
       "GroupMonster": [
         5002
@@ -1503,7 +1503,7 @@
     {
       "ID": 2053,
       "GroupMonsterLevel": [
-        1
+        161
       ],
       "GroupMonster": [
         5003
@@ -1512,7 +1512,7 @@
     {
       "ID": 2054,
       "GroupMonsterLevel": [
-        1
+        163
       ],
       "GroupMonster": [
         5004
@@ -1521,7 +1521,7 @@
     {
       "ID": 2055,
       "GroupMonsterLevel": [
-        1
+        166
       ],
       "GroupMonster": [
         9005
@@ -1530,7 +1530,7 @@
     {
       "ID": 2056,
       "GroupMonsterLevel": [
-        1
+        169
       ],
       "GroupMonster": [
         5004
@@ -1539,7 +1539,7 @@
     {
       "ID": 2057,
       "GroupMonsterLevel": [
-        1
+        171
       ],
       "GroupMonster": [
         5005
@@ -1548,7 +1548,7 @@
     {
       "ID": 2058,
       "GroupMonsterLevel": [
-        1
+        173
       ],
       "GroupMonster": [
         5006
@@ -1557,7 +1557,7 @@
     {
       "ID": 2059,
       "GroupMonsterLevel": [
-        1
+        176
       ],
       "GroupMonster": [
         5007
@@ -1566,7 +1566,7 @@
     {
       "ID": 2060,
       "GroupMonsterLevel": [
-        1
+        179
       ],
       "GroupMonster": [
         9002
@@ -1575,7 +1575,7 @@
     {
       "ID": 2061,
       "GroupMonsterLevel": [
-        1
+        181
       ],
       "GroupMonster": [
         5001
@@ -1584,7 +1584,7 @@
     {
       "ID": 2062,
       "GroupMonsterLevel": [
-        1
+        183
       ],
       "GroupMonster": [
         5002
@@ -1593,7 +1593,7 @@
     {
       "ID": 2063,
       "GroupMonsterLevel": [
-        1
+        186
       ],
       "GroupMonster": [
         5003
@@ -1602,7 +1602,7 @@
     {
       "ID": 2064,
       "GroupMonsterLevel": [
-        1
+        189
       ],
       "GroupMonster": [
         5004
@@ -1611,7 +1611,7 @@
     {
       "ID": 2065,
       "GroupMonsterLevel": [
-        1
+        191
       ],
       "GroupMonster": [
         9001
@@ -1620,7 +1620,7 @@
     {
       "ID": 2066,
       "GroupMonsterLevel": [
-        1
+        193
       ],
       "GroupMonster": [
         5004
@@ -1629,7 +1629,7 @@
     {
       "ID": 2067,
       "GroupMonsterLevel": [
-        1
+        196
       ],
       "GroupMonster": [
         5005
@@ -1638,7 +1638,7 @@
     {
       "ID": 2068,
       "GroupMonsterLevel": [
-        1
+        199
       ],
       "GroupMonster": [
         5006
@@ -1647,7 +1647,7 @@
     {
       "ID": 2069,
       "GroupMonsterLevel": [
-        1
+        201
       ],
       "GroupMonster": [
         5007
@@ -1656,7 +1656,7 @@
     {
       "ID": 2070,
       "GroupMonsterLevel": [
-        1
+        203
       ],
       "GroupMonster": [
         9002
@@ -1665,7 +1665,7 @@
     {
       "ID": 2071,
       "GroupMonsterLevel": [
-        1
+        206
       ],
       "GroupMonster": [
         5001
@@ -1674,7 +1674,7 @@
     {
       "ID": 2072,
       "GroupMonsterLevel": [
-        1
+        209
       ],
       "GroupMonster": [
         5002
@@ -1683,7 +1683,7 @@
     {
       "ID": 2073,
       "GroupMonsterLevel": [
-        1
+        211
       ],
       "GroupMonster": [
         5003
@@ -1692,7 +1692,7 @@
     {
       "ID": 2074,
       "GroupMonsterLevel": [
-        1
+        213
       ],
       "GroupMonster": [
         5004
@@ -1701,7 +1701,7 @@
     {
       "ID": 2075,
       "GroupMonsterLevel": [
-        1
+        216
       ],
       "GroupMonster": [
         9003
@@ -1710,7 +1710,7 @@
     {
       "ID": 2076,
       "GroupMonsterLevel": [
-        1
+        219
       ],
       "GroupMonster": [
         5004
@@ -1719,7 +1719,7 @@
     {
       "ID": 2077,
       "GroupMonsterLevel": [
-        1
+        221
       ],
       "GroupMonster": [
         5005
@@ -1728,7 +1728,7 @@
     {
       "ID": 2078,
       "GroupMonsterLevel": [
-        1
+        223
       ],
       "GroupMonster": [
         5006
@@ -1737,7 +1737,7 @@
     {
       "ID": 2079,
       "GroupMonsterLevel": [
-        1
+        226
       ],
       "GroupMonster": [
         5007
@@ -1746,7 +1746,7 @@
     {
       "ID": 2080,
       "GroupMonsterLevel": [
-        1
+        229
       ],
       "GroupMonster": [
         9004
@@ -1755,7 +1755,7 @@
     {
       "ID": 2081,
       "GroupMonsterLevel": [
-        1
+        231
       ],
       "GroupMonster": [
         5001
@@ -1764,7 +1764,7 @@
     {
       "ID": 2082,
       "GroupMonsterLevel": [
-        1
+        233
       ],
       "GroupMonster": [
         5002
@@ -1773,7 +1773,7 @@
     {
       "ID": 2083,
       "GroupMonsterLevel": [
-        1
+        236
       ],
       "GroupMonster": [
         5003
@@ -1782,7 +1782,7 @@
     {
       "ID": 2084,
       "GroupMonsterLevel": [
-        1
+        239
       ],
       "GroupMonster": [
         5004
@@ -1791,7 +1791,7 @@
     {
       "ID": 2085,
       "GroupMonsterLevel": [
-        1
+        241
       ],
       "GroupMonster": [
         9005
@@ -1800,7 +1800,7 @@
     {
       "ID": 2086,
       "GroupMonsterLevel": [
-        1
+        243
       ],
       "GroupMonster": [
         5004
@@ -1809,7 +1809,7 @@
     {
       "ID": 2087,
       "GroupMonsterLevel": [
-        1
+        246
       ],
       "GroupMonster": [
         5005
@@ -1818,7 +1818,7 @@
     {
       "ID": 2088,
       "GroupMonsterLevel": [
-        1
+        249
       ],
       "GroupMonster": [
         5006
@@ -1827,7 +1827,7 @@
     {
       "ID": 2089,
       "GroupMonsterLevel": [
-        1
+        251
       ],
       "GroupMonster": [
         5007
@@ -1836,7 +1836,7 @@
     {
       "ID": 2090,
       "GroupMonsterLevel": [
-        1
+        253
       ],
       "GroupMonster": [
         9002
@@ -1845,7 +1845,7 @@
     {
       "ID": 2091,
       "GroupMonsterLevel": [
-        1
+        256
       ],
       "GroupMonster": [
         5001
@@ -1854,7 +1854,7 @@
     {
       "ID": 2092,
       "GroupMonsterLevel": [
-        1
+        260
       ],
       "GroupMonster": [
         5002
@@ -1863,7 +1863,7 @@
     {
       "ID": 2093,
       "GroupMonsterLevel": [
-        1
+        265
       ],
       "GroupMonster": [
         5003
@@ -1872,7 +1872,7 @@
     {
       "ID": 2094,
       "GroupMonsterLevel": [
-        1
+        270
       ],
       "GroupMonster": [
         5004
@@ -1881,7 +1881,7 @@
     {
       "ID": 2095,
       "GroupMonsterLevel": [
-        1
+        275
       ],
       "GroupMonster": [
         9005
@@ -1890,7 +1890,7 @@
     {
       "ID": 2096,
       "GroupMonsterLevel": [
-        1
+        280
       ],
       "GroupMonster": [
         5004
@@ -1899,7 +1899,7 @@
     {
       "ID": 2097,
       "GroupMonsterLevel": [
-        1
+        285
       ],
       "GroupMonster": [
         5005
@@ -1908,7 +1908,7 @@
     {
       "ID": 2098,
       "GroupMonsterLevel": [
-        1
+        290
       ],
       "GroupMonster": [
         5006
@@ -1917,7 +1917,7 @@
     {
       "ID": 2099,
       "GroupMonsterLevel": [
-        1
+        295
       ],
       "GroupMonster": [
         5007
@@ -1926,7 +1926,7 @@
     {
       "ID": 2100,
       "GroupMonsterLevel": [
-        1
+        300
       ],
       "GroupMonster": [
         9002

Assets/Res/Config/LanguageChineseConfig.json

@@ -7794,11 +7794,11 @@
     },
     {
       "ID": 1949,
-      "txt": "道具描述_好感度礼物1"
+      "txt": "道具描述_清茶"
     },
     {
       "ID": 1950,
-      "txt": "道具描述_好感度礼物2"
+      "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,
@@ -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();