修改bug

Assets/Res/Config/HeroPowerUpConfig.json

@@ -7812,8 +7812,8 @@
       "HPFactor": 64254.9766,
       "ATKFactor": 679.0936,
       "DEFFactor": 679.0936,
-      "HudunFactor": 4388.21,
-      "defK": 487579,
+      "HudunFactor": 4390.41,
+      "defK": 487823,
       "ShenshiMax": 1800,
       "AutoXiuwei": 0.42,
       "FailureExpReduce": -1,
@@ -7843,8 +7843,8 @@
       "HPFactor": 65379.543,
       "ATKFactor": 688.262634,
       "DEFFactor": 688.262634,
-      "HudunFactor": 4442.85,
-      "defK": 493650,
+      "HudunFactor": 4447.29,
+      "defK": 494143,
       "ShenshiMax": 1800,
       "AutoXiuwei": 0.42,
       "FailureExpReduce": -1,
@@ -7874,8 +7874,8 @@
       "HPFactor": 66522.76,
       "ATKFactor": 697.5555,
       "DEFFactor": 697.5555,
-      "HudunFactor": 4498.27,
-      "defK": 499808,
+      "HudunFactor": 4505.0,
+      "defK": 500556,
       "ShenshiMax": 1800,
       "AutoXiuwei": 0.43,
       "FailureExpReduce": -1,
@@ -7905,8 +7905,8 @@
       "HPFactor": 67684.93,
       "ATKFactor": 706.973755,
       "DEFFactor": 706.973755,
-      "HudunFactor": 4554.5,
-      "defK": 506055,
+      "HudunFactor": 4563.58,
+      "defK": 507064,
       "ShenshiMax": 1800,
       "AutoXiuwei": 0.43,
       "FailureExpReduce": -1,
@@ -7936,8 +7936,8 @@
       "HPFactor": 68866.36,
       "ATKFactor": 716.519165,
       "DEFFactor": 716.519165,
-      "HudunFactor": 4611.52,
-      "defK": 512391,
+      "HudunFactor": 4623.0,
+      "defK": 513667,
       "ShenshiMax": 1800,
       "AutoXiuwei": 0.43,
       "FailureExpReduce": -1,
@@ -7967,8 +7967,8 @@
       "HPFactor": 70067.35,
       "ATKFactor": 726.1935,
       "DEFFactor": 726.1935,
-      "HudunFactor": 4668.18,
-      "defK": 518687,
+      "HudunFactor": 4682.39,
+      "defK": 520265,
       "ShenshiMax": 1800,
       "AutoXiuwei": 0.43,
       "FailureExpReduce": -1,
@@ -7998,8 +7998,8 @@
       "HPFactor": 71288.22,
       "ATKFactor": 735.9984,
       "DEFFactor": 735.9984,
-      "HudunFactor": 4725.65,
-      "defK": 525072,
+      "HudunFactor": 4742.63,
+      "defK": 526959,
       "ShenshiMax": 1800,
       "AutoXiuwei": 0.43,
       "FailureExpReduce": -1,
@@ -8029,8 +8029,8 @@
       "HPFactor": 72529.28,
       "ATKFactor": 745.9357,
       "DEFFactor": 745.9357,
-      "HudunFactor": 4783.93,
-      "defK": 531548,
+      "HudunFactor": 4803.76,
+      "defK": 533751,
       "ShenshiMax": 1800,
       "AutoXiuwei": 0.44,
       "FailureExpReduce": -1,
@@ -8060,8 +8060,8 @@
       "HPFactor": 73790.86,
       "ATKFactor": 756.007263,
       "DEFFactor": 756.007263,
-      "HudunFactor": 4843.04,
-      "defK": 538116,
+      "HudunFactor": 4865.78,
+      "defK": 540642,
       "ShenshiMax": 1800,
       "AutoXiuwei": 0.44,
       "FailureExpReduce": -1,
@@ -8107,8 +8107,8 @@
       "HPFactor": 75073.28,
       "ATKFactor": 766.2147,
       "DEFFactor": 766.2147,
-      "HudunFactor": 5175.38,
-      "defK": 544777,
+      "HudunFactor": 5202.51,
+      "defK": 547633,
       "ShenshiMax": 1800,
       "AutoXiuwei": 0.44,
       "FailureExpReduce": 15,
@@ -8138,8 +8138,8 @@
       "HPFactor": 82895.3359,
       "ATKFactor": 842.8362,
       "DEFFactor": 842.8362,
-      "HudunFactor": 5808.23,
-      "defK": 611393,
+      "HudunFactor": 5841.86,
+      "defK": 614933,
       "ShenshiMax": 1800,
       "AutoXiuwei": 0.44,
       "FailureExpReduce": -1,
@@ -8169,8 +8169,8 @@
       "HPFactor": 84333.55,
       "ATKFactor": 854.216,
       "DEFFactor": 854.216,
-      "HudunFactor": 5879.0,
-      "defK": 618842,
+      "HudunFactor": 5916.25,
+      "defK": 622763,
       "ShenshiMax": 1800,
       "AutoXiuwei": 0.44,
       "FailureExpReduce": -1,
@@ -8200,8 +8200,8 @@
       "HPFactor": 85795.4844,
       "ATKFactor": 865.7495,
       "DEFFactor": 865.7495,
-      "HudunFactor": 5950.76,
-      "defK": 626396,
+      "HudunFactor": 5991.72,
+      "defK": 630707,
       "ShenshiMax": 1800,
       "AutoXiuwei": 0.45,
       "FailureExpReduce": -1,
@@ -8231,8 +8231,8 @@
       "HPFactor": 87281.53,
       "ATKFactor": 877.4387,
       "DEFFactor": 877.4387,
-      "HudunFactor": 6023.54,
-      "defK": 634057,
+      "HudunFactor": 6068.29,
+      "defK": 638767,
       "ShenshiMax": 1800,
       "AutoXiuwei": 0.45,
       "FailureExpReduce": -1,
