修改bug

Assets/Res/Config/GroupConfig.json

@@ -1,94 +1,123 @@
 {
   "configList": [
     {
-      "ID": 100001
+      "ID": 100001,
+      "GroupMonster": [
+        1001,
+        1002
+      ]
     },
     {
-      "ID": 100002
+      "ID": 100002,
+      "GroupMonster": [
+        1001,
+        1002
+      ]
     },
     {
-      "ID": 100003
+      "ID": 100003,
+      "GroupMonster": [
+        1001,
+        1002
+      ]
     },
     {
-      "ID": 100004
+      "ID": 100004,
+      "GroupMonster": [
+        1001,
+        1002
+      ]
     },
     {
-      "ID": 100005
+      "ID": 100005,
+      "GroupMonster": [
+        1001,
+        1002
+      ]
     },
     {
-      "ID": 100006
+      "ID": 100006,
+      "GroupMonster": [
+        1001,
+        1002
+      ]
     },
     {
-      "ID": 100007
+      "ID": 100007,
+      "GroupMonster": [
+        1001,
+        1002
+      ]
     },
     {
-      "ID": 100008
+      "ID": 100008,
+      "GroupMonster": [
+        1001,
+        1002
+      ]
     },
     {
-      "ID": 100009
+      "ID": 100009,
+      "GroupMonster": [
+        1001,
+        1002
+      ]
     },
     {
-      "ID": 100010
+      "ID": 1002,
+      "GroupMonster": [
+        1001,
+        1002
+      ]
     },
     {
-      "ID": 100011
+      "ID": 1003,
+      "GroupMonster": [
+        1001,
+        1002
+      ]
     },
     {
-      "ID": 100012
+      "ID": 1004,
+      "GroupMonster": [
+        1001,
+        1002
+      ]
     },
     {
-      "ID": 100013
+      "ID": 1005,
+      "GroupMonster": [
+        1001,
+        1002
+      ]
     },
     {
-      "ID": 100014
+      "ID": 1006,
+      "GroupMonster": [
+        1001,
+        1002
+      ]
     },
     {
-      "ID": 100015
+      "ID": 1007,
+      "GroupMonster": [
+        1001,
+        1002
+      ]
     },
     {
-      "ID": 100016
+      "ID": 1008,
+      "GroupMonster": [
+        1001,
+        1002
+      ]
     },
     {
-      "ID": 100017
-    },
-    {
-      "ID": 100018
-    },
-    {
-      "ID": 100019
-    },
-    {
-      "ID": 100020
-    },
-    {
-      "ID": 100021
-    },
-    {
-      "ID": 100022
-    },
-    {
-      "ID": 100023
-    },
-    {
-      "ID": 100024
-    },
-    {
-      "ID": 100025
-    },
-    {
-      "ID": 100026
-    },
-    {
-      "ID": 100027
-    },
-    {
-      "ID": 100028
-    },
-    {
-      "ID": 100029
-    },
-    {
-      "ID": 100030
+      "ID": 1009,
+      "GroupMonster": [
+        1001,
+        1002
+      ]
     }
   ]
 }

Assets/Res/Config/HeroModelConfig.json

@@ -80,15 +80,15 @@
       ],
       "skillID": [
         1201,
-        2004,
+        -1,
         1301,
-        2004,
+        -1,
         1401,
-        2006,
+        -1,
         -1,
         -1,
         1101,
-        2001
+        -1
       ],
       "skillActiveLv": [
         1,
@@ -103,10 +103,10 @@
         10
       ],
       "fa_bao_id": [
-        10001,
-        10003,
-        10006,
-        10010
+        -1,
+        -1,
+        -1,
+        -1
       ],
       "fabaoActiveLv": [
         1,
@@ -138,15 +138,15 @@
       ],
       "skillID": [
         1202,
-        2005,
+        -1,
         1301,
-        2005,
+        -1,
         1402,
-        2007,
+        -1,
         -1,
         -1,
         1102,
-        2002
+        -1
       ],
       "skillActiveLv": [
         1,
@@ -161,10 +161,10 @@
         10
       ],
       "fa_bao_id": [
-        10003,
-        10006,
-        10010,
-        10001
+        -1,
+        -1,
+        -1,
+        -1
       ],
       "fabaoActiveLv": [
         1,
@@ -196,15 +196,15 @@
       ],
       "skillID": [
         1201,
-        2006,
+        -1,
         1301,
-        2006,
+        -1,
         1403,
-        2008,
+        -1,
         -1,
         -1,
         1103,
-        2003
+        -1
       ],
       "skillActiveLv": [
         1,
@@ -219,10 +219,10 @@
         10
       ],
       "fa_bao_id": [
-        10006,
-        10010,
-        10001,
-        10003
+        -1,
+        -1,
+        -1,
+        -1
       ],
       "fabaoActiveLv": [
         1,
@@ -233,17 +233,17 @@
       "heroStory": null
     },
     {
-      "ID": 9001,
+      "ID": 1004,
       "nickName": -1,
-      "name": 5,
-      "headicon": "icon_tx9001",
-      "model": "Boss01",
+      "name": 4,
+      "headicon": "icon_tx1004",
+      "model": "Guixiu01",
       "isUseGpu": false,
-      "heroType": 4,
-      "attack": 35,
-      "hp": 150,
+      "heroType": 2,
+      "attack": 95,
+      "hp": 80,
       "def": 50,
-      "shield": 0,
+      "shield": 63,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -253,55 +253,171 @@
         100
       ],
       "skillID": [
-        9003,
-        9004,
-        9005,
+        9031,
         -1,
+        9032,
         -1,
+        9033,
         -1,
         -1,
+        9033,
         -1,
-        9001,
-        9002
+        -1
       ],
       "skillActiveLv": [
         1,
+        40,
+        30,
+        70,
+        60,
+        -1,
+        -1,
+        -1,
         1,
+        10
+      ],
+      "fa_bao_id": [
+        -1,
+        -1,
+        -1,
+        -1
+      ],
+      "fabaoActiveLv": [
         1,
+        20,
+        50,
+        80
+      ],
+      "heroStory": null
+    },
+    {
+      "ID": 1005,
+      "nickName": -1,
+      "name": 4,
+      "headicon": "icon_tx1005",
+      "model": "Guixiu01",
+      "isUseGpu": false,
+      "heroType": 2,
+      "attack": 95,
+      "hp": 80,
+      "def": 50,
+      "shield": 63,
+      "speed_atk": 0.0,
+      "Linggen": [
+        100,
+        100,
+        100,
+        100,
+        100
+      ],
+      "skillID": [
+        9071,
+        -1,
+        -1,
+        -1,
+        9071,
         -1,
         -1,
         -1,
+        9071,
+        -1
+      ],
+      "skillActiveLv": [
+        1,
+        40,
+        30,
+        70,
+        60,
+        -1,
         -1,
         -1,
         1,
-        1
+        10
       ],
       "fa_bao_id": [
-        10001,
         -1,
-        10006,
+        -1,
+        -1,
         -1
       ],
       "fabaoActiveLv": [
         1,
+        20,
+        50,
+        80
+      ],
+      "heroStory": null
+    },
+    {
+      "ID": 5001,
+      "nickName": -1,
+      "name": 4,
+      "headicon": "icon_tx5001",
+      "model": "Guixiu01",
+      "isUseGpu": false,
+      "heroType": 2,
+      "attack": 95,
+      "hp": 80,
+      "def": 50,
+      "shield": 63,
+      "speed_atk": 0.0,
+      "Linggen": [
+        100,
+        100,
+        100,
+        100,
+        100
+      ],
+      "skillID": [
+        -1,
+        2003,
+        1105,
+        -1,
+        1104,
+        -1,
+        1101,
+        -1,
+        1103,
+        2003
+      ],
+      "skillActiveLv": [
+        1,
+        40,
+        30,
+        70,
+        60,
+        -1,
+        -1,
         -1,
         1,
+        10
+      ],
+      "fa_bao_id": [
+        3102,
+        3101,
+        -1,
         -1
       ],
+      "fabaoActiveLv": [
+        1,
+        20,
+        50,
+        80
+      ],
       "heroStory": null
     },
     {
-      "ID": 9002,
+      "ID": 5002,
       "nickName": -1,
-      "name": 5,
-      "headicon": "icon_tx9002",
-      "model": "Boss_fenghuang",
+      "name": 4,
+      "headicon": "icon_tx5002",
+      "model": "Guixiu01",
       "isUseGpu": false,
-      "heroType": 4,
-      "attack": 35,
-      "hp": 150,
+      "heroType": 2,
+      "attack": 95,
+      "hp": 80,
       "def": 50,
-      "shield": 0,
+      "shield": 63,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -311,33 +427,671 @@
         100
       ],
       "skillID": [
-        9011,
-        9012,
-        9013,
-        9014,
+        1201,
         -1,
         -1,
         -1,
+        1205,
         -1,
-        9015,
-        9015
+        1204,
+        -1,
+        1202,
+        2003
       ],
       "skillActiveLv": [
         1,
+        40,
+        30,
+        70,
+        60,
+        -1,
+        -1,
+        -1,
         1,
+        10
+      ],
+      "fa_bao_id": [
+        3203,
+        3202,
+        -1,
+        -1
+      ],
+      "fabaoActiveLv": [
         1,
+        20,
+        50,
+        80
+      ],
+      "heroStory": null
+    },
+    {
+      "ID": 5003,
+      "nickName": -1,
+      "name": 4,
+      "headicon": "icon_tx5003",
+      "model": "Guixiu01",
+      "isUseGpu": false,
+      "heroType": 2,
+      "attack": 95,
+      "hp": 80,
+      "def": 50,
+      "shield": 63,
+      "speed_atk": 0.0,
+      "Linggen": [
+        100,
+        100,
+        100,
+        100,
+        100
+      ],
+      "skillID": [
+        -1,
+        1301,
         -1,
         -1,
+        1305,
         -1,
+        1304,
         -1,
         -1,
+        1302
+      ],
+      "skillActiveLv": [
         1,
-        1
+        40,
+        30,
+        70,
+        60,
+        -1,
+        -1,
+        -1,
+        1,
+        10
       ],
       "fa_bao_id": [
-        10001,
+        3301,
+        3302,
+        -1,
+        -1
+      ],
+      "fabaoActiveLv": [
+        1,
+        20,
+        50,
+        80
+      ],
+      "heroStory": null
+    },
+    {
+      "ID": 5004,
+      "nickName": -1,
+      "name": 4,
+      "headicon": "icon_tx5004",
+      "model": "Guixiu01",
+      "isUseGpu": false,
+      "heroType": 2,
+      "attack": 95,
+      "hp": 80,
+      "def": 50,
+      "shield": 63,
+      "speed_atk": 0.0,
+      "Linggen": [
+        100,
+        100,
+        100,
+        100,
+        100
+      ],
+      "skillID": [
+        -1,
+        1404,
+        -1,
+        1401,
+        -1,
+        -1,
+        2005,
+        1402,
+        -1,
+        1403
+      ],
+      "skillActiveLv": [
+        1,
+        40,
+        30,
+        70,
+        60,
+        -1,
+        -1,
+        -1,
+        1,
+        10
+      ],
+      "fa_bao_id": [
+        3301,
+        3302,
+        -1,
+        -1
+      ],
+      "fabaoActiveLv": [
+        1,
+        20,
+        50,
+        80
+      ],
+      "heroStory": null
+    },
+    {
+      "ID": 5005,
+      "nickName": -1,
+      "name": 4,
+      "headicon": "icon_tx5005",
+      "model": "Guixiu01",
+      "isUseGpu": false,
+      "heroType": 2,
+      "attack": 95,
+      "hp": 80,
+      "def": 50,
+      "shield": 63,
+      "speed_atk": 0.0,
+      "Linggen": [
+        100,
+        100,
+        100,
+        100,
+        100
+      ],
+      "skillID": [
+        -1,
+        1501,
+        -1,
+        1502,
+        -1,
+        -1,
+        2005,
+        1504,
+        -1,
+        1505
+      ],
+      "skillActiveLv": [
+        1,
+        40,
+        30,
+        70,
+        60,
+        -1,
+        -1,
+        -1,
+        1,
+        10
+      ],
+      "fa_bao_id": [
+        3501,
+        3203,
+        -1,
+        -1
+      ],
+      "fabaoActiveLv": [
+        1,
+        20,
+        50,
+        80
+      ],
+      "heroStory": null
+    },
+    {
+      "ID": 5006,
+      "nickName": -1,
+      "name": 4,
+      "headicon": "icon_tx5006",
+      "model": "Guixiu01",
+      "isUseGpu": false,
+      "heroType": 2,
+      "attack": 95,
+      "hp": 80,
+      "def": 50,
+      "shield": 63,
+      "speed_atk": 0.0,
+      "Linggen": [
+        100,
+        100,
+        100,
+        100,
+        100
+      ],
+      "skillID": [
+        -1,
+        9041,
+        -1,
+        9042,
+        9044,
+        -1,
+        9043,
+        -1,
+        -1,
+        9044
+      ],
+      "skillActiveLv": [
+        1,
+        40,
+        30,
+        70,
+        60,
+        -1,
+        -1,
+        -1,
+        1,
+        10
+      ],
+      "fa_bao_id": [
+        -1,
+        -1,
+        -1,
+        -1
+      ],
+      "fabaoActiveLv": [
+        1,
+        20,
+        50,
+        80
+      ],
+      "heroStory": null
+    },
+    {
+      "ID": 5007,
+      "nickName": -1,
+      "name": 4,
+      "headicon": "icon_tx5007",
+      "model": "Guixiu01",
+      "isUseGpu": false,
+      "heroType": 2,
+      "attack": 95,
+      "hp": 80,
+      "def": 50,
+      "shield": 63,
+      "speed_atk": 0.0,
+      "Linggen": [
+        100,
+        100,
+        100,
+        100,
+        100
+      ],
+      "skillID": [
+        -1,
+        9051,
+        -1,
+        9052,
+        9051,
+        -1,
+        9053,
+        -1,
+        -1,
+        9054
+      ],
+      "skillActiveLv": [
+        1,
+        40,
+        30,
+        70,
+        60,
+        -1,
+        -1,
+        -1,
+        1,
+        10
+      ],
+      "fa_bao_id": [
+        -1,
+        -1,
+        -1,
+        -1
+      ],
+      "fabaoActiveLv": [
+        1,
+        20,
+        50,
+        80
+      ],
+      "heroStory": null
+    },
+    {
+      "ID": 9001,
+      "nickName": -1,
+      "name": 5,
+      "headicon": "icon_tx9001",
+      "model": "Boss01",
+      "isUseGpu": false,
+      "heroType": 4,
+      "attack": 35,
+      "hp": 150,
+      "def": 50,
+      "shield": 0,
+      "speed_atk": 0.0,
+      "Linggen": [
+        100,
+        100,
+        100,
+        100,
+        100
+      ],
+      "skillID": [
+        9003,
+        -1,
+        9005,
+        -1,
+        9005,
+        -1,
+        9004,
+        -1,
+        9001,
+        9002
+      ],
+      "skillActiveLv": [
+        1,
+        1,
+        1,
+        -1,
+        -1,
+        -1,
+        -1,
+        -1,
+        1,
+        1
+      ],
+      "fa_bao_id": [
+        10001,
+        -1,
+        10006,
+        -1
+      ],
+      "fabaoActiveLv": [
+        1,
+        -1,
+        1,
+        -1
+      ],
+      "heroStory": null
+    },
+    {
+      "ID": 9002,
+      "nickName": -1,
+      "name": 5,
+      "headicon": "icon_tx9002",
+      "model": "Boss_fenghuang",
+      "isUseGpu": false,
+      "heroType": 4,
+      "attack": 35,
+      "hp": 150,
+      "def": 50,
+      "shield": 0,
+      "speed_atk": 0.0,
+      "Linggen": [
+        100,
+        100,
+        100,
+        100,
+        100
+      ],
+      "skillID": [
+        9011,
+        -1,
+        9013,
+        9014,
+        -1,
+        9012,
+        -1,
+        -1,
+        9015,
+        9015
+      ],
+      "skillActiveLv": [
+        1,
+        1,
+        1,
+        -1,
+        -1,
+        -1,
+        -1,
+        -1,
+        1,
+        1
+      ],
+      "fa_bao_id": [
+        -1,
+        -1,
+        -1,
+        -1
+      ],
+      "fabaoActiveLv": [
+        1,
+        -1,
+        1,
+        -1
+      ],
+      "heroStory": null
+    },
+    {
+      "ID": 9003,
+      "nickName": -1,
+      "name": 5,
+      "headicon": "icon_tx9003",
+      "model": "Boss_fenghuang",
+      "isUseGpu": false,
+      "heroType": 4,
+      "attack": 35,
+      "hp": 150,
+      "def": 50,
+      "shield": 0,
+      "speed_atk": 0.0,
+      "Linggen": [
+        100,
+        100,
+        100,
+        100,
+        100
+      ],
+      "skillID": [
+        9021,
+        -1,
+        -1,
+        9022,
+        -1,
+        9023,
+        -1,
+        -1,
+        9024,
+        9023
+      ],
+      "skillActiveLv": [
+        1,
+        1,
+        1,
+        -1,
+        -1,
+        -1,
+        -1,
+        -1,
+        1,
+        1
+      ],
+      "fa_bao_id": [
+        -1,
+        -1,
+        -1,
+        -1
+      ],
+      "fabaoActiveLv": [
+        1,
+        -1,
+        1,
+        -1
+      ],
+      "heroStory": null
+    },
+    {
+      "ID": 9004,
+      "nickName": -1,
+      "name": 5,
+      "headicon": "icon_tx9004",
+      "model": "Boss_fenghuang",
+      "isUseGpu": false,
+      "heroType": 4,
+      "attack": 35,
+      "hp": 150,
+      "def": 50,
+      "shield": 0,
+      "speed_atk": 0.0,
+      "Linggen": [
+        100,
+        100,
+        100,
+        100,
+        100
+      ],
+      "skillID": [
+        -1,
+        9061,
+        -1,
+        9064,
+        9062,
+        9063,
+        -1,
+        -1,
+        -1,
+        9063
+      ],
+      "skillActiveLv": [
+        1,
+        1,
+        1,
+        -1,
+        -1,
+        -1,
+        -1,
+        -1,
+        1,
+        1
+      ],
+      "fa_bao_id": [
+        -1,
+        -1,
+        -1,
+        -1
+      ],
+      "fabaoActiveLv": [
+        1,
+        -1,
+        1,
+        -1
+      ],
+      "heroStory": null
+    },
+    {
+      "ID": 9005,
+      "nickName": -1,
+      "name": 5,
+      "headicon": "icon_tx9005",
+      "model": "Boss_fenghuang",
+      "isUseGpu": false,
+      "heroType": 4,
+      "attack": 35,
+      "hp": 150,
+      "def": 50,
+      "shield": 0,
+      "speed_atk": 0.0,
+      "Linggen": [
+        100,
+        100,
+        100,
+        100,
+        100
+      ],
+      "skillID": [
+        -1,
+        9061,
+        -1,
+        9064,
+        9062,
+        9063,
+        -1,
+        -1,
+        -1,
+        9063
+      ],
+      "skillActiveLv": [
+        1,
+        1,
+        1,
+        -1,
+        -1,
+        -1,
+        -1,
+        -1,
+        1,
+        1
+      ],
+      "fa_bao_id": [
+        -1,
+        -1,
+        -1,
+        -1
+      ],
+      "fabaoActiveLv": [
+        1,
+        -1,
+        1,
+        -1
+      ],
+      "heroStory": null
+    },
+    {
+      "ID": 9006,
+      "nickName": -1,
+      "name": 5,
+      "headicon": "icon_tx9006",
+      "model": "Boss_fenghuang",
+      "isUseGpu": false,
+      "heroType": 4,
+      "attack": 35,
+      "hp": 150,
+      "def": 50,
+      "shield": 0,
+      "speed_atk": 0.0,
+      "Linggen": [
+        100,
+        100,
+        100,
+        100,
+        100
+      ],
+      "skillID": [
+        -1,
+        9081,
+        -1,
+        9082,
+        9084,
+        9083,
+        -1,
+        9085,
+        -1,
+        9084
+      ],
+      "skillActiveLv": [
+        1,
+        1,
+        1,
+        -1,
+        -1,
+        -1,
+        -1,
+        -1,
+        1,
+        1
+      ],
+      "fa_bao_id": [
+        -1,
+        -1,
         -1,
-        10006,
         -1
       ],
       "fabaoActiveLv": [

Assets/Res/Config/LevelbattleConfig.json

@@ -41,9 +41,9 @@
       "MonsterGroupPower": 100
     },
     {
-      "ID": 1001,
+      "ID": 1002,
       "Group": [
-        100001
+        1002
       ],
       "combatTime": 120.0,
       "combatType": 1,
@@ -51,9 +51,9 @@
       "MonsterGroupPower": 100
     },
     {
-      "ID": 1002,
+      "ID": 1003,
       "Group": [
-        100002
+        1003
       ],
       "combatTime": 120.0,
       "combatType": 1,
@@ -61,9 +61,9 @@
       "MonsterGroupPower": 100
     },
     {
-      "ID": 1003,
+      "ID": 1004,
       "Group": [
-        100003
+        1004
       ],
       "combatTime": 120.0,
       "combatType": 1,
@@ -71,9 +71,9 @@
       "MonsterGroupPower": 100
     },
     {
-      "ID": 1004,
+      "ID": 1005,
       "Group": [
-        100001
+        1005
       ],
       "combatTime": 120.0,
       "combatType": 1,
@@ -81,9 +81,9 @@
       "MonsterGroupPower": 100
     },
     {
-      "ID": 1005,
+      "ID": 1006,
       "Group": [
-        100002
+        1006
       ],
       "combatTime": 120.0,
       "combatType": 1,
@@ -91,9 +91,9 @@
       "MonsterGroupPower": 100
     },
     {
-      "ID": 1006,
+      "ID": 1007,
       "Group": [
-        100004
+        1007
       ],
       "combatTime": 120.0,
       "combatType": 1,
@@ -101,9 +101,9 @@
       "MonsterGroupPower": 100
     },
     {
-      "ID": 1007,
+      "ID": 1008,
       "Group": [
-        100001
+        1008
       ],
       "combatTime": 120.0,
       "combatType": 1,
@@ -111,9 +111,9 @@
       "MonsterGroupPower": 100
     },
     {
-      "ID": 1008,
+      "ID": 1009,
       "Group": [
-        100001
+        1009
       ],
       "combatTime": 120.0,
       "combatType": 1,

Assets/Scenes/testCombat.scene

@@ -2394,7 +2394,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 9214784224709271120, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: m_IsActive
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []