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

# Conflicts:
#	UserSettings/Layouts/default-2022.dwlt   resolved by master version

Assets/Res/Config/EventLinkConfig.json

@@ -4947,7 +4947,7 @@
       "optionType": null,
       "ResultType": 1,
       "ResultOptions": [
-        500107
+        500106
       ]
     },
     {
@@ -4965,7 +4965,7 @@
       "optionType": null,
       "ResultType": 1,
       "ResultOptions": [
-        500108
+        500107
       ]
     },
     {
@@ -4989,7 +4989,10 @@
         2374,
         2375
       ],
-      "ResultType": null
+      "ResultType": 1,
+      "ResultOptions": [
+        500108
+      ]
     },
     {
       "ID": 500108,
@@ -5135,8 +5138,8 @@
       ],
       "ResultType": 2,
       "ResultOptions": [
-        500105,
-        100
+        500116,
+        101
       ]
     },
     {
@@ -5158,7 +5161,10 @@
       "optionPara2": [
         2386
       ],
-      "ResultType": null
+      "ResultType": 1,
+      "ResultOptions": [
+        500117
+      ]
     },
     {
       "ID": 500117,