@@ -8262,8 +8262,8 @@
       "HPFactor": 88792.0547,
       "ATKFactor": 889.285767,
       "DEFFactor": 889.285767,
-      "HudunFactor": 6097.37,
-      "defK": 641828,
+      "HudunFactor": 6145.96,
+      "defK": 646943,
       "ShenshiMax": 1800,
       "AutoXiuwei": 0.45,
       "FailureExpReduce": -1,
@@ -8293,8 +8293,8 @@
       "HPFactor": 90327.47,
       "ATKFactor": 901.2927,
       "DEFFactor": 901.2927,
-      "HudunFactor": 6172.23,
-      "defK": 649708,
+      "HudunFactor": 6224.77,
+      "defK": 655239,
       "ShenshiMax": 1800,
       "AutoXiuwei": 0.45,
       "FailureExpReduce": -1,
@@ -8324,8 +8324,8 @@
       "HPFactor": 91888.15,
       "ATKFactor": 913.461853,
       "DEFFactor": 913.461853,
-      "HudunFactor": 6248.16,
-      "defK": 657701,
+      "HudunFactor": 6304.73,
+      "defK": 663656,
       "ShenshiMax": 1800,
       "AutoXiuwei": 0.46,
       "FailureExpReduce": -1,
@@ -8355,8 +8355,8 @@
       "HPFactor": 93474.51,
       "ATKFactor": 925.7952,
       "DEFFactor": 925.7952,
-      "HudunFactor": 6325.16,
-      "defK": 665806,
+      "HudunFactor": 6385.85,
+      "defK": 672195,
       "ShenshiMax": 1800,
       "AutoXiuwei": 0.46,
       "FailureExpReduce": -1,
@@ -8386,8 +8386,8 @@
       "HPFactor": 95086.95,
       "ATKFactor": 938.295166,
       "DEFFactor": 938.295166,
-      "HudunFactor": 6403.27,
-      "defK": 674028,
+      "HudunFactor": 6468.16,
+      "defK": 680859,
       "ShenshiMax": 1800,
       "AutoXiuwei": 0.46,
       "FailureExpReduce": -1,
@@ -8433,8 +8433,8 @@
       "HPFactor": 96725.91,
       "ATKFactor": 950.963867,
       "DEFFactor": 950.963867,
-      "HudunFactor": 6823.65,
-      "defK": 682365,
+      "HudunFactor": 6896.49,
+      "defK": 689649,
       "ShenshiMax": 1800,
       "AutoXiuwei": 0.46,
       "FailureExpReduce": 15,
@@ -8464,8 +8464,8 @@
       "HPFactor": 106789.109,
       "ATKFactor": 1046.06018,
       "DEFFactor": 1046.06018,
-      "HudunFactor": 7658.0,
-      "defK": 765800,
+      "HudunFactor": 7743.86,
+      "defK": 774386,
       "ShenshiMax": 1800,
       "AutoXiuwei": 0.46,
       "FailureExpReduce": -1,
@@ -8495,8 +8495,8 @@
       "HPFactor": 108626.836,
       "ATKFactor": 1060.184,
       "DEFFactor": 1060.184,
-      "HudunFactor": 7751.23,
-      "defK": 775123,
+      "HudunFactor": 7842.29,
+      "defK": 784229,
       "ShenshiMax": 1800,
       "AutoXiuwei": 0.47,
       "FailureExpReduce": -1,
@@ -8526,8 +8526,8 @@
       "HPFactor": 110494.727,
       "ATKFactor": 1074.49841,
       "DEFFactor": 1074.49841,
-      "HudunFactor": 7845.78,
-      "defK": 784578,
+      "HudunFactor": 7942.16,
+      "defK": 794216,
       "ShenshiMax": 1800,
       "AutoXiuwei": 0.47,
       "FailureExpReduce": -1,
@@ -8557,8 +8557,8 @@
       "HPFactor": 112393.258,
       "ATKFactor": 1089.0061,
       "DEFFactor": 1089.0061,
-      "HudunFactor": 7941.68,
-      "defK": 794168,
+      "HudunFactor": 8043.48,
+      "defK": 804348,
       "ShenshiMax": 1800,
       "AutoXiuwei": 0.47,
       "FailureExpReduce": -1,
@@ -8588,8 +8588,8 @@
       "HPFactor": 114322.914,
       "ATKFactor": 1103.70959,
       "DEFFactor": 1103.70959,
-      "HudunFactor": 8038.93,
-      "defK": 803893,
+      "HudunFactor": 8146.28,
+      "defK": 814628,
       "ShenshiMax": 1800,
       "AutoXiuwei": 0.47,
       "FailureExpReduce": -1,
@@ -8619,8 +8619,8 @@
       "HPFactor": 116284.18,
       "ATKFactor": 1118.61169,
       "DEFFactor": 1118.61169,
-      "HudunFactor": 8137.57,
-      "defK": 813757,
+      "HudunFactor": 8250.57,
+      "defK": 825057,
       "ShenshiMax": 1800,
       "AutoXiuwei": 0.48,
       "FailureExpReduce": -1,
@@ -8650,8 +8650,8 @@
       "HPFactor": 118277.57,
       "ATKFactor": 1133.71509,
       "DEFFactor": 1133.71509,
-      "HudunFactor": 8237.6,
-      "defK": 823760,
+      "HudunFactor": 8356.37,
+      "defK": 835637,
       "ShenshiMax": 1800,
       "AutoXiuwei": 0.48,
       "FailureExpReduce": -1,
@@ -8681,8 +8681,8 @@
       "HPFactor": 120303.594,
       "ATKFactor": 1149.02234,
       "DEFFactor": 1149.02234,
-      "HudunFactor": 8339.06,
-      "defK": 833906,
+      "HudunFactor": 8463.72,
+      "defK": 846372,
       "ShenshiMax": 1800,
       "AutoXiuwei": 0.48,
       "FailureExpReduce": -1,
