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

Assets/Res/Config/EventConfig.json

@@ -203,7 +203,8 @@
     {
       "ID": 11,
       "EventLinksId": [
-        10001
+        1101,
+        1102
       ],
       "EventTriggerType": 2,
       "EventTag": null,
@@ -228,7 +229,9 @@
     {
       "ID": 12,
       "EventLinksId": [
-        10003
+        1201,
+        1202,
+        1203
       ],
       "EventTriggerType": 2,
       "EventTag": null,
@@ -253,7 +256,10 @@
     {
       "ID": 13,
       "EventLinksId": [
-        10004
+        1301,
+        1302,
+        1303,
+        1304
       ],
       "EventTriggerType": 2,
       "EventTag": null,
@@ -278,7 +284,8 @@
     {
       "ID": 14,
       "EventLinksId": [
-        10005
+        1401,
+        1402
       ],
       "EventTriggerType": 2,
       "EventTag": null,
@@ -303,7 +310,8 @@
     {
       "ID": 15,
       "EventLinksId": [
-        10006
+        1501,
+        1502
       ],
       "EventTriggerType": 2,
       "EventTag": null,

Assets/Res/Config/EventLinkConfig.json

@@ -417,33 +417,33 @@
       "ResultType": null
     },
     {
-      "ID": 10001,
-      "conciseEventMessage": 208,
+      "ID": 1101,
+      "conciseEventMessage": null,
       "EventConditionMessage": null,
       "NPCID": null,
       "LanID": [
         208
       ],
-      "EventID": null,
+      "EventID": 11,
       "optionType": 2,
       "optionPara1": [
         100001
       ],
       "ResultType": 2,
       "ResultOptions": [
-        10002,
+        1102,
         100
       ]
     },
     {
-      "ID": 10002,
-      "conciseEventMessage": 209,
+      "ID": 1102,
+      "conciseEventMessage": null,
       "EventConditionMessage": null,
       "NPCID": null,
       "LanID": [
         209
       ],
-      "EventID": null,
+      "EventID": 11,
       "optionType": 3,
       "PrizeIDs": [
         1003
@@ -454,16 +454,44 @@
       "ResultType": null
     },
     {
-      "ID": 10003,
-      "conciseEventMessage": 210,
+      "ID": 1201,
+      "conciseEventMessage": null,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "LanID": [
+        210
+      ],
+      "EventID": 12,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1202
+      ]
+    },
+    {
+      "ID": 1202,
+      "conciseEventMessage": null,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "LanID": [
+        211
+      ],
+      "EventID": 12,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1203
+      ]
+    },
+    {
+      "ID": 1203,
+      "conciseEventMessage": null,
       "EventConditionMessage": null,
       "NPCID": null,
       "LanID": [
-        210,
-        211,
         1903
       ],
-      "EventID": null,
+      "EventID": 12,
       "optionType": 3,
       "PrizeIDs": [
         1005
@@ -474,17 +502,59 @@
       "ResultType": null
     },
     {
-      "ID": 10004,
-      "conciseEventMessage": 212,
+      "ID": 1301,
+      "conciseEventMessage": null,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "LanID": [
+        212
+      ],
+      "EventID": 13,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1302
+      ]
+    },
+    {
+      "ID": 1302,
+      "conciseEventMessage": null,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "LanID": [
+        213
+      ],
+      "EventID": 13,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1303
+      ]
+    },
+    {
+      "ID": 1303,
+      "conciseEventMessage": null,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "LanID": [
+        214
+      ],
+      "EventID": 13,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1304
+      ]
+    },
+    {
+      "ID": 1304,
+      "conciseEventMessage": null,
       "EventConditionMessage": null,
       "NPCID": null,
       "LanID": [
-        212,
-        213,
-        214,
         215
       ],
-      "EventID": null,
+      "EventID": 13,
       "optionType": 3,
       "PrizeIDs": [
         1006
@@ -495,43 +565,79 @@
       "ResultType": null
     },
     {
-      "ID": 10005,
-      "conciseEventMessage": 1901,
+      "ID": 1401,
+      "conciseEventMessage": null,
       "EventConditionMessage": null,
       "NPCID": null,
       "LanID": [
         1901
       ],
-      "EventID": null,
+      "EventID": 14,
       "optionType": 2,
       "optionPara1": [
         100002
       ],
       "ResultType": 2,
       "ResultOptions": [
-        10002,
+        1402,
         100
       ]
     },
     {
-      "ID": 10006,
-      "conciseEventMessage": 1902,
+      "ID": 1402,
+      "conciseEventMessage": null,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "LanID": [
+        209
+      ],
+      "EventID": 14,
+      "optionType": 3,
+      "PrizeIDs": [
+        1003
+      ],
+      "PrizeNums": [
+        3000
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1501,
+      "conciseEventMessage": null,
       "EventConditionMessage": null,
       "NPCID": null,
       "LanID": [
         1902
       ],
-      "EventID": null,
+      "EventID": 15,
       "optionType": 2,
       "optionPara1": [
         100003
       ],
       "ResultType": 2,
       "ResultOptions": [
-        10002,
+        1502,
         100
       ]
     },
+    {
+      "ID": 1502,
+      "conciseEventMessage": null,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "LanID": [
+        209
+      ],
+      "EventID": 15,
+      "optionType": 3,
+      "PrizeIDs": [
+        1003
+      ],
+      "PrizeNums": [
+        3000
+      ],
+      "ResultType": null
+    },
     {
       "ID": 9003,
       "conciseEventMessage": 2036,
@@ -772,12 +878,9 @@
     {
       "ID": 1000203,
       "conciseEventMessage": 2091,
-      "EventConditionMessage": null,
+      "EventConditionMessage": 2094,
       "NPCID": null,
       "EventID": 10002,
-      "ConditionId": [
-        6
-      ],
       "optionType": null,
       "ResultType": 3,
       "ResultOptions": [

Assets/Res/Config/LanguageChineseConfig.json

@@ -7602,11 +7602,11 @@
     },
     {
       "ID": 1901,
-      "txt": ""
+      "txt": "事件10005：一只[怪物2]袭击了你，准备迎战"
     },
     {
       "ID": 1902,
-      "txt": ""
+      "txt": "事件10006：一只[怪物3]袭击了你，准备迎战"
     },
     {
       "ID": 1903,

Assets/Scripts/GameData/ExcelConfig/EventLinkConfig.cs

@@ -93,7 +93,7 @@ public int ResultType;
 
 
 		/// <summary>
-		///事件结局后提供的选项 1.EventConditionId 2.胜利id;失败id 3.EventConfigId
+		///事件结局后提供的选项 1.EventLinkId 2.胜利id;失败id 3.EventConfigId
 		/// </summary>
 public int[] ResultOptions;