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

Assets/Res/Config/EventConditionConfig.json

@@ -484,7 +484,7 @@
       "ConditionPara": [
         20005
       ],
-      "finishCount": 3,
+      "finishCount": 1,
       "RelatedEvents": [
         30013
       ],
@@ -500,7 +500,7 @@
       "ConditionPara": [
         3003
       ],
-      "finishCount": 3,
+      "finishCount": 2,
       "RelatedEvents": [
         30014
       ],
@@ -544,9 +544,9 @@
       "ID": 41,
       "message": 9040,
       "Operation": 0,
-      "ConditionType": 10,
+      "ConditionType": 1,
       "ConditionPara": [
-        30017
+        20007
       ],
       "finishCount": 3,
       "RelatedEvents": [
@@ -560,9 +560,9 @@
       "ID": 42,
       "message": 9041,
       "Operation": 0,
-      "ConditionType": 10,
+      "ConditionType": 1,
       "ConditionPara": [
-        30018
+        20008
       ],
       "finishCount": 1,
       "RelatedEvents": [
@@ -576,11 +576,11 @@
       "ID": 43,
       "message": 9042,
       "Operation": 0,
-      "ConditionType": 10,
+      "ConditionType": 1,
       "ConditionPara": [
-        30019
+        20009
       ],
-      "finishCount": 2,
+      "finishCount": 1,
       "RelatedEvents": [
         30019
       ],
@@ -592,9 +592,9 @@
       "ID": 44,
       "message": 9043,
       "Operation": 0,
-      "ConditionType": 10,
+      "ConditionType": 1,
       "ConditionPara": [
-        30020
+        20010
       ],
       "finishCount": 3,
       "RelatedEvents": [
@@ -608,9 +608,9 @@
       "ID": 45,
       "message": 9044,
       "Operation": 0,
-      "ConditionType": 10,
+      "ConditionType": 1,
       "ConditionPara": [
-        30021
+        20011
       ],
       "finishCount": 2,
       "RelatedEvents": [
@@ -624,9 +624,9 @@
       "ID": 46,
       "message": 9045,
       "Operation": 0,
-      "ConditionType": 10,
+      "ConditionType": 1,
       "ConditionPara": [
-        30022
+        20012
       ],
       "finishCount": 3,
       "RelatedEvents": [

Assets/Res/Config/EventConfig.json

@@ -2837,7 +2837,13 @@
       "EventType": 1,
       "Score": 0,
       "EventQuality": 1,
-      "RefreshProbability": 50,
+      "PrizeIDs": [
+        20005
+      ],
+      "PrizeNums": [
+        1
+      ],
+      "RefreshProbability": 30,
       "RefreshCount": 1,
       "placeID": 1,
       "SmallPlacesId": 0,
@@ -2859,7 +2865,7 @@
       "EventType": 1,
       "Score": 0,
       "EventQuality": 1,
-      "RefreshProbability": 30,
+      "RefreshProbability": 50,
       "RefreshCount": 1,
       "placeID": 1,
       "SmallPlacesId": 0,
@@ -2881,7 +2887,13 @@
       "EventType": 1,
       "Score": 0,
       "EventQuality": 1,
-      "RefreshProbability": 30,
+      "PrizeIDs": [
+        20006
+      ],
+      "PrizeNums": [
+        1
+      ],
+      "RefreshProbability": 40,
       "RefreshCount": 1,
       "placeID": 1,
       "SmallPlacesId": 0,
@@ -2928,7 +2940,13 @@
       "EventType": 1,
       "Score": 0,
       "EventQuality": 1,
-      "RefreshProbability": 30,
+      "PrizeIDs": [
+        20007
+      ],
+      "PrizeNums": [
+        1
+      ],
+      "RefreshProbability": 40,
       "RefreshCount": 1,
       "placeID": 1,
       "SmallPlacesId": 0,
@@ -2950,6 +2968,12 @@
       "EventType": 1,
       "Score": 0,
       "EventQuality": 1,
+      "PrizeIDs": [
+        20008
+      ],
+      "PrizeNums": [
+        1
+      ],
       "RefreshProbability": 30,
       "RefreshCount": 1,
       "placeID": 1,
@@ -2972,6 +2996,12 @@
       "EventType": 1,
       "Score": 0,
       "EventQuality": 1,
+      "PrizeIDs": [
+        20009
+      ],
+      "PrizeNums": [
+        1
+      ],
       "RefreshProbability": 30,
       "RefreshCount": 1,
       "placeID": 1,
@@ -2994,13 +3024,19 @@
       "EventType": 1,
       "Score": 0,
       "EventQuality": 1,
-      "RefreshProbability": 30,
+      "PrizeIDs": [
+        20010
+      ],
+      "PrizeNums": [
+        1
+      ],
+      "RefreshProbability": 40,
       "RefreshCount": 1,
       "placeID": 1,
       "SmallPlacesId": 0,
       "XiantuID": 0,
       "EventCount": [
-        2
+        3
       ],
       "EventName": 4227,
       "Description": 4228
@@ -3018,6 +3054,12 @@
       "EventType": 1,
       "Score": 0,
       "EventQuality": 1,
+      "PrizeIDs": [
+        20011
+      ],
+      "PrizeNums": [
+        1
+      ],
       "RefreshProbability": 30,
       "RefreshCount": 1,
       "placeID": 1,
@@ -3041,6 +3083,12 @@
       "EventType": 1,
       "Score": 0,
       "EventQuality": 1,
+      "PrizeIDs": [
+        20012
+      ],
+      "PrizeNums": [
+        1
+      ],
       "RefreshProbability": 30,
       "RefreshCount": 1,
       "placeID": 1,
@@ -6130,7 +6178,7 @@
         915108,
         102
       ],
-      "EventTriggerType": 1,
+      "EventTriggerType": 6,
       "EventTag": 3,
       "EventType": 1,
       "Score": 0,
@@ -6164,7 +6212,7 @@
         915208,
         102
       ],
-      "EventTriggerType": 1,
+      "EventTriggerType": 6,
       "EventTag": 3,
       "EventType": 1,
       "Score": 0,
@@ -6206,7 +6254,7 @@
         915310,
         102
       ],
-      "EventTriggerType": 1,
+      "EventTriggerType": 6,
       "EventTag": 3,
       "EventType": 1,
       "Score": 0,
@@ -6245,7 +6293,7 @@
         915407,
         102
       ],
-      "EventTriggerType": 1,
+      "EventTriggerType": 6,
       "EventTag": 3,
       "EventType": 1,
       "Score": 0,