@@ -8712,8 +8712,8 @@
       "HPFactor": 122362.766,
       "ATKFactor": 1164.53613,
       "DEFFactor": 1164.53613,
-      "HudunFactor": 8441.96,
-      "defK": 844196,
+      "HudunFactor": 8572.63,
+      "defK": 857263,
       "ShenshiMax": 1800,
       "AutoXiuwei": 0.48,
       "FailureExpReduce": -1,
@@ -8754,15 +8754,15 @@
         1
       ],
       "LeijieDamages": [
-        27035683,
-        40553525,
+        27468440,
+        41202660,
         10
       ],
       "HPFactor": 124455.609,
       "ATKFactor": 1180.25952,
       "DEFFactor": 1180.25952,
-      "HudunFactor": 8973.64,
-      "defK": 854632,
+      "HudunFactor": 9117.28,
+      "defK": 868312,
       "ShenshiMax": 1800,
       "AutoXiuwei": 0.48,
       "FailureExpReduce": 15,
@@ -8792,8 +8792,8 @@
       "HPFactor": 162365.234,
       "ATKFactor": 1534.3374,
       "DEFFactor": 1534.3374,
-      "HudunFactor": 11901.82,
-      "defK": 1133507,
+      "HudunFactor": 12098.64,
+      "defK": 1152251,
       "ShenshiMax": 1900,
       "AutoXiuwei": 0.49,
       "FailureExpReduce": -1,
@@ -8823,8 +8823,8 @@
       "HPFactor": 165138.125,
       "ATKFactor": 1555.05383,
       "DEFFactor": 1555.05383,
-      "HudunFactor": 12046.62,
-      "defK": 1147297,
+      "HudunFactor": 12252.18,
+      "defK": 1166874,
       "ShenshiMax": 1900,
       "AutoXiuwei": 0.49,
       "FailureExpReduce": -1,
@@ -8854,8 +8854,8 @@
       "HPFactor": 167956.313,
       "ATKFactor": 1576.0498,
       "DEFFactor": 1576.0498,
-      "HudunFactor": 12193.47,
-      "defK": 1161283,
+      "HudunFactor": 12407.94,
+      "defK": 1181709,
       "ShenshiMax": 1900,
       "AutoXiuwei": 0.49,
       "FailureExpReduce": -1,
@@ -8885,8 +8885,8 @@
       "HPFactor": 170820.484,
       "ATKFactor": 1597.32935,
       "DEFFactor": 1597.32935,
-      "HudunFactor": 12342.4,
-      "defK": 1175467,
+      "HudunFactor": 12565.98,
+      "defK": 1196760,
       "ShenshiMax": 1900,
       "AutoXiuwei": 0.49,
       "FailureExpReduce": -1,
@@ -8916,8 +8916,8 @@
       "HPFactor": 173731.391,
       "ATKFactor": 1618.89624,
       "DEFFactor": 1618.89624,
-      "HudunFactor": 12493.45,
-      "defK": 1189852,
+      "HudunFactor": 12726.3,
+      "defK": 1212029,
       "ShenshiMax": 1900,
       "AutoXiuwei": 0.5,
       "FailureExpReduce": -1,
@@ -8947,8 +8947,8 @@
       "HPFactor": 176689.766,
       "ATKFactor": 1640.75427,
       "DEFFactor": 1640.75427,
-      "HudunFactor": 12646.64,
-      "defK": 1204442,
+      "HudunFactor": 12888.97,
+      "defK": 1227521,
       "ShenshiMax": 1900,
       "AutoXiuwei": 0.5,
       "FailureExpReduce": -1,
@@ -8978,8 +8978,8 @@
       "HPFactor": 179696.344,
       "ATKFactor": 1662.90747,
       "DEFFactor": 1662.90747,
-      "HudunFactor": 12802.0,
-      "defK": 1219238,
+      "HudunFactor": 13054.0,
+      "defK": 1243238,
       "ShenshiMax": 1900,
       "AutoXiuwei": 0.5,
       "FailureExpReduce": -1,
@@ -9009,8 +9009,8 @@
       "HPFactor": 182751.9,
       "ATKFactor": 1685.35986,
       "DEFFactor": 1685.35986,
-      "HudunFactor": 12959.57,
-      "defK": 1234245,
+      "HudunFactor": 13221.42,
+      "defK": 1259183,
       "ShenshiMax": 1900,
       "AutoXiuwei": 0.5,
       "FailureExpReduce": -1,
@@ -9040,8 +9040,8 @@
       "HPFactor": 185857.219,
       "ATKFactor": 1708.11523,
       "DEFFactor": 1708.11523,
-      "HudunFactor": 13119.37,
-      "defK": 1249464,
+      "HudunFactor": 13391.28,
+      "defK": 1275360,
       "ShenshiMax": 1900,
       "AutoXiuwei": 0.51,
       "FailureExpReduce": -1,
@@ -9089,8 +9089,8 @@
       "HPFactor": 189013.078,
       "ATKFactor": 1731.178,
       "DEFFactor": 1731.178,
-      "HudunFactor": 13913.89,
-      "defK": 1264899,
+      "HudunFactor": 14209.5,
+      "defK": 1291773,
       "ShenshiMax": 1900,
       "AutoXiuwei": 0.51,
       "FailureExpReduce": 15,
@@ -9120,8 +9120,8 @@
       "HPFactor": 208625.469,
       "ATKFactor": 1904.29578,
       "DEFFactor": 1904.29578,
-      "HudunFactor": 15614.92,
-      "defK": 1419538,
+      "HudunFactor": 15954.76,
+      "defK": 1450433,
       "ShenshiMax": 1900,
       "AutoXiuwei": 0.51,
       "FailureExpReduce": -1,
@@ -9151,8 +9151,8 @@
       "HPFactor": 212162.984,
       "ATKFactor": 1930.0072,
       "DEFFactor": 1930.0072,
