Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

Assets/Res/Config/GroupConfig.json

@@ -103,7 +103,7 @@
         16
       ],
       "GroupMonster": [
-        9001
+        7004
       ]
     },
     {

Assets/Res/Config/HeroModelConfig.json

@@ -992,8 +992,8 @@
       "model": "Boss01",
       "isUseGpu": false,
       "heroType": 4,
-      "attack": 100,
-      "hp": 80,
+      "attack": 50,
+      "hp": 200,
       "def": 100,
       "shield": 100,
       "speed_atk": 0.0,
@@ -1398,8 +1398,8 @@
       "model": "Nanzhu",
       "isUseGpu": false,
       "heroType": 3,
-      "attack": 93,
-      "hp": 93,
+      "attack": 77,
+      "hp": 98,
       "def": 100,
       "shield": 93,
       "speed_atk": 0.0,
@@ -1505,6 +1505,64 @@
         -1
       ],
       "heroStory": 0
+    },
+    {
+      "ID": 7004,
+      "nickName": -1,
+      "name": 17,
+      "headicon": "icon_tx7004",
+      "model": "Boss01",
+      "isUseGpu": false,
+      "heroType": 4,
+      "attack": 110,
+      "hp": 130,
+      "def": 100,
+      "shield": 100,
+      "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": [
+        30,
+        -1,
+        1,
+        -1
+      ],
+      "heroStory": 0
     }
   ]
 }