浏览代码

修改配置表

DESKTOP-BGJIU14\ck 1 天之前
父节点
当前提交
615f207db2

+ 80 - 0
Assets/Res/Config/GroupConfig.json

@@ -134,6 +134,10 @@
       "GroupMonster": [
         5001,
         1001
+      ],
+      "qiangDu": [
+        70,
+        30
       ]
     },
     {
@@ -144,6 +148,10 @@
       "GroupMonster": [
         5002,
         1002
+      ],
+      "qiangDu": [
+        70,
+        30
       ]
     },
     {
@@ -154,6 +162,10 @@
       "GroupMonster": [
         5003,
         1003
+      ],
+      "qiangDu": [
+        70,
+        30
       ]
     },
     {
@@ -164,6 +176,10 @@
       "GroupMonster": [
         5004,
         1004
+      ],
+      "qiangDu": [
+        70,
+        30
       ]
     },
     {
@@ -174,6 +190,10 @@
       "GroupMonster": [
         5005,
         1005
+      ],
+      "qiangDu": [
+        70,
+        30
       ]
     },
     {
@@ -184,6 +204,10 @@
       "GroupMonster": [
         5001,
         1001
+      ],
+      "qiangDu": [
+        70,
+        30
       ]
     },
     {
@@ -194,6 +218,10 @@
       "GroupMonster": [
         5002,
         1002
+      ],
+      "qiangDu": [
+        70,
+        30
       ]
     },
     {
@@ -204,6 +232,10 @@
       "GroupMonster": [
         5003,
         1003
+      ],
+      "qiangDu": [
+        70,
+        30
       ]
     },
     {
@@ -214,6 +246,10 @@
       "GroupMonster": [
         5004,
         1004
+      ],
+      "qiangDu": [
+        70,
+        30
       ]
     },
     {
@@ -224,6 +260,10 @@
       "GroupMonster": [
         5005,
         1005
+      ],
+      "qiangDu": [
+        70,
+        30
       ]
     },
     {
@@ -234,6 +274,10 @@
       "GroupMonster": [
         5001,
         1001
+      ],
+      "qiangDu": [
+        70,
+        30
       ]
     },
     {
@@ -244,6 +288,10 @@
       "GroupMonster": [
         5002,
         1002
+      ],
+      "qiangDu": [
+        70,
+        30
       ]
     },
     {
@@ -254,6 +302,10 @@
       "GroupMonster": [
         5003,
         1003
+      ],
+      "qiangDu": [
+        70,
+        30
       ]
     },
     {
@@ -264,6 +316,10 @@
       "GroupMonster": [
         5004,
         1004
+      ],
+      "qiangDu": [
+        70,
+        30
       ]
     },
     {
@@ -274,6 +330,10 @@
       "GroupMonster": [
         5005,
         1005
+      ],
+      "qiangDu": [
+        70,
+        30
       ]
     },
     {
@@ -284,6 +344,10 @@
       "GroupMonster": [
         5001,
         1001
+      ],
+      "qiangDu": [
+        70,
+        30
       ]
     },
     {
@@ -294,6 +358,10 @@
       "GroupMonster": [
         5002,
         1002
+      ],
+      "qiangDu": [
+        70,
+        30
       ]
     },
     {
@@ -304,6 +372,10 @@
       "GroupMonster": [
         5003,
         1003
+      ],
+      "qiangDu": [
+        70,
+        30
       ]
     },
     {
@@ -314,6 +386,10 @@
       "GroupMonster": [
         5004,
         1004
+      ],
+      "qiangDu": [
+        70,
+        30
       ]
     },
     {
@@ -324,6 +400,10 @@
       "GroupMonster": [
         5005,
         1005
+      ],
+      "qiangDu": [
+        70,
+        30
       ]
     }
   ]

+ 9 - 9
Assets/Res/Config/HeroModelConfig.json

