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

Assets/Res/Config/EventConditionConfig.json

@@ -56,7 +56,7 @@
     },
     {
       "ID": 7,
-      "message": null,
+      "message": 2362,
       "Operation": null,
       "ConditionType": 5,
       "ConditionPara": [
@@ -66,7 +66,7 @@
     },
     {
       "ID": 8,
-      "message": null,
+      "message": 2363,
       "Operation": null,
       "ConditionType": 3,
       "ConditionPara": [
@@ -76,7 +76,7 @@
     },
     {
       "ID": 9,
-      "message": null,
+      "message": 2364,
       "Operation": null,
       "ConditionType": 5,
       "ConditionPara": [
@@ -86,7 +86,7 @@
     },
     {
       "ID": 10,
-      "message": null,
+      "message": 2365,
       "Operation": null,
       "ConditionType": 5,
       "ConditionPara": [
@@ -96,7 +96,7 @@
     },
     {
       "ID": 11,
-      "message": null,
+      "message": 2366,
       "Operation": null,
       "ConditionType": 6,
       "ConditionPara": [
@@ -106,7 +106,7 @@
     },
     {
       "ID": 12,
-      "message": null,
+      "message": 2367,
       "Operation": null,
       "ConditionType": 5,
       "ConditionPara": [
@@ -116,7 +116,7 @@
     },
     {
       "ID": 13,
-      "message": null,
+      "message": 2368,
       "Operation": null,
       "ConditionType": 5,
       "ConditionPara": [
@@ -126,7 +126,7 @@
     },
     {
       "ID": 14,
-      "message": null,
+      "message": 2369,
       "Operation": null,
       "ConditionType": 3,
       "ConditionPara": [
@@ -136,7 +136,7 @@
     },
     {
       "ID": 15,
-      "message": null,
+      "message": 2370,
       "Operation": null,
       "ConditionType": 5,
       "ConditionPara": [

Assets/Res/Config/EventConfig.json

@@ -543,8 +543,8 @@
       "XiantuID": 1,
       "EventConditionId": null,
       "EventCount": null,
-      "EventName": null,
-      "Description": null
+      "EventName": 2320,
+      "Description": 2341
     },
     {
       "ID": 10008,
@@ -581,8 +581,8 @@
       "XiantuID": 1,
       "EventConditionId": null,
       "EventCount": null,
-      "EventName": null,
-      "Description": null
+      "EventName": 2321,
+      "Description": 2342
     },
     {
       "ID": 10009,
@@ -608,8 +608,8 @@
       "XiantuID": 1,
       "EventConditionId": null,
       "EventCount": null,
-      "EventName": null,
-      "Description": null
+      "EventName": 2322,
+      "Description": 2343
     },
     {
       "ID": 10010,
@@ -633,8 +633,8 @@
       "XiantuID": 1,
       "EventConditionId": null,
       "EventCount": null,
-      "EventName": null,
-      "Description": null
+      "EventName": 2323,
+      "Description": 2344
     },
     {
       "ID": 10011,
@@ -658,8 +658,8 @@
       "XiantuID": 1,
       "EventConditionId": null,
       "EventCount": null,
-      "EventName": null,
-      "Description": null
+      "EventName": 2324,
+      "Description": 2345
     },
     {
       "ID": 10012,
@@ -694,8 +694,8 @@
       "XiantuID": 1,
       "EventConditionId": null,
       "EventCount": null,
-      "EventName": null,
-      "Description": null
+      "EventName": 2325,
+      "Description": 2346
     },
     {
       "ID": 10013,
@@ -734,8 +734,8 @@
       "XiantuID": 1,
       "EventConditionId": null,
       "EventCount": null,
-      "EventName": null,
-      "Description": null
+      "EventName": 2326,
+      "Description": 2347
     },
     {
       "ID": 10014,
@@ -766,8 +766,8 @@
       "XiantuID": 1,
       "EventConditionId": null,
       "EventCount": null,
-      "EventName": null,
-      "Description": null
+      "EventName": 2327,
+      "Description": 2348
     },
     {
       "ID": 10015,
@@ -798,8 +798,8 @@
       "XiantuID": 1,
       "EventConditionId": null,
       "EventCount": null,
-      "EventName": null,
-      "Description": null
+      "EventName": 2328,
+      "Description": 2349
     },
     {
       "ID": 10016,
@@ -835,8 +835,8 @@
       "XiantuID": 1,
       "EventConditionId": null,
       "EventCount": null,
-      "EventName": null,
-      "Description": null
+      "EventName": 2329,
+      "Description": 2350
     },
     {
       "ID": 10017,
@@ -869,8 +869,8 @@
       "XiantuID": 1,
       "EventConditionId": null,
       "EventCount": null,
-      "EventName": null,
-      "Description": null
+      "EventName": 2330,
+      "Description": 2351
     },
     {
       "ID": 10018,
@@ -913,8 +913,8 @@
       "XiantuID": 1,
       "EventConditionId": null,
       "EventCount": null,
-      "EventName": null,
-      "Description": null
+      "EventName": 2331,
+      "Description": 2352
     },
     {
       "ID": 10019,
@@ -939,8 +939,8 @@
       "XiantuID": 1,
       "EventConditionId": null,
       "EventCount": null,
-      "EventName": null,
-      "Description": null
+      "EventName": 2332,
+      "Description": 2353
     },
     {
       "ID": 10020,
@@ -967,8 +967,8 @@
       "XiantuID": 1,
       "EventConditionId": null,
       "EventCount": null,
-      "EventName": null,
-      "Description": null
+      "EventName": 2333,
+      "Description": 2354
     },
     {
       "ID": 10021,
@@ -1003,14 +1003,15 @@
       "XiantuID": 1,
       "EventConditionId": null,
       "EventCount": null,
-      "EventName": null,
-      "Description": null
+      "EventName": 2334,
+      "Description": 2355
     },
     {
       "ID": 10022,
       "EventLinksId": [
         1002201,
-        1002202
+        1002202,
+        1002203
       ],
       "EventTriggerType": 4,
       "EventTag": 1,
@@ -1029,11 +1030,14 @@
       "XiantuID": 1,
       "EventConditionId": null,
       "EventCount": null,
-      "EventName": null,
-      "Description": null
+      "EventName": 2335,
+      "Description": 2356
     },
     {
       "ID": 10023,
+      "EventLinksId": [
+        1002301
+      ],
       "EventTriggerType": 4,
       "EventTag": 1,
       "EventType": 1,
@@ -1051,8 +1055,8 @@
       "XiantuID": 1,
       "EventConditionId": null,
       "EventCount": null,
-      "EventName": null,
-      "Description": null
+      "EventName": 2336,
+      "Description": 2357
     },
     {
       "ID": 10024,
@@ -1073,8 +1077,8 @@
       "XiantuID": 1,
       "EventConditionId": null,
       "EventCount": null,
-      "EventName": null,
-      "Description": null
+      "EventName": 2337,
+      "Description": 2358
     },
     {
       "ID": 10025,
@@ -1095,8 +1099,8 @@
       "XiantuID": 1,
       "EventConditionId": null,
       "EventCount": null,
-      "EventName": null,
-      "Description": null
+      "EventName": 2338,
+      "Description": 2359
     },
     {
       "ID": 10026,
@@ -1117,8 +1121,8 @@
       "XiantuID": 1,
       "EventConditionId": null,
       "EventCount": null,
-      "EventName": null,
-      "Description": null
+      "EventName": 2339,
+      "Description": 2360
     },
     {
       "ID": 10027,
@@ -1139,8 +1143,8 @@
       "XiantuID": 1,
       "EventConditionId": null,
       "EventCount": null,
-      "EventName": null,
-      "Description": null
+      "EventName": 2340,
+      "Description": 2361
     },
     {
       "ID": 1001,
@@ -1269,7 +1273,7 @@
         1004,
         1005
       ],
-      "EventTriggerType": 99,
+      "EventTriggerType": 6,
       "EventTag": 3,
       "EventType": 1,
       "Score": 0,
@@ -1300,7 +1304,7 @@
         1015,
         1016
       ],
-      "EventTriggerType": 99,
+      "EventTriggerType": 6,
       "EventTag": 3,
       "EventType": 1,
       "Score": 0,
@@ -1330,7 +1334,7 @@
         9007,
         9008
       ],
-      "EventTriggerType": 99,
+      "EventTriggerType": 6,
       "EventTag": 5,
       "EventType": 1,
       "Score": 0,
@@ -1356,7 +1360,7 @@
         9025,
         9026
       ],
-      "EventTriggerType": 1,
+      "EventTriggerType": 6,
       "EventTag": 3,
       "EventType": 1,
       "Score": 0,
@@ -1381,7 +1385,7 @@
       "EventLinksId": [
         9014
       ],
-      "EventTriggerType": 99,
+      "EventTriggerType": 6,
       "EventTag": 3,
       "EventType": 1,
       "Score": 0,
@@ -1409,7 +1413,7 @@
       "EventLinksId": [
         9031
       ],
-      "EventTriggerType": 99,
+      "EventTriggerType": 6,
       "EventTag": 3,
       "EventType": 1,
       "Score": 0,

Assets/Res/Config/EventLinkConfig.json

@@ -3720,10 +3720,39 @@
         15
       ],
       "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1002203
+      ]
+    },
+    {
+      "ID": 1002203,
+      "conciseEventMessage": 2315,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "DialogueType": null,
+      "EventID": 10022,
+      "optionType": null,
       "ResultType": 3,
       "ResultOptions": [
         10023
       ]
+    },
+    {
+      "ID": 1002301,
+      "conciseEventMessage": 2318,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "LanID": [
+        2319
+      ],
+      "DialogueType": null,
+      "EventID": 10023,
+      "optionType": null,
+      "ResultType": 3,
+      "ResultOptions": [
+        10024
+      ]
     }
   ]
 }

Assets/Scripts/GameData/ExcelConfig/EventConfig.cs

@@ -27,7 +27,7 @@ public int[] EventLinksId;
 
 
 		/// <summary>
-		///事件类型： 1.通用事件 2.挂机事件 4.主线任务 5.仙山探险 99.无标记 
+		///事件类型： 1.通用事件 2.挂机事件 4.主线任务 5.仙山探险 6.支线事件 99.无标记 
 		/// </summary>
 public int EventTriggerType;