1

Assets/Res/Config/EventConditionConfig.json

@@ -26,7 +26,7 @@
       "Operation": null,
       "ConditionType": 5,
       "ConditionPara": [
-        100001
+        1001
       ],
       "finishCount": 5
     },
@@ -60,7 +60,7 @@
       "Operation": null,
       "ConditionType": 5,
       "ConditionPara": [
-        100001
+        1002
       ],
       "finishCount": 1
     },
@@ -80,7 +80,7 @@
       "Operation": null,
       "ConditionType": 5,
       "ConditionPara": [
-        100004
+        1003
       ],
       "finishCount": 1
     },
@@ -90,7 +90,7 @@
       "Operation": null,
       "ConditionType": 5,
       "ConditionPara": [
-        100001
+        1004
       ],
       "finishCount": 3
     },
@@ -110,7 +110,7 @@
       "Operation": null,
       "ConditionType": 5,
       "ConditionPara": [
-        100004
+        1005
       ],
       "finishCount": 1
     },
@@ -120,7 +120,7 @@
       "Operation": null,
       "ConditionType": 5,
       "ConditionPara": [
-        100004
+        1006
       ],
       "finishCount": 1
     },
@@ -140,7 +140,17 @@
       "Operation": null,
       "ConditionType": 5,
       "ConditionPara": [
-        100004
+        1007
+      ],
+      "finishCount": 1
+    },
+    {
+      "ID": 17,
+      "message": 2852,
+      "Operation": null,
+      "ConditionType": 5,
+      "ConditionPara": [
+        1008
       ],
       "finishCount": 1
     }

Assets/Res/Config/EventConfig.json

@@ -627,6 +627,9 @@
       "PrizeNums": [
         10
       ],
+      "RelatedEvents": [
+        30001
+      ],
       "RefreshProbability": null,
       "RefreshCount": null,
       "placeID": 1,
@@ -890,11 +893,7 @@
         1001813,
         1001814,
         1001815,
-        1001816,
-        1001817,
-        1001818,
-        1001819,
-        1001820
+        1001816
       ],
       "EventTriggerType": 4,
       "EventTag": 1,
@@ -1038,7 +1037,16 @@
       "EventLinksId": [
         1002301,
         1002302,
-        1002303
+        1002303,
+        1002304,
+        1002305,
+        1002306,
+        1002307,
+        1002308,
+        1002309,
+        1002310,
+        1002311,
+        1002312
       ],
       "EventTriggerType": 4,
       "EventTag": 1,