-      "HudunFactor": 15804.77,
-      "defK": 1436797,
+      "HudunFactor": 16156.92,
+      "defK": 1468811,
       "ShenshiMax": 1900,
       "AutoXiuwei": 0.51,
       "FailureExpReduce": -1,
@@ -9182,8 +9182,8 @@
       "HPFactor": 215757.984,
       "ATKFactor": 1956.0658,
       "DEFFactor": 1956.0658,
-      "HudunFactor": 15997.3,
-      "defK": 1454300,
+      "HudunFactor": 16362.02,
+      "defK": 1487456,
       "ShenshiMax": 1900,
       "AutoXiuwei": 0.52,
       "FailureExpReduce": -1,
@@ -9213,8 +9213,8 @@
       "HPFactor": 219411.391,
       "ATKFactor": 1982.47632,
       "DEFFactor": 1982.47632,
-      "HudunFactor": 16192.56,
-      "defK": 1472051,
+      "HudunFactor": 16570.08,
+      "defK": 1506371,
       "ShenshiMax": 1900,
       "AutoXiuwei": 0.52,
       "FailureExpReduce": -1,
@@ -9244,8 +9244,8 @@
       "HPFactor": 223124.125,
       "ATKFactor": 2009.24329,
       "DEFFactor": 2009.24329,
-      "HudunFactor": 16390.59,
-      "defK": 1490054,
+      "HudunFactor": 16781.17,
+      "defK": 1525561,
       "ShenshiMax": 1900,
       "AutoXiuwei": 0.52,
       "FailureExpReduce": -1,
@@ -9275,8 +9275,8 @@
       "HPFactor": 226897.109,
       "ATKFactor": 2036.37183,
       "DEFFactor": 2036.37183,
-      "HudunFactor": 16591.43,
-      "defK": 1508312,
+      "HudunFactor": 16995.33,
+      "defK": 1545030,
       "ShenshiMax": 1900,
       "AutoXiuwei": 0.52,
       "FailureExpReduce": -1,
@@ -9306,8 +9306,8 @@
       "HPFactor": 230731.313,
       "ATKFactor": 2063.86646,
       "DEFFactor": 2063.86646,
-      "HudunFactor": 16795.12,
-      "defK": 1526829,
+      "HudunFactor": 17212.59,
+      "defK": 1564781,
       "ShenshiMax": 1900,
       "AutoXiuwei": 0.53,
       "FailureExpReduce": -1,
@@ -9337,8 +9337,8 @@
       "HPFactor": 234627.672,
       "ATKFactor": 2091.73242,
       "DEFFactor": 2091.73242,
-      "HudunFactor": 17001.7,
-      "defK": 1545609,
+      "HudunFactor": 17433.01,
+      "defK": 1584819,
       "ShenshiMax": 1900,
       "AutoXiuwei": 0.53,
       "FailureExpReduce": -1,
@@ -9368,8 +9368,8 @@
       "HPFactor": 238587.2,
       "ATKFactor": 2119.97461,
       "DEFFactor": 2119.97461,
-      "HudunFactor": 17211.21,
-      "defK": 1564655,
+      "HudunFactor": 17656.64,
+      "defK": 1605149,
       "ShenshiMax": 1900,
       "AutoXiuwei": 0.53,
       "FailureExpReduce": -1,
@@ -9417,8 +9417,8 @@
       "HPFactor": 242610.875,
       "ATKFactor": 2148.59814,
       "DEFFactor": 2148.59814,
-      "HudunFactor": 18215.68,
-      "defK": 1583972,
+      "HudunFactor": 18696.39,
+      "defK": 1625773,
       "ShenshiMax": 1900,
       "AutoXiuwei": 0.53,
       "FailureExpReduce": 15,
@@ -9448,8 +9448,8 @@
       "HPFactor": 267754.5,
       "ATKFactor": 2363.458,
       "DEFFactor": 2363.458,
-      "HudunFactor": 20442.45,
-      "defK": 1777604,
+      "HudunFactor": 20992.35,
+      "defK": 1825422,
       "ShenshiMax": 1900,
       "AutoXiuwei": 0.54,
       "FailureExpReduce": -1,
@@ -9479,8 +9479,8 @@
       "HPFactor": 272264.125,
       "ATKFactor": 2395.36914,
       "DEFFactor": 2395.36914,
-      "HudunFactor": 20690.81,
-      "defK": 1799201,
+      "HudunFactor": 21257.92,
+      "defK": 1848515,
       "ShenshiMax": 1900,
       "AutoXiuwei": 0.54,
       "FailureExpReduce": -1,
@@ -9510,8 +9510,8 @@
       "HPFactor": 276846.75,
       "ATKFactor": 2427.711,
       "DEFFactor": 2427.711,
-      "HudunFactor": 20942.71,
-      "defK": 1821105,
+      "HudunFactor": 21527.34,
+      "defK": 1871943,
       "ShenshiMax": 1900,
       "AutoXiuwei": 0.54,
       "FailureExpReduce": -1,
@@ -9541,8 +9541,8 @@
       "HPFactor": 281503.438,
       "ATKFactor": 2460.4895,
       "DEFFactor": 2460.4895,
-      "HudunFactor": 21198.17,
-      "defK": 1843319,
+      "HudunFactor": 21800.68,
+      "defK": 1895711,
       "ShenshiMax": 1900,
       "AutoXiuwei": 0.54,
       "FailureExpReduce": -1,
@@ -9572,8 +9572,8 @@
       "HPFactor": 286235.438,
       "ATKFactor": 2493.71069,
       "DEFFactor": 2493.71069,
-      "HudunFactor": 21457.24,
-      "defK": 1865847,
+      "HudunFactor": 22077.98,
+      "defK": 1919824,
       "ShenshiMax": 1900,
       "AutoXiuwei": 0.55,
       "FailureExpReduce": -1,
@@ -9603,8 +9603,8 @@
       "HPFactor": 291043.9,
       "ATKFactor": 2527.38013,
       "DEFFactor": 2527.38013,
