1

Assets/Res/Config/EventConditionConfig.json

@@ -131,9 +131,9 @@
       "Operation": 0,
       "ConditionType": 5,
       "ConditionPara": [
-        1003
+        1015
       ],
-      "finishCount": 1,
+      "finishCount": 3,
       "RelatedEvents": [
         30003
       ],
@@ -567,6 +567,25 @@
         3,
         4
       ]
+    },
+    {
+      "ID": 36,
+      "message": 9035,
+      "Operation": 0,
+      "ConditionType": 5,
+      "ConditionPara": [
+        1003
+      ],
+      "finishCount": 1,
+      "RelatedEvents": [
+        30003
+      ],
+      "SkiptoIds": [
+        1,
+        2,
+        3,
+        4
+      ]
     }
   ]
 }

Assets/Res/Config/EventConfig.json

@@ -1231,6 +1231,11 @@
       "ID": 10010,
       "EventLinksId": [
         1001001,
+        1001002,
+        1001003,
+        1001004,
+        1001005,
+        1001006,
         102
       ],
       "EventTriggerType": 4,
@@ -1259,6 +1264,17 @@
       "ID": 10011,
       "EventLinksId": [
         1001101,
+        1001102,
+        1001103,
+        1001104,
+        1001105,
+        1001106,
+        1001107,
+        1001108,
+        1001109,
+        1001110,
+        1001111,
+        1001112,
         102
       ],
       "EventTriggerType": 4,
@@ -1287,6 +1303,8 @@
       "ID": 10012,
       "EventLinksId": [
         1001201,
+        1001202,
+        1001203,
         102
       ],
       "EventTriggerType": 4,
@@ -1766,6 +1784,7 @@
         1002505,
         1002506,
         1002507,
+        1002508,
         102
       ],
       "EventTriggerType": 4,
@@ -1864,6 +1883,7 @@
         1002733,
         1002734,
         1002735,
+        1002736,
         102
       ],
       "EventTriggerType": 4,
@@ -1938,6 +1958,7 @@
         1002917,
         1002918,
         1002919,
+        1002920,
         102
       ],
       "EventTriggerType": 4,
@@ -1972,6 +1993,7 @@
         1003005,
         1003006,
         1003007,
+        1003008,
         102
       ],
       "EventTriggerType": 4,
@@ -2002,6 +2024,19 @@
         1003101,
         1003102,
         1003103,
+        1003104,
+        1003105,
+        1003106,
+        1003107,
+        1003108,
+        1003109,
+        1003110,
+        1003111,
+        1003112,
+        1003113,
+        1003114,
+        1003115,
+        1003116,
         102
       ],
       "EventTriggerType": 4,

Assets/Res/Config/EventNPC.json

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

Assets/Res/Config/GroupConfig.json

@@ -20,7 +20,7 @@
       ],
       "levelAdd": [
         0,
-        -2
+        0
       ]
     },
     {
@@ -43,7 +43,7 @@
       ],
       "levelAdd": [
         0,
-        -2
+        0
       ]
     },
     {
@@ -94,7 +94,7 @@
         5
       ],
       "GroupMonster": [
-        5001
+        9002
       ]
     },
     {
@@ -103,7 +103,7 @@
         15
       ],
       "GroupMonster": [
-        5002
+        9001
       ]
     },
     {
@@ -112,7 +112,7 @@
         25
       ],
       "GroupMonster": [
-        5003
+        1008
       ]
     },
     {
@@ -121,7 +121,7 @@
         45
       ],
       "GroupMonster": [
-        5004
+        1008
       ]
     },
     {
@@ -130,7 +130,7 @@
         50
       ],
       "GroupMonster": [
-        5005
+        5006
       ]
     },
     {
@@ -139,16 +139,13 @@
         55
       ],
       "GroupMonster": [
-        5006
+        5007
       ]
     },
     {
       "ID": 1008,
       "GroupMonsterLevel": [
         85
-      ],
-      "GroupMonster": [
-        5007
       ]
     },
     {
@@ -157,7 +154,7 @@
         95
       ],
       "GroupMonster": [
-        5007
+        9002
       ]
     },
     {
@@ -166,7 +163,7 @@
         100
       ],
       "GroupMonster": [
-        5007
+        9002
       ]
     },
     {
@@ -175,7 +172,7 @@
         110
       ],
       "GroupMonster": [
-        5007
+        9001
       ]
     },
     {
@@ -184,7 +181,7 @@
         120
       ],
       "GroupMonster": [
-        5007
+        9004
       ]
     },
     {
@@ -202,7 +199,50 @@
         150
       ],
       "GroupMonster": [
-        5007
+        1008,
+        1006
+      ],
+      "hpQiangDu": [
+        80,
+        40
+      ],
+      "attQiangDu": [
+        72,
+        36
+      ],
+      "duipingQiangDu": [
+        67,
+        33
+      ],
+      "levelAdd": [
+        0,
+        0
+      ]
+    },
+    {
+      "ID": 1015,
+      "GroupMonsterLevel": [
+        25
+      ],
+      "GroupMonster": [
+        1008,
+        1006
+      ],
+      "hpQiangDu": [
+        80,
+        40
+      ],
+      "attQiangDu": [
+        72,
+        36
+      ],
+      "duipingQiangDu": [
+        67,
+        33
+      ],
+      "levelAdd": [
+        0,
+        0
       ]
     },
     {
@@ -218,6 +258,10 @@
       "hpQiangDu": [
         70,
         30
+      ],
+      "levelAdd": [
+        70,
+        30
       ]
     },
     {
@@ -233,6 +277,10 @@
       "hpQiangDu": [
         70,
         30
+      ],
+      "levelAdd": [
+        70,
+        30
       ]
     },
     {
@@ -248,6 +296,10 @@
       "hpQiangDu": [
         70,
         30
+      ],
+      "levelAdd": [
+        70,
+        30
       ]
     },
     {
@@ -263,6 +315,10 @@
       "hpQiangDu": [
         70,
         30
+      ],
+      "levelAdd": [
+        70,
+        30
       ]
     },
     {
@@ -278,6 +334,10 @@
       "hpQiangDu": [
         70,
         30
+      ],
+      "levelAdd": [
+        70,
+        30
       ]
     },
     {
@@ -292,6 +352,10 @@
       "hpQiangDu": [
         70,
         30
+      ],
+      "levelAdd": [
+        70,
+        30
       ]
     },
     {
@@ -306,6 +370,10 @@
       "hpQiangDu": [
         70,
         30
+      ],
+      "levelAdd": [
+        70,
+        30
       ]
     },
     {
@@ -320,6 +388,10 @@
       "hpQiangDu": [
         70,
         30
+      ],
+      "levelAdd": [
+        70,
+        30
       ]
     },
     {
@@ -334,6 +406,10 @@
       "hpQiangDu": [
         70,
         30
+      ],
+      "levelAdd": [
+        70,
+        30
       ]
     },
     {
@@ -348,6 +424,10 @@
       "hpQiangDu": [
         70,
         30
+      ],
+      "levelAdd": [
+        70,
+        30
       ]
     },
     {
@@ -362,6 +442,10 @@
       "hpQiangDu": [
         70,
         30
+      ],
+      "levelAdd": [
+        70,
+        30
       ]
     },
     {
@@ -376,6 +460,10 @@
       "hpQiangDu": [
         70,
         30
+      ],
+      "levelAdd": [
+        70,
+        30
       ]
     },
     {
@@ -390,6 +478,10 @@
       "hpQiangDu": [
         70,
         30
+      ],
+      "levelAdd": [
+        70,
+        30
       ]
     },
     {
@@ -404,6 +496,10 @@
       "hpQiangDu": [
         70,
         30
+      ],
+      "levelAdd": [
+        70,
+        30
       ]
     },
     {
@@ -418,6 +514,10 @@
       "hpQiangDu": [
         70,
         30
+      ],
+      "levelAdd": [
+        70,
+        30
       ]
     },
     {
@@ -432,6 +532,10 @@
       "hpQiangDu": [
         70,
         30
+      ],
+      "levelAdd": [
+        70,
+        30
       ]
     },
     {
@@ -446,6 +550,10 @@
       "hpQiangDu": [
         70,
         30
+      ],
+      "levelAdd": [
+        70,
+        30
       ]
     },
     {
@@ -460,6 +568,10 @@
       "hpQiangDu": [
         70,
         30
+      ],
+      "levelAdd": [
+        70,
+        30
       ]
     },
     {
@@ -474,6 +586,10 @@
       "hpQiangDu": [
         70,
         30
+      ],
+      "levelAdd": [
+        70,
+        30
       ]
     },
     {
@@ -488,6 +604,10 @@
       "hpQiangDu": [
         70,
         30
+      ],
+      "levelAdd": [
+        70,
+        30
       ]
     }
   ]

Assets/Res/Config/LevelbattleConfig.json

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

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;