@@ -1062,6 +1070,15 @@
     },
     {
       "ID": 10024,
+      "EventLinksId": [
+        1002401,
+        1002402,
+        1002403,
+        1002404,
+        1002405,
+        1002406,
+        1002407
+      ],
       "EventTriggerType": 4,
       "EventTag": 1,
       "EventType": 1,
@@ -1084,6 +1101,17 @@
     },
     {
       "ID": 10025,
+      "EventLinksId": [
+        1002501,
+        1002502,
+        1002503,
+        1002504,
+        1002505,
+        1002506,
+        1002507,
+        1002508,
+        1002509
+      ],
       "EventTriggerType": 4,
       "EventTag": 1,
       "EventType": 1,
@@ -1106,6 +1134,9 @@
     },
     {
       "ID": 10026,
+      "EventLinksId": [
+        1002601
+      ],
       "EventTriggerType": 4,
       "EventTag": 1,
       "EventType": 1,
@@ -1358,10 +1389,6 @@
     },
     {
       "ID": 9025,
-      "EventLinksId": [
-        9025,
-        9026
-      ],
       "EventTriggerType": 6,
       "EventTag": 3,
       "EventType": 1,
@@ -1434,6 +1461,134 @@
       "EventCount": null,
       "EventName": 2071,
       "Description": 2072
+    },
+    {
+      "ID": 30001,
+      "EventTriggerType": 99,
+      "EventTag": 6,
+      "EventType": null,
+      "Score": null,
+      "EventQuality": null,
+      "RefreshProbability": 50,
+      "RefreshCount": 5,
+      "placeID": null,
+      "XiantuID": null,
+      "EventConditionId": null,
+      "EventCount": null,
+      "EventName": null,
+      "Description": null
+    },
+    {
+      "ID": 30002,
+      "EventTriggerType": 99,
+      "EventTag": 6,
+      "EventType": null,
+      "Score": null,
+      "EventQuality": null,
+      "RefreshProbability": 50,
+      "RefreshCount": 1,
+      "placeID": null,
+      "XiantuID": null,
+      "EventConditionId": null,
+      "EventCount": null,
+      "EventName": null,
+      "Description": null
+    },
+    {
+      "ID": 30003,
+      "EventTriggerType": 99,
+      "EventTag": 6,
+      "EventType": null,
+      "Score": null,
+      "EventQuality": null,
+      "RefreshProbability": 50,
+      "RefreshCount": 1,
+      "placeID": null,
+      "XiantuID": null,
+      "EventConditionId": null,
+      "EventCount": null,
+      "EventName": null,
+      "Description": null
+    },
+    {
+      "ID": 30004,
+      "EventTriggerType": 99,
+      "EventTag": 6,
+      "EventType": null,
+      "Score": null,
+      "EventQuality": null,
+      "RefreshProbability": 50,
+      "RefreshCount": 3,
+      "placeID": null,
+      "XiantuID": null,
+      "EventConditionId": null,
+      "EventCount": null,
+      "EventName": null,
+      "Description": null
+    },
+    {
+      "ID": 30005,
+      "EventTriggerType": 99,
+      "EventTag": 6,
+      "EventType": null,
+      "Score": null,
+      "EventQuality": null,
+      "RefreshProbability": 50,
+      "RefreshCount": 1,
+      "placeID": null,
+      "XiantuID": null,
+      "EventConditionId": null,
+      "EventCount": null,
+      "EventName": null,
+      "Description": null
+    },
+    {
+      "ID": 30006,
+      "EventTriggerType": 99,
+      "EventTag": 6,
+      "EventType": null,
+      "Score": null,
+      "EventQuality": null,
+      "RefreshProbability": 50,
+      "RefreshCount": 1,
+      "placeID": null,
+      "XiantuID": null,
+      "EventConditionId": null,
+      "EventCount": null,
+      "EventName": null,
+      "Description": null
+    },
+    {
+      "ID": 30007,
+      "EventTriggerType": 99,
+      "EventTag": 6,
+      "EventType": null,
+      "Score": null,
+      "EventQuality": null,
+      "RefreshProbability": 50,
+      "RefreshCount": 1,
+      "placeID": null,
+      "XiantuID": null,
+      "EventConditionId": null,
+      "EventCount": null,
+      "EventName": null,
+      "Description": null
+    },
+    {
+      "ID": 30008,
+      "EventTriggerType": 99,
+      "EventTag": 6,
+      "EventType": null,
+      "Score": null,
+      "EventQuality": null,
+      "RefreshProbability": 50,
+      "RefreshCount": 1,
+      "placeID": null,
+      "XiantuID": null,
+      "EventConditionId": null,
+      "EventCount": null,
+      "EventName": null,
+      "Description": null
     }
   ]
 }

Assets/Res/Config/EventLinkConfig.json

@@ -3764,27 +3764,469 @@
       ],
       "DialogueType": null,
       "EventID": 10023,
