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

Assets/Res/Config/EventConfig.json

@@ -949,6 +949,127 @@
       "EventName": 4027,
       "Description": 4102
     },
+    {
+      "ID": 11,
+      "EventLinksId": [
+        1101,
+        1102,
+        1103,
+        100,
+        102
+      ],
+      "EventTriggerType": 2,
+      "EventTag": 3,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "PrizeIDs": [
+        1003
+      ],
+      "PrizeNums": [
+        -5
+      ],
+      "RefreshProbability": 0,
+      "RefreshCount": 0,
+      "placeID": 0,
+      "SmallPlacesId": 0,
+      "XiantuID": 0,
+      "EventConditionId": 0,
+      "EventCount": 0,
+      "EventName": 0,
+      "Description": 0
+    },
+    {
+      "ID": 12,
+      "EventLinksId": [
+        1201,
+        1202,
+        1203,
+        100,
+        102
+      ],
+      "EventTriggerType": 2,
+      "EventTag": 3,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "PrizeIDs": [
+        1005
+      ],
+      "PrizeNums": [
+        -5
+      ],
+      "RefreshProbability": 0,
+      "RefreshCount": 0,
+      "placeID": 0,
+      "SmallPlacesId": 0,
+      "XiantuID": 0,
+      "EventConditionId": 0,
+      "EventCount": 0,
+      "EventName": 0,
+      "Description": 0
+    },
+    {
+      "ID": 13,
+      "EventLinksId": [
+        1301,
+        1302,
+        1303,
+        1304,
+        100,
+        102
+      ],
+      "EventTriggerType": 2,
+      "EventTag": 3,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "PrizeIDs": [
+        1006
+      ],
+      "PrizeNums": [
+        -5
+      ],
+      "RefreshProbability": 0,
+      "RefreshCount": 0,
+      "placeID": 0,
+      "SmallPlacesId": 0,
+      "XiantuID": 0,
+      "EventConditionId": 0,
+      "EventCount": 0,
+      "EventName": 0,
+      "Description": 0
+    },
+    {
+      "ID": 14,
+      "EventLinksId": [
+        1401,
+        1402,
+        1403,
+        100,
+        102
+      ],
+      "EventTriggerType": 2,
+      "EventTag": 3,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        -5
+      ],
+      "RefreshProbability": 0,
+      "RefreshCount": 0,
+      "placeID": 0,
+      "SmallPlacesId": 0,
+      "XiantuID": 0,
+      "EventConditionId": 0,
+      "EventCount": 0,
+      "EventName": 0,
+      "Description": 0
+    },
     {
       "ID": 10001,
       "EventLinksId": [
@@ -4285,6 +4406,7 @@
         605503,
         605504,
         605505,
+        605506,
         102
       ],
       "EventTriggerType": 7,

Assets/Res/Config/EventLinkConfig.json

@@ -14143,6 +14143,21 @@
         605506,
         101
       ]
+    },
+    {
+      "ID": 605506,
+      "conciseEventMessage": 6020,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        6021
+      ],
+      "DialogueType": 0,
+      "EventID": 6055,
+      "optionType": 0,
+      "ResultType": 0
     }
   ]
 }