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

Assets/Res/Config/EventConditionConfig.json

@@ -171,7 +171,7 @@
       "Operation": null,
       "ConditionType": 5,
       "ConditionPara": [
-        20002
+        1008
       ],
       "finishCount": 1,
       "RelatedEvents": [

Assets/Res/Config/EventLinkConfig.json

@@ -4687,11 +4687,11 @@
       ],
       "DialogueType": null,
       "EventID": 10025,
-      "optionType": 1,
-      "optionPara1": [
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
         1002509
-      ],
-      "ResultType": null
+      ]
     },
     {
       "ID": 1002507,