+      "optionType": 1,
+      "optionPara1": [
+        1002303
+      ],
+      "optionPara2": [
+        2321
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1002303,
+      "conciseEventMessage": 2318,
+      "EventConditionMessage": null,
+      "NPCID": 111,
+      "LanID": [
+        2322
+      ],
+      "DialogueType": null,
+      "EventID": 10023,
       "optionType": null,
       "ResultType": 1,
       "ResultOptions": [
-        1002303
+        1002304
       ]
     },
     {
-      "ID": 1002303,
+      "ID": 1002304,
       "conciseEventMessage": 2318,
       "EventConditionMessage": null,
       "NPCID": 100,
       "LanID": [
-        2321
+        2323
+      ],
+      "DialogueType": null,
+      "EventID": 10023,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1002305
+      ]
+    },
+    {
+      "ID": 1002305,
+      "conciseEventMessage": 2318,
+      "EventConditionMessage": null,
+      "NPCID": 111,
+      "LanID": [
+        2324
+      ],
+      "DialogueType": null,
+      "EventID": 10023,
+      "optionType": 1,
+      "optionPara1": [
+        1002306
+      ],
+      "optionPara2": [
+        2325
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1002306,
+      "conciseEventMessage": 2318,
+      "EventConditionMessage": null,
+      "NPCID": 111,
+      "LanID": [
+        2326
+      ],
+      "DialogueType": null,
+      "EventID": 10023,
+      "optionType": 1,
+      "optionPara1": [
+        1002307
+      ],
+      "optionPara2": [
+        2327
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1002307,
+      "conciseEventMessage": 2318,
+      "EventConditionMessage": null,
+      "NPCID": 111,
+      "LanID": [
+        2328
       ],
       "DialogueType": null,
       "EventID": 10023,
       "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1002308
+      ]
+    },
+    {
+      "ID": 1002308,
+      "conciseEventMessage": 2318,
+      "EventConditionMessage": null,
+      "NPCID": 100,
+      "LanID": [
+        2329
+      ],
+      "DialogueType": null,
+      "EventID": 10023,
+      "optionType": 1,
+      "optionPara1": [
+        1002309
+      ],
+      "optionPara2": [
+        2330
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1002309,
+      "conciseEventMessage": 2318,
+      "EventConditionMessage": null,
+      "NPCID": 111,
+      "LanID": [
+        2331
+      ],
+      "DialogueType": null,
+      "EventID": 10023,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1002310
+      ]
+    },
+    {
+      "ID": 1002310,
+      "conciseEventMessage": 2318,
+      "EventConditionMessage": null,
+      "NPCID": 111,
+      "LanID": [
+        2332
+      ],
+      "DialogueType": null,
+      "EventID": 10023,
+      "optionType": 1,
+      "optionPara1": [
+        1002311
+      ],
+      "optionPara2": [
+        2333
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1002311,
+      "conciseEventMessage": 2318,
+      "EventConditionMessage": null,
+      "NPCID": 111,
+      "LanID": [
+        2334
+      ],
+      "DialogueType": null,
+      "EventID": 10023,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1002312
+      ]
+    },
+    {
+      "ID": 1002312,
+      "conciseEventMessage": 2318,
+      "EventConditionMessage": null,
+      "NPCID": 111,
+      "LanID": [
+        2335
+      ],
+      "DialogueType": null,
+      "EventID": 10023,
+      "optionType": 1,
+      "optionPara1": [
+        0
+      ],
+      "optionPara2": [
+        2336
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1002401,
+      "conciseEventMessage": 2337,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "LanID": [
+        2338
+      ],
+      "DialogueType": null,
+      "EventID": 10024,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1002402
+      ]
+    },
+    {
+      "ID": 1002402,
+      "conciseEventMessage": 2337,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "LanID": [
+        2339
+      ],
+      "DialogueType": null,
+      "EventID": 10024,
+      "ConditionId": [
+        17
+      ],
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1002403
+      ]
+    },
+    {
+      "ID": 1002403,
+      "conciseEventMessage": 2337,
+      "EventConditionMessage": null,
+      "NPCID": 100,
+      "LanID": [
+        2340
+      ],
+      "DialogueType": null,
+      "EventID": 10024,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1002404
+      ]
+    },
+    {
+      "ID": 1002404,
+      "conciseEventMessage": 2337,
+      "EventConditionMessage": null,
+      "NPCID": 110,
+      "LanID": [
+        2341
+      ],
+      "DialogueType": null,
+      "EventID": 10024,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1002405
+      ]
+    },
+    {
+      "ID": 1002405,
+      "conciseEventMessage": 2337,
+      "EventConditionMessage": null,
+      "NPCID": 100,
+      "LanID": [
+        2342
+      ],
+      "DialogueType": null,
+      "EventID": 10024,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1002406
+      ]
+    },
+    {
+      "ID": 1002406,
+      "conciseEventMessage": 2337,
+      "EventConditionMessage": null,
+      "NPCID": 110,
+      "LanID": [
+        2343
+      ],
+      "DialogueType": null,
+      "EventID": 10024,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1002407
+      ]
+    },
+    {
+      "ID": 1002407,
+      "conciseEventMessage": 2337,
+      "EventConditionMessage": null,
+      "NPCID": 100,
+      "LanID": [
+        2344
+      ],
+      "DialogueType": null,
+      "EventID": 10024,
+      "optionType": null,
+      "PrizeIDs": [
+        20001
+      ],
+      "PrizeNums": [
+        1
+      ],
+      "ResultType": 3,
+      "ResultOptions": [
+        10025
+      ]
+    },
+    {
+      "ID": 1002501,
+      "conciseEventMessage": 2345,
+      "EventConditionMessage": null,
+      "NPCID": 111,
+      "LanID": [
+        2346
+      ],
+      "DialogueType": null,
+      "EventID": 10025,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1002502
+      ]
+    },
+    {
+      "ID": 1002502,
+      "conciseEventMessage": 2345,
+      "EventConditionMessage": null,
+      "NPCID": 100,
+      "LanID": [
+        2347
+      ],
+      "DialogueType": null,
+      "EventID": 10025,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1002503
+      ]
+    },
+    {
+      "ID": 1002503,
+      "conciseEventMessage": 2345,
+      "EventConditionMessage": null,
+      "NPCID": 111,
+      "LanID": [
+        2348
+      ],
+      "DialogueType": null,
+      "EventID": 10025,
+      "optionType": 1,
+      "optionPara1": [
+        1002504
+      ],
+      "optionPara2": [
+        2349
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1002504,
+      "conciseEventMessage": 2345,
+      "EventConditionMessage": null,
+      "NPCID": 111,
+      "LanID": [
+        2350
+      ],
+      "DialogueType": null,
+      "EventID": 10025,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1002505
+      ]
+    },
+    {
+      "ID": 1002505,
+      "conciseEventMessage": 2345,
+      "EventConditionMessage": null,
+      "NPCID": 111,
+      "LanID": [
+        2351
+      ],
+      "DialogueType": null,
+      "EventID": 10025,
+      "optionType": 1,
+      "optionPara1": [
+        1002506,
+        1002507
+      ],
+      "optionPara2": [
+        2352,
+        2353
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1002506,
+      "conciseEventMessage": 2345,
+      "EventConditionMessage": null,
+      "NPCID": 111,
+      "LanID": [
+        2354
+      ],
+      "DialogueType": null,
+      "EventID": 10025,
+      "optionType": 1,
+      "optionPara1": [
+        1002509
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1002507,
+      "conciseEventMessage": 2345,
+      "EventConditionMessage": null,
+      "NPCID": 111,
+      "LanID": [
+        2355
+      ],
+      "DialogueType": null,
+      "EventID": 10025,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1002508
+      ]
+    },
+    {
+      "ID": 1002508,
+      "conciseEventMessage": 2345,
+      "EventConditionMessage": null,
+      "NPCID": 111,
+      "LanID": [
+        2356
+      ],
+      "DialogueType": null,
+      "EventID": 10025,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1002509
+      ]
+    },
+    {
+      "ID": 1002509,
+      "conciseEventMessage": 2345,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "DialogueType": null,
+      "EventID": 10025,
+      "optionType": null,
       "ResultType": 3,
       "ResultOptions": [
-        10024
+        10026
       ]
+    },
+    {
+      "ID": 1002601,
+      "conciseEventMessage": 2357,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "DialogueType": null,
+      "EventID": 10026,
+      "optionType": 2,
+      "ResultType": 2
     }
   ]
 }

