1

Assets/Res/Config/EventConditionConfig.json

@@ -2,7 +2,7 @@
   "configList": [
     {
       "ID": 1,
-      "message": 2078,
+      "message": 9001,
       "Operation": 0,
       "ConditionType": 1,
       "ConditionPara": [
@@ -18,7 +18,7 @@
     },
     {
       "ID": 2,
-      "message": 2079,
+      "message": 9002,
       "Operation": 0,
       "ConditionType": 3,
       "ConditionPara": [
@@ -34,7 +34,7 @@
     },
     {
       "ID": 3,
-      "message": 2080,
+      "message": 9003,
       "Operation": 0,
       "ConditionType": 5,
       "ConditionPara": [
@@ -53,7 +53,7 @@
     },
     {
       "ID": 4,
-      "message": 2081,
+      "message": 9004,
       "Operation": 0,
       "ConditionType": 6,
       "ConditionPara": [
@@ -69,7 +69,7 @@
     },
     {
       "ID": 5,
-      "message": 2082,
+      "message": 9005,
       "Operation": 0,
       "ConditionType": 8,
       "finishCount": 1,
@@ -82,7 +82,7 @@
     },
     {
       "ID": 6,
-      "message": 2094,
+      "message": 9006,
       "Operation": 0,
       "ConditionType": 9,
       "finishCount": 6,
@@ -95,7 +95,7 @@
     },
     {
       "ID": 7,
-      "message": 2843,
+      "message": 9007,
       "Operation": 0,
       "ConditionType": 5,
       "ConditionPara": [
@@ -111,7 +111,7 @@
     },
     {
       "ID": 8,
-      "message": 2844,
+      "message": 9008,
       "Operation": 0,
       "ConditionType": 3,
       "ConditionPara": [
@@ -127,7 +127,7 @@
     },
     {
       "ID": 9,
-      "message": 2845,
+      "message": 9009,
       "Operation": 0,
       "ConditionType": 5,
       "ConditionPara": [
@@ -146,7 +146,7 @@
     },
     {
       "ID": 10,
-      "message": 2846,
+      "message": 9010,
       "Operation": 0,
       "ConditionType": 5,
       "ConditionPara": [
@@ -165,7 +165,7 @@
     },
     {
       "ID": 11,
-      "message": 2847,
+      "message": 9011,
       "Operation": 0,
       "ConditionType": 6,
       "ConditionPara": [
@@ -184,7 +184,7 @@
     },
     {
       "ID": 12,
-      "message": 2848,
+      "message": 9012,
       "Operation": 0,
       "ConditionType": 5,
       "ConditionPara": [
@@ -203,7 +203,7 @@
     },
     {
       "ID": 13,
-      "message": 2849,
+      "message": 9013,
       "Operation": 0,
       "ConditionType": 5,
       "ConditionPara": [
@@ -222,7 +222,7 @@
     },
     {
       "ID": 14,
-      "message": 2850,
+      "message": 9014,
       "Operation": 0,
       "ConditionType": 3,
       "ConditionPara": [
@@ -238,7 +238,7 @@
     },
     {
       "ID": 15,
-      "message": 2851,
+      "message": 9015,
       "Operation": 0,
       "ConditionType": 5,
       "ConditionPara": [
@@ -257,7 +257,7 @@
     },
     {
       "ID": 17,
-      "message": 2852,
+      "message": 9016,
       "Operation": 0,
       "ConditionType": 5,
       "ConditionPara": [
@@ -276,7 +276,7 @@
     },
     {
       "ID": 18,
-      "message": 2853,
+      "message": 9017,
       "Operation": 0,
       "ConditionType": 6,
       "ConditionPara": [
@@ -295,7 +295,7 @@
     },
     {
       "ID": 19,
-      "message": 2854,
+      "message": 9018,
       "Operation": 0,
       "ConditionType": 6,
       "ConditionPara": [
@@ -314,7 +314,7 @@
     },
     {
       "ID": 20,
-      "message": 2855,
+      "message": 9019,
       "Operation": 0,
       "ConditionType": 1,
       "ConditionPara": [
@@ -330,7 +330,7 @@
     },
     {
       "ID": 21,
-      "message": 2856,
+      "message": 9020,
       "Operation": 0,
       "ConditionType": 3,
       "ConditionPara": [
@@ -346,7 +346,7 @@
     },
     {
       "ID": 22,
-      "message": 2857,
+      "message": 9021,
       "Operation": 0,
       "ConditionType": 3,
       "ConditionPara": [
@@ -362,7 +362,7 @@
     },
     {
       "ID": 23,
-      "message": 2858,
+      "message": 9022,
       "Operation": 0,
       "ConditionType": 3,
       "ConditionPara": [
@@ -378,7 +378,7 @@
     },
     {
       "ID": 24,
-      "message": 2859,
+      "message": 9023,
       "Operation": 0,
       "ConditionType": 3,
       "ConditionPara": [
@@ -394,7 +394,7 @@
     },
     {
       "ID": 25,
-      "message": 2860,
+      "message": 9024,
       "Operation": 0,
       "ConditionType": 3,
       "ConditionPara": [
@@ -410,7 +410,7 @@
     },
     {
       "ID": 26,
-      "message": 2861,
+      "message": 9025,
       "Operation": 0,
       "ConditionType": 3,
       "ConditionPara": [
@@ -423,6 +423,38 @@
         3,
         4
       ]
+    },
+    {
+      "ID": 27,
+      "message": 9026,
+      "Operation": 0,
+      "ConditionType": 6,
+      "ConditionPara": [
+        20004
+      ],
+      "finishCount": 3,
+      "SkiptoIds": [
+        1,
+        2,
+        3,
+        4
+      ]
+    },
+    {
+      "ID": 28,
+      "message": 9027,
+      "Operation": 0,
+      "ConditionType": 5,
+      "ConditionPara": [
+        1013
+      ],
+      "finishCount": 1,
+      "SkiptoIds": [
+        1,
+        2,
+        3,
+        4
+      ]
     }
   ]
 }

Assets/Res/Config/EventNPC.json

@@ -173,6 +173,12 @@
       "name": 0,
       "ID_1": 0,
       "DaoyouID": 0
+    },
+    {
+      "ID": 118,
+      "name": 0,
+      "ID_1": 0,
+      "DaoyouID": 0
     }
   ]
 }

Assets/Res/Config/GroupConfig.json

@@ -162,6 +162,15 @@
         5007
       ]
     },
+    {
+      "ID": 1013,
+      "GroupMonsterLevel": [
+        105
+      ],
+      "GroupMonster": [
+        5007
+      ]
+    },
     {
       "ID": 2001,
       "GroupMonsterLevel": [

Assets/Res/Config/HeroModelConfig.json

@@ -63,7 +63,7 @@
       "nickName": -1,
       "name": 2,
       "headicon": "icon_tx1001",
-      "model": "Guixiu01",
+      "model": "Gw_Man",
       "isUseGpu": false,
       "heroType": 2,
       "attack": 248,
@@ -121,7 +121,7 @@
       "nickName": -1,
       "name": 3,
       "headicon": "icon_tx1002",
-      "model": "Nanzhu",
+      "model": "Gw_Man",
       "isUseGpu": false,
       "heroType": 2,
       "attack": 203,
@@ -179,7 +179,7 @@
       "nickName": -1,
       "name": 4,
       "headicon": "icon_tx1003",
-      "model": "Guixiu01",
+      "model": "Gw_Woman",
       "isUseGpu": false,
       "heroType": 2,
       "attack": 225,
@@ -237,7 +237,7 @@
       "nickName": -1,
       "name": 4,
       "headicon": "icon_tx1004",
-      "model": "Guixiu01",
+      "model": "Gw_Woman",
       "isUseGpu": false,
       "heroType": 2,
       "attack": 270,
@@ -527,7 +527,7 @@
       "nickName": -1,
       "name": 4,
       "headicon": "icon_tx5001",
-      "model": "Nanzhu",
+      "model": "Gw_Man",
       "isUseGpu": false,
       "heroType": 3,
       "attack": 316,
@@ -585,7 +585,7 @@
       "nickName": -1,
       "name": 4,
       "headicon": "icon_tx5002",
-      "model": "Nanzhu",
+      "model": "Gw_Man",
       "isUseGpu": false,
       "heroType": 3,
       "attack": 259,
@@ -643,7 +643,7 @@
       "nickName": -1,
       "name": 4,
       "headicon": "icon_tx5003",
-      "model": "Nanzhu",
+      "model": "Gw_Woman",
       "isUseGpu": false,
       "heroType": 3,
       "attack": 288,
@@ -701,7 +701,7 @@
       "nickName": -1,
       "name": 4,
       "headicon": "icon_tx5004",
-      "model": "Nanzhu",
+      "model": "Gw_Woman",
       "isUseGpu": false,
       "heroType": 3,
       "attack": 345,
@@ -759,7 +759,7 @@
       "nickName": -1,
       "name": 4,
       "headicon": "icon_tx5005",
-      "model": "Nanzhu",
+      "model": "Gw_Man",
       "isUseGpu": false,
       "heroType": 3,
       "attack": 230,

Assets/Res/Config/ItemConfig.json

@@ -3874,6 +3874,31 @@
       "sort": 0,
       "itemDesc2": 0
     },
+    {
+      "ID": 20004,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_item_20004",
+      "itemTag": 21,
+      "quality": 3,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 0,
+      "sort": 0,
+      "itemDesc2": 0
+    },
     {
       "ID": 21001,
       "itemName": 3194,

Assets/Res/Config/LevelbattleConfig.json

@@ -150,6 +150,16 @@
       "MonsterGroupTruePower": 100,
       "MonsterGroupPower": 100
     },
+    {
+      "ID": 1013,
+      "Group": [
+        1013
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
     {
       "ID": 2001,
       "Group": [

Assets/Res/Config/SkillConfig.json

@@ -5796,8 +5796,8 @@
       "level": 1,
       "effectValue": [
         5.0,
-        50.0,
-        100.0
+        30.0,
+        50.0
       ],
       "intensifierIndex": [
         0
@@ -5824,8 +5824,8 @@
       "level": 2,
       "effectValue": [
         5.0,
-        60.0,
-        120.0
+        40.0,
+        60.0
       ],
       "intensifierIndex": [
         0
@@ -5861,8 +5861,8 @@
       "level": 3,
       "effectValue": [
         5.0,
-        70.0,
-        140.0
+        50.0,
+        70.0
       ],
       "intensifierIndex": [
         0
@@ -5898,8 +5898,8 @@
       "level": 4,
       "effectValue": [
         5.0,
-        80.0,
-        160.0
+        60.0,
+        80.0
       ],
       "intensifierIndex": [
         0
@@ -5935,8 +5935,8 @@
       "level": 5,
       "effectValue": [
         5.0,
-        90.0,
-        180.0
+        70.0,
+        90.0
       ],
       "intensifierIndex": [
         0
@@ -5973,7 +5973,7 @@
       "effectValue": [
         5.0,
         100.0,
-        200.0
+        100.0
       ],
       "intensifierIndex": [
         0
@@ -6006,7 +6006,7 @@
       "SkillType": 2,
       "level": 1,
       "effectValue": [
-        120.0,
+        90.0,
         0.0
       ],
       "intensifierIndex": [
@@ -6030,7 +6030,7 @@
       "SkillType": 2,
       "level": 2,
       "effectValue": [
-        130.0,
+        110.0,
         20.0,
         20.0
       ],
@@ -6064,7 +6064,7 @@
       "SkillType": 2,
       "level": 3,
       "effectValue": [
-        140.0,
+        130.0,
         20.0,
         20.0
       ],
@@ -6132,7 +6132,7 @@
       "SkillType": 2,
       "level": 5,
       "effectValue": [
-        160.0,
+        170.0,
         30.0,
         30.0
       ],
@@ -6166,7 +6166,7 @@
       "SkillType": 2,
       "level": 6,
       "effectValue": [
-        170.0,
+        190.0,
         30.0,
         30.0
       ],

Assets/Scripts/GameData/ExcelConfig/EventConfig.cs

@@ -35,7 +35,7 @@ namespace Excel2Json
 		
 
 		/// <summary>
-		///事件类型： 1.通用事件 2.挂机事件 4.主线任务 5.仙山探险 6.支线事件 99.无标记 
+		///事件类型： 1.通用事件 2.挂机事件 4.主线任务 5.仙山探险 6.支线事件 88.特定任务触发的事件 99.无标记 
 		/// </summary>
 #if !COMBAT_SERVER
 		public int EventTriggerType;

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;

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;

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;