@@ -369,15 +369,15 @@
         100
       ],
       "skillID": [
-        9071,
-        -1,
+        9091,
         -1,
         -1,
-        9071,
+        9091,
         -1,
         -1,
+        9092,
+        9091,
         -1,
-        9071,
         -1
       ],
       "skillActiveLv": [
@@ -427,15 +427,15 @@
         100
       ],
       "skillID": [
-        9071,
+        9101,
         -1,
         -1,
+        9101,
         -1,
-        9071,
-        -1,
+        9102,
         -1,
+        9101,
         -1,
-        9071,
         -1
       ],
       "skillActiveLv": [
@@ -472,7 +472,7 @@
       "model": "Gw_zhizhu",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 50,
+      "attack": 70,
       "hp": 80,
       "def": 50,
       "shield": 63,

+ 616 - 52
Assets/Res/Config/SkillConfig.json

@@ -12830,7 +12830,7 @@
       "level": 1,
       "effectValue": [
         3.0,
-        30.0,
+        100.0,
         30.0
       ],
       "intensifierIndex": [
@@ -12855,7 +12855,7 @@
       "level": 2,
       "effectValue": [
         3.0,
-        40.0,
+        130.0,
         35.0
       ],
       "intensifierIndex": [
@@ -12880,7 +12880,7 @@
       "level": 3,
       "effectValue": [
         3.0,
-        50.0,
+        160.0,
         40.0
       ],
       "intensifierIndex": [
@@ -12905,7 +12905,7 @@
       "level": 4,
       "effectValue": [
         3.0,
-        60.0,
+        190.0,
         45.0
       ],
       "intensifierIndex": [
@@ -12930,7 +12930,7 @@
       "level": 5,
       "effectValue": [
         3.0,
-        70.0,
+        220.0,
         50.0
       ],
       "intensifierIndex": [
@@ -12955,7 +12955,7 @@
       "level": 6,
       "effectValue": [
         3.0,
-        80.0,
+        250.0,
         55.0
       ],
       "intensifierIndex": [
@@ -12980,7 +12980,7 @@
       "level": 1,
       "effectValue": [
         3.0,
-        30.0
+        110.0
       ],
       "intensifierIndex": [
         1
@@ -13004,7 +13004,7 @@
       "level": 2,
       "effectValue": [
         3.0,
-        40.0
+        140.0
       ],
       "intensifierIndex": [
         1
@@ -13028,7 +13028,7 @@
       "level": 3,
       "effectValue": [
         3.0,
-        50.0
+        150.0
       ],
       "intensifierIndex": [
         1
@@ -13052,7 +13052,7 @@
       "level": 4,
       "effectValue": [
         3.0,
-        60.0
+        170.0
       ],
       "intensifierIndex": [
         1
@@ -13076,7 +13076,7 @@
       "level": 5,
       "effectValue": [
         3.0,
-        70.0
+        190.0
       ],
       "intensifierIndex": [
         1
@@ -13100,7 +13100,7 @@
       "level": 6,
       "effectValue": [
         3.0,
-        80.0
+        210.0
       ],
       "intensifierIndex": [
         1
@@ -13124,7 +13124,7 @@
       "level": 1,
       "effectValue": [
         3.0,
-        30.0
+        110.0
       ],
       "intensifierIndex": [
         1
@@ -13148,7 +13148,7 @@
       "level": 2,
       "effectValue": [
         3.0,
-        40.0
+        140.0
       ],
       "intensifierIndex": [
         1
@@ -13172,7 +13172,7 @@
       "level": 3,
       "effectValue": [
         3.0,
-        50.0
+        170.0
       ],
       "intensifierIndex": [
         1
@@ -13196,7 +13196,7 @@
       "level": 4,
       "effectValue": [
         3.0,
-        60.0
+        200.0
       ],
       "intensifierIndex": [
         1
@@ -13220,7 +13220,7 @@
       "level": 5,
       "effectValue": [
         3.0,
-        70.0
+        230.0
       ],
       "intensifierIndex": [
         1
@@ -13244,7 +13244,7 @@
       "level": 6,
       "effectValue": [
         3.0,
-        80.0
+        260.0
       ],
       "intensifierIndex": [
         1
@@ -13268,7 +13268,7 @@
       "level": 1,
       "effectValue": [
         3.0,
-        30.0
+        70.0
       ],
       "intensifierIndex": [
         1
@@ -13292,7 +13292,7 @@
       "level": 2,
       "effectValue": [
         3.0,
-        40.0
+        85.0
       ],
       "intensifierIndex": [
         1
@@ -13316,7 +13316,7 @@
       "level": 3,
       "effectValue": [
         3.0,
-        50.0
+        100.0
       ],
       "intensifierIndex": [
         1
@@ -13340,7 +13340,7 @@
       "level": 4,
       "effectValue": [
         3.0,
-        60.0
+        115.0
       ],
       "intensifierIndex": [
         1
@@ -13364,7 +13364,7 @@
       "level": 5,
       "effectValue": [
         3.0,
-        70.0
+        130.0
       ],
       "intensifierIndex": [
         1
@@ -13388,7 +13388,7 @@
       "level": 6,
       "effectValue": [
         3.0,
-        80.0
+        145.0
       ],
       "intensifierIndex": [
         1
@@ -13412,7 +13412,7 @@
       "level": 1,
       "effectValue": [
         3.0,
-        30.0
+        90.0
       ],
       "intensifierIndex": [
         1
@@ -13436,7 +13436,7 @@
       "level": 2,
       "effectValue": [
         3.0,
-        40.0
+        110.0
       ],
       "intensifierIndex": [
         1
@@ -13460,7 +13460,7 @@
       "level": 3,
       "effectValue": [
         3.0,
-        50.0
+        130.0
       ],
       "intensifierIndex": [
         1
@@ -13484,7 +13484,7 @@
       "level": 4,
       "effectValue": [
         3.0,
-        60.0
+        150.0
       ],
       "intensifierIndex": [
         1
@@ -13508,7 +13508,7 @@
       "level": 5,
       "effectValue": [
         3.0,
-        70.0
+        170.0
       ],
       "intensifierIndex": [
         1
@@ -13532,7 +13532,7 @@
       "level": 6,
       "effectValue": [
         3.0,
-        80.0
+        190.0
       ],
       "intensifierIndex": [
         1
@@ -13555,8 +13555,8 @@
       "SkillType": 1,
       "level": 1,
       "effectValue": [
-        3.0,
-        30.0
+        2.0,
+        50.0
       ],
       "intensifierIndex": [
         1
@@ -13579,8 +13579,8 @@
       "SkillType": 1,
       "level": 2,
       "effectValue": [
-        3.0,
-        40.0
+        2.0,
+        60.0
       ],
       "intensifierIndex": [
         1
@@ -13603,8 +13603,8 @@
       "SkillType": 1,
       "level": 3,
       "effectValue": [
-        3.0,
-        50.0
+        2.0,
+        70.0
       ],
       "intensifierIndex": [
         1
@@ -13627,8 +13627,8 @@
       "SkillType": 1,
       "level": 4,
       "effectValue": [
-        3.0,
-        60.0
+        2.0,
+        80.0
       ],
       "intensifierIndex": [
         1
@@ -13651,8 +13651,8 @@
       "SkillType": 1,
       "level": 5,
       "effectValue": [
-        3.0,
-        70.0
+        2.0,
+        90.0
       ],
       "intensifierIndex": [
         1
@@ -13675,8 +13675,8 @@
       "SkillType": 1,
       "level": 6,
       "effectValue": [
-        3.0,
-        80.0
+        2.0,
+        100.0
       ],
       "intensifierIndex": [
         1
@@ -13694,13 +13694,13 @@
       "scriptName": "S9044",
       "IDGroup": 9044,
       "timelineName": "Boss_ShuGuai_TD",
-      "cd": 1.0,
+      "cd": 3.0,
       "addcd": 1.0,
       "SkillType": 1,
       "level": 1,
       "effectValue": [
         1.0,
-        300.0
+        400.0
       ],
       "intensifierIndex": [
         1
@@ -13718,13 +13718,13 @@
       "scriptName": "S9044",
       "IDGroup": 9044,
       "timelineName": "Boss_ShuGuai_TD",
-      "cd": 1.0,
+      "cd": 3.0,
       "addcd": 1.0,
       "SkillType": 1,
       "level": 2,
       "effectValue": [
         1.0,
-        400.0
+        600.0
       ],
       "intensifierIndex": [
         1
@@ -13742,13 +13742,13 @@
       "scriptName": "S9044",
       "IDGroup": 9044,
       "timelineName": "Boss_ShuGuai_TD",
-      "cd": 1.0,
+      "cd": 3.0,
       "addcd": 1.0,
       "SkillType": 1,
       "level": 3,
       "effectValue": [
         1.0,
-        500.0
+        800.0
       ],
       "intensifierIndex": [
         1
@@ -13766,13 +13766,13 @@
       "scriptName": "S9044",
       "IDGroup": 9044,
       "timelineName": "Boss_ShuGuai_TD",
-      "cd": 1.0,
+      "cd": 3.0,
       "addcd": 1.0,
       "SkillType": 1,
       "level": 4,
       "effectValue": [
         1.0,
-        600.0
+        1000.0
       ],
       "intensifierIndex": [
         1
@@ -13790,13 +13790,13 @@
       "scriptName": "S9044",
       "IDGroup": 9044,
       "timelineName": "Boss_ShuGuai_TD",
-      "cd": 1.0,
+      "cd": 3.0,
       "addcd": 1.0,
       "SkillType": 1,
       "level": 5,
       "effectValue": [
         1.0,
-        700.0
+        1200.0
       ],
       "intensifierIndex": [
         1
@@ -13814,6 +13814,150 @@
       "scriptName": "S9044",
       "IDGroup": 9044,
       "timelineName": "Boss_ShuGuai_TD",
+      "cd": 3.0,
+      "addcd": 1.0,
+      "SkillType": 1,
+      "level": 6,
+      "effectValue": [
+        1.0,
+        1400.0
+      ],
+      "intensifierIndex": [
+        1
+      ],
+      "PromoteLan": 0
+    },
+    {
+      "ID": 90910,
+      "PieceID": 0,
+      "power": 100.0,
+      "name": 711,
+      "dec": 721,
+      "attribute": 2,
+      "icon": "icon_s9091",
+      "scriptName": "S9091",
+      "IDGroup": 9091,
+      "timelineName": "Boss_ShuGuai_TD",
+      "cd": 1.0,
+      "addcd": 1.0,
+      "SkillType": 1,
+      "level": 1,
+      "effectValue": [
+        1.0,
+        300.0
+      ],
+      "intensifierIndex": [
+        1
+      ],
+      "PromoteLan": 0
+    },
+    {
+      "ID": 90911,
+      "PieceID": 0,
+      "power": 150.0,
+      "name": 711,
+      "dec": 721,
+      "attribute": 2,
+      "icon": "icon_s9091",
+      "scriptName": "S9091",
+      "IDGroup": 9091,
+      "timelineName": "Boss_ShuGuai_TD",
+      "cd": 1.0,
+      "addcd": 1.0,
+      "SkillType": 1,
+      "level": 2,
+      "effectValue": [
+        1.0,
+        400.0
+      ],
+      "intensifierIndex": [
+        1
+      ],
+      "PromoteLan": 0
+    },
+    {
+      "ID": 90912,
+      "PieceID": 0,
+      "power": 225.0,
+      "name": 711,
+      "dec": 721,
+      "attribute": 2,
+      "icon": "icon_s9091",
+      "scriptName": "S9091",
+      "IDGroup": 9091,
+      "timelineName": "Boss_ShuGuai_TD",
+      "cd": 1.0,
+      "addcd": 1.0,
+      "SkillType": 1,
+      "level": 3,
+      "effectValue": [
+        1.0,
+        500.0
+      ],
+      "intensifierIndex": [
+        1
+      ],
+      "PromoteLan": 0
+    },
+    {
+      "ID": 90913,
+      "PieceID": 0,
+      "power": 337.5,
+      "name": 711,
+      "dec": 721,
+      "attribute": 2,
+      "icon": "icon_s9091",
+      "scriptName": "S9091",
+      "IDGroup": 9091,
+      "timelineName": "Boss_ShuGuai_TD",
+      "cd": 1.0,
+      "addcd": 1.0,
+      "SkillType": 1,
+      "level": 4,
+      "effectValue": [
+        1.0,
+        600.0
+      ],
+      "intensifierIndex": [
+        1
+      ],
+      "PromoteLan": 0
+    },
+    {
+      "ID": 90914,
+      "PieceID": 0,
+      "power": 506.25,
+      "name": 711,
+      "dec": 721,
+      "attribute": 2,
+      "icon": "icon_s9091",
+      "scriptName": "S9091",
+      "IDGroup": 9091,
+      "timelineName": "Boss_ShuGuai_TD",
+      "cd": 1.0,
+      "addcd": 1.0,
+      "SkillType": 1,
+      "level": 5,
+      "effectValue": [
+        1.0,
+        700.0
+      ],
+      "intensifierIndex": [
+        1
+      ],
+      "PromoteLan": 0
+    },
+    {
+      "ID": 90915,
+      "PieceID": 0,
+      "power": 759.375,
+      "name": 711,
+      "dec": 721,
+      "attribute": 2,
+      "icon": "icon_s9091",
+      "scriptName": "S9091",
+      "IDGroup": 9091,
+      "timelineName": "Boss_ShuGuai_TD",
       "cd": 1.0,
       "addcd": 1.0,
       "SkillType": 1,
@@ -13826,6 +13970,426 @@
         1
       ],
       "PromoteLan": 0
+    },
+    {
+      "ID": 90920,
+      "PieceID": 0,
+      "power": 100.0,
+      "name": 711,
+      "dec": 721,
+      "attribute": 2,
+      "icon": "icon_s9092",
+      "scriptName": "S9092",
+      "IDGroup": 9092,
+      "timelineName": "Boss_ShuGuai_TD",
+      "cd": 1.0,
+      "addcd": 1.0,
+      "SkillType": 1,
+      "level": 1,
+      "effectValue": [
+        20.0
+      ],
+      "intensifierIndex": [
+        1
+      ],
+      "PromoteLan": 0
+    },
+    {
+      "ID": 90921,
+      "PieceID": 0,
+      "power": 150.0,
+      "name": 711,
+      "dec": 721,
+      "attribute": 2,
+      "icon": "icon_s9092",
+      "scriptName": "S9092",
+      "IDGroup": 9092,
+      "timelineName": "Boss_ShuGuai_TD",
+      "cd": 1.0,
+      "addcd": 1.0,
+      "SkillType": 1,
+      "level": 2,
+      "effectValue": [
+        30.0
+      ],
+      "intensifierIndex": [
+        1
+      ],
+      "PromoteLan": 0
+    },
+    {
+      "ID": 90922,
+      "PieceID": 0,
+      "power": 225.0,
+      "name": 711,
+      "dec": 721,
+      "attribute": 2,
+      "icon": "icon_s9092",
+      "scriptName": "S9092",
+      "IDGroup": 9092,
+      "timelineName": "Boss_ShuGuai_TD",
+      "cd": 1.0,
+      "addcd": 1.0,
+      "SkillType": 1,
+      "level": 3,
+      "effectValue": [
+        40.0
+      ],
+      "intensifierIndex": [
+        1
+      ],
+      "PromoteLan": 0
+    },
+    {
+      "ID": 90923,
+      "PieceID": 0,
+      "power": 337.5,
+      "name": 711,
+      "dec": 721,
+      "attribute": 2,
+      "icon": "icon_s9092",
+      "scriptName": "S9092",
+      "IDGroup": 9092,
+      "timelineName": "Boss_ShuGuai_TD",
+      "cd": 1.0,
+      "addcd": 1.0,
+      "SkillType": 1,
+      "level": 4,
+      "effectValue": [
+        50.0
+      ],
+      "intensifierIndex": [
+        1
+      ],
+      "PromoteLan": 0
+    },
+    {
+      "ID": 90924,
+      "PieceID": 0,
+      "power": 506.25,
+      "name": 711,
+      "dec": 721,
+      "attribute": 2,
+      "icon": "icon_s9092",
+      "scriptName": "S9092",
+      "IDGroup": 9092,
+      "timelineName": "Boss_ShuGuai_TD",
+      "cd": 1.0,
+      "addcd": 1.0,
+      "SkillType": 1,
+      "level": 5,
+      "effectValue": [
+        60.0
+      ],
+      "intensifierIndex": [
+        1
+      ],
+      "PromoteLan": 0
+    },
+    {
+      "ID": 90925,
+      "PieceID": 0,
+      "power": 759.375,
+      "name": 711,
+      "dec": 721,
+      "attribute": 2,
+      "icon": "icon_s9092",
+      "scriptName": "S9092",
+      "IDGroup": 9092,
+      "timelineName": "Boss_ShuGuai_TD",
+      "cd": 1.0,
+      "addcd": 1.0,
+      "SkillType": 1,
+      "level": 6,
+      "effectValue": [
+        70.0
+      ],
+      "intensifierIndex": [
+        1
+      ],
+      "PromoteLan": 0
+    },
+    {
+      "ID": 91010,
+      "PieceID": 0,
+      "power": 100.0,
+      "name": 711,
+      "dec": 721,
+      "attribute": 2,
+      "icon": "icon_s9101",
+      "scriptName": "S9101",
+      "IDGroup": 9101,
+      "timelineName": "Boss_ShuGuai_TD",
+      "cd": 1.0,
+      "addcd": 1.0,
+      "SkillType": 1,
+      "level": 1,
+      "effectValue": [
+        1.0,
+        300.0
+      ],
+      "intensifierIndex": [
+        1
+      ],
+      "PromoteLan": 0
+    },
+    {
+      "ID": 91011,
+      "PieceID": 0,
+      "power": 150.0,
+      "name": 711,
+      "dec": 721,
+      "attribute": 2,
+      "icon": "icon_s9101",
+      "scriptName": "S9101",
+      "IDGroup": 9101,
+      "timelineName": "Boss_ShuGuai_TD",
+      "cd": 1.0,
+      "addcd": 1.0,
+      "SkillType": 1,
+      "level": 2,
+      "effectValue": [
+        1.0,
+        400.0
+      ],
+      "intensifierIndex": [
+        1
+      ],
+      "PromoteLan": 0
+    },
+    {
+      "ID": 91012,
+      "PieceID": 0,
+      "power": 225.0,
+      "name": 711,
+      "dec": 721,
+      "attribute": 2,
+      "icon": "icon_s9101",
+      "scriptName": "S9101",
+      "IDGroup": 9101,
+      "timelineName": "Boss_ShuGuai_TD",
+      "cd": 1.0,
+      "addcd": 1.0,
+      "SkillType": 1,
+      "level": 3,
+      "effectValue": [
+        1.0,
+        500.0
+      ],
+      "intensifierIndex": [
+        1
+      ],
+      "PromoteLan": 0
+    },
+    {
+      "ID": 91013,
+      "PieceID": 0,
+      "power": 337.5,
+      "name": 711,
+      "dec": 721,
+      "attribute": 2,
+      "icon": "icon_s9101",
+      "scriptName": "S9101",
+      "IDGroup": 9101,
+      "timelineName": "Boss_ShuGuai_TD",
+      "cd": 1.0,
+      "addcd": 1.0,
+      "SkillType": 1,
+      "level": 4,
+      "effectValue": [
+        1.0,
+        600.0
+      ],
+      "intensifierIndex": [
+        1
+      ],
+      "PromoteLan": 0
+    },
+    {
+      "ID": 91014,
+      "PieceID": 0,
+      "power": 506.25,
+      "name": 711,
+      "dec": 721,
+      "attribute": 2,
+      "icon": "icon_s9101",
+      "scriptName": "S9101",
+      "IDGroup": 9101,
+      "timelineName": "Boss_ShuGuai_TD",
+      "cd": 1.0,
+      "addcd": 1.0,
+      "SkillType": 1,
+      "level": 5,
+      "effectValue": [
+        1.0,
+        700.0
+      ],
+      "intensifierIndex": [
+        1
+      ],
+      "PromoteLan": 0
+    },
+    {
+      "ID": 91015,
+      "PieceID": 0,
+      "power": 759.375,
+      "name": 711,
+      "dec": 721,
+      "attribute": 2,
+      "icon": "icon_s9101",
+      "scriptName": "S9101",
+      "IDGroup": 9101,
+      "timelineName": "Boss_ShuGuai_TD",
+      "cd": 1.0,
+      "addcd": 1.0,
+      "SkillType": 1,
+      "level": 6,
+      "effectValue": [
+        1.0,
+        800.0
+      ],
+      "intensifierIndex": [
+        1
+      ],
+      "PromoteLan": 0
+    },
+    {
+      "ID": 91020,
+      "PieceID": 0,
+      "power": 100.0,
+      "name": 711,
+      "dec": 721,
+      "attribute": 2,
+      "icon": "icon_s9102",
+      "scriptName": "S9102",
+      "IDGroup": 9102,
+      "timelineName": "Boss_ShuGuai_TD",
+      "cd": 1.0,
+      "addcd": 1.0,
+      "SkillType": 1,
+      "level": 1,
+      "effectValue": [
+        1.0
+      ],
+      "intensifierIndex": [
+        1
+      ],
+      "PromoteLan": 0
+    },
+    {
+      "ID": 91021,
+      "PieceID": 0,
+      "power": 150.0,
+      "name": 711,
+      "dec": 721,
+      "attribute": 2,
+      "icon": "icon_s9102",
+      "scriptName": "S9102",
+      "IDGroup": 9102,
+      "timelineName": "Boss_ShuGuai_TD",
+      "cd": 1.0,
+      "addcd": 1.0,
+      "SkillType": 1,
+      "level": 2,
+      "effectValue": [
+        1.0
+      ],
+      "intensifierIndex": [
+        1
+      ],
+      "PromoteLan": 0
+    },
+    {
+      "ID": 91022,
+      "PieceID": 0,
+      "power": 225.0,
+      "name": 711,
+      "dec": 721,
+      "attribute": 2,
+      "icon": "icon_s9102",
+      "scriptName": "S9102",
+      "IDGroup": 9102,
+      "timelineName": "Boss_ShuGuai_TD",
+      "cd": 1.0,
+      "addcd": 1.0,
+      "SkillType": 1,
+      "level": 3,
+      "effectValue": [
+        1.0
+      ],
+      "intensifierIndex": [
+        1
+      ],
+      "PromoteLan": 0
+    },
+    {
+      "ID": 91023,
+      "PieceID": 0,
+      "power": 337.5,
+      "name": 711,
+      "dec": 721,
+      "attribute": 2,
+      "icon": "icon_s9102",
+      "scriptName": "S9102",
+      "IDGroup": 9102,
+      "timelineName": "Boss_ShuGuai_TD",
+      "cd": 1.0,
+      "addcd": 1.0,
+      "SkillType": 1,
+      "level": 4,
+      "effectValue": [
+        1.0
+      ],
+      "intensifierIndex": [
+        1
+      ],
+      "PromoteLan": 0
+    },
+    {
+      "ID": 91024,
+      "PieceID": 0,
+      "power": 506.25,
+      "name": 711,
+      "dec": 721,
+      "attribute": 2,
+      "icon": "icon_s9102",
+      "scriptName": "S9102",
+      "IDGroup": 9102,
+      "timelineName": "Boss_ShuGuai_TD",
+      "cd": 1.0,
+      "addcd": 1.0,
+      "SkillType": 1,
+      "level": 5,
+      "effectValue": [
+        1.0
+      ],
+      "intensifierIndex": [
+        1
+      ],
+      "PromoteLan": 0
+    },
+    {
+      "ID": 91025,
+      "PieceID": 0,
+      "power": 759.375,
+      "name": 711,
+      "dec": 721,
+      "attribute": 2,
+      "icon": "icon_s9102",
+      "scriptName": "S9102",
+      "IDGroup": 9102,
+      "timelineName": "Boss_ShuGuai_TD",
+      "cd": 1.0,
+      "addcd": 1.0,
+      "SkillType": 1,
+      "level": 6,
+      "effectValue": [
+        1.0
+      ],
+      "intensifierIndex": [
+        1
+      ],
+      "PromoteLan": 0
     }
   ]
 }

+ 5 - 1
Assets/Scenes/testCombat.scene

@@ -2257,7 +2257,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].heroID
-      value: 5007
+      value: 5006
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[1].heroID
@@ -3107,6 +3107,10 @@ PrefabInstance:
       propertyPath: m_Name
       value: shan
       objectReference: {fileID: 0}
+    - target: {fileID: 588676686924597288, guid: a1aaee09d6c42094ca34c69a18f0c2f8, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 9050292251551944394, guid: a1aaee09d6c42094ca34c69a18f0c2f8, type: 3}
       propertyPath: m_LocalPosition.x
       value: 0.9

+ 10 - 0
Assets/Scripts/GameData/ExcelConfig/GroupConfig.cs

@@ -44,6 +44,16 @@ namespace Excel2Json
 #endif
 		
 
+		/// <summary>
+		///每个怪的比例强度 一个都不填就是默认强度
+		/// </summary>
+#if !COMBAT_SERVER
+		public int[] qiangDu;
+#else
+		public int[] qiangDu{ set; get; }
+#endif
+		
+
 	}
 
 }

+ 1 - 1
Assets/Scripts/GameData/ExcelConfig/SkillConfig.cs

@@ -1,5 +1,5 @@
 // Auto Generated Code By excel2json
-// Generate From Excel\skill.xlsx. SheetName: SkillConfig
+// Generate From Excel\Skill.xlsx. SheetName: SkillConfig
 
 using System;
 using Fort23.GameData;

+ 1 - 1
Assets/Scripts/GameData/ExcelConfig/SkillConstant.cs

@@ -1,5 +1,5 @@
 // Auto Generated Code By excel2json
-// Generate From Excel\skill.xlsx. SheetName: SkillConstant
+// Generate From Excel\Skill.xlsx. SheetName: SkillConstant
 
 using System;
 using Fort23.GameData;

+ 1 - 1
Assets/Scripts/GameData/ExcelConfig/SkillPowerupConfig.cs

@@ -1,5 +1,5 @@
 // Auto Generated Code By excel2json
-// Generate From Excel\skill.xlsx. SheetName: SkillPowerupConfig
+// Generate From Excel\Skill.xlsx. SheetName: SkillPowerupConfig
 
 using System;
 using Fort23.GameData;

+ 1 - 1
Assets/Scripts/GameLogic/Combat/Skill/S9043.cs

@@ -21,7 +21,7 @@ namespace GameLogic.Combat.Skill
         protected override void ProUseSkill()
         {
             ActivationTimeLineData("9043");
-            ballisticsCount = (int)effectValue[0];
+            ballisticsCount = (int)effectValue[0]*3;
         }
 
         protected void ProDefaultTimeLineTrigger_hit(string groupName, CombatHeroHitPoint targetEntity,

二进制
Excel2Json/Excel/HeroModel.xlsx


二进制
Excel2Json/Excel/skill.xlsx


二进制
Excel2Json/Excel/数据验_2.xlam


+ 50 - 76
UserSettings/Layouts/CurrentMaximizeLayout.dwlt

@@ -15,17 +15,16 @@ MonoBehaviour:
   m_Children:
   - {fileID: 3}
   - {fileID: 5}
-  - {fileID: 6}
-  - {fileID: 8}
-  - {fileID: 10}
+  - {fileID: 7}
+  - {fileID: 9}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 30
     width: 2560
     height: 1307
-  m_MinSize: {x: 500, y: 50}
-  m_MaxSize: {x: 40480, y: 8096}
+  m_MinSize: {x: 400, y: 50}
+  m_MaxSize: {x: 32384, y: 8096}
   vertical: 0
   controlID: -1
   draggingID: 0
@@ -49,9 +48,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 546
+    x: 0
     y: 73
-    width: 661
+    width: 873
     height: 1286
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -94,9 +93,9 @@ MonoBehaviour:
     m_VAllowExceedBaseRangeMax: 1
     m_ScaleWithWindow: 0
     m_HSlider: 0
-    m_VSlider: 1
+    m_VSlider: 0
     m_IgnoreScrollWheelUntilClicked: 0
-    m_EnableMouseInput: 1
+    m_EnableMouseInput: 0
     m_EnableSliderZoomHorizontal: 0
     m_EnableSliderZoomVertical: 0
     m_UniformScale: 1
@@ -105,23 +104,23 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 661
+      width: 873
       height: 1265
     m_Scale: {x: 0.7789409, y: 0.7789409}
-    m_Translation: {x: 330.5, y: 632.49994}
+    m_Translation: {x: 436.5, y: 632.49994}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -424.29407
+      x: -560.3763
       y: -811.9999
-      width: 848.58813
+      width: 1120.7526
       height: 1623.9999
     m_MinimalGUI: 1
   m_defaultScale: 0.7789409
-  m_LastWindowPixelSize: {x: 661, y: 1286}
+  m_LastWindowPixelSize: {x: 873, y: 1286}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000001000000000000
@@ -137,21 +136,22 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 1
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: SceneView
+  m_Name: GameView
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 546
+    width: 874
     height: 1307
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 4}
+  m_ActualView: {fileID: 2}
   m_Panes:
   - {fileID: 4}
-  m_Selected: 0
+  - {fileID: 2}
+  m_Selected: 1
   m_LastSelected: 0
 --- !u!114 &4
 MonoBehaviour:
@@ -174,8 +174,8 @@ MonoBehaviour:
   m_Pos:
     serializedVersion: 2
     x: 0
-    y: 73
-    width: 545
+    y: 19
+    width: 873
     height: 1286
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -643,32 +643,6 @@ MonoBehaviour:
   m_LastLockedObject: {fileID: 0}
   m_ViewIsLockedToObject: 0
 --- !u!114 &5
-MonoBehaviour:
-  m_ObjectHideFlags: 52
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: GameView
-  m_EditorClassIdentifier: 
-  m_Children: []
-  m_Position:
-    serializedVersion: 2
-    x: 546
-    y: 0
-    width: 663
-    height: 1307
-  m_MinSize: {x: 202, y: 221}
-  m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 2}
-  m_Panes:
-  - {fileID: 2}
-  m_Selected: 0
-  m_LastSelected: 0
---- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -683,18 +657,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1209
+    x: 874
     y: 0
-    width: 411
+    width: 742
     height: 1307
   m_MinSize: {x: 202, y: 221}
   m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 7}
+  m_ActualView: {fileID: 6}
   m_Panes:
-  - {fileID: 7}
+  - {fileID: 6}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &7
+--- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -714,9 +688,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1209
+    x: 874
     y: 73
-    width: 409
+    width: 740
     height: 1286
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -731,8 +705,8 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 
-      m_LastClickedID: 0
+      m_SelectedIDs: 8806feff
+      m_LastClickedID: -129400
       m_ExpandedIDs: e4dbfdffeadbfdffea0afeff8626feff8c26feff2c77ffffb6c7ffff3ecbffffe6eeffff38efffff7cfaffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
@@ -749,7 +723,7 @@ MonoBehaviour:
         m_IsRenaming: 0
         m_OriginalEventType: 11
         m_IsRenamingFilename: 0
-        m_ClientGUIView: {fileID: 6}
+        m_ClientGUIView: {fileID: 5}
       m_SearchString: 
     m_ExpandedScenes: []
     m_CurrenRootInstanceID: 0
@@ -757,7 +731,7 @@ MonoBehaviour:
       m_IsLocked: 0
     m_CurrentSortingName: TransformSorting
   m_WindowGUID: 468457e0d3add1041b6fec0b00b6a014
---- !u!114 &8
+--- !u!114 &7
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -772,18 +746,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1620
+    x: 1616
     y: 0
     width: 367
     height: 1307
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
-  m_ActualView: {fileID: 9}
+  m_ActualView: {fileID: 8}
   m_Panes:
-  - {fileID: 9}
+  - {fileID: 8}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &9
+--- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -803,7 +777,7 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1620
+    x: 1616
     y: 73
     width: 365
     height: 1286
@@ -898,8 +872,8 @@ MonoBehaviour:
       m_Icon: {fileID: 0}
       m_ResourceFile: 
   m_ListAreaState:
-    m_SelectedInstanceIDs: 
-    m_LastClickedInstanceID: 0
+    m_SelectedInstanceIDs: 8806feff
+    m_LastClickedInstanceID: -129400
     m_HadKeyboardFocusLastEvent: 0
     m_ExpandedInstanceIDs: 00000000
     m_RenameOverlay:
@@ -917,7 +891,7 @@ MonoBehaviour:
       m_IsRenaming: 0
       m_OriginalEventType: 11
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 8}
+      m_ClientGUIView: {fileID: 7}
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
       m_InstanceID: 0
@@ -929,7 +903,7 @@ MonoBehaviour:
     m_GridSize: 16
   m_SkipHiddenPackages: 0
   m_DirectoriesAreaWidth: 163
---- !u!114 &10
+--- !u!114 &9
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -944,18 +918,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1987
+    x: 1983
     y: 0
-    width: 573
+    width: 577
     height: 1307
   m_MinSize: {x: 276, y: 71}
   m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 11}
+  m_ActualView: {fileID: 10}
   m_Panes:
-  - {fileID: 11}
+  - {fileID: 10}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &11
+--- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -975,14 +949,14 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1987
+    x: 1983
     y: 73
-    width: 572
+    width: 576
     height: 1286
   m_SerializedDataModeController:
-    m_DataMode: 0
-    m_PreferredDataMode: 0
-    m_SupportedDataModes: 
+    m_DataMode: 1
+    m_PreferredDataMode: 1
+    m_SupportedDataModes: 010000000200000003000000
     isAutomatic: 1
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas: