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

Assets/Res/Config/EventConfig.json

@@ -1451,7 +1451,7 @@
       "RefreshProbability": 0,
       "RefreshCount": 0,
       "placeID": 1,
-      "SmallPlacesId": 0,
+      "SmallPlacesId": 1,
       "XiantuID": 1,
       "EventName": 4259,
       "Description": 0
@@ -1484,7 +1484,7 @@
       "RefreshProbability": 0,
       "RefreshCount": 0,
       "placeID": 1,
-      "SmallPlacesId": 0,
+      "SmallPlacesId": 1,
       "XiantuID": 1,
       "EventName": 4028,
       "Description": 4103
@@ -4895,7 +4895,7 @@
       "RefreshProbability": 35,
       "RefreshCount": 1,
       "placeID": 1,
-      "SmallPlacesId": 1,
+      "SmallPlacesId": 0,
       "XiantuID": 2,
       "EventConditionId": [
         3
@@ -4935,7 +4935,7 @@
       "RefreshProbability": 35,
       "RefreshCount": 1,
       "placeID": 1,
-      "SmallPlacesId": 1,
+      "SmallPlacesId": 0,
       "XiantuID": 2,
       "EventConditionId": [
         10,
@@ -4977,7 +4977,7 @@
       "RefreshProbability": 30,
       "RefreshCount": 1,
       "placeID": 1,
-      "SmallPlacesId": 1,
+      "SmallPlacesId": 0,
       "XiantuID": 2,
       "EventConditionId": [
         10,
@@ -5020,7 +5020,7 @@
       "RefreshProbability": 25,
       "RefreshCount": 1,
       "placeID": 1,
-      "SmallPlacesId": 1,
+      "SmallPlacesId": 0,
       "XiantuID": 3,
       "EventConditionId": [
         10,
@@ -5059,7 +5059,7 @@
       "RefreshProbability": 20,
       "RefreshCount": 1,
       "placeID": 1,
-      "SmallPlacesId": 1,
+      "SmallPlacesId": 0,
       "XiantuID": 3,
       "EventConditionId": [
         10,
@@ -5116,7 +5116,7 @@
       "RefreshProbability": 15,
       "RefreshCount": 1,
       "placeID": 1,
-      "SmallPlacesId": 1,
+      "SmallPlacesId": 0,
       "XiantuID": 3,
       "EventConditionId": [
         1
@@ -5297,7 +5297,7 @@
       "RefreshProbability": 25,
       "RefreshCount": 1,
       "placeID": 1,
-      "SmallPlacesId": 3,
+      "SmallPlacesId": 0,
       "XiantuID": 5,
       "EventConditionId": [
         10,
@@ -5338,7 +5338,7 @@
       "RefreshProbability": 20,
       "RefreshCount": 1,
       "placeID": 1,
-      "SmallPlacesId": 3,
+      "SmallPlacesId": 0,
       "XiantuID": 5,
       "EventConditionId": [
         10,
@@ -5390,7 +5390,7 @@
       "RefreshProbability": 15,
       "RefreshCount": 1,
       "placeID": 1,
-      "SmallPlacesId": 3,
+      "SmallPlacesId": 0,
       "XiantuID": 5,
       "EventConditionId": [
         10,
@@ -5454,7 +5454,7 @@
       "RefreshProbability": 40,
       "RefreshCount": 1,
       "placeID": 1,
-      "SmallPlacesId": 4,
+      "SmallPlacesId": 0,
       "XiantuID": 6,
       "EventConditionId": [
         10,
@@ -5492,7 +5492,7 @@
       "RefreshProbability": 35,
       "RefreshCount": 1,
       "placeID": 1,
-      "SmallPlacesId": 4,
+      "SmallPlacesId": 0,
       "XiantuID": 6,
       "EventConditionId": [
         10,
@@ -5532,7 +5532,7 @@
       "RefreshProbability": 30,
       "RefreshCount": 1,
       "placeID": 1,
-      "SmallPlacesId": 4,
+      "SmallPlacesId": 0,
       "XiantuID": 6,
       "EventConditionId": [
         10,
@@ -5573,7 +5573,7 @@
       "RefreshProbability": 25,
       "RefreshCount": 1,
       "placeID": 1,
-      "SmallPlacesId": 4,
+      "SmallPlacesId": 0,
       "XiantuID": 6,
       "EventConditionId": [
         10,
@@ -5617,7 +5617,7 @@
       "RefreshProbability": 30,
       "RefreshCount": 1,
       "placeID": 2,
-      "SmallPlacesId": 5,
+      "SmallPlacesId": 0,
       "XiantuID": 7,
       "EventConditionId": [
         10,
@@ -5659,7 +5659,7 @@
       "RefreshProbability": 20,
       "RefreshCount": 1,
       "placeID": 2,
-      "SmallPlacesId": 5,
+      "SmallPlacesId": 0,
       "XiantuID": 7,
       "EventConditionId": [
         10,
@@ -5711,7 +5711,7 @@
       "RefreshProbability": 15,
       "RefreshCount": 1,
       "placeID": 2,
-      "SmallPlacesId": 5,
+      "SmallPlacesId": 0,
       "XiantuID": 7,
       "EventConditionId": [
         10,
@@ -5753,7 +5753,7 @@
       "RefreshProbability": 30,
       "RefreshCount": 1,
       "placeID": 2,
-      "SmallPlacesId": 5,
+      "SmallPlacesId": 0,
       "XiantuID": 8,
       "EventConditionId": [
         10,
@@ -5792,7 +5792,7 @@
       "RefreshProbability": 20,
       "RefreshCount": 1,
       "placeID": 2,
-      "SmallPlacesId": 5,
+      "SmallPlacesId": 0,
       "XiantuID": 8,
       "EventConditionId": [
         10,
@@ -5842,7 +5842,7 @@
       "RefreshProbability": 15,
       "RefreshCount": 1,
       "placeID": 2,
-      "SmallPlacesId": 5,
+      "SmallPlacesId": 0,
       "XiantuID": 8,
       "EventConditionId": [
         10,