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": [

Assets/Res/Config/EventLinkConfig.json

@@ -937,7 +937,7 @@
       ],
       "DialogueType": 0,
       "EventID": 0,
-      "optionType": 4,
+      "optionType": 0,
       "ResultType": 1,
       "ResultOptions": [
         9007

Assets/Scripts/GameData/ExcelConfig/EventLinkConfig.cs

@@ -65,7 +65,7 @@ namespace Excel2Json
 		
 
 		/// <summary>
-		///对话NPCID 0=玩家 -1=不显示
+		///对话NPCID 空白=不显示 100=玩家
 		/// </summary>
 #if !COMBAT_SERVER
 		public int NPCID;