-      "HudunFactor": 21719.99,
-      "defK": 1888695,
+      "HudunFactor": 22359.3,
+      "defK": 1944287,
       "ShenshiMax": 1900,
       "AutoXiuwei": 0.55,
       "FailureExpReduce": -1,
@@ -9634,8 +9634,8 @@
       "HPFactor": 295930.0,
       "ATKFactor": 2561.50439,
       "DEFFactor": 2561.50439,
-      "HudunFactor": 21986.47,
-      "defK": 1911867,
+      "HudunFactor": 22644.7,
+      "defK": 1969104,
       "ShenshiMax": 1900,
       "AutoXiuwei": 0.55,
       "FailureExpReduce": -1,
@@ -9665,8 +9665,8 @@
       "HPFactor": 300895.031,
       "ATKFactor": 2596.0896,
       "DEFFactor": 2596.0896,
-      "HudunFactor": 22256.73,
-      "defK": 1935368,
+      "HudunFactor": 22934.24,
+      "defK": 1994282,
       "ShenshiMax": 1900,
       "AutoXiuwei": 0.55,
       "FailureExpReduce": -1,
@@ -9697,8 +9697,8 @@
       "HPFactor": 305940.156,
       "ATKFactor": 2631.14136,
       "DEFFactor": 2631.14136,
-      "HudunFactor": 22530.82,
-      "defK": 1959202,
+      "HudunFactor": 23228.0,
+      "defK": 2019826,
       "ShenshiMax": 1900,
       "AutoXiuwei": 0.56,
       "FailureExpReduce": -1,
@@ -9715,7 +9715,9 @@
       "jingjie2": 21,
       "jingjie3": 10,
       "jingjieLanIDs": [
-        10688
+        10688,
+        10802,
+        10803
       ],
       "levelUpExp": 8100,
       "DujieLevelbattleID": 100006,
@@ -9739,15 +9741,15 @@
         1
       ],
       "LeijieDamages": [
-        70748867,
-        106123300,
+        72973569,
+        109460353,
         11
       ],
       "HPFactor": 311066.656,
       "ATKFactor": 2666.66675,
       "DEFFactor": 2666.66675,
-      "HudunFactor": 24260.22,
-      "defK": 2021685,
+      "HudunFactor": 25023.08,
+      "defK": 2085257,
       "ShenshiMax": 1900,
       "AutoXiuwei": 0.56,
       "FailureExpReduce": 15,

Assets/Res/Config/LanguageChineseConfig.json

@@ -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,
@@ -40243,6 +40243,14 @@
     {
       "ID": 10801,
       "txt": "达到{0}解锁！"
+    },
+    {
+      "ID": 10802,
+      "txt": " "
+    },
+    {
+      "ID": 10803,
+      "txt": " "
     }
   ]
 }

Assets/Scripts/GameLogic/Player/SummonManager.cs

@@ -93,13 +93,14 @@ namespace GameLogic.Player
                             {
                                 return null;
                             }
+                            await TimerComponent.Instance.WaitAsync(1000);
                         }
                         else
                         {
                             return null;
                         }
 
-                        await TimerComponent.Instance.WaitAsync(1000);
+                     
 #endif
                     }
                     else

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

