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

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

Assets/Res/Config/EventConfig.json

@@ -1,17 +1,12 @@
 {
   "configList": [
     {
-      "ID": 1,
+      "ID": 101,
       "EventLinksId": [
-        1001,
-        1002,
-        1003,
-        1004,
-        1005,
-        100,
+        10101,
         102
       ],
-      "EventTriggerType": 99,
+      "EventTriggerType": 1,
       "EventTag": 7,
       "EventType": 1,
       "Score": 0,
@@ -27,7 +22,7 @@
         -1000,
         1
       ],
-      "RefreshProbability": 100,
+      "RefreshProbability": 10,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -38,16 +33,9 @@
       "Description": 4076
     },
     {
-      "ID": 2,
+      "ID": 102,
       "EventLinksId": [
-        1010,
-        1011,
-        1012,
-        1013,
-        1014,
-        1015,
-        1016,
-        100,
+        10201,
         102
       ],
       "EventTriggerType": 1,
@@ -66,7 +54,7 @@
         -1000,
         1
       ],
-      "RefreshProbability": 100,
+      "RefreshProbability": 10,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -77,10 +65,9 @@
       "Description": 4077
     },
     {
-      "ID": 4,
+      "ID": 103,
       "EventLinksId": [
-        1030,
-        100,
+        10301,
         102
       ],
       "EventTriggerType": 1,
@@ -110,10 +97,9 @@
       "Description": 4078
     },
     {
-      "ID": 5,
+      "ID": 104,
       "EventLinksId": [
-        1040,
-        100,
+        10401,
         102
       ],
       "EventTriggerType": 1,
@@ -143,10 +129,9 @@
       "Description": 4079
     },
     {
-      "ID": 6,
+      "ID": 105,
       "EventLinksId": [
-        1050,
-        100,
+        10501,
         102
       ],
       "EventTriggerType": 1,
@@ -176,10 +161,9 @@
       "Description": 4080
     },
     {
-      "ID": 7,
+      "ID": 106,
       "EventLinksId": [
-        1060,
-        100,
+        10601,
         102
       ],
       "EventTriggerType": 1,
@@ -192,13 +176,13 @@
       ],
       "PrizeIDs": [
         1003,
-        999001
+        1002
       ],
       "PrizeNums": [
         -1000,
-        1
+        100
       ],
-      "RefreshProbability": 100,
+      "RefreshProbability": 30,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -209,10 +193,9 @@
       "Description": 4081
     },
     {
-      "ID": 1011,
+      "ID": 107,
       "EventLinksId": [
-        101101,
-        100,
+        10701,
         102
       ],
       "EventTriggerType": 1,
@@ -225,13 +208,13 @@
       ],
       "PrizeIDs": [
         1003,
-        999002
+        1004
       ],
       "PrizeNums": [
         -1000,
-        1
+        10
       ],
