修改bug

Assets/Res/Config/BuffConfig.json

@@ -72,8 +72,8 @@
       "buffGroup": 1005,
       "overlayCount": 15,
       "effectValue": [
-        2.0,
-        1.0
+        1.0,
+        0.5
       ],
       "timeType": 2,
       "buffTime": 15.0,
@@ -517,7 +517,7 @@
       "buffGroup": 1029,
       "overlayCount": 15,
       "effectValue": [
-        1.0
+        2.0
       ],
       "timeType": 2,
       "buffTime": 30.0,
@@ -537,7 +537,7 @@
       "buffGroup": 1030,
       "overlayCount": 15,
       "effectValue": [
-        1.0
+        2.0
       ],
       "timeType": 2,
       "buffTime": 30.0,
@@ -557,7 +557,7 @@
       "buffGroup": 1031,
       "overlayCount": 15,
       "effectValue": [
-        1.0
+        2.0
       ],
       "timeType": 2,
       "buffTime": 30.0,
@@ -577,7 +577,7 @@
       "buffGroup": 1032,
       "overlayCount": 15,
       "effectValue": [
-        1.0
+        2.0
       ],
       "timeType": 2,
       "buffTime": 30.0,
@@ -597,7 +597,7 @@
       "buffGroup": 1033,
       "overlayCount": 15,
       "effectValue": [
-        1.0
+        2.0
       ],
       "timeType": 2,
       "buffTime": 30.0,

Assets/Res/Config/FabaoPowerupConfig.json