@@ -67,7 +67,7 @@ namespace Fort23.Mono
             tenButton.onClick.AddListener(async () =>
             {
 #if UNITY_ANDROID && !UNITY_EDITOR&& Ads
-                if (!PlayerManager.Instance.BagController.IsEnough(23001, 1))
+                 if (!PlayerManager.Instance.BagController.IsEnough(23001, 1) && !PlayerManager.Instance.BagController.IsEnough(23002, 1))
                 {
                     bool relust = await TipsPanle.OpenPnael(10800);
                     if (!relust)

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

@@ -21,6 +21,7 @@ namespace Fort23.Mono
     [UIBinding(prefab = "HeroInformationPanel")]
     public partial class HeroInformationPanel : UIPanel
     {
+        private int maxLevel = 300;
         private GameObjectPool modelObj;
 
         List<HeroAttributeWidget> HeroAttributeWidgets = new List<HeroAttributeWidget>();
@@ -155,9 +156,6 @@ namespace Fort23.Mono
                         HeroBreakthroughSuccessPanel heroBreakthroughSuccessPanel =
                             await HeroBreakthroughSuccessPanel.OpenPanel(1, heroAttributData);
                         await heroBreakthroughSuccessPanel.UIClosed();
-
-
-                      
                     }
                     //大突破
                     else
@@ -188,118 +186,13 @@ namespace Fort23.Mono
         {
             ClosePool();
 
-            await CreatHero();
-
-
-            heroInfo = PlayerManager.Instance.myHero.CopyHero();
-            heroInfo.InitHero(PlayerManager.Instance.myHero.heroData.heroModelId,
-                PlayerManager.Instance.myHero.heroData.heroPowerId + 1);
-
-
             int currentMiao = (int)((TimeHelper.ClientNow() - PlayerManager.Instance.myHero.heroData.upTime) /
                                     1000);
 
             float allexp = currentMiao * PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei;
-            int redDotID = 5;
-            AccountFileInfo.RedDot redDot = RedDotManager.Instance.GetRedDot(redDotID);
-            if (redDot == null)
-            {
-                redDot = new AccountFileInfo.RedDot();
-                redDot.id = redDotID;
-            }
-
-
-            if (PlayerManager.Instance.myHero.powerUpConfig.jingjie1 == heroInfo.powerUpConfig.jingjie1)
-            {
-                //大突破
-                if (PlayerManager.Instance.myHero.powerUpConfig.jingjie2 != heroInfo.powerUpConfig.jingjie2)
-                {
-                    for (var i = 0;
-                         i < PlayerManager.Instance.myHero.powerUpConfig.DujieMustItemIDs.Length;
-                         i++)
-                    {
-                        if (!PlayerManager.Instance.BagController.IsEnough(
-                                PlayerManager.Instance.myHero.powerUpConfig.DujieMustItemIDs[i], 1))
-                        {
-                            break;
-                        }
-                    }
-
-                    if (!redDot.Params.Contains(PlayerManager.Instance.myHero.powerUpConfig.ID.ToString()))
-                    {
-                        redDot.Params.Add(PlayerManager.Instance.myHero.powerUpConfig.ID.ToString());
-                        RedDotManager.Instance.AddRedDot(redDot);
-                    }
-                }
-            }
-            else
-            {
-                for (var i = 0;
-                     i < PlayerManager.Instance.myHero.powerUpConfig.DujieMustItemIDs.Length;
-                     i++)
-                {
-                    if (!PlayerManager.Instance.BagController.IsEnough(
-                            PlayerManager.Instance.myHero.powerUpConfig.DujieMustItemIDs[i], 1))
-                    {
-                        break;
-                    }
-                }
-
-                if (!redDot.Params.Contains(PlayerManager.Instance.myHero.powerUpConfig.ID.ToString()))
-                {
-                    redDot.Params.Add(PlayerManager.Instance.myHero.powerUpConfig.ID.ToString());
-                    RedDotManager.Instance.AddRedDot(redDot);
-                }
-            }
-
-
-            HeroAttributeWidget heroAttributeWidget =
-                await UIManager.Instance.CreateGComponent<HeroAttributeWidget>(null, AttributeRoot);
-            heroAttributeWidget.CustomInit(new HeroAttributeData("生命",
-                PlayerManager.Instance.myHero.hp.Value.ToStringEx(),
-                "+" + (heroInfo.hp.Value - PlayerManager.Instance.myHero.hp.Value).ToStringEx()));
-            HeroAttributeWidgets.Add(heroAttributeWidget);
-
-            heroAttributeWidget =
-                await UIManager.Instance.CreateGComponent<HeroAttributeWidget>(null, AttributeRoot);
-            heroAttributeWidget.CustomInit(new HeroAttributeData("攻击",
-                PlayerManager.Instance.myHero.attack.Value.ToStringEx(),
-                "+" + (heroInfo.attack.Value - PlayerManager.Instance.myHero.attack.Value).ToStringEx()));
-            HeroAttributeWidgets.Add(heroAttributeWidget);
-
-            heroAttributeWidget =
-                await UIManager.Instance.CreateGComponent<HeroAttributeWidget>(null, AttributeRoot);
-            heroAttributeWidget.CustomInit(new HeroAttributeData("防御",
-                PlayerManager.Instance.myHero.defense.Value.ToStringEx(),
-                "+" + (heroInfo.defense.Value - PlayerManager.Instance.myHero.defense.Value).ToStringEx()));
-            HeroAttributeWidgets.Add(heroAttributeWidget);
-
+            // await CreatHero();
             Slider_Exp.maxValue = PlayerManager.Instance.myHero.powerUpConfig.levelUpExp;
             Slider_Exp.value = PlayerManager.Instance.myHero.heroData.exp;
-            //
-            // heroAttributeWidget = await UIManager.Instance.CreateGComponent<HeroAttributeWidget>(null, AttributeRoot);
-            // heroAttributeWidget.CustomInit("生命", PlayerManager.Instance.myHero.hp.Value.ToString(), (heroInfo.hp.Value - PlayerManager.Instance.myHero.hp.Value).ToString());
-            // HeroAttributeWidgets.Add(heroAttributeWidget);
-            if (PlayerManager.Instance.myHero.heroData.isYuanMan)
-            {
-                Text_Jingjie1.text =
-                    LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[0]) +
-                    LanguageManager.Instance.Text(10429) + LanguageManager.Instance.Text(10381);
-            }
-            else
-            {
-                Text_Jingjie1.text =
-                    LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[0]) +
-                    LanguageManager.Instance.Text(10429);
-            }
-
-            string jingjie =
-                LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[0]) +
-                LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[1]) +
-                LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[2]);
-            Text_Jingjie.text = LanguageManager.Instance.Text(10225, jingjie,
-                PlayerManager.Instance.myHero.powerUpConfig.jingjie3, 10);
-
 
             for (var i = 0; i < JingJieIcons.Count; i++)
             {
@@ -331,72 +224,202 @@ namespace Fort23.Mono
                     PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei);
             }
 
-
-            //可以突破特效设置
-            fx_ui_tupo_loop.gameObject.SetActive(false);
-            fx_ui_pojing_loop.gameObject.SetActive(false);
-            fx_ui_pojing_loop2.gameObject.SetActive(false);
-            fx_ui_dujie_loop.gameObject.SetActive(false);
-            if (PlayerManager.Instance.myHero.heroData.exp + allexp >=
-                PlayerManager.Instance.myHero.powerUpConfig.levelUpExp)
+            if (PlayerManager.Instance.myHero.heroData.heroPowerId >= maxLevel)
+            {
+                Btn_TuPo.gameObject.SetActive(false);
+
+                HeroAttributeWidget heroAttributeWidget =
+                    await UIManager.Instance.CreateGComponent<HeroAttributeWidget>(null, AttributeRoot);
+                heroAttributeWidget.CustomInit(new HeroAttributeData("生命",
+                    PlayerManager.Instance.myHero.hp.Value.ToStringEx(), "Max"));
+                HeroAttributeWidgets.Add(heroAttributeWidget);
+
+                heroAttributeWidget =
+                    await UIManager.Instance.CreateGComponent<HeroAttributeWidget>(null, AttributeRoot);
+                heroAttributeWidget.CustomInit(new HeroAttributeData("攻击",
+                    PlayerManager.Instance.myHero.attack.Value.ToStringEx(), "Max"));
+                HeroAttributeWidgets.Add(heroAttributeWidget);
+
+                heroAttributeWidget =
+                    await UIManager.Instance.CreateGComponent<HeroAttributeWidget>(null, AttributeRoot);
+                heroAttributeWidget.CustomInit(new HeroAttributeData("防御",
+                    PlayerManager.Instance.myHero.defense.Value.ToStringEx(), "Max"));
+                HeroAttributeWidgets.Add(heroAttributeWidget);
+            }
+            else
             {
+                Btn_TuPo.gameObject.SetActive(true);
+                heroInfo = PlayerManager.Instance.myHero.CopyHero();
+                heroInfo.InitHero(PlayerManager.Instance.myHero.heroData.heroModelId,
+                    PlayerManager.Instance.myHero.heroData.heroPowerId + 1);
+
+
+                int redDotID = 5;
+                AccountFileInfo.RedDot redDot = RedDotManager.Instance.GetRedDot(redDotID);
+                if (redDot == null)
+                {
+                    redDot = new AccountFileInfo.RedDot();
+                    redDot.id = redDotID;
+                }
+
+
                 if (PlayerManager.Instance.myHero.powerUpConfig.jingjie1 == heroInfo.powerUpConfig.jingjie1)
                 {
-                    //小突破
-                    if (PlayerManager.Instance.myHero.powerUpConfig.jingjie2 == heroInfo.powerUpConfig.jingjie2)
+                    //大突破
+                    if (PlayerManager.Instance.myHero.powerUpConfig.jingjie2 != heroInfo.powerUpConfig.jingjie2)
                     {
-                        fx_ui_tupo_loop.gameObject.SetActive(true);
-                        fx_ui_tupo_loop.Play();
+                        for (var i = 0;
+                             i < PlayerManager.Instance.myHero.powerUpConfig.DujieMustItemIDs.Length;
+                             i++)
+                        {
+                            if (!PlayerManager.Instance.BagController.IsEnough(
+                                    PlayerManager.Instance.myHero.powerUpConfig.DujieMustItemIDs[i], 1))
+                            {
+                                break;
+                            }
+                        }
+
+                        if (!redDot.Params.Contains(PlayerManager.Instance.myHero.powerUpConfig.ID.ToString()))
+                        {
+                            redDot.Params.Add(PlayerManager.Instance.myHero.powerUpConfig.ID.ToString());
+                            RedDotManager.Instance.AddRedDot(redDot);
+                        }
                     }
-                    //破镜
-                    else
+                }
+                else
+                {
+                    for (var i = 0;
+                         i < PlayerManager.Instance.myHero.powerUpConfig.DujieMustItemIDs.Length;
+                         i++)
+                    {
+                        if (!PlayerManager.Instance.BagController.IsEnough(
+                                PlayerManager.Instance.myHero.powerUpConfig.DujieMustItemIDs[i], 1))
+                        {
+                            break;
+                        }
+                    }
+
+                    if (!redDot.Params.Contains(PlayerManager.Instance.myHero.powerUpConfig.ID.ToString()))
                     {
-                        fx_ui_pojing_loop.Play();
-                        fx_ui_pojing_loop.gameObject.SetActive(true);
+                        redDot.Params.Add(PlayerManager.Instance.myHero.powerUpConfig.ID.ToString());
+                        RedDotManager.Instance.AddRedDot(redDot);
                     }
                 }
-                //圆满
-                else if (!PlayerManager.Instance.myHero.heroData.isYuanMan)
+
+
+                HeroAttributeWidget heroAttributeWidget =
+                    await UIManager.Instance.CreateGComponent<HeroAttributeWidget>(null, AttributeRoot);
+                heroAttributeWidget.CustomInit(new HeroAttributeData("生命",
+                    PlayerManager.Instance.myHero.hp.Value.ToStringEx(),
+                    "+" + (heroInfo.hp.Value - PlayerManager.Instance.myHero.hp.Value).ToStringEx()));
+                HeroAttributeWidgets.Add(heroAttributeWidget);
+
+                heroAttributeWidget =
+                    await UIManager.Instance.CreateGComponent<HeroAttributeWidget>(null, AttributeRoot);
+                heroAttributeWidget.CustomInit(new HeroAttributeData("攻击",
+                    PlayerManager.Instance.myHero.attack.Value.ToStringEx(),
+                    "+" + (heroInfo.attack.Value - PlayerManager.Instance.myHero.attack.Value).ToStringEx()));
+                HeroAttributeWidgets.Add(heroAttributeWidget);
+
+                heroAttributeWidget =
+                    await UIManager.Instance.CreateGComponent<HeroAttributeWidget>(null, AttributeRoot);
+                heroAttributeWidget.CustomInit(new HeroAttributeData("防御",
+                    PlayerManager.Instance.myHero.defense.Value.ToStringEx(),
+                    "+" + (heroInfo.defense.Value - PlayerManager.Instance.myHero.defense.Value).ToStringEx()));
+                HeroAttributeWidgets.Add(heroAttributeWidget);
+
+
+                //
+                // heroAttributeWidget = await UIManager.Instance.CreateGComponent<HeroAttributeWidget>(null, AttributeRoot);
+                // heroAttributeWidget.CustomInit("生命", PlayerManager.Instance.myHero.hp.Value.ToString(), (heroInfo.hp.Value - PlayerManager.Instance.myHero.hp.Value).ToString());
+                // HeroAttributeWidgets.Add(heroAttributeWidget);
+                if (PlayerManager.Instance.myHero.heroData.isYuanMan)
                 {
-                    fx_ui_pojing_loop2.gameObject.SetActive(true);
-                    fx_ui_pojing_loop2.Play();
+                    Text_Jingjie1.text =
+                        LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[0]) +
+                        LanguageManager.Instance.Text(10429) + LanguageManager.Instance.Text(10381);
                 }
-                else if (PlayerManager.Instance.myHero.heroData.isYuanMan)
+                else
                 {
-                    fx_ui_dujie_loop.gameObject.SetActive(true);
-                    fx_ui_dujie_loop.Play();
+                    Text_Jingjie1.text =
+                        LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[0]) +
+                        LanguageManager.Instance.Text(10429);
                 }