-      "RefreshProbability": 100,
+      "RefreshProbability": 20,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -242,29 +225,28 @@
       "Description": 4082
     },
     {
-      "ID": 1012,
+      "ID": 108,
       "EventLinksId": [
-        101201,
-        100,
+        10801,
         102
       ],
       "EventTriggerType": 1,
       "EventTag": 7,
       "EventType": 1,
       "Score": 0,
-      "EventQuality": 3,
+      "EventQuality": 1,
       "PrizeType": [
         7
       ],
       "PrizeIDs": [
         1003,
-        1001
+        1501
       ],
       "PrizeNums": [
         -1000,
-        -5000
+        1
       ],
-      "RefreshProbability": 100,
+      "RefreshProbability": 60,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -275,29 +257,28 @@
       "Description": 4083
     },
     {
-      "ID": 1013,
+      "ID": 109,
       "EventLinksId": [
-        101301,
-        100,
+        10901,
         102
       ],
       "EventTriggerType": 1,
       "EventTag": 7,
       "EventType": 1,
       "Score": 0,
-      "EventQuality": 3,
+      "EventQuality": 1,
       "PrizeType": [
         7
       ],
       "PrizeIDs": [
         1003,
-        1005
+        1601
       ],
       "PrizeNums": [
         -1000,
-        -5000
+        1
       ],
-      "RefreshProbability": 100,
+      "RefreshProbability": 40,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -308,26 +289,153 @@
       "Description": 4084
     },
     {
-      "ID": 1014,
+      "ID": 110,
       "EventLinksId": [
-        101401,
-        100,
+        11001,
         102
       ],
       "EventTriggerType": 1,
       "EventTag": 7,
       "EventType": 1,
       "Score": 0,
-      "EventQuality": 3,
+      "EventQuality": 2,
       "PrizeType": [
         7
       ],
+      "PrizeIDs": [
+        1003,
+        999001
+      ],
+      "PrizeNums": [
+        -1100,
+        1
+      ],
+      "RefreshProbability": 15,
+      "RefreshCount": 0,
+      "placeID": 0,
+      "SmallPlacesId": 0,
+      "XiantuID": 0,
+      "EventConditionId": 0,
+      "EventCount": 0,
+      "EventName": 4010,
+      "Description": 4085
+    },
+    {
+      "ID": 111,
+      "EventLinksId": [
+        11101,
+        102
+      ],
+      "EventTriggerType": 1,
+      "EventTag": 7,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 2,
+      "PrizeType": [
+        8
+      ],
+      "PrizeIDs": [
+        1003,
+        999002
+      ],
+      "PrizeNums": [
+        -1100,
+        1
+      ],
+      "RefreshProbability": 15,
+      "RefreshCount": 0,
+      "placeID": 0,
+      "SmallPlacesId": 0,
+      "XiantuID": 0,
+      "EventConditionId": 0,
+      "EventCount": 0,
+      "EventName": 4011,
+      "Description": 4086
+    },
+    {
+      "ID": 112,
+      "EventLinksId": [
+        11201,
+        102
+      ],
+      "EventTriggerType": 1,
+      "EventTag": 7,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 2,
+      "PrizeType": [
+        8
+      ],
+      "PrizeIDs": [
+        1003,
+        1001
+      ],
+      "PrizeNums": [
+        -1100,
+        -5000
+      ],
+      "RefreshProbability": 100,
+      "RefreshCount": 0,
+      "placeID": 0,
+      "SmallPlacesId": 0,
+      "XiantuID": 0,
+      "EventConditionId": 0,
+      "EventCount": 0,
+      "EventName": 4012,
+      "Description": 4087
+    },
+    {
+      "ID": 113,
+      "EventLinksId": [
+        11301,
+        102
+      ],
+      "EventTriggerType": 1,
+      "EventTag": 7,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 2,
+      "PrizeType": [
+        8
+      ],
+      "PrizeIDs": [
+        1003,
+        1005
+      ],
+      "PrizeNums": [
+        -1100,
+        -5000
+      ],
+      "RefreshProbability": 100,
+      "RefreshCount": 0,
+      "placeID": 0,
+      "SmallPlacesId": 0,
+      "XiantuID": 0,
+      "EventConditionId": 0,
+      "EventCount": 0,
+      "EventName": 4013,
+      "Description": 4088
+    },
+    {
+      "ID": 114,
+      "EventLinksId": [
+        11401,
+        102
+      ],
+      "EventTriggerType": 1,
+      "EventTag": 7,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 2,
+      "PrizeType": [
+        8
+      ],
       "PrizeIDs": [
         1003,
         1006
       ],
       "PrizeNums": [
-        -1000,
+        -1100,
         -5000
       ],
       "RefreshProbability": 100,
@@ -337,8 +445,394 @@
       "XiantuID": 0,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 4010,
-      "Description": 4085
+      "EventName": 4014,
+      "Description": 4089
+    },
+    {
+      "ID": 115,
+      "EventTriggerType": 1,
+      "EventTag": 7,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 2,
+      "PrizeType": [
+        9
+      ],
+      "PrizeIDs": [
+        1003,
+        1002
+      ],
+      "PrizeNums": [
+        -1100,
+        100
+      ],
+      "RefreshProbability": 35,
+      "RefreshCount": 0,
+      "placeID": 0,
+      "SmallPlacesId": 0,
+      "XiantuID": 0,
+      "EventConditionId": 0,
+      "EventCount": 0,
+      "EventName": 4015,
+      "Description": 4090
+    },
+    {
+      "ID": 116,
+      "EventTriggerType": 1,
+      "EventTag": 7,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 2,
+      "PrizeType": [
+        9
+      ],
+      "PrizeIDs": [
+        1003,
+        1004
+      ],
+      "PrizeNums": [
+        -1100,
+        10
+      ],
+      "RefreshProbability": 25,
+      "RefreshCount": 0,
+      "placeID": 0,
+      "SmallPlacesId": 0,
+      "XiantuID": 0,
+      "EventConditionId": 0,
+      "EventCount": 0,
+      "EventName": 4016,
+      "Description": 4091
+    },
+    {
+      "ID": 117,
+      "EventTriggerType": 1,
+      "EventTag": 7,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 2,
+      "PrizeType": [
+        9
+      ],
+      "PrizeIDs": [
+        1003,
+        1501
+      ],
+      "PrizeNums": [
+        -1100,
+        1
+      ],
+      "RefreshProbability": 65,
+      "RefreshCount": 0,
+      "placeID": 0,
+      "SmallPlacesId": 0,
+      "XiantuID": 0,
+      "EventConditionId": 0,
+      "EventCount": 0,
+      "EventName": 4017,
+      "Description": 4092
+    },
+    {
+      "ID": 118,
+      "EventTriggerType": 1,
+      "EventTag": 7,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 2,
+      "PrizeType": [
+        10
+      ],
+      "PrizeIDs": [
+        1003,
+        1601
+      ],
+      "PrizeNums": [
+        -1100,
+        1
+      ],
+      "RefreshProbability": 45,
+      "RefreshCount": 0,
+      "placeID": 0,
+      "SmallPlacesId": 0,
+      "XiantuID": 0,
+      "EventConditionId": 0,
+      "EventCount": 0,
+      "EventName": 4018,
+      "Description": 4093
+    },
+    {
+      "ID": 119,
+      "EventTriggerType": 1,
+      "EventTag": 7,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 5,
+      "PrizeType": [
+        10
+      ],
+      "PrizeIDs": [
+        1003,
+        999001
+      ],
+      "PrizeNums": [
+        -1400,
+        1
+      ],
+      "RefreshProbability": 30,
+      "RefreshCount": 0,
+      "placeID": 0,
+      "SmallPlacesId": 0,
+      "XiantuID": 0,
+      "EventConditionId": 0,
+      "EventCount": 0,
+      "EventName": 4316,
+      "Description": 4094
+    },
+    {
+      "ID": 120,
+      "EventTriggerType": 1,
+      "EventTag": 7,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 5,
+      "PrizeType": [
+        11
+      ],
+      "PrizeIDs": [
+        1003,
+        999002
+      ],
+      "PrizeNums": [
+        -1400,
+        1
+      ],
+      "RefreshProbability": 30,
+      "RefreshCount": 0,
+      "placeID": 0,
+      "SmallPlacesId": 0,
+      "XiantuID": 0,
+      "EventConditionId": 0,
+      "EventCount": 0,
+      "EventName": 4317,
+      "Description": 4095
+    },
+    {
+      "ID": 121,
+      "EventTriggerType": 1,
+      "EventTag": 7,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 5,
+      "PrizeType": [
+        1
+      ],
+      "PrizeIDs": [
+        1003,
+        1001
+      ],
+      "PrizeNums": [
+        -1400,
+        -5000
+      ],
+      "RefreshProbability": 100,
+      "RefreshCount": 0,
+      "placeID": 0,
+      "SmallPlacesId": 0,
+      "XiantuID": 0,
+      "EventConditionId": 0,
+      "EventCount": 0,
+      "EventName": 4318,
+      "Description": 4096
+    },
+    {
+      "ID": 122,
+      "EventTriggerType": 1,
+      "EventTag": 7,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 5,
+      "PrizeType": [
+        2
+      ],
+      "PrizeIDs": [
+        1003,
+        1005
+      ],
+      "PrizeNums": [
+        -1400,
+        -5000
+      ],
+      "RefreshProbability": 100,
+      "RefreshCount": 0,
+      "placeID": 0,
+      "SmallPlacesId": 0,
+      "XiantuID": 0,
+      "EventConditionId": 0,
+      "EventCount": 0,
+      "EventName": 4319,
+      "Description": 4097
+    },
+    {
+      "ID": 123,
+      "EventTriggerType": 1,
+      "EventTag": 7,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 5,
+      "PrizeType": [
+        3
+      ],
+      "PrizeIDs": [
+        1003,
+        1006
+      ],
+      "PrizeNums": [
+        -1400,
+        -5000
+      ],
+      "RefreshProbability": 100,
+      "RefreshCount": 0,
+      "placeID": 0,
+      "SmallPlacesId": 0,
+      "XiantuID": 0,
+      "EventConditionId": 0,
+      "EventCount": 0,
+      "EventName": 4320,
+      "Description": 4098
+    },
+    {
+      "ID": 124,
+      "EventTriggerType": 1,
+      "EventTag": 7,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 5,
+      "PrizeType": [
+        4
+      ],
+      "PrizeIDs": [
+        1003,
+        1002
+      ],
+      "PrizeNums": [
+        -1400,
+        100
+      ],
+      "RefreshProbability": 50,
+      "RefreshCount": 0,
+      "placeID": 0,
+      "SmallPlacesId": 0,
+      "XiantuID": 0,
+      "EventConditionId": 0,
+      "EventCount": 0,
+      "EventName": 4321,
+      "Description": 4099
+    },
+    {
+      "ID": 125,
+      "EventTriggerType": 1,
+      "EventTag": 7,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 5,
+      "PrizeType": [
+        7
+      ],
+      "PrizeIDs": [
+        1003,
+        1004
+      ],
+      "PrizeNums": [
+        -1400,
+        10
+      ],
+      "RefreshProbability": 40,
+      "RefreshCount": 0,
+      "placeID": 0,
+      "SmallPlacesId": 0,
+      "XiantuID": 0,
+      "EventConditionId": 0,
+      "EventCount": 0,
+      "EventName": 4322,
+      "Description": 4100
+    },
+    {
+      "ID": 126,
+      "EventTriggerType": 1,
+      "EventTag": 7,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 5,
+      "PrizeType": [
+        8
+      ],
+      "PrizeIDs": [
+        1003,
+        1501
+      ],
+      "PrizeNums": [
+        -1400,
+        1
+      ],
+      "RefreshProbability": 80,
+      "RefreshCount": 0,
+      "placeID": 0,
+      "SmallPlacesId": 0,
+      "XiantuID": 0,
+      "EventConditionId": 0,
+      "EventCount": 0,
+      "EventName": 4323,
+      "Description": 4101
+    },
+    {
+      "ID": 127,
+      "EventTriggerType": 1,
+      "EventTag": 7,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 5,
+      "PrizeType": [
+        9
+      ],
+      "PrizeIDs": [
+        1003,
+        1601
+      ],
+      "PrizeNums": [
+        -1400,
+        1
+      ],
+      "RefreshProbability": 60,
+      "RefreshCount": 0,
+      "placeID": 0,
+      "SmallPlacesId": 0,
+      "XiantuID": 0,
+      "EventConditionId": 0,
+      "EventCount": 0,
+      "EventName": 4324,
+      "Description": 4102
+    },
+    {
+      "ID": 9999,
+      "EventLinksId": [
+        999901,
+        100,
+        102
+      ],
+      "EventTriggerType": 99,
+      "EventTag": 3,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "RefreshProbability": 0,
+      "RefreshCount": 0,
+      "placeID": 0,
+      "SmallPlacesId": 0,
+      "XiantuID": 0,
+      "EventConditionId": 0,
+      "EventCount": 0,
+      "EventName": 4325,
+      "Description": 0
     },
     {
       "ID": 10000,