Assets/Res/Config/ItemConfig.json

@@ -3228,6 +3228,31 @@
       "associateID": null,
       "sort": null,
       "itemDesc_1": null
+    },
+    {
+      "ID": 20001,
+      "itemName": null,
+      "itemDesc": null,
+      "icon": "icon_item_20001",
+      "itemTag": 21,
+      "quality": 3,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": null,
+      "sort": null,
+      "itemDesc_1": null
     }
   ]
 }

Assets/Res/Config/LevelbattleConfig.json

@@ -39,6 +39,86 @@
       "combatType": 1,
       "MonsterGroupTruePower": 100,
       "MonsterGroupPower": 100
+    },
+    {
+      "ID": 1001,
+      "Group": [
+        100001
+      ],
+      "combatTime": 0,
+      "combatType": null,
+      "MonsterGroupTruePower": null,
+      "MonsterGroupPower": null
+    },
+    {
+      "ID": 1002,
+      "Group": [
+        100002
+      ],
+      "combatTime": 0,
+      "combatType": null,
+      "MonsterGroupTruePower": null,
+      "MonsterGroupPower": null
+    },
+    {
+      "ID": 1003,
+      "Group": [
+        100003
+      ],
+      "combatTime": 0,
+      "combatType": null,
+      "MonsterGroupTruePower": null,
+      "MonsterGroupPower": null
+    },
+    {
+      "ID": 1004,
+      "Group": [
+        100001
+      ],
+      "combatTime": 0,
+      "combatType": null,
+      "MonsterGroupTruePower": null,
+      "MonsterGroupPower": null
+    },
+    {
+      "ID": 1005,
+      "Group": [
+        100002
+      ],
+      "combatTime": 0,
+      "combatType": null,
+      "MonsterGroupTruePower": null,
+      "MonsterGroupPower": null
+    },
+    {
+      "ID": 1006,
+      "Group": [
+        100004
+      ],
+      "combatTime": 0,
+      "combatType": null,
+      "MonsterGroupTruePower": null,
+      "MonsterGroupPower": null
+    },
+    {
+      "ID": 1007,
+      "Group": [
+        100001
+      ],
+      "combatTime": 0,
+      "combatType": null,
+      "MonsterGroupTruePower": null,
+      "MonsterGroupPower": null
+    },
+    {
+      "ID": 1008,
+      "Group": [
+        100001
+      ],
+      "combatTime": 0,
+      "combatType": null,
+      "MonsterGroupTruePower": null,
+      "MonsterGroupPower": null
     }
   ]
 }

Assets/Scripts/GameData/ExcelConfig/EventConfig.cs

@@ -33,7 +33,7 @@ public int EventTriggerType;
 
 
 		/// <summary>
-		///tag 1主线2支线 3通用 4地图通用 5道友
+		///tag 1主线2支线 3通用 4地图通用 5道友6任务
 		/// </summary>
 public int EventTag;