-            }
 
+                string jingjie =
+                    LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[0]) +
+                    LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[1]) +
+                    LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[2]);
+                Text_Jingjie.text = LanguageManager.Instance.Text(10225, jingjie,
+                    PlayerManager.Instance.myHero.powerUpConfig.jingjie3, 10);
 
-            Text_exp.text =
-                $"{(int)PlayerManager.Instance.myHero.exp.Value + allexp}/{PlayerManager.Instance.myHero.powerUpConfig.levelUpExp}";
 
-            //突破按钮图片和文字设置
-            if (PlayerManager.Instance.myHero.powerUpConfig.jingjie1 == heroInfo.powerUpConfig.jingjie1 &&
-                PlayerManager.Instance.myHero.powerUpConfig.jingjie2 == heroInfo.powerUpConfig.jingjie2)
-            {
-                Btn_TuPo.GetComponent<MyImage>().icon_name = "btn_xiulianTupo";
-                Text_TuPo.text = LanguageManager.Instance.Text(10228);
-            }
-            else if (PlayerManager.Instance.myHero.powerUpConfig.jingjie1 == heroInfo.powerUpConfig.jingjie1 &&
-                     PlayerManager.Instance.myHero.powerUpConfig.jingjie2 != heroInfo.powerUpConfig.jingjie2)
-            {
-                Btn_TuPo.GetComponent<MyImage>().icon_name = "btn_xiulianTupo";
-                Text_TuPo.text = "破镜";
-            }
+                //可以突破特效设置
+                fx_ui_tupo_loop.gameObject.SetActive(false);
+                fx_ui_pojing_loop.gameObject.SetActive(false);
+                fx_ui_pojing_loop2.gameObject.SetActive(false);
+                fx_ui_dujie_loop.gameObject.SetActive(false);
+                if (PlayerManager.Instance.myHero.heroData.exp + allexp >=
+                    PlayerManager.Instance.myHero.powerUpConfig.levelUpExp)
+                {
+                    if (PlayerManager.Instance.myHero.powerUpConfig.jingjie1 == heroInfo.powerUpConfig.jingjie1)
+                    {
+                        //小突破
+                        if (PlayerManager.Instance.myHero.powerUpConfig.jingjie2 == heroInfo.powerUpConfig.jingjie2)
+                        {
+                            fx_ui_tupo_loop.gameObject.SetActive(true);
+                            fx_ui_tupo_loop.Play();
+                        }
+                        //破镜
+                        else
+                        {
+                            fx_ui_pojing_loop.Play();
+                            fx_ui_pojing_loop.gameObject.SetActive(true);
+                        }
+                    }
+                    //圆满
+                    else if (!PlayerManager.Instance.myHero.heroData.isYuanMan)
+                    {
+                        fx_ui_pojing_loop2.gameObject.SetActive(true);
+                        fx_ui_pojing_loop2.Play();
+                    }
+                    else if (PlayerManager.Instance.myHero.heroData.isYuanMan)
+                    {
+                        fx_ui_dujie_loop.gameObject.SetActive(true);
+                        fx_ui_dujie_loop.Play();
+                    }
+                }
 
-            else
-            {
-                if (PlayerManager.Instance.myHero.heroData.isYuanMan)
+
+                Text_exp.text =
+                    $"{(int)PlayerManager.Instance.myHero.exp.Value + allexp}/{PlayerManager.Instance.myHero.powerUpConfig.levelUpExp}";
+
+                //突破按钮图片和文字设置
+                if (PlayerManager.Instance.myHero.powerUpConfig.jingjie1 == heroInfo.powerUpConfig.jingjie1 &&
+                    PlayerManager.Instance.myHero.powerUpConfig.jingjie2 == heroInfo.powerUpConfig.jingjie2)
+                {
+                    Btn_TuPo.GetComponent<MyImage>().icon_name = "btn_xiulianTupo";
+                    Text_TuPo.text = LanguageManager.Instance.Text(10228);
+                }
+                else if (PlayerManager.Instance.myHero.powerUpConfig.jingjie1 == heroInfo.powerUpConfig.jingjie1 &&
+                         PlayerManager.Instance.myHero.powerUpConfig.jingjie2 != heroInfo.powerUpConfig.jingjie2)
                 {
-                    Btn_TuPo.GetComponent<MyImage>().icon_name = "btn_xiulianDujie";
-                    Text_TuPo.text = LanguageManager.Instance.Text(10229);
+                    Btn_TuPo.GetComponent<MyImage>().icon_name = "btn_xiulianTupo";
+                    Text_TuPo.text = "破镜";
                 }
+
                 else
                 {
-                    Btn_TuPo.GetComponent<MyImage>().icon_name = "btn_xiulianTupo2";
-                    Text_TuPo.text = LanguageManager.Instance.Text(10228);
+                    if (PlayerManager.Instance.myHero.heroData.isYuanMan)
+                    {
+                        Btn_TuPo.GetComponent<MyImage>().icon_name = "btn_xiulianDujie";
+                        Text_TuPo.text = LanguageManager.Instance.Text(10229);
+                    }
+                    else
+                    {
+                        Btn_TuPo.GetComponent<MyImage>().icon_name = "btn_xiulianTupo2";
+                        Text_TuPo.text = LanguageManager.Instance.Text(10228);
+                    }
                 }
             }
         }

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

@@ -59,7 +59,7 @@ namespace Fort23.Mono
             Btn_ShuangBei.onClick.AddListener(async () =>
             {
 #if UNITY_ANDROID && !UNITY_EDITOR&& Ads
-                if (!PlayerManager.Instance.BagController.IsEnough(23001, 1))
+                if (!PlayerManager.Instance.BagController.IsEnough(23001, 1) && !PlayerManager.Instance.BagController.IsEnough(23002, 1))
                 {
                     bool relust = await TipsPanle.OpenPnael(10800);
                     if (!relust)