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

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

Assets/Res/Config/EventConfig.json

@@ -949,127 +949,6 @@
       "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": [

UserSettings/EditorUserSettings.asset

@@ -45,10 +45,10 @@ EditorUserSettings:
       value: 525456020100515e5d5f087145710844404f1c797d2e7262752d4b67b0b6373e
       flags: 0
     RecentlyUsedSceneGuid-8:
-      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
+      value: 52570c02000d5e025a58597212725c4440161c2e797a75607f2c4467b7b3323e
       flags: 0
     RecentlyUsedSceneGuid-9:
-      value: 52570c02000d5e025a58597212725c4440161c2e797a75607f2c4467b7b3323e
+      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
       flags: 0
     Systems Window:
       value: 183b144645154b7802000a2b17364d11021e17246e72662b47695d73a2a07478a2a505e1e82d6f2f100cca3210371526d1051c05e22a040f2507f00b32f01c061ccb5a9f5ace1e10d81c50a48d5d91a3959694aa9ad8efd7c9f2afe0f1c0fcfdf6f8b6f2a5a6dacfb89debbfa1cbc9c3f5c3bac18e9c89c1bbdec2d6f2b992939996c59699c79ae8d182b7baad82aba0b0aea88398abdbf1dd8a8ea765ffc520262728fafcf8f6c28eb162945c71898d6167877a72a980809c9f71cecece859d579fd5f106dbdadb21de0dde237c686c76706641634c764f547c624a7e622d6628286620686f653d2b635a0204003e0805017509093043470e3643041c5d5b415c54450e1c424b420f6e4b634e636263696655641a1f273c0f083c1102ec362de62318e9ea25ab61ade8ed0ee30655b0b6b7b8176615