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

Assets/Res/Config/EventConditionConfig.json

@@ -640,13 +640,13 @@
       "ID": 47,
       "message": 9046,
       "Operation": 0,
-      "ConditionType": 10,
+      "ConditionType": 5,
       "ConditionPara": [
-        30023
+        4023
       ],
-      "finishCount": 5,
+      "finishCount": 1,
       "RelatedEvents": [
-        9141
+        30023
       ],
       "SkiptoIds": [
         5
@@ -656,13 +656,13 @@
       "ID": 48,
       "message": 9047,
       "Operation": 0,
-      "ConditionType": 10,
+      "ConditionType": 5,
       "ConditionPara": [
-        30024
+        4024
       ],
-      "finishCount": 5,
+      "finishCount": 1,
       "RelatedEvents": [
-        9143
+        30024
       ],
       "SkiptoIds": [
         5