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

# Conflicts:
#	Excel2Json/Excel/EventConfig.xlsx   resolved by origin/master(远端) version

Assets/Res/Config/EventConfig.json

@@ -922,182 +922,6 @@
       "EventName": 3077,
       "Description": 3074
     },
-    {
-      "ID": 11,
-      "EventLinksId": [
-        1101,
-        1102,
-        1103,
-        100,
-        102
-      ],
-      "EventTriggerType": 2,
-      "EventTag": 3,
-      "EventType": 1,
-      "Score": 0,
-      "EventQuality": 1,
-      "PrizeIDs": [
-        1003
-      ],
-      "PrizeNums": [
-        -5
-      ],
-      "RefreshProbability": null,
-      "RefreshCount": null,
-      "placeID": null,
-      "XiantuID": null,
-      "EventConditionId": null,
-      "EventCount": null,
-      "EventName": null,
-      "Description": null
-    },
-    {
-      "ID": 12,
-      "EventLinksId": [
-        1201,
-        1202,
-        1203,
-        100,
-        102
-      ],
-      "EventTriggerType": 2,
-      "EventTag": 3,
-      "EventType": 1,
-      "Score": 0,
-      "EventQuality": 1,
-      "PrizeIDs": [
-        1005
-      ],
-      "PrizeNums": [
-        -5
-      ],
-      "RefreshProbability": null,
-      "RefreshCount": null,
-      "placeID": null,
-      "XiantuID": null,
-      "EventConditionId": null,
-      "EventCount": null,
-      "EventName": null,
-      "Description": null
-    },
-    {
-      "ID": 13,
-      "EventLinksId": [
-        1301,
-        1302,
-        1303,
-        1304,
-        100,
-        102
-      ],
-      "EventTriggerType": 2,
-      "EventTag": 3,
-      "EventType": 1,
-      "Score": 0,
-      "EventQuality": 1,
-      "PrizeIDs": [
-        1006
-      ],
-      "PrizeNums": [
-        -5
-      ],
-      "RefreshProbability": null,
-      "RefreshCount": null,
-      "placeID": null,
-      "XiantuID": null,
-      "EventConditionId": null,
-      "EventCount": null,
-      "EventName": null,
-      "Description": null
-    },
-    {
-      "ID": 14,
-      "EventLinksId": [
-        1401,
-        1402,
-        1403,
-        100,
-        102
-      ],
-      "EventTriggerType": 2,
-      "EventTag": 3,
-      "EventType": 1,
-      "Score": 0,
-      "EventQuality": 1,
-      "PrizeIDs": [
-        1001
-      ],
-      "PrizeNums": [
-        -5
-      ],
-      "RefreshProbability": null,
-      "RefreshCount": null,
-      "placeID": null,
-      "XiantuID": null,
-      "EventConditionId": null,
-      "EventCount": null,
-      "EventName": null,
-      "Description": null
-    },
-    {
-      "ID": 15,
-      "EventLinksId": [
-        1501,
-        1502,
-        1503,
-        1504,
-        100,
-        102
-      ],
-      "EventTriggerType": 2,
-      "EventTag": 3,
-      "EventType": 1,
-      "Score": 0,
-      "EventQuality": 1,
-      "PrizeIDs": [
-        1001
-      ],
-      "PrizeNums": [
-        -5
-      ],
-      "RefreshProbability": null,
-      "RefreshCount": null,
-      "placeID": null,
-      "XiantuID": null,
-      "EventConditionId": null,
-      "EventCount": null,
-      "EventName": null,
-      "Description": null
-    },
-    {
-      "ID": 16,
-      "EventLinksId": [
-        1601,
-        1602,
-        1603,
-        100,
-        102
-      ],
-      "EventTriggerType": 2,
-      "EventTag": 3,
-      "EventType": 1,
-      "Score": 0,
-      "EventQuality": 1,
-      "PrizeIDs": [
-        1001
-      ],
-      "PrizeNums": [
-        -5
-      ],
-      "RefreshProbability": null,
-      "RefreshCount": null,
-      "placeID": null,
-      "XiantuID": null,
-      "EventConditionId": null,
-      "EventCount": null,
-      "EventName": null,
-      "Description": null
-    },
     {
       "ID": 10001,
       "EventLinksId": [
@@ -2296,7 +2120,7 @@
         910101,
         102
       ],
-      "EventTriggerType": 6,
+      "EventTriggerType": 1,
       "EventTag": 5,
       "EventType": 1,
       "Score": 0,
@@ -2322,7 +2146,7 @@
         910201,
         102
       ],
-      "EventTriggerType": 6,
+      "EventTriggerType": 1,
       "EventTag": 5,
       "EventType": 1,
       "Score": 0,
@@ -2348,7 +2172,7 @@
         910301,
         102
       ],
-      "EventTriggerType": 6,
+      "EventTriggerType": 1,
       "EventTag": 5,
       "EventType": 1,
       "Score": 0,
@@ -2374,7 +2198,7 @@
         910401,
         102
       ],
-      "EventTriggerType": 6,
+      "EventTriggerType": 1,
       "EventTag": 5,
       "EventType": 1,
       "Score": 0,
@@ -2400,7 +2224,7 @@
         910501,
         102
       ],
-      "EventTriggerType": 6,
+      "EventTriggerType": 1,
       "EventTag": 5,
       "EventType": 1,
       "Score": 0,
@@ -2426,7 +2250,7 @@
         910601,
         102
       ],
-      "EventTriggerType": 6,
+      "EventTriggerType": 1,
       "EventTag": 5,
       "EventType": 1,
       "Score": 0,
@@ -2452,7 +2276,7 @@
         910701,
         102
       ],
-      "EventTriggerType": 6,
+      "EventTriggerType": 1,
       "EventTag": 5,
       "EventType": 1,
       "Score": 0,
@@ -2478,7 +2302,7 @@
         910801,
         102
       ],
-      "EventTriggerType": 6,
+      "EventTriggerType": 1,
       "EventTag": 5,
       "EventType": 1,
       "Score": 0,
@@ -2504,7 +2328,7 @@
         910901,
         102
       ],
-      "EventTriggerType": 6,
+      "EventTriggerType": 1,
       "EventTag": 5,
       "EventType": 1,
       "Score": 0,
@@ -2530,7 +2354,7 @@
         911001,
         102
       ],
-      "EventTriggerType": 6,
+      "EventTriggerType": 1,
       "EventTag": 5,
       "EventType": 1,
       "Score": 0,