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

Assets/Res/Config/EventConditionConfig.json

@@ -16,7 +16,7 @@
       "Operation": null,
       "ConditionType": 3,
       "ConditionPara": [
-        10
+        11
       ],
       "finishCount": 1
     },
@@ -63,6 +63,26 @@
         100001
       ],
       "finishCount": 1
+    },
+    {
+      "ID": 8,
+      "message": null,
+      "Operation": null,
+      "ConditionType": 3,
+      "ConditionPara": [
+        21
+      ],
+      "finishCount": 1
+    },
+    {
+      "ID": 9,
+      "message": null,
+      "Operation": null,
+      "ConditionType": 5,
+      "ConditionPara": [
+        100004
+      ],
+      "finishCount": 1
     }
   ]
 }

Assets/Res/Config/EventConfig.json

@@ -414,7 +414,7 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
-      "placeID": 2,
+      "placeID": 1,
       "XiantuID": 1,
       "EventConditionId": null,
       "EventCount": null,
@@ -442,7 +442,7 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
-      "placeID": 3,
+      "placeID": 1,
       "XiantuID": 1,
       "EventConditionId": null,
       "EventCount": null,
@@ -451,6 +451,22 @@
     },
     {
       "ID": 10005,
+      "EventLinksId": [
+        1000501,
+        1000502,
+        1000503,
+        1000504,
+        1000505,
+        1000506,
+        1000507,
+        1000508,
+        1000509,
+        1000510,
+        1000511,
+        1000512,
+        1000513,
+        1000514
+      ],
       "EventTriggerType": 4,
       "EventTag": 1,
       "EventType": 1,
@@ -464,12 +480,42 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
-      "placeID": 4,
+      "placeID": 1,
       "XiantuID": 1,
       "EventConditionId": null,
       "EventCount": null,
-      "EventName": null,
-      "Description": null
+      "EventName": 2135,
+      "Description": 2137
+    },
+    {
+      "ID": 10006,
+      "EventLinksId": [
+        1000601,
+        1000602,
+        1000603,
+        1000604,
+        1000605,
+        1000606
+      ],
+      "EventTriggerType": 4,
+      "EventTag": 1,
+      "EventType": 1,
+      "Score": 10,
+      "EventQuality": 1,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
+      "RefreshProbability": null,
+      "RefreshCount": null,
+      "placeID": 1,
+      "XiantuID": 1,
+      "EventConditionId": null,
+      "EventCount": null,
+      "EventName": 2136,
+      "Description": 2138
     },
     {
       "ID": 1001,

Assets/Res/Config/EventLinkConfig.json

@@ -2,12 +2,26 @@
   "configList": [
     {
       "ID": 100,
-      "conciseEventMessage": 216,
+      "conciseEventMessage": null,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "LanID": [
+        216
+      ],
+      "DialogueType": null,
+      "EventID": null,
+      "optionType": null,
+      "ResultType": null
+    },
+    {
+      "ID": 101,
+      "conciseEventMessage": null,
       "EventConditionMessage": null,
       "NPCID": null,
       "LanID": [
         216
       ],
+      "DialogueType": null,
       "EventID": null,
       "optionType": null,
       "ResultType": null
@@ -20,6 +34,7 @@
       "LanID": [
         177
       ],
+      "DialogueType": null,
       "EventID": null,
       "optionType": 1,
       "optionPara1": [
@@ -40,6 +55,7 @@
       "LanID": [
         178
       ],
+      "DialogueType": null,
       "EventID": null,
       "optionType": 2,
       "optionPara1": [
@@ -59,6 +75,7 @@
       "LanID": [
         179
       ],
+      "DialogueType": null,
       "EventID": null,
       "optionType": 1,
       "optionPara1": [
@@ -77,6 +94,7 @@
       "LanID": [
         180
       ],
+      "DialogueType": null,
       "EventID": null,
       "optionType": 3,
       "PrizeIDs": [
@@ -95,6 +113,7 @@
       "LanID": [
         181
       ],
+      "DialogueType": null,
       "EventID": null,
       "optionType": 3,
       "PrizeIDs": [
@@ -113,6 +132,7 @@
       "LanID": [
         182
       ],
+      "DialogueType": null,
       "EventID": null,
       "optionType": 1,
       "optionPara1": [
@@ -133,6 +153,7 @@
       "LanID": [
         183
       ],
+      "DialogueType": null,
       "EventID": null,
       "optionType": 1,
       "optionPara1": [
@@ -154,6 +175,7 @@
         184,
         187
       ],
+      "DialogueType": null,
       "EventID": null,
       "optionType": 3,
       "PrizeIDs": [
@@ -172,6 +194,7 @@
       "LanID": [
         185
       ],
+      "DialogueType": null,
       "EventID": null,
       "optionType": 2,
       "optionPara1": [
@@ -192,6 +215,7 @@
         186,
         189
       ],
+      "DialogueType": null,
       "EventID": null,
       "optionType": 3,
       "PrizeIDs": [
@@ -210,6 +234,7 @@
       "LanID": [
         188
       ],
+      "DialogueType": null,
       "EventID": null,
       "optionType": null,
       "PrizeIDs": [
@@ -228,6 +253,7 @@
       "LanID": [
         190
       ],
+      "DialogueType": null,
       "EventID": null,
       "optionType": 1,
       "optionPara1": [
@@ -248,6 +274,7 @@
       "LanID": [
         191
       ],
+      "DialogueType": null,
       "EventID": null,
       "optionType": 2,
       "optionPara1": [
@@ -273,6 +300,7 @@
       "LanID": [
         192
       ],
+      "DialogueType": null,
       "EventID": null,
       "optionType": 4,
       "PrizeIDs": [
@@ -292,6 +320,7 @@
         193,
         196
       ],
+      "DialogueType": null,
       "EventID": null,
       "optionType": 2,
       "optionPara1": [
@@ -318,6 +347,7 @@
         194,
         197
       ],
+      "DialogueType": null,
       "EventID": null,
       "optionType": 3,
       "PrizeIDs": [
@@ -336,6 +366,7 @@
       "LanID": [
         207
       ],
+      "DialogueType": null,
       "EventID": null,
       "optionType": 1,
       "optionPara1": [
@@ -356,6 +387,7 @@
       "LanID": [
         221
       ],
+      "DialogueType": null,
       "EventID": null,
       "optionType": 3,
       "PrizeIDs": [
@@ -374,6 +406,7 @@
       "LanID": [
         222
       ],
+      "DialogueType": null,
       "EventID": null,
       "optionType": 3,
       "PrizeIDs": [
@@ -392,6 +425,7 @@
       "LanID": [
         223
       ],
+      "DialogueType": null,
       "EventID": null,
       "optionType": 3,
       "PrizeIDs": [
@@ -412,6 +446,7 @@
       "LanID": [
         224
       ],
+      "DialogueType": null,
       "EventID": null,
       "optionType": null,
       "ResultType": null
@@ -424,6 +459,7 @@
       "LanID": [
         208
       ],
+      "DialogueType": null,
       "EventID": 11,
       "optionType": 2,
       "optionPara1": [
@@ -443,6 +479,7 @@
       "LanID": [
         209
       ],
+      "DialogueType": null,
       "EventID": 11,
       "optionType": 3,
       "PrizeIDs": [
@@ -461,6 +498,7 @@
       "LanID": [
         210
       ],
+      "DialogueType": null,
       "EventID": 12,
       "optionType": null,
       "ResultType": 1,
@@ -476,6 +514,7 @@
       "LanID": [
         211
       ],
+      "DialogueType": null,
       "EventID": 12,
       "optionType": null,
       "ResultType": 1,
@@ -491,6 +530,7 @@
       "LanID": [
         1903
       ],
+      "DialogueType": null,
       "EventID": 12,
       "optionType": 3,
       "PrizeIDs": [
@@ -509,6 +549,7 @@
       "LanID": [
         212
       ],
+      "DialogueType": null,
       "EventID": 13,
       "optionType": null,
       "ResultType": 1,
@@ -524,6 +565,7 @@
       "LanID": [
         213
       ],
+      "DialogueType": null,
       "EventID": 13,
       "optionType": null,
       "ResultType": 1,
@@ -539,6 +581,7 @@
       "LanID": [
         214
       ],
+      "DialogueType": null,
       "EventID": 13,
       "optionType": null,
       "ResultType": 1,
@@ -554,6 +597,7 @@
       "LanID": [
         215
       ],
+      "DialogueType": null,
       "EventID": 13,
       "optionType": 3,
       "PrizeIDs": [
@@ -572,6 +616,7 @@
       "LanID": [
         1901
       ],
+      "DialogueType": null,
       "EventID": 14,
       "optionType": 2,
       "optionPara1": [
@@ -591,6 +636,7 @@
       "LanID": [
         209
       ],
+      "DialogueType": null,
       "EventID": 14,
       "optionType": 3,
       "PrizeIDs": [
@@ -609,6 +655,7 @@
       "LanID": [
         1902
       ],
+      "DialogueType": null,
       "EventID": 15,
       "optionType": 2,
       "optionPara1": [
@@ -628,6 +675,7 @@
       "LanID": [
         209
       ],
+      "DialogueType": null,
       "EventID": 15,
       "optionType": 3,
       "PrizeIDs": [
@@ -646,6 +694,7 @@
       "LanID": [
         2036
       ],
+      "DialogueType": null,
       "EventID": null,
       "optionType": 1,
       "optionPara1": [
@@ -666,6 +715,7 @@
       "LanID": [
         2037
       ],
+      "DialogueType": null,
       "EventID": null,
       "optionType": 2,
       "optionPara1": [
@@ -685,6 +735,7 @@
       "LanID": [
         2038
       ],
+      "DialogueType": null,
       "EventID": null,
       "optionType": null,
       "ResultType": null
@@ -697,6 +748,7 @@
       "LanID": [
         2039
       ],
+      "DialogueType": null,
       "EventID": null,
       "optionType": null,
       "ResultType": null
@@ -709,6 +761,7 @@
       "LanID": [
         2040
       ],
+      "DialogueType": null,
       "EventID": null,
       "optionType": 4,
       "ResultType": 1,
@@ -721,6 +774,7 @@
       "conciseEventMessage": null,
       "EventConditionMessage": null,
       "NPCID": null,
+      "DialogueType": null,
       "EventID": null,
       "optionType": 3,
       "PrizeIDs": [
@@ -739,6 +793,7 @@
       "LanID": [
         2074
       ],
+      "DialogueType": null,
       "EventID": null,
       "optionType": 1,
       "optionPara1": [
@@ -754,6 +809,7 @@
       "conciseEventMessage": null,
       "EventConditionMessage": null,
       "NPCID": null,
+      "DialogueType": null,
       "EventID": null,
       "optionType": null,
       "ResultType": 3,
@@ -766,6 +822,7 @@
       "conciseEventMessage": 2070,
       "EventConditionMessage": null,
       "NPCID": null,
+      "DialogueType": null,
       "EventID": null,
       "ConditionId": [
         3
@@ -778,6 +835,7 @@
       "conciseEventMessage": 2076,
       "EventConditionMessage": 2077,
       "NPCID": null,
+      "DialogueType": null,
       "EventID": null,
       "optionType": 2,
       "optionPara1": [
@@ -793,6 +851,7 @@
       "LanID": [
         2083
       ],
+      "DialogueType": 2,
       "EventID": 10001,
       "optionType": null,
       "ResultType": 1,
@@ -808,6 +867,7 @@
       "LanID": [
         2084
       ],
+      "DialogueType": 2,
       "EventID": 10001,
       "optionType": null,
       "ResultType": 1,
@@ -823,6 +883,7 @@
       "LanID": [
         2085
       ],
+      "DialogueType": 2,
       "EventID": 10001,
       "optionType": null,
       "ResultType": 1,
@@ -835,6 +896,7 @@
       "conciseEventMessage": 2086,
       "EventConditionMessage": null,
       "NPCID": null,
+      "DialogueType": null,
       "EventID": 10001,
       "ConditionId": [
         5
@@ -853,6 +915,7 @@
       "LanID": [
         2092
       ],
+      "DialogueType": null,
       "EventID": 10002,
       "optionType": null,
       "ResultType": 1,
@@ -868,6 +931,7 @@
       "LanID": [
         2093
       ],
+      "DialogueType": null,
       "EventID": 10002,
       "optionType": null,
       "ResultType": 1,
@@ -880,6 +944,7 @@
       "conciseEventMessage": 2091,
       "EventConditionMessage": 2094,
       "NPCID": null,
+      "DialogueType": null,
       "EventID": 10002,
       "optionType": null,
       "ResultType": 3,
@@ -895,6 +960,7 @@
       "LanID": [
         2096
       ],
+      "DialogueType": null,
       "EventID": 10003,
       "optionType": null,
       "ResultType": 1,
@@ -910,6 +976,7 @@
       "LanID": [
         2097
       ],
+      "DialogueType": null,
       "EventID": 10003,
       "optionType": null,
       "ResultType": 1,
@@ -925,6 +992,7 @@
       "LanID": [
         2098
       ],
+      "DialogueType": null,
       "EventID": 10003,
       "optionType": 1,
       "optionPara1": [
@@ -943,6 +1011,7 @@
       "LanID": [
         2100
       ],
+      "DialogueType": null,
       "EventID": 10003,
       "optionType": null,
       "ResultType": 1,
@@ -958,6 +1027,7 @@
       "LanID": [
         2101
       ],
+      "DialogueType": null,
       "EventID": 10003,
       "optionType": 1,
       "optionPara1": [
@@ -976,6 +1046,7 @@
       "LanID": [
         2103
       ],
+      "DialogueType": null,
       "EventID": 10003,
       "optionType": null,
       "ResultType": 1,
@@ -991,6 +1062,7 @@
       "LanID": [
         2104
       ],
+      "DialogueType": null,
       "EventID": 10003,
       "optionType": 1,
       "optionPara1": [
@@ -1010,6 +1082,7 @@
       "LanID": [
         2107
       ],
+      "DialogueType": null,
       "EventID": 10003,
       "optionType": 1,
       "optionPara1": [
@@ -1028,6 +1101,7 @@
       "LanID": [
         2109
       ],
+      "DialogueType": null,
       "EventID": 10003,
       "optionType": null,
       "ResultType": 3,
@@ -1043,6 +1117,7 @@
       "LanID": [
         2111
       ],
+      "DialogueType": null,
       "EventID": 10004,
       "optionType": 1,
       "optionPara1": [
@@ -1061,6 +1136,7 @@
       "LanID": [
         2113
       ],
+      "DialogueType": null,
       "EventID": 10004,
       "optionType": null,
       "ResultType": 1,
@@ -1076,6 +1152,7 @@
       "LanID": [
         2114
       ],
+      "DialogueType": null,
       "EventID": 10004,
       "optionType": 2,
       "optionPara1": [
@@ -1083,7 +1160,8 @@
       ],
       "ResultType": 2,
       "ResultOptions": [
-        1000404
+        1000404,
+        101
       ]
     },
     {
@@ -1094,12 +1172,959 @@
       "LanID": [
         2115
       ],
+      "DialogueType": null,
       "EventID": 10004,
       "optionType": null,
       "ResultType": 3,
       "ResultOptions": [
         10005
       ]
+    },
+    {
+      "ID": 1000501,
+      "conciseEventMessage": 2151,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "LanID": [
+        2116
+      ],
+      "DialogueType": null,
+      "EventID": 10005,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1000502
+      ]
+    },
+    {
+      "ID": 1000502,
+      "conciseEventMessage": 2151,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "LanID": [
+        2117
+      ],
+      "DialogueType": null,
+      "EventID": 10005,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1000503
+      ]
+    },
+    {
+      "ID": 1000503,
+      "conciseEventMessage": 2151,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "LanID": [
+        2118
+      ],
+      "DialogueType": null,
+      "EventID": 10005,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1000504
+      ]
+    },
+    {
+      "ID": 1000504,
+      "conciseEventMessage": 2151,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "LanID": [
+        2119
+      ],
+      "DialogueType": null,
+      "EventID": 10005,
+      "optionType": 1,
+      "optionPara1": [
+        1000505
+      ],
+      "optionPara2": [
+        2120
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1000505,
+      "conciseEventMessage": 2151,
+      "EventConditionMessage": null,
+      "NPCID": 103,
+      "LanID": [
+        2121
+      ],
+      "DialogueType": null,
+      "EventID": 10005,
+      "optionType": 1,
+      "optionPara1": [
+        1000506
+      ],
+      "optionPara2": [
+        2122
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1000506,
+      "conciseEventMessage": 2151,
+      "EventConditionMessage": null,
+      "NPCID": 103,
+      "LanID": [
+        2123
+      ],
+      "DialogueType": null,
+      "EventID": 10005,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1000507
+      ]
+    },
+    {
+      "ID": 1000507,
+      "conciseEventMessage": 2151,
+      "EventConditionMessage": null,
+      "NPCID": 103,
+      "LanID": [
+        2124
+      ],
+      "DialogueType": null,
+      "EventID": 10005,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1000508
+      ]
+    },
+    {
+      "ID": 1000508,
+      "conciseEventMessage": 2151,
+      "EventConditionMessage": null,
+      "NPCID": 103,
+      "LanID": [
+        2125
+      ],
+      "DialogueType": null,
+      "EventID": 10005,
+      "optionType": 1,
+      "optionPara1": [
+        1000509
+      ],
+      "optionPara2": [
+        2126,
+        2127
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1000509,
+      "conciseEventMessage": 2151,
+      "EventConditionMessage": null,
+      "NPCID": 103,
+      "LanID": [
+        2128
+      ],
+      "DialogueType": null,
+      "EventID": 10005,
+      "optionType": 1,
+      "optionPara1": [
+        1000510
+      ],
+      "optionPara2": [
+        2129
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1000510,
+      "conciseEventMessage": 2151,
+      "EventConditionMessage": null,
+      "NPCID": 103,
+      "LanID": [
+        2130
+      ],
+      "DialogueType": null,
+      "EventID": 10005,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1000511
+      ]
+    },
+    {
+      "ID": 1000511,
+      "conciseEventMessage": 2151,
+      "EventConditionMessage": null,
+      "NPCID": 103,
+      "LanID": [
+        2131
+      ],
+      "DialogueType": null,
+      "EventID": 10005,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1000512
+      ]
+    },
+    {
+      "ID": 1000512,
+      "conciseEventMessage": 2151,
+      "EventConditionMessage": null,
+      "NPCID": 103,
+      "LanID": [
+        2132
+      ],
+      "DialogueType": null,
+      "EventID": 10005,
+      "optionType": 1,
+      "optionPara1": [
+        1000513
+      ],
+      "optionPara2": [
+        2133
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1000513,
+      "conciseEventMessage": 2151,
+      "EventConditionMessage": null,
+      "NPCID": 103,
+      "LanID": [
+        2134
+      ],
+      "DialogueType": null,
+      "EventID": 10005,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1000514
+      ]
+    },
+    {
+      "ID": 1000514,
+      "conciseEventMessage": 2151,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "DialogueType": null,
+      "EventID": 10005,
+      "ConditionId": [
+        2
+      ],
+      "optionType": null,
+      "ResultType": 3,
+      "ResultOptions": [
+        10006
+      ]
+    },
+    {
+      "ID": 1000601,
+      "conciseEventMessage": 2152,
+      "EventConditionMessage": null,
+      "NPCID": 103,
+      "LanID": [
+        2139
+      ],
+      "DialogueType": null,
+      "EventID": 10006,
+      "optionType": 1,
+      "optionPara1": [
+        100603,
+        100602
+      ],
+      "optionPara2": [
+        2140,
+        2141
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1000602,
+      "conciseEventMessage": 2152,
+      "EventConditionMessage": null,
+      "NPCID": 103,
+      "LanID": [
+        2142
+      ],
+      "DialogueType": null,
+      "EventID": 10006,
+      "optionType": 1,
+      "optionPara1": [
+        1000603
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1000603,
+      "conciseEventMessage": 2152,
+      "EventConditionMessage": null,
+      "NPCID": 103,
+      "LanID": [
+        2143
+      ],
+      "DialogueType": null,
+      "EventID": 10006,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1000604
+      ]
+    },
+    {
+      "ID": 1000604,
+      "conciseEventMessage": 2152,
+      "EventConditionMessage": null,
+      "NPCID": 103,
+      "LanID": [
+        2144
+      ],
+      "DialogueType": null,
+      "EventID": 10006,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1000605
+      ]
+    },
+    {
+      "ID": 1000605,
+      "conciseEventMessage": 2152,
+      "EventConditionMessage": null,
+      "NPCID": 103,
+      "LanID": [
+        2145
+      ],
+      "DialogueType": null,
+      "EventID": 10006,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1000606
+      ]
+    },
+    {
+      "ID": 1000606,
+      "conciseEventMessage": 2152,
+      "EventConditionMessage": null,
+      "NPCID": 103,
+      "LanID": [
+        2146
+      ],
+      "DialogueType": null,
+      "EventID": 10006,
+      "optionType": null,
+      "ResultType": 3,
+      "ResultOptions": [
+        10007
+      ]
+    },
+    {
+      "ID": 1000701,
+      "conciseEventMessage": 2153,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "LanID": [
+        2147
+      ],
+      "DialogueType": null,
+      "EventID": 10007,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1000702
+      ]
+    },
+    {
+      "ID": 1000702,
+      "conciseEventMessage": 2153,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "LanID": [
+        2148
+      ],
+      "DialogueType": null,
+      "EventID": 10007,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1000703
+      ]
+    },
+    {
+      "ID": 1000703,
+      "conciseEventMessage": 2153,
+      "EventConditionMessage": null,
+      "NPCID": 104,
+      "LanID": [
+        2149
+      ],
+      "DialogueType": null,
+      "EventID": 10007,
+      "optionType": 1,
+      "optionPara1": [
+        1000704
+      ],
+      "optionPara2": [
+        2150
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1000704,
+      "conciseEventMessage": 2153,
+      "EventConditionMessage": null,
+      "NPCID": 104,
+      "LanID": [
+        2154
+      ],
+      "DialogueType": null,
+      "EventID": 10007,
+      "optionType": 2,
+      "optionPara1": [
+        100004
+      ],
+      "ResultType": 2,
+      "ResultOptions": [
+        1000705,
+        101
+      ]
+    },
+    {
+      "ID": 1000705,
+      "conciseEventMessage": 2153,
+      "EventConditionMessage": null,
+      "NPCID": 104,
+      "LanID": [
+        2155
+      ],
+      "DialogueType": null,
+      "EventID": 10007,
+      "optionType": null,
+      "ResultType": 3,
+      "ResultOptions": [
+        10008
+      ]
+    },
+    {
+      "ID": 1000801,
+      "conciseEventMessage": 2156,
+      "EventConditionMessage": null,
+      "NPCID": 104,
+      "LanID": [
+        2157
+      ],
+      "DialogueType": null,
+      "EventID": 10008,
+      "optionType": 1,
+      "optionPara1": [
+        1000802
+      ],
+      "optionPara2": [
+        2158
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1000802,
+      "conciseEventMessage": 2156,
+      "EventConditionMessage": null,
+      "NPCID": 104,
+      "LanID": [
+        2159
+      ],
+      "DialogueType": null,
+      "EventID": 10008,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1000803
+      ]
+    },
+    {
+      "ID": 1000803,
+      "conciseEventMessage": 2156,
+      "EventConditionMessage": null,
+      "NPCID": 104,
+      "LanID": [
+        2160
+      ],
+      "DialogueType": null,
+      "EventID": 10008,
+      "optionType": 1,
+      "optionPara1": [
+        1000804
+      ],
+      "optionPara2": [
+        2161
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1000804,
+      "conciseEventMessage": 2156,
+      "EventConditionMessage": null,
+      "NPCID": 104,
+      "LanID": [
+        2162
+      ],
+      "DialogueType": null,
+      "EventID": 10008,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1000805
+      ]
+    },
+    {
+      "ID": 1000805,
+      "conciseEventMessage": 2156,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "LanID": [
+        2163
+      ],
+      "DialogueType": null,
+      "EventID": 10008,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1000806
+      ]
+    },
+    {
+      "ID": 1000806,
+      "conciseEventMessage": 2156,
+      "EventConditionMessage": null,
+      "NPCID": 103,
+      "LanID": [
+        2164
+      ],
+      "DialogueType": null,
+      "EventID": 10008,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1000807
+      ]
+    },
+    {
+      "ID": 1000807,
+      "conciseEventMessage": 2156,
+      "EventConditionMessage": null,
+      "NPCID": 104,
+      "LanID": [
+        2165
+      ],
+      "DialogueType": null,
+      "EventID": 10008,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1000808
+      ]
+    },
+    {
+      "ID": 1000808,
+      "conciseEventMessage": 2156,
+      "EventConditionMessage": null,
+      "NPCID": 103,
+      "LanID": [
+        2166
+      ],
+      "DialogueType": null,
+      "EventID": 10008,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1000809
+      ]
+    },
+    {
+      "ID": 1000809,
+      "conciseEventMessage": 2156,
+      "EventConditionMessage": null,
+      "NPCID": 103,
+      "LanID": [
+        2167
+      ],
+      "DialogueType": null,
+      "EventID": 10008,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1000810
+      ]
+    },
+    {
+      "ID": 1000810,
+      "conciseEventMessage": 2156,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "LanID": [
+        2168
+      ],
+      "DialogueType": null,
+      "EventID": 10008,
+      "optionType": 1,
+      "optionPara1": [
+        1000811
+      ],
+      "optionPara2": [
+        2169
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1000811,
+      "conciseEventMessage": 2156,
+      "EventConditionMessage": null,
+      "NPCID": 103,
+      "LanID": [
+        2170
+      ],
+      "DialogueType": null,
+      "EventID": 10008,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1000812
+      ]
+    },
+    {
+      "ID": 1000812,
+      "conciseEventMessage": 2156,
+      "EventConditionMessage": null,
+      "NPCID": 104,
+      "LanID": [
+        2171
+      ],
+      "DialogueType": null,
+      "EventID": 10008,
+      "optionType": 1,
+      "optionPara1": [
+        1000813
+      ],
+      "optionPara2": [
+        2172,
+        2173
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1000813,
+      "conciseEventMessage": 2156,
+      "EventConditionMessage": null,
+      "NPCID": 104,
+      "LanID": [
+        2174
+      ],
+      "DialogueType": null,
+      "EventID": 10008,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1000814
+      ]
+    },
+    {
+      "ID": 1000814,
+      "conciseEventMessage": 2156,
+      "EventConditionMessage": null,
+      "NPCID": 104,
+      "LanID": [
+        2175
+      ],
+      "DialogueType": null,
+      "EventID": 10008,
+      "optionType": null,
+      "ResultType": 3,
+      "ResultOptions": [
+        10009
+      ]
+    },
+    {
+      "ID": 1000901,
+      "conciseEventMessage": 2176,
+      "EventConditionMessage": null,
+      "NPCID": 100,
+      "LanID": [
+        2177
+      ],
+      "DialogueType": null,
+      "EventID": 10009,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1000902
+      ]
+    },
+    {
+      "ID": 1000902,
+      "conciseEventMessage": 2176,
+      "EventConditionMessage": null,
+      "NPCID": 100,
+      "LanID": [
+        2178
+      ],
+      "DialogueType": null,
+      "EventID": 10009,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1000903
+      ]
+    },
+    {
+      "ID": 1000903,
+      "conciseEventMessage": 2176,
+      "EventConditionMessage": null,
+      "NPCID": 100,
+      "LanID": [
+        2179
+      ],
+      "DialogueType": null,
+      "EventID": 10009,
+      "ConditionId": [
+        8
+      ],
+      "optionType": null,
+      "ResultType": 3,
+      "ResultOptions": [
+        10010
+      ]
+    },
+    {
+      "ID": 1001001,
+      "conciseEventMessage": 2180,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "DialogueType": null,
+      "EventID": 10010,
+      "ConditionId": [
+        9
+      ],
+      "optionType": null,
+      "ResultType": 3,
+      "ResultOptions": [
+        10011
+      ]
+    },
+    {
+      "ID": 1001101,
+      "conciseEventMessage": 2181,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "LanID": [
+        2182
+      ],
+      "DialogueType": null,
+      "EventID": 10011,
+      "optionType": null,
+      "ResultType": 3,
+      "ResultOptions": [
+        10012
+      ]
+    },
+    {
+      "ID": 1001201,
+      "conciseEventMessage": 2183,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "LanID": [
+        2184
+      ],
+      "DialogueType": null,
+      "EventID": 10012,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001202
+      ]
+    },
+    {
+      "ID": 1001202,
+      "conciseEventMessage": 2183,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "LanID": [
+        2185
+      ],
+      "DialogueType": null,
+      "EventID": 10012,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001203
+      ]
+    },
+    {
+      "ID": 1001203,
+      "conciseEventMessage": 2183,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "LanID": [
+        2186
+      ],
+      "DialogueType": null,
+      "EventID": 10012,
+      "optionType": 1,
+      "optionPara1": [
+        1001204
+      ],
+      "optionPara2": [
+        2187
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1001204,
+      "conciseEventMessage": 2183,
+      "EventConditionMessage": null,
+      "NPCID": 105,
+      "LanID": [
+        2188
+      ],
+      "DialogueType": null,
+      "EventID": 10012,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001205
+      ]
+    },
+    {
+      "ID": 1001205,
+      "conciseEventMessage": 2183,
+      "EventConditionMessage": null,
+      "NPCID": 105,
+      "LanID": [
+        2189
+      ],
+      "DialogueType": null,
+      "EventID": 10012,
+      "optionType": 1,
+      "optionPara1": [
+        1001206
+      ],
+      "optionPara2": [
+        2190,
+        2191
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1001206,
+      "conciseEventMessage": 2183,
+      "EventConditionMessage": null,
+      "NPCID": 105,
+      "LanID": [
+        2192
+      ],
+      "DialogueType": null,
+      "EventID": 10012,
+      "optionType": 1,
+      "optionPara1": [
+        1001207
+      ],
+      "optionPara2": [
+        2193
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1001207,
+      "conciseEventMessage": 2183,
+      "EventConditionMessage": null,
+      "NPCID": 105,
+      "LanID": [
+        2194
+      ],
+      "DialogueType": null,
+      "EventID": 10012,
+      "optionType": 1,
+      "optionPara1": [
+        1001208
+      ],
+      "optionPara2": [
+        2195
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1001208,
+      "conciseEventMessage": 2183,
+      "EventConditionMessage": null,
+      "NPCID": 105,
+      "LanID": [
+        2196
+      ],
+      "DialogueType": null,
+      "EventID": 10012,
+      "optionType": 1,
+      "optionPara1": [
+        1001209
+      ],
+      "optionPara2": [
+        2197
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1001209,
+      "conciseEventMessage": 2183,
+      "EventConditionMessage": null,
+      "NPCID": 105,
+      "LanID": [
+        2198
+      ],
+      "DialogueType": null,
+      "EventID": 10012,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001210
+      ]
+    },
+    {
+      "ID": 1001210,
+      "conciseEventMessage": 2183,
+      "EventConditionMessage": null,
+      "NPCID": 105,
+      "LanID": [
+        2199
+      ],
+      "DialogueType": null,
+      "EventID": 10012,
+      "optionType": 1,
+      "optionPara1": [
+        1001211
+      ],
+      "optionPara2": [
+        2200
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1001211,
+      "conciseEventMessage": 2183,
+      "EventConditionMessage": null,
+      "NPCID": 105,
+      "LanID": [
+        2201
+      ],
+      "DialogueType": null,
+      "EventID": 10012,
+      "optionType": 1,
+      "optionPara1": [
+        0
+      ],
+      "optionPara2": [
+        2202
+      ],
+      "ResultType": null
     }
   ]
 }

Assets/Res/Config/EventNPC.json

@@ -83,6 +83,24 @@
       "name": null,
       "ID_1": null,
       "DaoyouID": null
+    },
+    {
+      "ID": 103,
+      "name": null,
+      "ID_1": null,
+      "DaoyouID": null
+    },
+    {
+      "ID": 104,
+      "name": null,
+      "ID_1": null,
+      "DaoyouID": null
+    },
+    {
+      "ID": 105,
+      "name": null,
+      "ID_1": null,
+      "DaoyouID": null
     }
   ]
 }

Assets/Res/Config/LanguageChineseConfig.json

@@ -7654,19 +7654,19 @@
     },
     {
       "ID": 1914,
-      "txt": "北冥有鱼，其名为鲲……不过北海遥远，何时能寻得鲲鹏的踪迹。\n好在我的神识尚在，可探天地，再加上刚刚的风铃，或许能寻得前路线索。"
+      "txt": "神识未灭"
     },
     {
       "ID": 1915,
-      "txt": "神识探得北海方向，有一条古径，隐于云山之间。\n不过，古径深处妖气弥漫，有妖兽盘踞，需要破除后才能通过。\n鲲鹏的秘密，可能和这些妖兽有关。"
+      "txt": "御剑而行"
     },
     {
       "ID": 1916,
-      "txt": "鲲鹏需要去南海最深处的天池，可缺少龙卷风，没有大风，大鹏无法飞起来"
+      "txt": "雀笑大鹏"
     },
     {
       "ID": 1917,
-      "txt": "需要达到境界"
+      "txt": "击败结界兽"
     },
     {
       "ID": 1918,
@@ -8314,7 +8314,7 @@
     },
     {
       "ID": 2079,
-      "txt": "达到境界{0}/{1}"
+      "txt": "达到境界：筑基-中期{0}/{1}"
     },
     {
       "ID": 2080,
@@ -8462,351 +8462,351 @@
     },
     {
       "ID": 2116,
-      "txt": ""
+      "txt": "你穿过古径结界，来到一片被风托起的浮空灵岛群。"
     },
     {
       "ID": 2117,
-      "txt": ""
+      "txt": "风势强劲，岛与岛之间缝隙深不见底，无桥无梯。"
     },
     {
       "ID": 2118,
-      "txt": ""
+      "txt": "此处盘踞一位神秘道人，常独自站在岛边望风，仿佛等待什么。"
     },
     {
       "ID": 2119,
-      "txt": ""
+      "txt": "（你尝试御剑，却在风中打转，被吹回原地）"
     },
     {
       "ID": 2120,
-      "txt": ""
+      "txt": "前辈，这里的风太大，我无法飞行，请教如何才能通过？"
     },
     {
       "ID": 2121,
-      "txt": ""
+      "txt": "......"
     },
     {
       "ID": 2122,
-      "txt": ""
+      "txt": "前辈，我准备前往北海深处，寻鲲鹏。"
     },
     {
       "ID": 2123,
-      "txt": ""
+      "txt": "鲲鹏？……世间竟还有人记得它。"
     },
     {
       "ID": 2124,
-      "txt": ""
+      "txt": "（说着从手中掏出一个碎片，往空中一震，瞬间风停）过来吧。"
     },
     {
       "ID": 2125,
-      "txt": ""
+      "txt": "说吧，为何寻那鲲鹏？"
     },
     {
       "ID": 2126,
-      "txt": ""
+      "txt": "冲虚真人让我去的"
     },
     {
       "ID": 2127,
-      "txt": ""
+      "txt": "我只是好奇.."
     },
     {
       "ID": 2128,
-      "txt": ""
+      "txt": "你可知鹏飞九万里，需凭借龙卷风，才可达成？"
     },
     {
       "ID": 2129,
-      "txt": ""
+      "txt": "请前辈赐教......"
     },
     {
       "ID": 2130,
-      "txt": ""
+      "txt": "看你修为尚浅，跟你说多了也无用。"
     },
     {
       "ID": 2131,
-      "txt": ""
+      "txt": "再往前是我师弟的洞府了，他可不好说话。"
     },
     {
       "ID": 2132,
-      "txt": ""
+      "txt": "就在我这附近好好修炼吧，至少提升至筑基修为。"
     },
     {
       "ID": 2133,
-      "txt": ""
+      "txt": "前辈为何如此助我？"
     },
     {
       "ID": 2134,
-      "txt": ""
+      "txt": "（疯道人望你一眼，没有回答，但丢过来一本功法）修到[筑基-中期]再来找我。"
     },
     {
       "ID": 2135,
-      "txt": ""
+      "txt": "浮空之岛1"
     },
     {
       "ID": 2136,
-      "txt": ""
+      "txt": "浮空之岛2"
     },
     {
       "ID": 2137,
-      "txt": ""
+      "txt": "初见疯道人"
     },
     {
       "ID": 2138,
-      "txt": ""
+      "txt": "筑基中期"
     },
     {
       "ID": 2139,
-      "txt": ""
+      "txt": "你已突破筑基前期达到中期，灵力通畅，是时候去会一会我的师弟了。"
     },
     {
       "ID": 2140,
-      "txt": ""
+      "txt": "是的。鲲鹏之行，志在必达。"
     },
     {
       "ID": 2141,
-      "txt": ""
+      "txt": "看看风的尽头到底有什么。"
     },
     {
       "ID": 2142,
-      "txt": ""
+      "txt": "（轻轻一笑）你说风的尽头……我也曾想看。\n（他望向远处翻涌的云海）"
     },
     {
       "ID": 2143,
-      "txt": ""
+      "txt": "我和师弟，共守这处风眼多年。我想出去，他却偏要留。"
     },
     {
       "ID": 2144,
-      "txt": ""
+      "txt": "风灵珠碎成两半，一半在我这里，另一半……在他洞府中。"
     },
     {
       "ID": 2145,
-      "txt": ""
+      "txt": "你若想见鲲鹏，必须要集齐整个风灵珠。"
     },
     {
       "ID": 2146,
-      "txt": ""
+      "txt": "我这一半给你，可助你在大风中，来去自如。"
     },
     {
       "ID": 2147,
-      "txt": ""
+      "txt": "你获得了疯道人的半颗风灵珠，在狂风中自由飞行，好不自在。"
     },
     {
       "ID": 2148,
-      "txt": ""
+      "txt": "这......就是逍遥游吗？"
     },
     {
       "ID": 2149,
-      "txt": ""
+      "txt": "你终于来了......"
     },
     {
       "ID": 2150,
-      "txt": ""
+      "txt": "你知道我要来？"
     },
     {
       "ID": 2151,
-      "txt": ""
+      "txt": "初见疯道人"
     },
     {
       "ID": 2152,
-      "txt": ""
+      "txt": "疯道人赠与一半风灵珠"
     },
     {
       "ID": 2153,
-      "txt": ""
+      "txt": "没想到痴道人一来就要与你交手"
     },
     {
       "ID": 2154,
-      "txt": ""
+      "txt": "多说无益，我早已感应到你身上的半颗风灵珠。必是那疯老头让来的。出手吧！"
     },
     {
       "ID": 2155,
-      "txt": ""
+      "txt": "（被击倒在一边）够了！"
     },
     {
       "ID": 2156,
-      "txt": ""
+      "txt": "疯痴相聚"
     },
     {
       "ID": 2157,
-      "txt": ""
+      "txt": "......"
     },
     {
       "ID": 2158,
-      "txt": ""
+      "txt": "（你靠近痴道人）你真的想一直留在这里？你师兄说你不肯走。"
     },
     {
       "ID": 2159,
-      "txt": ""
+      "txt": "你修炼的时候，有没有过那种感觉——身边的人都在往前走，只有你还在原地。"
     },
     {
       "ID": 2160,
-      "txt": ""
+      "txt": "我师兄，他悟性极高，一年就能走我三年的路。我不服气，想努力赶上他。"
     },
     {
       "ID": 2161,
-      "txt": ""
+      "txt": "然后呢？"
     },
     {
       "ID": 2162,
-      "txt": ""
+      "txt": "我一直苦心修炼，可人也困在这儿了……越修炼，越困难，修不动了。"
     },
     {
       "ID": 2163,
-      "txt": ""
+      "txt": "[此时，疯道人踏风而至，就在几步之外]"
     },
     {
       "ID": 2164,
-      "txt": ""
+      "txt": "师弟，你修着修着，就不记得一开始，是为了什么而修行。"
     },
     {
       "ID": 2165,
-      "txt": ""
+      "txt": "（抬头）......我，我真的不记得了。"
     },
     {
       "ID": 2166,
-      "txt": ""
+      "txt": "那就放下风灵珠，和我出去走走。"
     },
     {
       "ID": 2167,
-      "txt": ""
+      "txt": "[痴道人楞了一下，片刻后轻轻点头]"
     },
     {
       "ID": 2168,
-      "txt": ""
+      "txt": "[突然..洞府周围灵气汇聚，快速涌入痴道人的身体.]"
     },
     {
       "ID": 2169,
-      "txt": ""
+      "txt": "前辈，为何灵气会动！"
     },
     {
       "ID": 2170,
-      "txt": ""
+      "txt": "恭喜师弟，突破心魔。"
     },
     {
       "ID": 2171,
-      "txt": ""
+      "txt": "多谢师兄！"
     },
     {
       "ID": 2172,
-      "txt": ""
+      "txt": "原来如此…"
     },
     {
       "ID": 2173,
-      "txt": ""
+      "txt": "请前辈赐我风灵珠。"
     },
     {
       "ID": 2174,
-      "txt": ""
+      "txt": "小友莫急… (说罢，痴道人将风灵珠的碎片合成了一颗完整的风灵珠)"
     },
     {
       "ID": 2175,
-      "txt": ""
+      "txt": "拿好了，这风啊……来一回，不容易。"
     },
     {
       "ID": 2176,
-      "txt": ""
+      "txt": "达到筑基后期"
     },
     {
       "ID": 2177,
-      "txt": ""
+      "txt": "完整的风灵珠果然不同凡响，我可以更大的狂风中穿行了。"
     },
     {
       "ID": 2178,
-      "txt": ""
+      "txt": "前方似乎有不少高阶妖兽，我先在此地提升一些修为吧。"
     },
     {
       "ID": 2179,
-      "txt": ""
+      "txt": "终于筑基中期了，继续寻找冲虚提到的“七道心境”吧，不知鲲鹏是否会给我答案。"
     },
     {
       "ID": 2180,
-      "txt": ""
+      "txt": "妖兽横行"
     },
     {
       "ID": 2181,
-      "txt": ""
+      "txt": "遇见鲲鹏"
     },
     {
       "ID": 2182,
-      "txt": ""
+      "txt": "鲲鹏需要去南海最深处的天池，可缺少龙卷风，没有大风，大鹏无法飞起来"
     },
     {
       "ID": 2183,
-      "txt": ""
+      "txt": "尧让天下"
     },
     {
       "ID": 2184,
-      "txt": ""
+      "txt": "你踏入帝尧治下的仙域——一片祥和之地，灵气充沛，民众安居，仿佛世外桃源。"
     },
     {
       "ID": 2185,
-      "txt": ""
+      "txt": "然而，这位千年帝君，却眉宇间有难掩的忧色。"
     },
     {
       "ID": 2186,
-      "txt": ""
+      "txt": "（你根据逍遥铃的指引，找到了尧）"
     },
     {
       "ID": 2187,
-      "txt": ""
+      "txt": "拜见帝尧，晚辈受冲虚真人的指引，游历到此处。"
     },
     {
       "ID": 2188,
-      "txt": ""
+      "txt": "（缓缓回头，脸上带着淡淡忧虑）冲虚真人吗？我也许久没见了.."
     },
     {
       "ID": 2189,
-      "txt": ""
+      "txt": "(尧帝邀你来到一高处)\n小友，你看此处景致如何？"
     },
     {
       "ID": 2190,
-      "txt": ""
+      "txt": "万象更新，灵气环绕，是修行的福地。"
     },
     {
       "ID": 2191,
-      "txt": ""
+      "txt": "国泰民安，仙人治理，世间罕见。"
     },
     {
       "ID": 2192,
-      "txt": ""
+      "txt": "（叹息）是啊，人人自在，唯我不自在。这些年来，我境界难以寸进，已有百年。"
     },
     {
       "ID": 2193,
-      "txt": ""
+      "txt": "帝尧何出此言？"
     },
     {
       "ID": 2194,
-      "txt": ""
+      "txt": "你等散修，自由自在，来去如风，可曾体会过身负重任的滋味？"
     },
     {
       "ID": 2195,
-      "txt": ""
+      "txt": "也有重担，却未必如帝尧这样复杂。"
     },
     {
       "ID": 2196,
-      "txt": ""
+      "txt": "（微微一笑，摇头）天下如画卷，画卷再美，日夜背负，也终是负担。"
     },
     {
       "ID": 2197,
-      "txt": ""
+      "txt": "......"
     },
     {
       "ID": 2198,
-      "txt": ""
+      "txt": "（凝望远方云海）深山之中有位贤士，名为许由，素有盛名，我曾多次请他出山，但未成如愿。"
     },
     {
       "ID": 2199,
-      "txt": ""
+      "txt": "我甚至提出让天下于他，他也不为所动。"
     },
     {
       "ID": 2200,
-      "txt": ""
+      "txt": "世间竟然有此奇人？"
     },
     {
       "ID": 2201,
-      "txt": ""
+      "txt": "我甚至提出让天下于他，他也不为所动。"
     },
     {
       "ID": 2202,
-      "txt": ""
+      "txt": "世间竟然有此奇人？"
     },
     {
       "ID": 2203,

Assets/Scenes/testCombat.scene

@@ -2185,15 +2185,19 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: isZhanZhuang
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: zhanZhuangTime
-      value: 60
+      value: 200
+      objectReference: {fileID: 0}
+    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
+      propertyPath: enemyHeroInfo.Array.size
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].hp
-      value: 43373
+      value: 4337300
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].mu
@@ -2239,10 +2243,18 @@ PrefabInstance:
       propertyPath: enemyHeroInfo.Array.data[0].level
       value: 150
       objectReference: {fileID: 0}
+    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
+      propertyPath: enemyHeroInfo.Array.data[1].level
+      value: 150
+      objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].heroID
       value: 9201
       objectReference: {fileID: 0}
+    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
+      propertyPath: enemyHeroInfo.Array.data[1].heroID
+      value: 9201
+      objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].skillLevel
       value: 30
@@ -2251,6 +2263,14 @@ PrefabInstance:
       propertyPath: myHeroInfo.Array.data[0].skillStart
       value: 4
       objectReference: {fileID: 0}
+    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
+      propertyPath: enemyHeroInfo.Array.data[1].skillLevel
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
+      propertyPath: enemyHeroInfo.Array.data[1].skillStart
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].skill.Array.size
       value: 0

Assets/Scripts/GameData/ExcelConfig/EventLinkConfig.cs

@@ -44,6 +44,12 @@ public int NPCID;
 public int[] LanID;
 
 
+		/// <summary>
+		///对话框类型
+		/// </summary>
+public int DialogueType;
+
+
 		/// <summary>
 		///属于哪个事件
 		/// </summary>

Assets/Scripts/GameLogic/Combat/Hero/CombatHeroSkillControl.cs

@@ -99,14 +99,16 @@ namespace GameLogic.Combat.Hero
 
             if (!_combatHeroEntity.IsEnemy)
             {
-                float cd = _combatHeroEntity.CurrCombatHeroInfo.powerUpConfig.MaxActiveGongfaNum * 3;
+                float cd = _combatHeroEntity.CurrCombatHeroInfo.powerUpConfig.MaxActiveGongfaNum * PlayerManager.Instance.gameConstantConfig.BasicCDperSkill/1000;
                 _combatHeroEntity.CurrCombatHeroInfo.SetSkillAttSpeed(
                     cd + SkillTurntable.skillAddSkillCd);
             }
             else
             {
+                
+                float cd = (SkillTurntable.skillCount * PlayerManager.Instance.gameConstantConfig.BasicCDperSkill)/1000;
                 _combatHeroEntity.CurrCombatHeroInfo.SetSkillAttSpeed(
-                    _combatHeroEntity.CurrCombatHeroInfo.modelConfig.speed_atk + SkillTurntable.skillAddSkillCd);
+                    cd + SkillTurntable.skillAddSkillCd);
             }
         }
 

Assets/Scripts/GameLogic/Combat/Hero/Turntable/SkillTurntable.cs

@@ -21,6 +21,7 @@ namespace GameLogic.Combat.Hero.Turntable
         private BetterList<SkillBasic> currUseFinishSkill = new BetterList<SkillBasic>();
 
         public float skillAddSkillCd;
+        public int skillCount;
         public void Init(int count, CombatHeroSkillControl combatHeroSkillControl, CombatHeroEntity combatHeroEntity)
         {
             this.combatHeroSkillControl = combatHeroSkillControl;
@@ -79,6 +80,7 @@ namespace GameLogic.Combat.Hero.Turntable
 
             _removeTime = 0;
             skillAddSkillCd = 0;
+            skillCount=0;
             if (allSkill != null)
             {
                 for (int i = 0; i < allSkill.Length; i++)
@@ -96,6 +98,11 @@ namespace GameLogic.Combat.Hero.Turntable
                         continue;
                     }
 
+                    if (skillConfig.SkillType == 1)
+                    {
+                        skillCount++;
+                    }
+
                     skillAddSkillCd+=skillConfig.addcd;
                     SetSkill(skillInfo.index, skillBasic);
 

Assets/Scripts/GameLogic/Combat/Skill/S9011.cs

@@ -0,0 +1,48 @@
+using CombatLibrary.CombatLibrary.CombatCore.CustomizeTimeLogic.FxLogic;
+using GameLogic.Combat.CombatTool;
+using GameLogic.Combat.Hero;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.Logical;
+using UnityEngine;
+using UTool.CustomizeTimeLogic.FxLogic.TimeLineEventinterface;
+
+namespace GameLogic.Combat.Skill
+{
+    /// <summary>
+    /// 玄冰神翎  凤凰煽动翅膀，再翅膀前方行程类似于羽毛的冰箭，生成{0}枚冰箭，对敌人造成水属性伤害，并施加一层寒气
+    /// </summary>
+    public class S9011 : SkillBasic
+    {
+        protected override void ProUseSkill()
+        {
+            ballisticsCount = (int)effectValue[0];
+            for (int i = 0; i < effectValue[0]; i++)
+            {
+                CombatHeroHitPoint combatHeroHitPoint = CombatHeroEntity.CombatAIBasic.currFocusTarget
+                    .GetThis<CombatHeroEntity>()
+                    .GetMainHotPoin<CombatHeroHitPoint>();
+                BetterList<ILifetCycleHitPoint> currTarget = new BetterList<ILifetCycleHitPoint>();
+                currTarget.Add(combatHeroHitPoint);
+                SpecialDotInfo specialDotInfo = CombatHeroEntity.GetSpecialDotInfo("zdpos" + (i + 2));
+                ActivationTimeLineData("1101", currTarget: currTarget,
+                    customizePos: new Vector3[] { specialDotInfo.GetWorlPos() }, indexCount: i);
+            }
+        }
+
+        protected override void ProDefaultTimeLineTrigger(string groupName, CombatHeroHitPoint targetEntity,
+            ITimelineFxLogic timelineFxLogic,
+            TriggerData triggerData, ISkillFeatures skillFeatures)
+        {
+            float harmBl = effectValue[1];
+
+
+            long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(CombatHeroEntity.CurrCombatHeroInfo.attack.Value,
+                harmBl);
+
+            HarmReturnInfo harmReturnInfo = CombatCalculateTool.Instance.Harm(CombatHeroEntity, targetEntity, v,
+                AttType.Skill, triggerData,
+                wuXingType, skillFeatures,
+                HarmType.Default);
+            // if(harmReturnInfo.isInvalid)
+        }
+    }
+}

Assets/Scripts/GameLogic/Combat/Skill/S9011.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 95f8ecb2dd214403be4745664de143df
+timeCreated: 1750301607

UserSettings/Layouts/default-2022.dwlt

@@ -1,30 +1,6 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
 --- !u!114 &1
-MonoBehaviour:
-  m_ObjectHideFlags: 52
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_PixelRect:
-    serializedVersion: 2
-    x: 517
-    y: 487
-    width: 796
-    height: 458
-  m_ShowMode: 0
-  m_Title: Console
-  m_RootView: {fileID: 4}
-  m_MinSize: {x: 100, y: 121}
-  m_MaxSize: {x: 4000, y: 4021}
-  m_Maximized: 0
---- !u!114 &2
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -38,17 +14,17 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_PixelRect:
     serializedVersion: 2
-    x: 0
-    y: 43
-    width: 2560
-    height: 1349
+    x: -1046
+    y: -17.333313
+    width: 1015.3334
+    height: 1118
   m_ShowMode: 4
   m_Title: Game
-  m_RootView: {fileID: 5}
+  m_RootView: {fileID: 4}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
-  m_Maximized: 1
---- !u!114 &3
+  m_Maximized: 0
+--- !u!114 &2
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -64,17 +40,17 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 0
-    width: 796
-    height: 458
-  m_MinSize: {x: 100, y: 121}
-  m_MaxSize: {x: 4000, y: 4021}
-  m_ActualView: {fileID: 13}
+    y: 258.66666
+    width: 544
+    height: 809.3334
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 10}
   m_Panes:
-  - {fileID: 13}
+  - {fileID: 10}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &4
+--- !u!114 &3
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -87,19 +63,20 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 3}
+  - {fileID: 8}
+  - {fileID: 2}
   m_Position:
     serializedVersion: 2
-    x: 0
+    x: 471.33334
     y: 0
-    width: 796
-    height: 458
-  m_MinSize: {x: 100, y: 121}
-  m_MaxSize: {x: 4000, y: 4021}
-  vertical: 0
-  controlID: 86345
+    width: 544
+    height: 1068
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 8096, y: 16192}
+  vertical: 1
+  controlID: 516
   draggingID: 0
---- !u!114 &5
+--- !u!114 &4
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -112,22 +89,22 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
+  - {fileID: 5}
   - {fileID: 6}
   - {fileID: 7}
-  - {fileID: 8}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 2560
-    height: 1349
+    width: 1015.3334
+    height: 1118
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_UseTopView: 1
   m_TopViewHeight: 30
   m_UseBottomView: 1
   m_BottomViewHeight: 20
---- !u!114 &6
+--- !u!114 &5
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -144,12 +121,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 2560
+    width: 1015.3334
     height: 30
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
-  m_LastLoadedLayoutName: 
---- !u!114 &7
+  m_LastLoadedLayoutName: zouge
+--- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -162,22 +139,20 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 12}
   - {fileID: 9}
-  - {fileID: 10}
-  - {fileID: 11}
+  - {fileID: 3}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 30
-    width: 2560
-    height: 1299
-  m_MinSize: {x: 400, y: 50}
-  m_MaxSize: {x: 32384, y: 8096}
+    width: 1015.3334
+    height: 1068
+  m_MinSize: {x: 200, y: 100}
+  m_MaxSize: {x: 16192, y: 16192}
   vertical: 0
-  controlID: 19
+  controlID: 515
   draggingID: 0
---- !u!114 &8
+--- !u!114 &7
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -193,38 +168,12 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 1329
-    width: 2560
+    y: 1098
+    width: 1015.3334
     height: 20
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
---- !u!114 &9
-MonoBehaviour:
-  m_ObjectHideFlags: 52
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 1
-  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Children: []
-  m_Position:
-    serializedVersion: 2
-    x: 1209
-    y: 0
-    width: 224
-    height: 1299
-  m_MinSize: {x: 202, y: 221}
-  m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 14}
-  m_Panes:
-  - {fileID: 14}
-  m_Selected: 0
-  m_LastSelected: 0
---- !u!114 &10
+--- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -234,23 +183,25 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 1
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
+  m_Name: SceneHierarchyWindow
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1433
+    x: 0
     y: 0
-    width: 554
-    height: 1299
-  m_MinSize: {x: 232, y: 271}
-  m_MaxSize: {x: 10002, y: 10021}
-  m_ActualView: {fileID: 16}
+    width: 544
+    height: 258.66666
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 11}
   m_Panes:
-  - {fileID: 16}
+  - {fileID: 11}
+  - {fileID: 13}
+  - {fileID: 12}
   m_Selected: 0
-  m_LastSelected: 0
---- !u!114 &11
+  m_LastSelected: 1
+--- !u!114 &9
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -260,50 +211,24 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 1
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
+  m_Name: GameView
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1987
+    x: 0
     y: 0
-    width: 573
-    height: 1299
-  m_MinSize: {x: 275, y: 50}
+    width: 471.33334
+    height: 1068
+  m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 15}
+  m_ActualView: {fileID: 14}
   m_Panes:
   - {fileID: 15}
-  m_Selected: 0
+  - {fileID: 14}
+  m_Selected: 1
   m_LastSelected: 0
---- !u!114 &12
-MonoBehaviour:
-  m_ObjectHideFlags: 52
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 1
-  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: SceneView
-  m_EditorClassIdentifier: 
-  m_Children: []
-  m_Position:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1209
-    height: 1299
-  m_MinSize: {x: 201, y: 221}
-  m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 18}
-  m_Panes:
-  - {fileID: 18}
-  - {fileID: 17}
-  m_Selected: 0
-  m_LastSelected: 1
---- !u!114 &13
+--- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -319,14 +244,14 @@ MonoBehaviour:
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
     m_Text: Console
-    m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0}
+    m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 517
-    y: 487
-    width: 796
-    height: 437
+    x: -574.6666
+    y: 271.3333
+    width: 543
+    height: 788.3334
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -337,7 +262,7 @@ MonoBehaviour:
     m_LastAppliedPresetName: Default
     m_SaveData: []
     m_OverlaysVisible: 1
---- !u!114 &14
+--- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -353,14 +278,14 @@ MonoBehaviour:
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
     m_Text: Hierarchy
-    m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0}
+    m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1209
-    y: 73
-    width: 222
-    height: 1278
+    x: -574.6666
+    y: 12.666687
+    width: 543
+    height: 237.66666
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -374,25 +299,25 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 
+      m_SelectedIDs: da880100
       m_LastClickedID: 0
-      m_ExpandedIDs: bc1bf4ffc61bf4ff281cf4ffb225f4ffc025f4ffec43f4fff643f4ff0244f4ff1244f4ff7444f4ffe65cf4fff45cf4ffae07f5ffbe07f5ff2008f5ffc014f5ffce14f5ff52daf5ffa20bf6ffc60bf6ffe40bf6ff2018f6ff2e18f6ff0e46f6ff1c46f6ff9e01f8ffa601f8ffb001f8ff2402f8ff9a0ef8ff9e0ef8ffac0ef8ff4ae2faff66e4faff70e4faff7ae4fafface4faff10f1faff1ef1faff78faffff
+      m_ExpandedIDs: 64f8feff3c09ffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
-        m_Name: MarskRoot
-        m_OriginalName: MarskRoot
+        m_Name: 
+        m_OriginalName: 
         m_EditFieldRect:
           serializedVersion: 2
           x: 0
           y: 0
           width: 0
           height: 0
-        m_UserData: -718914
+        m_UserData: 0
         m_IsWaitingForDelay: 0
         m_IsRenaming: 0
-        m_OriginalEventType: 0
+        m_OriginalEventType: 11
         m_IsRenamingFilename: 0
-        m_ClientGUIView: {fileID: 9}
+        m_ClientGUIView: {fileID: 0}
       m_SearchString: 
     m_ExpandedScenes: []
     m_CurrenRootInstanceID: 0
@@ -400,7 +325,7 @@ MonoBehaviour:
       m_IsLocked: 0
     m_CurrentSortingName: TransformSorting
   m_WindowGUID: 468457e0d3add1041b6fec0b00b6a014
---- !u!114 &15
+--- !u!114 &12
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -416,14 +341,14 @@ MonoBehaviour:
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
     m_Text: Inspector
-    m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0}
+    m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1987
-    y: 73
-    width: 572
-    height: 1278
+    x: -574.6666
+    y: 12.666687
+    width: 543
+    height: 263.66666
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -440,14 +365,14 @@ MonoBehaviour:
     m_CachedPref: -160
     m_ControlHash: -371814159
     m_PrefName: Preview_InspectorPreview
-  m_LastInspectedObjectInstanceID: -1
+  m_LastInspectedObjectInstanceID: 100570
   m_LastVerticalScrollValue: 0
   m_GlobalObjectId: 
   m_InspectorMode: 0
   m_LockTracker:
     m_IsLocked: 0
   m_PreviewWindow: {fileID: 0}
---- !u!114 &16
+--- !u!114 &13
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -463,14 +388,14 @@ MonoBehaviour:
   m_MaxSize: {x: 10000, y: 10000}
   m_TitleContent:
     m_Text: Project
-    m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0}
+    m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1433
-    y: 73
-    width: 552
-    height: 1278
+    x: -574.6666
+    y: 12.666687
+    width: 543
+    height: 263.66666
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -482,7 +407,7 @@ MonoBehaviour:
     m_SaveData: []
     m_OverlaysVisible: 1
   m_SearchFilter:
-    m_NameFilter: 
+    m_NameFilter: gameruntime
     m_ClassNames: []
     m_AssetLabels: []
     m_AssetBundleNames: []
@@ -492,24 +417,24 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Res/UI/XianTuLogPanel
+    - Assets/Scenes
     m_Globs: []
-    m_OriginalText: 
+    m_OriginalText: gameruntime
     m_ImportLogFlags: 0
     m_FilterByTypeIntersection: 0
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Res/UI/XianTuLogPanel
+  - Assets/Scenes
   m_LastFoldersGridSize: 16
-  m_LastProjectPath: D:\FB\XiuXianGame
+  m_LastProjectPath: D:\UGit\XiuXianGame
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 342}
-    m_SelectedIDs: a2e90000
-    m_LastClickedID: 59810
-    m_ExpandedIDs: 000000008ce800008ee8000090e8000092e8000094e8000096e8000098e800009ae800009ce800009ee80000a0e80000a2e80000a4e800000ae900001ce9000000ca9a3bffffff7f
+    scrollPos: {x: 0, y: 188.33334}
+    m_SelectedIDs: da8f0100
+    m_LastClickedID: 102362
+    m_ExpandedIDs: 00000000a28f010000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -537,7 +462,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 000000008ce800008ee8000090e8000092e8000094e8000096e8000098e800009ae800009ce800009ee80000a0e80000a2e80000a4e80000
+    m_ExpandedIDs: 00000000a28f0100
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -562,26 +487,26 @@ MonoBehaviour:
       m_Icon: {fileID: 0}
       m_ResourceFile: 
   m_ListAreaState:
-    m_SelectedInstanceIDs: 
-    m_LastClickedInstanceID: 0
+    m_SelectedInstanceIDs: da880100
+    m_LastClickedInstanceID: 100570
     m_HadKeyboardFocusLastEvent: 0
     m_ExpandedInstanceIDs: 
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: 
-      m_OriginalName: 
+      m_Name: GameRuntimeConfig
+      m_OriginalName: GameRuntimeConfig
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 0
+      m_UserData: 100570
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
-      m_OriginalEventType: 11
+      m_OriginalEventType: 0
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 10}
+      m_ClientGUIView: {fileID: 8}
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
       m_InstanceID: 0
@@ -592,8 +517,8 @@ MonoBehaviour:
     m_ScrollPosition: {x: 0, y: 0}
     m_GridSize: 16
   m_SkipHiddenPackages: 0
-  m_DirectoriesAreaWidth: 279
---- !u!114 &17
+  m_DirectoriesAreaWidth: 256
+--- !u!114 &14
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -609,14 +534,14 @@ MonoBehaviour:
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
     m_Text: Game
-    m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0}
+    m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 0
-    y: 73
-    width: 1208
-    height: 1278
+    x: -1046
+    y: 12.666687
+    width: 470.33334
+    height: 1047
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -642,16 +567,16 @@ MonoBehaviour:
   m_VSyncEnabled: 0
   m_Gizmos: 0
   m_Stats: 0
-  m_SelectedSizes: 08000000000000000000000012000000000000000000000000000000000000000000000000000000
+  m_SelectedSizes: 08000000000000000000000011000000000000000000000000000000000000000000000000000000
   m_ZoomArea:
     m_HRangeLocked: 0
     m_VRangeLocked: 0
     hZoomLockedByDefault: 0
     vZoomLockedByDefault: 0
-    m_HBaseRangeMin: -375
-    m_HBaseRangeMax: 375
-    m_VBaseRangeMin: -812
-    m_VBaseRangeMax: 812
+    m_HBaseRangeMin: -250
+    m_HBaseRangeMax: 250
+    m_VBaseRangeMin: -541.3334
+    m_VBaseRangeMax: 541.3334
     m_HAllowExceedBaseRangeMin: 1
     m_HAllowExceedBaseRangeMax: 1
     m_VAllowExceedBaseRangeMin: 1
@@ -660,7 +585,7 @@ MonoBehaviour:
     m_HSlider: 0
     m_VSlider: 0
     m_IgnoreScrollWheelUntilClicked: 0
-    m_EnableMouseInput: 0
+    m_EnableMouseInput: 1
     m_EnableSliderZoomHorizontal: 0
     m_EnableSliderZoomVertical: 0
     m_UniformScale: 1
@@ -669,29 +594,29 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 1208
-      height: 1257
-    m_Scale: {x: 0.7740148, y: 0.7740148}
-    m_Translation: {x: 604, y: 628.5}
+      width: 470.33334
+      height: 1026
+    m_Scale: {x: 0.9406667, y: 0.9406667}
+    m_Translation: {x: 235.16667, y: 513}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -780.34686
-      y: -812
-      width: 1560.6937
-      height: 1624
+      x: -250
+      y: -545.3579
+      width: 500
+      height: 1090.7158
     m_MinimalGUI: 1
-  m_defaultScale: 0.7740148
-  m_LastWindowPixelSize: {x: 1208, y: 1278}
+  m_defaultScale: 0.9406667
+  m_LastWindowPixelSize: {x: 705.5, y: 1570.5}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000001000000000000
   m_XRRenderMode: 0
   m_RenderTexture: {fileID: 0}
---- !u!114 &18
+--- !u!114 &15
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -707,13 +632,13 @@ MonoBehaviour:
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
     m_Text: Scene
-    m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0}
+    m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
     x: 0
     y: 73
-    width: 1208
+    width: 1917
     height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -1160,7 +1085,7 @@ MonoBehaviour:
     m_OcclusionCulling: 0
     m_EnableGDRP: 1
     m_BackfaceCulling: 0
-  m_LastSceneViewRotation: {x: 0.07805907, y: 0.89706963, z: -0.176071, w: 0.3977065}
+  m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226}
   m_LastSceneViewOrtho: 0
   m_ReplacementShader: {fileID: 0}
   m_ReplacementString: