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

Assets/Res/Config/EventConfig.json

@@ -1801,6 +1801,22 @@
     {
       "ID": 10026,
       "EventLinksId": [
+        1002601,
+        1002602,
+        1002603,
+        1002604,
+        1002605,
+        1002606,
+        1002607,
+        1002608,
+        1002609,
+        1002610,
+        1002611,
+        1002612,
+        1002613,
+        1002614,
+        1002615,
+        1002616,
         102
       ],
       "EventTriggerType": 4,

Assets/Res/Config/EventLinkConfig.json

@@ -7628,6 +7628,432 @@
       "EventID": 9110,
       "optionType": 0,
       "ResultType": 0
+    },
+    {
+      "ID": 1002601,
+      "conciseEventMessage": 2625,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        2626
+      ],
+      "DialogueType": 0,
+      "EventID": 10026,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        1002602
+      ]
+    },
+    {
+      "ID": 1002602,
+      "conciseEventMessage": 2625,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        2627
+      ],
+      "DialogueType": 0,
+      "EventID": 10026,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        1002603
+      ]
+    },
+    {
+      "ID": 1002603,
+      "conciseEventMessage": 2625,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        2628
+      ],
+      "DialogueType": 0,
+      "EventID": 10026,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        1002604
+      ]
+    },
+    {
+      "ID": 1002604,
+      "conciseEventMessage": 2625,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        2629
+      ],
+      "DialogueType": 0,
+      "EventID": 10026,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        1002605
+      ]
+    },
+    {
+      "ID": 1002605,
+      "conciseEventMessage": 2625,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        2630
+      ],
+      "DialogueType": 0,
+      "EventID": 10026,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        1002606
+      ]
+    },
+    {
+      "ID": 1002606,
+      "conciseEventMessage": 2631,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 115,
+      "LanID": [
+        2631
+      ],
+      "DialogueType": 0,
+      "EventID": 10026,
+      "optionType": 1,
+      "optionPara1": [
+        1002607,
+        1002611
+      ],
+      "optionPara2": [
+        2632,
+        2633
+      ],
+      "ResultType": 1,
+      "ResultOptions": [
+        1002607
+      ]
+    },
+    {
+      "ID": 1002607,
+      "conciseEventMessage": 2631,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 115,
+      "LanID": [
+        2634
+      ],
+      "DialogueType": 0,
+      "EventID": 10026,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        1002608
+      ]
+    },
+    {
+      "ID": 1002608,
+      "conciseEventMessage": 2631,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        2635
+      ],
+      "DialogueType": 0,
+      "EventID": 10026,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        1002609
+      ]
+    },
+    {
+      "ID": 1002609,
+      "conciseEventMessage": 2631,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 115,
+      "LanID": [
+        2636
+      ],
+      "DialogueType": 0,
+      "EventID": 10026,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        1002610
+      ]
+    },
+    {
+      "ID": 1002610,
+      "conciseEventMessage": 2631,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        2637
+      ],
+      "DialogueType": 0,
+      "EventID": 10026,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        1002614
+      ]
+    },
+    {
+      "ID": 1002611,
+      "conciseEventMessage": 2631,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 115,
+      "LanID": [
+        2638
+      ],
+      "DialogueType": 0,
+      "EventID": 10026,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        1002612
+      ]
+    },
+    {
+      "ID": 1002612,
+      "conciseEventMessage": 2631,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        2639
+      ],
+      "DialogueType": 0,
+      "EventID": 10026,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        1002613
+      ]
+    },
+    {
+      "ID": 1002613,
+      "conciseEventMessage": 2631,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        2640
+      ],
+      "DialogueType": 0,
+      "EventID": 10026,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        1002614
+      ]
+    },
+    {
+      "ID": 1002614,
+      "conciseEventMessage": 2631,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 115,
+      "LanID": [
+        2641
+      ],
+      "DialogueType": 0,
+      "EventID": 10026,
+      "optionType": 1,
+      "optionPara1": [
+        1002615
+      ],
+      "optionPara2": [
+        2642
+      ],
+      "ResultType": 1,
+      "ResultOptions": [
+        1002615
+      ]
+    },
+    {
+      "ID": 1002615,
+      "conciseEventMessage": 2631,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        2643
+      ],
+      "DialogueType": 0,
+      "EventID": 10026,
+      "optionType": 2,
+      "optionPara1": [
+        1010
+      ],
+      "ResultType": 2,
+      "ResultOptions": [
+        1002616,
+        101
+      ]
+    },
+    {
+      "ID": 1002616,
+      "conciseEventMessage": 2644,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 116,
+      "LanID": [
+        2644
+      ],
+      "DialogueType": 0,
+      "EventID": 10026,
+      "optionType": 1,
+      "optionPara1": [
+        1002617,
+        1002619
+      ],
+      "optionPara2": [
+        2645,
+        2646
+      ],
+      "ResultType": 1,
+      "ResultOptions": [
+        1002617
+      ]
+    },
+    {
+      "ID": 1002617,
+      "conciseEventMessage": 2644,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 116,
+      "LanID": [
+        2647
+      ],
+      "DialogueType": 0,
+      "EventID": 10026,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        1002618
+      ]
+    },
+    {
+      "ID": 1002618,
+      "conciseEventMessage": 2644,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        2648
+      ],
+      "DialogueType": 0,
+      "EventID": 10026,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        1002621
+      ]
+    },
+    {
+      "ID": 1002619,
+      "conciseEventMessage": 2644,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 116,
+      "LanID": [
+        2649
+      ],
+      "DialogueType": 0,
+      "EventID": 10026,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        1002620
+      ]
+    },
+    {
+      "ID": 1002620,
+      "conciseEventMessage": 2644,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        2650
+      ],
+      "DialogueType": 0,
+      "EventID": 10026,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        1002621
+      ]
+    },
+    {
+      "ID": 1002621,
+      "conciseEventMessage": 2644,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 116,
+      "LanID": [
+        2651
+      ],
+      "DialogueType": 0,
+      "EventID": 10026,
+      "optionType": 2,
+      "optionPara1": [
+        1011
+      ],
+      "ResultType": 2,
+      "ResultOptions": [
+        1002622,
+        101
+      ]
+    },
+    {
+      "ID": 1002622,
+      "conciseEventMessage": 2652,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        2652
+      ],
+      "DialogueType": 0,
+      "EventID": 10026,
+      "optionType": 0,
+      "ResultType": 3,
+      "ResultOptions": [
+        10027
+      ]
     }
   ]
 }

Assets/Res/Config/EventNPC.json

@@ -155,6 +155,18 @@
       "name": 3067,
       "ID_1": 0,
       "DaoyouID": 0
+    },
+    {
+      "ID": 115,
+      "name": 0,
+      "ID_1": 0,
+      "DaoyouID": 0
+    },
+    {
+      "ID": 116,
+      "name": 0,
+      "ID_1": 0,
+      "DaoyouID": 0
     }
   ]
 }

Assets/Res/Config/GroupConfig.json

@@ -135,6 +135,24 @@
         5007
       ]
     },
+    {
+      "ID": 1010,
+      "GroupMonsterLevel": [
+        105
+      ],
+      "GroupMonster": [
+        5007
+      ]
+    },
+    {
+      "ID": 1011,
+      "GroupMonsterLevel": [
+        105
+      ],
+      "GroupMonster": [
+        5007
+      ]
+    },
     {
       "ID": 2001,
       "GroupMonsterLevel": [

Assets/Res/Config/HeroModelConfig.json

@@ -8,10 +8,10 @@
       "model": "Nanzhu",
       "isUseGpu": false,
       "heroType": 1,
-      "attack": 100,
-      "hp": 100,
-      "def": 50,
-      "shield": 100,
+      "attack": 200,
+      "hp": 201,
+      "def": 100,
+      "shield": 201,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -66,10 +66,10 @@
       "model": "Gw_Man",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 70,
-      "hp": 89,
-      "def": 50,
-      "shield": 72,
+      "attack": 220,
+      "hp": 183,
+      "def": 100,
+      "shield": 183,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -124,10 +124,10 @@
       "model": "Nanzhu",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 75,
-      "hp": 81,
-      "def": 65,
-      "shield": 51,
+      "attack": 180,
+      "hp": 224,
+      "def": 100,
+      "shield": 224,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -182,10 +182,10 @@
       "model": "Gw_Man",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 75,
-      "hp": 80,
-      "def": 50,
-      "shield": 63,
+      "attack": 200,
+      "hp": 201,
+      "def": 100,
+      "shield": 201,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -240,10 +240,10 @@
       "model": "Gw_Woman",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 80,
-      "hp": 80,
-      "def": 50,
-      "shield": 63,
+      "attack": 240,
+      "hp": 168,
+      "def": 100,
+      "shield": 168,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -298,10 +298,10 @@
       "model": "Boss_Tree_xiao",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 50,
-      "hp": 80,
-      "def": 50,
-      "shield": 63,
+      "attack": 160,
+      "hp": 251,
+      "def": 100,
+      "shield": 251,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -356,10 +356,10 @@
       "model": "gw_xianhe",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 50,
-      "hp": 80,
-      "def": 50,
-      "shield": 63,
+      "attack": 230,
+      "hp": 175,
+      "def": 100,
+      "shield": 175,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -414,10 +414,10 @@
       "model": "gw_huli",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 50,
-      "hp": 80,
-      "def": 50,
-      "shield": 63,
+      "attack": 250,
+      "hp": 161,
+      "def": 100,
+      "shield": 161,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -472,10 +472,10 @@
       "model": "Gw_zhizhu",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 70,
-      "hp": 80,
-      "def": 50,
-      "shield": 63,
+      "attack": 210,
+      "hp": 192,
+      "def": 100,
+      "shield": 192,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -529,11 +529,11 @@
       "headicon": "icon_tx5001",
       "model": "Gw_Man",
       "isUseGpu": false,
-      "heroType": 2,
-      "attack": 90,
-      "hp": 95,
-      "def": 50,
-      "shield": 63,
+      "heroType": 3,
+      "attack": 286,
+      "hp": 238,
+      "def": 100,
+      "shield": 238,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -587,11 +587,11 @@
       "headicon": "icon_tx5002",
       "model": "Gw_Man",
       "isUseGpu": false,
-      "heroType": 2,
-      "attack": 90,
-      "hp": 95,
-      "def": 50,
-      "shield": 63,
+      "heroType": 3,
+      "attack": 234,
+      "hp": 291,
+      "def": 100,
+      "shield": 291,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -645,11 +645,11 @@
       "headicon": "icon_tx5003",
       "model": "Gw_Woman",
       "isUseGpu": false,
-      "heroType": 2,
-      "attack": 90,
-      "hp": 95,
-      "def": 50,
-      "shield": 63,
+      "heroType": 3,
+      "attack": 260,
+      "hp": 262,
+      "def": 100,
+      "shield": 262,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -703,11 +703,11 @@
       "headicon": "icon_tx5004",
       "model": "Gw_Man",
       "isUseGpu": false,
-      "heroType": 2,
-      "attack": 90,
-      "hp": 95,
-      "def": 50,
-      "shield": 63,
+      "heroType": 3,
+      "attack": 312,
+      "hp": 218,
+      "def": 100,
+      "shield": 218,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -761,11 +761,11 @@
       "headicon": "icon_tx5005",
       "model": "Gw_Woman",
       "isUseGpu": false,
-      "heroType": 2,
-      "attack": 90,
-      "hp": 95,
-      "def": 50,
-      "shield": 63,
+      "heroType": 3,
+      "attack": 208,
+      "hp": 327,
+      "def": 100,
+      "shield": 327,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -819,11 +819,11 @@
       "headicon": "icon_tx5006",
       "model": "Boss_ShuGuai",
       "isUseGpu": false,
-      "heroType": 2,
-      "attack": 90,
-      "hp": 95,
-      "def": 50,
-      "shield": 63,
+      "heroType": 3,
+      "attack": 299,
+      "hp": 227,
+      "def": 100,
+      "shield": 227,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -877,11 +877,11 @@
       "headicon": "icon_tx5007",
       "model": "Boss_QiongQi",
       "isUseGpu": false,
-      "heroType": 2,
-      "attack": 80,
-      "hp": 95,
-      "def": 50,
-      "shield": 63,
+      "heroType": 3,
+      "attack": 325,
+      "hp": 209,
+      "def": 100,
+      "shield": 209,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -936,10 +936,10 @@
       "model": "Boss01",
       "isUseGpu": false,
       "heroType": 4,
-      "attack": 80,
-      "hp": 170,
-      "def": 50,
-      "shield": 0,
+      "attack": 300,
+      "hp": 302,
+      "def": 100,
+      "shield": 302,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -994,10 +994,10 @@
       "model": "Boss_fenghuang",
       "isUseGpu": false,
       "heroType": 4,
-      "attack": 65,
-      "hp": 80,
-      "def": 50,
-      "shield": 0,
+      "attack": 300,
+      "hp": 302,
+      "def": 100,
+      "shield": 302,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -1052,10 +1052,10 @@
       "model": "Boss_BeiHaiGui",
       "isUseGpu": false,
       "heroType": 4,
-      "attack": 60,
-      "hp": 150,
-      "def": 50,
-      "shield": 0,
+      "attack": 300,
+      "hp": 302,
+      "def": 100,
+      "shield": 302,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -1110,10 +1110,10 @@
       "model": "Boss_Tree",
       "isUseGpu": false,
       "heroType": 4,
-      "attack": 35,
-      "hp": 100,
-      "def": 50,
-      "shield": 0,
+      "attack": 300,
+      "hp": 302,
+      "def": 100,
+      "shield": 302,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -1168,10 +1168,10 @@
       "model": "Boss_fenghuang",
       "isUseGpu": false,
       "heroType": 4,
-      "attack": 35,
-      "hp": 150,
-      "def": 50,
-      "shield": 0,
+      "attack": 300,
+      "hp": 302,
+      "def": 100,
+      "shield": 302,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -1226,10 +1226,10 @@
       "model": "Boss_fenghuang",
       "isUseGpu": false,
       "heroType": 4,
-      "attack": 35,
-      "hp": 150,
-      "def": 50,
-      "shield": 0,
+      "attack": 300,
+      "hp": 302,
+      "def": 100,
+      "shield": 302,
       "speed_atk": 0.0,
       "Linggen": [
         100,

Assets/Res/Config/LevelbattleConfig.json

@@ -120,6 +120,26 @@
       "MonsterGroupTruePower": 100,
       "MonsterGroupPower": 100
     },
+    {
+      "ID": 1010,
+      "Group": [
+        1010
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 1011,
+      "Group": [
+        1011
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
     {
       "ID": 2001,
       "Group": [

Assets/Scripts/GameData/ExcelConfig/HeroModelConfig.cs

@@ -84,6 +84,9 @@ namespace Excel2Json
 #endif
 		
 
+
+
+
 		/// <summary>
 		///攻击力
 		/// </summary>