@@ -3,9 +3,9 @@
     {
       "ID": 1,
       "Power": 100,
-      "HP": 301.75,
-      "DEF": 7.5,
-      "ATK": 15.0,
+      "HP": 452.63,
+      "DEF": 15.0,
+      "ATK": 30.0,
       "NeedLv": 11,
       "PowerupItemIDs": [
         1001,
@@ -20,9 +20,9 @@
     {
       "ID": 2,
       "Power": 126,
-      "HP": 374.65,
-      "DEF": 8.85,
-      "ATK": 17.7,
+      "HP": 544.51,
+      "DEF": 17.15,
+      "ATK": 34.3,
       "NeedLv": 21,
       "PowerupItemIDs": [
         1001,
@@ -37,9 +37,9 @@
     {
       "ID": 3,
       "Power": 159,
-      "HP": 482.4,
-      "DEF": 10.8,
-      "ATK": 21.6,
+      "HP": 722.6,
+      "DEF": 21.57,
+      "ATK": 43.14,
       "NeedLv": 31,
       "PowerupItemIDs": [
         1001,
@@ -54,9 +54,9 @@
     {
       "ID": 4,
       "Power": 200,
-      "HP": 634.5,
-      "DEF": 13.5,
-      "ATK": 27.0,
+      "HP": 956.33,
+      "DEF": 27.13,
+      "ATK": 54.26,
       "NeedLv": 41,
       "PowerupItemIDs": [
         1001,
@@ -71,9 +71,9 @@
     {
       "ID": 5,
       "Power": 252,
-      "HP": 1147.0,
-      "DEF": 23.25,
-      "ATK": 46.5,
+      "HP": 1721.61,
+      "DEF": 46.53,
+      "ATK": 93.06,
       "NeedLv": 51,
       "PowerupItemIDs": [
         1001,
@@ -88,9 +88,9 @@
     {
       "ID": 6,
       "Power": 318,
-      "HP": 1511.25,
-      "DEF": 29.25,
-      "ATK": 58.5,
+      "HP": 2267.84,
+      "DEF": 58.53,
+      "ATK": 117.05,
       "NeedLv": 61,
       "PowerupItemIDs": [
         1001,
@@ -108,9 +108,9 @@
     {
       "ID": 7,
       "Power": 401,
-      "HP": 1984.5,
-      "DEF": 36.75,
-      "ATK": 73.5,
+      "HP": 2981.0,
+      "DEF": 73.61,
+      "ATK": 147.21,
       "NeedLv": 71,
       "PowerupItemIDs": [
         1001,
@@ -125,9 +125,9 @@
     {
       "ID": 8,
       "Power": 505,
-      "HP": 3557.45,
-      "DEF": 63.15,
-      "ATK": 126.3,
+      "HP": 5333.64,
+      "DEF": 126.24,
+      "ATK": 252.48,
       "NeedLv": 81,
       "PowerupItemIDs": [
         1001,
@@ -142,9 +142,9 @@
     {
       "ID": 9,
       "Power": 636,
-      "HP": 4655.2,
-      "DEF": 79.35,
-      "ATK": 158.7,
+      "HP": 6986.32,
+      "DEF": 158.78,
+      "ATK": 317.56,
       "NeedLv": 91,
       "PowerupItemIDs": [
         1001,
@@ -159,9 +159,9 @@
     {
       "ID": 10,
       "Power": 801,
-      "HP": 6093.9,
-      "DEF": 99.9,
-      "ATK": 199.8,
+      "HP": 9136.28,
+      "DEF": 199.7,
+      "ATK": 399.4,
       "NeedLv": 101,
       "PowerupItemIDs": [
         1001,
@@ -176,9 +176,9 @@
     {
       "ID": 11,
       "Power": 1009,
-      "HP": 10849.0,
-      "DEF": 171.3,
-      "ATK": 342.6,
+      "HP": 16268.99,
+      "DEF": 342.51,
+      "ATK": 685.01,
       "NeedLv": 111,
       "PowerupItemIDs": [
         1001,
@@ -193,9 +193,9 @@
     {
       "ID": 12,
       "Power": 1271,
-      "HP": 14144.6,
-      "DEF": 215.4,
-      "ATK": 430.8,
+      "HP": 21215.67,
+      "DEF": 430.78,
+      "ATK": 861.55,
       "NeedLv": 121,
       "PowerupItemIDs": [
         1001,
@@ -213,9 +213,9 @@
     {
       "ID": 13,
       "Power": 1601,
-      "HP": 18421.2,
-      "DEF": 270.9,
-      "ATK": 541.8,
+      "HP": 27631.8,
+      "DEF": 541.8,
+      "ATK": 1083.6,
       "NeedLv": 131,
       "PowerupItemIDs": [
         1001,
@@ -230,9 +230,9 @@
     {
       "ID": 14,
       "Power": 2017,
-      "HP": 32673.35,
-      "DEF": 464.55,
-      "ATK": 929.1,
+      "HP": 49017.15,
+      "DEF": 929.24,
+      "ATK": 1858.47,
       "NeedLv": 141,
       "PowerupItemIDs": [
         1001,
@@ -247,9 +247,9 @@
     {
       "ID": 15,
       "Power": 2541,
-      "HP": 42466.4,
-      "DEF": 584.4,
-      "ATK": 1168.8,
+      "HP": 63695.51,
+      "DEF": 1168.73,
+      "ATK": 2337.45,
       "NeedLv": 151,
       "PowerupItemIDs": [
         1001,
@@ -264,9 +264,9 @@
     {
       "ID": 16,
       "Power": 3202,
-      "HP": 55125.0,
-      "DEF": 735.0,
-      "ATK": 1470.0,
+      "HP": 82683.84,
+      "DEF": 1469.94,
+      "ATK": 2939.87,
       "NeedLv": 161,
       "PowerupItemIDs": [
         1001,
@@ -281,9 +281,9 @@
     {
       "ID": 17,
       "Power": 4035,
-      "HP": 97486.4,
-      "DEF": 1260.6,
-      "ATK": 2521.2,
+      "HP": 146222.063,
+      "DEF": 2521.07,
+      "ATK": 5042.14,
       "NeedLv": 171,
       "PowerupItemIDs": [
         1001,
@@ -298,9 +298,9 @@
     {
       "ID": 18,
       "Power": 5084,
-      "HP": 126299.547,
-      "DEF": 1585.35,
-      "ATK": 3170.7,
+      "HP": 189456.5,
+      "DEF": 3170.82,
+      "ATK": 6341.64,
       "NeedLv": 181,
       "PowerupItemIDs": [
         1001,
@@ -318,9 +318,9 @@
     {
       "ID": 19,
       "Power": 6406,
-      "HP": 163503.9,
-      "DEF": 1993.95,
-      "ATK": 3987.9,
+      "HP": 245263.844,
+      "DEF": 3988.03,
+      "ATK": 7976.06,
       "NeedLv": 191,
       "PowerupItemIDs": [
         1001,
@@ -335,9 +335,9 @@
     {
       "ID": 20,
       "Power": 8072,
-      "HP": 288407.344,
-      "DEF": 3419.85,
-      "ATK": 6839.7,
+      "HP": 432618.3,
+      "DEF": 6839.82,
+      "ATK": 13679.63,
       "NeedLv": 201,
       "PowerupItemIDs": [
         1001,
@@ -352,9 +352,9 @@
     {
       "ID": 21,
       "Power": 10171,
-      "HP": 372775.0,
-      "DEF": 4301.25,
-      "ATK": 8602.5,
+      "HP": 559170.938,
+      "DEF": 8602.63,
+      "ATK": 17205.26,
       "NeedLv": 211,
       "PowerupItemIDs": [
         1001,
@@ -369,9 +369,9 @@
     {
       "ID": 22,
       "Power": 12815,
-      "HP": 481481.1,
-      "DEF": 5409.9,
-      "ATK": 10819.8,
+      "HP": 722220.3,
+      "DEF": 10819.78,
+      "ATK": 21639.56,
       "NeedLv": 221,
       "PowerupItemIDs": [
         1001,
@@ -386,9 +386,9 @@
     {
       "ID": 23,
       "Power": 16147,
-      "HP": 847427.2,
-      "DEF": 9278.4,
-      "ATK": 18556.8,
+      "HP": 1271143.5,
+      "DEF": 18556.84,
+      "ATK": 37113.68,
       "NeedLv": 231,
       "PowerupItemIDs": [
         1001,
@@ -403,9 +403,9 @@
     {
       "ID": 24,
       "Power": 20345,
-      "HP": 1093061.88,
-      "DEF": 11669.7,
-      "ATK": 23339.4,
+      "HP": 1639598.13,
+      "DEF": 23339.48,
+      "ATK": 46678.95,
       "NeedLv": 241,
       "PowerupItemIDs": [
         1001,
@@ -423,9 +423,9 @@
     {
       "ID": 25,
       "Power": 25635,
-      "HP": 1409025.63,
-      "DEF": 14677.35,
-      "ATK": 29354.7,
+      "HP": 2113541.0,
+      "DEF": 29354.74,
+      "ATK": 58709.47,
       "NeedLv": 251,
       "PowerupItemIDs": [
         1001,
@@ -440,9 +440,9 @@
     {
       "ID": 26,
       "Power": 32300,
-      "HP": 2475345.0,
-      "DEF": 25173.0,
-      "ATK": 50346.0,
+      "HP": 3713007.5,
+      "DEF": 50345.87,
+      "ATK": 100691.727,
       "NeedLv": 261,
       "PowerupItemIDs": [
         1001,
@@ -457,9 +457,9 @@
     {
       "ID": 27,
       "Power": 40698,
-      "HP": 3187187.25,
-      "DEF": 31660.8,
-      "ATK": 63321.6,
+      "HP": 4780769.5,
+      "DEF": 63321.45,
+      "ATK": 126642.9,
       "NeedLv": 271,
       "PowerupItemIDs": [
         1001,
@@ -474,9 +474,9 @@
     {
       "ID": 28,
       "Power": 51279,
-      "HP": 4101527.0,
-      "DEF": 39820.65,
-      "ATK": 79641.3,
+      "HP": 6152284.5,
+      "DEF": 79641.23,
+      "ATK": 159282.453,
       "NeedLv": 281,
       "PowerupItemIDs": [
         1001,
@@ -491,9 +491,9 @@
     {
       "ID": 29,
       "Power": 64612,
-      "HP": 7193819.0,
-      "DEF": 68295.75,
-      "ATK": 136591.5,
+      "HP": 10790726.0,
+      "DEF": 136591.469,
+      "ATK": 273182.938,
       "NeedLv": 291,
       "PowerupItemIDs": [
         1001,
@@ -508,9 +508,9 @@
     {
       "ID": 30,
       "Power": 81411,
-      "HP": 9248298.0,
-      "DEF": 85897.5,
-      "ATK": 171795.0,
+      "HP": 1.387245E+07,
+      "DEF": 171795.047,
+      "ATK": 343590.1,
       "NeedLv": 300,
       "PowerupItemIDs": [
         1001,
@@ -528,9 +528,9 @@
     {
       "ID": 31,
       "Power": 102578,
-      "HP": 11883944.0,
-      "DEF": 108035.852,
-      "ATK": 216071.7,
+      "HP": 17825908.0,
+      "DEF": 216071.609,
+      "ATK": 432143.219,
       "NeedLv": 310,
       "PowerupItemIDs": [
         1001,

Assets/Res/Config/HeroPowerUpConfig.json

@@ -6628,7 +6628,7 @@
       "HPFactor": 22054.01,
       "ATKFactor": 669.5714,
       "DEFFactor": 669.5714,
-      "HudunFactor": 4393.78,
+      "HudunFactor": 4393.775,
       "defK": 418455,
       "ShenshiMax": 1600,
       "AutoXiuwei": 14.84,

Assets/Res/Config/MonsterPowerUpConfig.json

@@ -3681,7 +3681,7 @@
       "HPFactor": 68914.3047,
       "ATKFactor": 2092.275,
       "DEFFactor": 2092.275,
-      "HudunFactor": 4393.78,
+      "HudunFactor": 4393.775,
       "defK": 418455,
       "GongfaLv": 41,
       "GongfaStar": 5,

Assets/Res/Config/SkillConfig.json

@@ -419,7 +419,7 @@
         3.0,
         56.0,
         100.0,
-        10.0
+        30.0
       ],
       "intensifierIndex": [
         2
@@ -445,7 +445,7 @@
         3.0,
         73.0,
         100.0,
-        10.0
+        40.0
       ],
       "intensifierIndex": [
         2
@@ -480,7 +480,7 @@
         3.0,
         95.0,
         100.0,
-        10.0
+        50.0
       ],
       "intensifierIndex": [
         2
@@ -515,7 +515,7 @@
         3.0,
         115.0,
         100.0,
-        10.0
+        60.0
       ],
       "intensifierIndex": [
         2
@@ -550,7 +550,7 @@
         3.0,
         111.0,
         100.0,
-        10.0,
+        70.0,
         20.0
       ],
       "intensifierIndex": [
@@ -5393,7 +5393,7 @@
       "SkillType": 2,
       "level": 1,
       "effectValue": [
-        20.0,
+        10.0,
         9.0
       ],
       "intensifierIndex": [
@@ -5421,7 +5421,7 @@
       "SkillType": 2,
       "level": 2,
       "effectValue": [
-        20.0,
+        10.0,
         9.0
       ],
       "intensifierIndex": [
@@ -5458,7 +5458,7 @@
       "SkillType": 2,
       "level": 3,
       "effectValue": [
-        20.0,
+        10.0,
         9.0
       ],
       "intensifierIndex": [
@@ -5495,7 +5495,7 @@
       "SkillType": 2,
       "level": 4,
       "effectValue": [
-        20.0,
+        10.0,
         9.0
       ],
       "intensifierIndex": [
@@ -5532,7 +5532,7 @@
       "SkillType": 2,
       "level": 5,
       "effectValue": [
-        20.0,
+        10.0,
         9.0
       ],
       "intensifierIndex": [
@@ -5569,7 +5569,7 @@
       "SkillType": 2,
       "level": 6,
       "effectValue": [
-        20.0,
+        10.0,
         9.0,
         15.0
       ],
@@ -5795,8 +5795,9 @@
       "SkillType": 2,
       "level": 1,
       "effectValue": [
-        100.0,
-        10.0
+        5.0,
+        50.0,
+        150.0
       ],
       "intensifierIndex": [
         0
@@ -5822,8 +5823,9 @@
       "SkillType": 2,
       "level": 2,
       "effectValue": [
-        100.0,
-        10.0
+        5.0,
+        60.0,
+        170.0
       ],
       "intensifierIndex": [
         0
@@ -5858,8 +5860,9 @@
       "SkillType": 2,
       "level": 3,
       "effectValue": [
-        100.0,
-        10.0
+        5.0,
+        70.0,
+        190.0
       ],
       "intensifierIndex": [
         0
@@ -5894,8 +5897,9 @@
       "SkillType": 2,
       "level": 4,
       "effectValue": [
-        100.0,
-        10.0
+        5.0,
+        80.0,
+        210.0
       ],
       "intensifierIndex": [
         0
@@ -5930,8 +5934,9 @@
       "SkillType": 2,
       "level": 5,
       "effectValue": [
-        100.0,
-        10.0
+        5.0,
+        90.0,
+        230.0
       ],
       "intensifierIndex": [
         0
@@ -5966,9 +5971,9 @@
       "SkillType": 2,
       "level": 6,
       "effectValue": [
+        5.0,
         100.0,
-        10.0,
-        1.0
+        250.0
       ],
       "intensifierIndex": [
         0
@@ -6001,7 +6006,7 @@
       "SkillType": 2,
       "level": 1,
       "effectValue": [
-        5.0,
+        170.0,
         0.0
       ],
       "intensifierIndex": [
@@ -6025,8 +6030,9 @@
       "SkillType": 2,
       "level": 2,
       "effectValue": [
-        5.0,
-        0.0
+        190.0,
+        20.0,
+        20.0
       ],
       "intensifierIndex": [
         0
@@ -6058,8 +6064,9 @@
       "SkillType": 2,
       "level": 3,
       "effectValue": [
-        5.0,
-        0.0
+        210.0,
+        20.0,
+        20.0
       ],
       "intensifierIndex": [
         0
@@ -6091,8 +6098,9 @@
       "SkillType": 2,
       "level": 4,
       "effectValue": [
-        5.0,
-        0.0
+        230.0,
+        30.0,
+        30.0
       ],
       "intensifierIndex": [
         0
@@ -6124,8 +6132,9 @@
       "SkillType": 2,
       "level": 5,
       "effectValue": [
-        5.0,
-        0.0
+        250.0,
+        30.0,
+        30.0
       ],
       "intensifierIndex": [
         0
@@ -6157,9 +6166,9 @@
       "SkillType": 2,
       "level": 6,
       "effectValue": [
-        5.0,
+        270.0,
         30.0,
-        3.0
+        30.0
       ],
       "intensifierIndex": [
         0
@@ -6188,7 +6197,7 @@
       "SkillType": 2,
       "level": 1,
       "effectValue": [
-        30.0
+        230.0
       ],
       "intensifierIndex": [
         0
@@ -6211,7 +6220,7 @@
       "SkillType": 2,
       "level": 2,
       "effectValue": [
-        40.0
+        250.0
       ],
       "intensifierIndex": [
         0
@@ -6243,7 +6252,7 @@
       "SkillType": 2,
       "level": 3,
       "effectValue": [
-        50.0
+        270.0
       ],
       "intensifierIndex": [
         0
@@ -6275,7 +6284,7 @@
       "SkillType": 2,
       "level": 4,
       "effectValue": [
-        60.0
+        290.0
       ],
       "intensifierIndex": [
         0
@@ -6307,7 +6316,7 @@
       "SkillType": 2,
       "level": 5,
       "effectValue": [
-        70.0
+        310.0
       ],
       "intensifierIndex": [
         0
@@ -6339,7 +6348,7 @@
       "SkillType": 2,
       "level": 6,
       "effectValue": [
-        80.0
+        330.0
       ],
       "intensifierIndex": [
         0
@@ -7397,7 +7406,7 @@
       "SkillType": 2,
       "level": 2,
       "effectValue": [
-        40.0
+        45.0
       ],
       "intensifierIndex": [
         0
@@ -7432,7 +7441,7 @@
       "SkillType": 2,
       "level": 3,
       "effectValue": [
-        50.0
+        60.0
       ],
       "intensifierIndex": [
         0
@@ -7467,7 +7476,7 @@
       "SkillType": 2,
       "level": 4,
       "effectValue": [
-        60.0
+        75.0
       ],
       "intensifierIndex": [
         0
@@ -7502,7 +7511,7 @@
       "SkillType": 2,
       "level": 5,
       "effectValue": [
-        70.0
+        90.0
       ],
       "intensifierIndex": [
         0
@@ -7537,7 +7546,7 @@
       "SkillType": 2,
       "level": 6,
       "effectValue": [
-        80.0
+        105.0
       ],
       "intensifierIndex": [
         0
@@ -7960,7 +7969,7 @@
       "scriptName": "S3101",
       "IDGroup": 3101,
       "timelineName": "",
-      "cd": 10.0,
+      "cd": 30.0,
       "addcd": 1.0,
       "SkillType": 3,
       "level": 1,
@@ -7984,7 +7993,7 @@
       "scriptName": "S3101",
       "IDGroup": 3101,
       "timelineName": "",
-      "cd": 10.0,
+      "cd": 30.0,
       "addcd": 1.0,
       "SkillType": 3,
       "level": 2,
@@ -8017,7 +8026,7 @@
       "scriptName": "S3101",
       "IDGroup": 3101,
       "timelineName": "",
-      "cd": 10.0,
+      "cd": 30.0,
       "addcd": 1.0,
       "SkillType": 3,
       "level": 3,
@@ -8052,7 +8061,7 @@
       "scriptName": "S3101",
       "IDGroup": 3101,
       "timelineName": "",
-      "cd": 10.0,
+      "cd": 30.0,
       "addcd": 1.0,
       "SkillType": 3,
       "level": 4,
@@ -8087,7 +8096,7 @@
       "scriptName": "S3101",
       "IDGroup": 3101,
       "timelineName": "",
-      "cd": 10.0,
+      "cd": 30.0,
       "addcd": 1.0,
       "SkillType": 3,
       "level": 5,
@@ -8122,7 +8131,7 @@
       "scriptName": "S3101",
       "IDGroup": 3101,
       "timelineName": "",
-      "cd": 10.0,
+      "cd": 30.0,
       "addcd": 1.0,
       "SkillType": 3,
       "level": 6,
@@ -8155,7 +8164,7 @@
       "scriptName": "S3102",
       "IDGroup": 3102,
       "timelineName": "",
-      "cd": 10.0,
+      "cd": 30.0,
       "addcd": 1.0,
       "SkillType": 3,
       "level": 1,
@@ -8178,7 +8187,7 @@
       "scriptName": "S3102",
       "IDGroup": 3102,
       "timelineName": "",
-      "cd": 10.0,
+      "cd": 30.0,
       "addcd": 1.0,
       "SkillType": 3,
       "level": 2,
@@ -8201,7 +8210,7 @@
       "scriptName": "S3102",
       "IDGroup": 3102,
       "timelineName": "",
-      "cd": 10.0,
+      "cd": 30.0,
       "addcd": 1.0,
       "SkillType": 3,
       "level": 3,
@@ -8224,7 +8233,7 @@
       "scriptName": "S3102",
       "IDGroup": 3102,
       "timelineName": "",
-      "cd": 10.0,
+      "cd": 30.0,
       "addcd": 1.0,
       "SkillType": 3,
       "level": 4,
@@ -8247,7 +8256,7 @@
       "scriptName": "S3102",
       "IDGroup": 3102,
       "timelineName": "",
-      "cd": 10.0,
+      "cd": 30.0,
       "addcd": 1.0,
       "SkillType": 3,
       "level": 5,
@@ -8270,7 +8279,7 @@
       "scriptName": "S3102",
       "IDGroup": 3102,
       "timelineName": "",
-      "cd": 10.0,
+      "cd": 30.0,
       "addcd": 1.0,
       "SkillType": 3,
       "level": 6,
@@ -8293,7 +8302,7 @@
       "scriptName": "S3201",
       "IDGroup": 3201,
       "timelineName": "",
-      "cd": 10.0,
+      "cd": 30.0,
       "addcd": 1.0,
       "SkillType": 3,
       "level": 1,
@@ -8317,7 +8326,7 @@
       "scriptName": "S3201",
       "IDGroup": 3201,
       "timelineName": "",
-      "cd": 10.0,
+      "cd": 30.0,
       "addcd": 1.0,
       "SkillType": 3,
       "level": 2,
@@ -8341,7 +8350,7 @@
       "scriptName": "S3201",
       "IDGroup": 3201,
       "timelineName": "",
-      "cd": 10.0,
+      "cd": 30.0,
       "addcd": 1.0,
       "SkillType": 3,
       "level": 3,
@@ -8374,7 +8383,7 @@
       "scriptName": "S3201",
       "IDGroup": 3201,
       "timelineName": "",
-      "cd": 10.0,
+      "cd": 30.0,
       "addcd": 1.0,
       "SkillType": 3,
       "level": 4,
@@ -8409,7 +8418,7 @@
       "scriptName": "S3201",
       "IDGroup": 3201,
       "timelineName": "",
-      "cd": 10.0,
+      "cd": 30.0,
       "addcd": 1.0,
       "SkillType": 3,
       "level": 5,
@@ -8444,7 +8453,7 @@
       "scriptName": "S3201",
       "IDGroup": 3201,
       "timelineName": "",
-      "cd": 10.0,
+      "cd": 30.0,
       "addcd": 1.0,
       "SkillType": 3,
       "level": 6,
@@ -8477,7 +8486,7 @@
       "scriptName": "S3202",
       "IDGroup": 3202,
       "timelineName": "",
-      "cd": 10.0,
+      "cd": 30.0,
       "addcd": 1.0,
       "SkillType": 3,
       "level": 1,
@@ -8502,7 +8511,7 @@
       "scriptName": "S3202",
       "IDGroup": 3202,
       "timelineName": "",
-      "cd": 10.0,
+      "cd": 30.0,
       "addcd": 1.0,
       "SkillType": 3,
       "level": 2,
@@ -8536,7 +8545,7 @@
       "scriptName": "S3202",
       "IDGroup": 3202,
       "timelineName": "",
-      "cd": 10.0,
+      "cd": 30.0,
       "addcd": 1.0,
       "SkillType": 3,
       "level": 3,
@@ -8572,7 +8581,7 @@
       "scriptName": "S3202",
       "IDGroup": 3202,
       "timelineName": "",
-      "cd": 10.0,
+      "cd": 30.0,
       "addcd": 1.0,
       "SkillType": 3,
       "level": 4,
@@ -8605,7 +8614,7 @@
       "scriptName": "S3202",
       "IDGroup": 3202,
       "timelineName": "",
-      "cd": 10.0,
+      "cd": 30.0,
       "addcd": 1.0,
       "SkillType": 3,
       "level": 5,
@@ -8641,7 +8650,7 @@
       "scriptName": "S3202",
       "IDGroup": 3202,
       "timelineName": "",
-      "cd": 10.0,
+      "cd": 30.0,
       "addcd": 1.0,
       "SkillType": 3,
       "level": 6,
@@ -8675,7 +8684,7 @@
       "scriptName": "S3203",
       "IDGroup": 3203,
       "timelineName": "",
-      "cd": 10.0,
+      "cd": 30.0,
       "addcd": 1.0,
       "SkillType": 3,
       "level": 1,
@@ -8700,7 +8709,7 @@
       "scriptName": "S3203",
       "IDGroup": 3203,
       "timelineName": "",
-      "cd": 10.0,
+      "cd": 30.0,
       "addcd": 1.0,
       "SkillType": 3,
       "level": 2,
@@ -8725,7 +8734,7 @@
       "scriptName": "S3203",
       "IDGroup": 3203,
       "timelineName": "",
-      "cd": 10.0,
+      "cd": 30.0,
       "addcd": 1.0,
       "SkillType": 3,
       "level": 3,
@@ -8750,7 +8759,7 @@
       "scriptName": "S3203",
       "IDGroup": 3203,
       "timelineName": "",
-      "cd": 10.0,
+      "cd": 30.0,
       "addcd": 1.0,
       "SkillType": 3,
       "level": 4,
@@ -8775,7 +8784,7 @@
       "scriptName": "S3203",
       "IDGroup": 3203,
       "timelineName": "",
-      "cd": 10.0,
+      "cd": 30.0,
       "addcd": 1.0,
       "SkillType": 3,
       "level": 5,
@@ -8800,7 +8809,7 @@
       "scriptName": "S3203",
       "IDGroup": 3203,
       "timelineName": "",
-      "cd": 10.0,
+      "cd": 30.0,
       "addcd": 1.0,
       "SkillType": 3,
       "level": 6,
@@ -8825,7 +8834,7 @@
       "scriptName": "S3301",
       "IDGroup": 3301,
       "timelineName": "",
-      "cd": 10.0,
+      "cd": 30.0,
       "addcd": 1.0,
       "SkillType": 3,
       "level": 1,
@@ -8850,7 +8859,7 @@
       "scriptName": "S3301",
       "IDGroup": 3301,
       "timelineName": "",
-      "cd": 10.0,
+      "cd": 30.0,
       "addcd": 1.0,
       "SkillType": 3,
       "level": 2,
@@ -8875,7 +8884,7 @@
       "scriptName": "S3301",
       "IDGroup": 3301,
       "timelineName": "",
-      "cd": 10.0,
+      "cd": 30.0,
       "addcd": 1.0,
       "SkillType": 3,
       "level": 3,
@@ -8909,7 +8918,7 @@
       "scriptName": "S3301",
       "IDGroup": 3301,
       "timelineName": "",
-      "cd": 10.0,
+      "cd": 30.0,
       "addcd": 1.0,
       "SkillType": 3,
       "level": 4,
@@ -8941,7 +8950,7 @@
       "scriptName": "S3301",
       "IDGroup": 3301,
       "timelineName": "",
-      "cd": 10.0,
+      "cd": 30.0,
       "addcd": 1.0,
       "SkillType": 3,
       "level": 5,
@@ -8976,7 +8985,7 @@
       "scriptName": "S3301",
       "IDGroup": 3301,
       "timelineName": "",
-      "cd": 10.0,
+      "cd": 30.0,
       "addcd": 1.0,
       "SkillType": 3,
       "level": 6,
@@ -9008,7 +9017,7 @@
       "scriptName": "S3302",
       "IDGroup": 3302,
       "timelineName": "",
-      "cd": 10.0,
+      "cd": 30.0,
       "addcd": 1.0,
       "SkillType": 3,
       "level": 1,
@@ -9032,7 +9041,7 @@
       "scriptName": "S3302",
       "IDGroup": 3302,
       "timelineName": "",
-      "cd": 10.0,
+      "cd": 30.0,
       "addcd": 1.0,
       "SkillType": 3,
       "level": 2,
@@ -9056,7 +9065,7 @@
       "scriptName": "S3302",
       "IDGroup": 3302,
       "timelineName": "",
-      "cd": 10.0,
+      "cd": 30.0,
       "addcd": 1.0,
       "SkillType": 3,
       "level": 3,
@@ -9080,7 +9089,7 @@
       "scriptName": "S3302",
       "IDGroup": 3302,
       "timelineName": "",
-      "cd": 10.0,
+      "cd": 30.0,
       "addcd": 1.0,
       "SkillType": 3,
       "level": 4,
@@ -9104,7 +9113,7 @@
       "scriptName": "S3302",
       "IDGroup": 3302,
       "timelineName": "",
-      "cd": 10.0,
+      "cd": 30.0,
       "addcd": 1.0,
       "SkillType": 3,
       "level": 5,
@@ -9128,7 +9137,7 @@
       "scriptName": "S3302",
       "IDGroup": 3302,
       "timelineName": "",
-      "cd": 10.0,
+      "cd": 30.0,
       "addcd": 1.0,
       "SkillType": 3,
       "level": 6,
@@ -9152,7 +9161,7 @@
       "scriptName": "S3401",
       "IDGroup": 3401,
       "timelineName": "",
-      "cd": 10.0,
+      "cd": 30.0,
       "addcd": 1.0,
       "SkillType": 3,
       "level": 1,
@@ -9176,7 +9185,7 @@
       "scriptName": "S3401",
       "IDGroup": 3401,
       "timelineName": "",
-      "cd": 10.0,
+      "cd": 30.0,
       "addcd": 1.0,
       "SkillType": 3,
       "level": 2,
@@ -9209,7 +9218,7 @@
       "scriptName": "S3401",
       "IDGroup": 3401,
       "timelineName": "",
-      "cd": 10.0,
+      "cd": 30.0,
       "addcd": 1.0,
       "SkillType": 3,
       "level": 3,
@@ -9239,7 +9248,7 @@
       "scriptName": "S3401",
       "IDGroup": 3401,
       "timelineName": "",
-      "cd": 10.0,
+      "cd": 30.0,
       "addcd": 1.0,
       "SkillType": 3,
       "level": 4,
@@ -9274,7 +9283,7 @@
       "scriptName": "S3401",
       "IDGroup": 3401,
       "timelineName": "",
-      "cd": 10.0,
+      "cd": 30.0,
       "addcd": 1.0,
       "SkillType": 3,
       "level": 5,
@@ -9309,7 +9318,7 @@
       "scriptName": "S3401",
       "IDGroup": 3401,
       "timelineName": "",
-      "cd": 10.0,
+      "cd": 30.0,
       "addcd": 1.0,
       "SkillType": 3,
       "level": 6,
@@ -9343,7 +9352,7 @@
       "scriptName": "S3402",
       "IDGroup": 3402,
       "timelineName": "",
-      "cd": 10.0,
+      "cd": 30.0,
       "addcd": 1.0,
       "SkillType": 3,
       "level": 1,
@@ -9363,7 +9372,7 @@
       "scriptName": "S3402",
       "IDGroup": 3402,
       "timelineName": "",
-      "cd": 10.0,
+      "cd": 30.0,
       "addcd": 1.0,
       "SkillType": 3,
       "level": 2,
@@ -9386,7 +9395,7 @@
       "scriptName": "S3402",
       "IDGroup": 3402,
       "timelineName": "",
-      "cd": 10.0,
+      "cd": 30.0,
       "addcd": 1.0,
       "SkillType": 3,
       "level": 3,
@@ -9418,7 +9427,7 @@
       "scriptName": "S3402",
       "IDGroup": 3402,
       "timelineName": "",
-      "cd": 10.0,
+      "cd": 30.0,
       "addcd": 1.0,
       "SkillType": 3,
       "level": 4,
@@ -9449,7 +9458,7 @@
       "scriptName": "S3402",
       "IDGroup": 3402,
       "timelineName": "",
-      "cd": 10.0,
+      "cd": 30.0,
       "addcd": 1.0,
       "SkillType": 3,
       "level": 5,
@@ -9483,7 +9492,7 @@
       "scriptName": "S3402",
       "IDGroup": 3402,
       "timelineName": "",
-      "cd": 10.0,
+      "cd": 30.0,
       "addcd": 1.0,
       "SkillType": 3,
       "level": 6,
@@ -9516,7 +9525,7 @@
       "scriptName": "S3501",
       "IDGroup": 3501,
       "timelineName": "",
-      "cd": 10.0,
+      "cd": 30.0,
       "addcd": 1.0,
       "SkillType": 3,
       "level": 1,
@@ -9540,7 +9549,7 @@
       "scriptName": "S3501",
       "IDGroup": 3501,
       "timelineName": "",
-      "cd": 10.0,
+      "cd": 30.0,
       "addcd": 1.0,
       "SkillType": 3,
       "level": 2,
@@ -9564,7 +9573,7 @@
       "scriptName": "S3501",
       "IDGroup": 3501,
       "timelineName": "",
-      "cd": 10.0,
+      "cd": 30.0,
       "addcd": 1.0,
       "SkillType": 3,
       "level": 3,
@@ -9597,7 +9606,7 @@
       "scriptName": "S3501",
       "IDGroup": 3501,
       "timelineName": "",
-      "cd": 10.0,
+      "cd": 30.0,
       "addcd": 1.0,
       "SkillType": 3,
       "level": 4,
@@ -9627,7 +9636,7 @@
       "scriptName": "S3501",
       "IDGroup": 3501,
       "timelineName": "",
-      "cd": 10.0,
+      "cd": 30.0,
       "addcd": 1.0,
       "SkillType": 3,
       "level": 5,
@@ -9660,7 +9669,7 @@
       "scriptName": "S3501",
       "IDGroup": 3501,
       "timelineName": "",
-      "cd": 10.0,
+      "cd": 30.0,
       "addcd": 1.0,
       "SkillType": 3,
       "level": 6,

Assets/Scenes/testCombat.scene

@@ -2249,7 +2249,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].level
-      value: 125
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[1].level
@@ -2265,7 +2265,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].level
-      value: 125
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[1].level
@@ -2289,11 +2289,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].skillLevel
-      value: 30
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].skillStart
-      value: 3
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[1].skillLevel
@@ -2345,7 +2345,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].magicWeaponId.Array.size
-      value: 4
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[1].magicWeaponId.Array.size

Assets/Scripts/GameLogic/Combat/Skill/S2009.cs

@@ -76,21 +76,17 @@ namespace GameLogic.Combat.Skill
                 {
                     currCount = 0;
                     List<BuffBasic> buffBasics = CombatHeroEntity.BuffControl.GetBuffBasicForBuffType(2);
-                    int count = (int)effectValue[1];
-                    for (int i = 0; i < count; i++)
+                    float odds = effectValue[1];
+                    float currOdds = CombatCalculateTool.Instance.GetOdd(0, 100);
+                    if (buffBasics.Count > 0 && currOdds <= odds)
                     {
-                        if (buffBasics.Count <= 0)
-                        {
-                            break;
-                        }
-
                         int index = CombatCalculateTool.Instance.GetOdd(0, buffBasics.Count);
                         BuffBasic buffBasic = buffBasics[index];
                         CombatHeroEntity.BuffControl.RemoveBuff(buffBasic);
                         buffBasics.RemoveAt(index);
                     }
 
-                    long maxHp = CombatHeroEntity.MaxCombatHeroInfo.hp.Value;
+                    long maxHp = CombatHeroEntity.CurrCombatHeroInfo.attack.Value;
                     long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(maxHp, effectValue[2]);
                     Recover(CombatHeroEntity, CombatHeroEntity.GetMainHotPoin<CombatHeroHitPoint>(true), v,
                         AttType.Skill);

Assets/Scripts/GameLogic/Combat/Skill/S2010.cs

@@ -31,8 +31,17 @@ namespace GameLogic.Combat.Skill
             {
                 if (triggerSkillSlotsEventData.triggerType == 2) //触发到木的位置
                 {
-                    long maxHp = CombatHeroEntity.MaxCombatHeroInfo.hp.Value;
-                    long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(maxHp, effectValue[0]);
+                    long maxHp = CombatHeroEntity.CurrCombatHeroInfo.attack.Value;
+                    float addBl = effectValue[0];
+                    if (effectValue.Length > 1)
+                    {
+                        if (CombatHeroEntity.HpBl < effectValue[1])
+                        {
+                            addBl += effectValue[2];
+                        }
+                    }
+
+                    long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(maxHp, addBl);
                     Recover(CombatHeroEntity, CombatHeroEntity.GetMainHotPoin<CombatHeroHitPoint>(true), v,
                         AttType.Skill);
                 }

Assets/Scripts/GameLogic/Combat/Skill/S2011.cs

@@ -59,10 +59,21 @@ namespace GameLogic.Combat.Skill
             HeroInjuredEventData heroInjuredEventData = ieventData as HeroInjuredEventData;
             b_1011 b1011 = heroInjuredEventData.HarmReturnInfo.triggerData.Source as b_1011;
             b_1012 b1012 = heroInjuredEventData.HarmReturnInfo.triggerData.Source as b_1012;
-            if ((b1011 == null && b1012 == null) || b1011.Source != CombatHeroEntity)
+          
+            if ((b1011 == null && b1012 == null))
             {
                 return;
             }
+            if(b1011!= null &&  b1011.Source != CombatHeroEntity)
+            {
+              return;
+            }
+            if (b1012 != null && b1012.Source != CombatHeroEntity)
+            {
+                return;
+            }
+          
+          
 
             long harm = heroInjuredEventData.HarmReturnInfo.att;
             addHarm += harm;

Assets/Scripts/GameLogic/Combat/Skill/SkillBasic.cs

@@ -602,6 +602,11 @@ namespace GameLogic.Combat.Skill
 
         public bool IsPassiveActivateSkill(SkillBasic targetSkillBasic)
         {
+            if (targetSkillBasic == null)
+            {
+                return false;
+            }
+
             if (targetSkillBasic.SelfSkillConfig.SkillType != 1)
             {
                 return false;
@@ -615,7 +620,8 @@ namespace GameLogic.Combat.Skill
             for (int i = 0; i < SelfSkillConfig.PromoteLanPara_1.Length; i++)
             {
                 int configIndex = (int)SelfSkillConfig.PromoteLanPara_1[i];
-                if (targetSkillBasic.index == configIndex + index)
+                int currIndex = (configIndex + index) % 10;
+                if (targetSkillBasic.index == currIndex)
                 {
                     return true;
                 }