修改事件表

Assets/Res/Config/EventConditionConfig.json

@@ -0,0 +1,46 @@
+{
+  "configList": [
+    {
+      "ID": 1,
+      "message": null,
+      "ConditionType": 1,
+      "ConditionPara": [
+        1001
+      ],
+      "finishCount": 10
+    },
+    {
+      "ID": 2,
+      "message": null,
+      "ConditionType": 3,
+      "ConditionPara": [
+        10
+      ],
+      "finishCount": 1
+    },
+    {
+      "ID": 3,
+      "message": null,
+      "ConditionType": 5,
+      "ConditionPara": [
+        100001
+      ],
+      "finishCount": 5
+    },
+    {
+      "ID": 4,
+      "message": null,
+      "ConditionType": 6,
+      "ConditionPara": [
+        1002
+      ],
+      "finishCount": 10
+    },
+    {
+      "ID": 5,
+      "message": null,
+      "ConditionType": null,
+      "finishCount": null
+    }
+  ]
+}

Assets/Res/Config/EventConditionConfig.json.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: CixN53+rAi6ILBA4j60i35WR2TibceB35HQXEOtZkRgxCv1PIpxRFCP235Jq
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Config/EventConfig.json

@@ -15,6 +15,8 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": 3,
+      "RefreshProbability": null,
+      "RefreshCount": null,
       "EventValue": [
         5
       ],
@@ -39,6 +41,8 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
+      "RefreshProbability": null,
+      "RefreshCount": null,
       "EventCount": null,
       "EventName": 175,
       "Description": 1937
@@ -60,6 +64,8 @@
       "Score": 10,
       "EventQuality": 1,
       "EventConditionId": 1,
+      "RefreshProbability": null,
+      "RefreshCount": null,
       "EventValue": [
         1004
       ],
@@ -78,6 +84,8 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": 7,
+      "RefreshProbability": null,
+      "RefreshCount": null,
       "EventValue": [
         500
       ],
@@ -96,6 +104,8 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
+      "RefreshProbability": null,
+      "RefreshCount": null,
       "EventCount": null,
       "EventName": 218,
       "Description": 1940
@@ -111,6 +121,8 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
+      "RefreshProbability": null,
+      "RefreshCount": null,
       "EventCount": null,
       "EventName": 219,
       "Description": 1941
@@ -126,6 +138,8 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
+      "RefreshProbability": null,
+      "RefreshCount": null,
       "EventCount": null,
       "EventName": 220,
       "Description": 1942
@@ -141,6 +155,8 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
+      "RefreshProbability": null,
+      "RefreshCount": null,
       "EventCount": null,
       "EventName": null,
       "Description": null
@@ -156,6 +172,8 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
+      "RefreshProbability": null,
+      "RefreshCount": null,
       "EventCount": null,
       "EventName": null,
       "Description": null
@@ -171,6 +189,8 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
+      "RefreshProbability": null,
+      "RefreshCount": null,
       "EventCount": null,
       "EventName": null,
       "Description": null
@@ -186,6 +206,8 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
+      "RefreshProbability": null,
+      "RefreshCount": null,
       "EventCount": null,
       "EventName": null,
       "Description": null
@@ -201,6 +223,8 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
+      "RefreshProbability": null,
+      "RefreshCount": null,
       "EventCount": null,
       "EventName": null,
       "Description": null
@@ -216,6 +240,8 @@
       "Score": 10,
       "EventQuality": 1,
       "EventConditionId": null,
+      "RefreshProbability": null,
+      "RefreshCount": null,
       "EventCount": null,
       "EventName": 1906,
       "Description": 1914
@@ -231,6 +257,8 @@
       "Score": 10,
       "EventQuality": 1,
       "EventConditionId": null,
+      "RefreshProbability": null,
+      "RefreshCount": null,
       "EventCount": null,
       "EventName": 1907,
       "Description": 1915
@@ -246,6 +274,8 @@
       "Score": 10,
       "EventQuality": 1,
       "EventConditionId": null,
+      "RefreshProbability": null,
+      "RefreshCount": null,
       "EventCount": null,
       "EventName": 1908,
       "Description": 1916
@@ -261,6 +291,8 @@
       "Score": 10,
       "EventQuality": 1,
       "EventConditionId": null,
+      "RefreshProbability": null,
+      "RefreshCount": null,
       "EventCount": null,
       "EventName": 1909,
       "Description": 1917
@@ -280,6 +312,8 @@
       "Score": 10,
       "EventQuality": 1,
       "EventConditionId": null,
+      "RefreshProbability": null,
+      "RefreshCount": null,
       "EventCount": null,
       "EventName": 1943,
       "Description": 1944
@@ -299,6 +333,8 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
+      "RefreshProbability": null,
+      "RefreshCount": null,
       "EventCount": null,
       "EventName": 174,
       "Description": 1936
@@ -320,6 +356,8 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
+      "RefreshProbability": null,
+      "RefreshCount": null,
       "EventCount": null,
       "EventName": 175,
       "Description": 1937
@@ -339,6 +377,8 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
+      "RefreshProbability": null,
+      "RefreshCount": null,
       "EventCount": null,
       "EventName": 1943,
       "Description": 1944
@@ -358,6 +398,8 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
+      "RefreshProbability": null,
+      "RefreshCount": null,
       "EventCount": null,
       "EventName": 174,
       "Description": 1936
@@ -379,6 +421,8 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
+      "RefreshProbability": null,
+      "RefreshCount": null,
       "EventCount": null,
       "EventName": 175,
       "Description": 1937
@@ -399,9 +443,78 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
+      "RefreshProbability": null,
+      "RefreshCount": null,
       "EventCount": null,
       "EventName": 2035,
       "Description": 2036
+    },
+    {
+      "ID": 9025,
+      "EventLinksId": [
+        9025,
+        9026
+      ],
+      "EventTriggerType": 99,
+      "EventTag": 3,
+      "EventType": null,
+      "Score": null,
+      "EventQuality": null,
+      "EventConditionId": null,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
+      "RefreshProbability": null,
+      "RefreshCount": null,
+      "EventCount": null,
+      "EventName": 2067,
+      "Description": 2068
+    },
+    {
+      "ID": 9014,
+      "EventLinksId": [
+        9014
+      ],
+      "EventTriggerType": 99,
+      "EventTag": 3,
+      "EventType": null,
+      "Score": null,
+      "EventQuality": null,
+      "EventConditionId": null,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
+      "RelatedEvents": [
+        9031
+      ],
+      "RefreshProbability": null,
+      "RefreshCount": null,
+      "EventCount": null,
+      "EventName": 2069,
+      "Description": 2070
+    },
+    {
+      "ID": 9031,
+      "EventLinksId": [
+        9031
+      ],
+      "EventTriggerType": 99,
+      "EventTag": 3,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "EventConditionId": null,
+      "RefreshProbability": 30,
+      "RefreshCount": 2,
+      "EventCount": null,
+      "EventName": 2071,
+      "Description": 2072
     }
   ]
 }

Assets/Res/Config/EventLinkConfig.json

@@ -3,24 +3,22 @@
     {
       "ID": 100,
       "conciseEventMessage": null,
+      "EventConditionMessage": null,
       "LanID": [
         216
       ],
       "NPCID": null,
-      "ConditionType": null,
-      "finishCount": null,
       "optionType": null,
       "ResultType": null
     },
     {
       "ID": 1001,
       "conciseEventMessage": null,
+      "EventConditionMessage": null,
       "LanID": [
         177
       ],
       "NPCID": 2,
-      "ConditionType": null,
-      "finishCount": null,
       "optionType": 1,
       "optionPara1": [
         1002,
@@ -35,15 +33,11 @@
     {
       "ID": 1002,
       "conciseEventMessage": null,
+      "EventConditionMessage": null,
       "LanID": [
         178
       ],
       "NPCID": null,
-      "ConditionType": 1,
-      "ConditionPara": [
-        1001
-      ],
-      "finishCount": 10,
       "optionType": 2,
       "optionPara1": [
         100001
@@ -57,15 +51,11 @@
     {
       "ID": 1003,
       "conciseEventMessage": null,
+      "EventConditionMessage": null,
       "LanID": [
         179
       ],
       "NPCID": null,
-      "ConditionType": 1,
-      "ConditionPara": [
-        1002
-      ],
-      "finishCount": 10,
       "optionType": 1,
       "optionPara1": [
         1005
@@ -78,12 +68,11 @@
     {
       "ID": 1004,
       "conciseEventMessage": null,
+      "EventConditionMessage": null,
       "LanID": [
         180
       ],
       "NPCID": null,
-      "ConditionType": null,
-      "finishCount": null,
       "optionType": 3,
       "PrizeIDs": [
         1002
@@ -96,15 +85,11 @@
     {
       "ID": 1005,
       "conciseEventMessage": null,
+      "EventConditionMessage": null,
       "LanID": [
         181
       ],
       "NPCID": null,
-      "ConditionType": 3,
-      "ConditionPara": [
-        10
-      ],
-      "finishCount": 1,
       "optionType": 3,
       "PrizeIDs": [
         1001
@@ -117,12 +102,11 @@
     {
       "ID": 1010,
       "conciseEventMessage": null,
+      "EventConditionMessage": null,
       "LanID": [
         182
       ],
       "NPCID": null,
-      "ConditionType": null,
-      "finishCount": null,
       "optionType": 1,
       "optionPara1": [
         1011,
@@ -137,12 +121,11 @@
     {
       "ID": 1011,
       "conciseEventMessage": null,
+      "EventConditionMessage": null,
       "LanID": [
         183
       ],
       "NPCID": null,
-      "ConditionType": null,
-      "finishCount": null,
       "optionType": 1,
       "optionPara1": [
         1014,
@@ -157,13 +140,12 @@
     {
       "ID": 1012,
       "conciseEventMessage": null,
+      "EventConditionMessage": null,
       "LanID": [
         184,
         187
       ],
       "NPCID": null,
-      "ConditionType": null,
-      "finishCount": null,
       "optionType": 3,
       "PrizeIDs": [
         1001
@@ -176,12 +158,11 @@
     {
       "ID": 1014,
       "conciseEventMessage": null,
+      "EventConditionMessage": null,
       "LanID": [
         185
       ],
       "NPCID": null,
-      "ConditionType": null,
-      "finishCount": null,
       "optionType": 2,
       "optionPara1": [
         100002
@@ -195,13 +176,12 @@
     {
       "ID": 1015,
       "conciseEventMessage": null,
+      "EventConditionMessage": null,
       "LanID": [
         186,
         189
       ],
       "NPCID": null,
-      "ConditionType": null,
-      "finishCount": null,
       "optionType": 3,
       "PrizeIDs": [
         1003
@@ -214,12 +194,11 @@
     {
       "ID": 1016,
       "conciseEventMessage": null,
+      "EventConditionMessage": null,
       "LanID": [
         188
       ],
       "NPCID": null,
-      "ConditionType": null,
-      "finishCount": null,
       "optionType": null,
       "PrizeIDs": [
         1001
@@ -232,12 +211,11 @@
     {
       "ID": 1020,
       "conciseEventMessage": null,
+      "EventConditionMessage": null,
       "LanID": [
         190
       ],
       "NPCID": null,
-      "ConditionType": null,
-      "finishCount": null,
       "optionType": 1,
       "optionPara1": [
         1021,
@@ -252,12 +230,11 @@
     {
       "ID": 1021,
       "conciseEventMessage": null,
+      "EventConditionMessage": null,
       "LanID": [
         191
       ],
       "NPCID": null,
-      "ConditionType": null,
-      "finishCount": null,
       "optionType": 2,
       "optionPara1": [
         100003
@@ -277,15 +254,11 @@
     {
       "ID": 1022,
       "conciseEventMessage": null,
+      "EventConditionMessage": null,
       "LanID": [
         192
       ],
       "NPCID": null,
-      "ConditionType": 1,
-      "ConditionPara": [
-        10007
-      ],
-      "finishCount": 1,
       "optionType": 4,
       "PrizeIDs": [
         1002
@@ -298,13 +271,12 @@
     {
       "ID": 1024,
       "conciseEventMessage": null,
+      "EventConditionMessage": null,
       "LanID": [
         193,
         196
       ],
       "NPCID": null,
-      "ConditionType": null,
-      "finishCount": null,
       "optionType": 2,
       "optionPara1": [
         100004
@@ -324,13 +296,12 @@
     {
       "ID": 1025,
       "conciseEventMessage": null,
+      "EventConditionMessage": null,
       "LanID": [
         194,
         197
       ],
       "NPCID": null,
-      "ConditionType": null,
-      "finishCount": null,
       "optionType": 3,
       "PrizeIDs": [
         1002
@@ -343,12 +314,11 @@
     {
       "ID": 1026,
       "conciseEventMessage": null,
+      "EventConditionMessage": null,
       "LanID": [
         207
       ],
       "NPCID": null,
-      "ConditionType": null,
-      "finishCount": null,
       "optionType": 1,
       "optionPara1": [
         1024,
@@ -363,12 +333,11 @@
     {
       "ID": 1030,
       "conciseEventMessage": null,
+      "EventConditionMessage": null,
       "LanID": [
         221
       ],
       "NPCID": null,
-      "ConditionType": null,
-      "finishCount": null,
       "optionType": 3,
       "PrizeIDs": [
         1002
@@ -381,12 +350,11 @@
     {
       "ID": 1040,
       "conciseEventMessage": null,
+      "EventConditionMessage": null,
       "LanID": [
         222
       ],
       "NPCID": null,
-      "ConditionType": null,
-      "finishCount": null,
       "optionType": 3,
       "PrizeIDs": [
         1002
@@ -399,12 +367,11 @@
     {
       "ID": 1050,
       "conciseEventMessage": null,
+      "EventConditionMessage": null,
       "LanID": [
         223
       ],
       "NPCID": null,
-      "ConditionType": null,
-      "finishCount": null,
       "optionType": 3,
       "PrizeIDs": [
         1002,
@@ -419,24 +386,22 @@
     {
       "ID": 1060,
       "conciseEventMessage": null,
+      "EventConditionMessage": null,
       "LanID": [
         224
       ],
       "NPCID": null,
-      "ConditionType": null,
-      "finishCount": null,
       "optionType": null,
       "ResultType": null
     },
     {
       "ID": 10001,
       "conciseEventMessage": null,
+      "EventConditionMessage": null,
       "LanID": [
         208
       ],
       "NPCID": null,
-      "ConditionType": null,
-      "finishCount": null,
       "optionType": 2,
       "optionPara1": [
         100001
@@ -450,12 +415,11 @@
     {
       "ID": 10002,
       "conciseEventMessage": null,
+      "EventConditionMessage": null,
       "LanID": [
         209
       ],
       "NPCID": null,
-      "ConditionType": null,
-      "finishCount": null,
       "optionType": 3,
       "PrizeIDs": [
         1003
@@ -468,14 +432,13 @@
     {
       "ID": 10003,
       "conciseEventMessage": null,
+      "EventConditionMessage": null,
       "LanID": [
         210,
         211,
         1903
       ],
       "NPCID": null,
-      "ConditionType": null,
-      "finishCount": null,
       "optionType": 3,
       "PrizeIDs": [
         1005
@@ -488,6 +451,7 @@
     {
       "ID": 10004,
       "conciseEventMessage": null,
+      "EventConditionMessage": null,
       "LanID": [
         212,
         213,
@@ -495,8 +459,6 @@
         215
       ],
       "NPCID": null,
-      "ConditionType": null,
-      "finishCount": null,
       "optionType": 3,
       "PrizeIDs": [
         1006
@@ -509,12 +471,11 @@
     {
       "ID": 10005,
       "conciseEventMessage": null,
+      "EventConditionMessage": null,
       "LanID": [
         1901
       ],
       "NPCID": null,
-      "ConditionType": null,
-      "finishCount": null,
       "optionType": 2,
       "optionPara1": [
         100002
@@ -528,12 +489,11 @@
     {
       "ID": 10006,
       "conciseEventMessage": null,
+      "EventConditionMessage": null,
       "LanID": [
         1902
       ],
       "NPCID": null,
-      "ConditionType": null,
-      "finishCount": null,
       "optionType": 2,
       "optionPara1": [
         100003
@@ -547,12 +507,11 @@
     {
       "ID": 100001,
       "conciseEventMessage": 1910,
+      "EventConditionMessage": null,
       "LanID": [
         1914
       ],
       "NPCID": null,
-      "ConditionType": null,
-      "finishCount": 1,
       "optionType": null,
       "ResultType": 3,
       "ResultOptions": [
@@ -562,12 +521,8 @@
     {
       "ID": 100002,
       "conciseEventMessage": 1911,
+      "EventConditionMessage": null,
       "NPCID": null,
-      "ConditionType": 5,
-      "ConditionPara": [
-        100001
-      ],
-      "finishCount": 2,
       "optionType": 2,
       "optionPara1": [
         100001
@@ -580,12 +535,8 @@
     {
       "ID": 100003,
       "conciseEventMessage": 1912,
+      "EventConditionMessage": null,
       "NPCID": null,
-      "ConditionType": 6,
-      "ConditionPara": [
-        1001
-      ],
-      "finishCount": 1000,
       "optionType": null,
       "ResultType": 3,
       "ResultOptions": [
@@ -595,24 +546,19 @@
     {
       "ID": 100004,
       "conciseEventMessage": 1913,
+      "EventConditionMessage": null,
       "NPCID": null,
-      "ConditionType": 3,
-      "ConditionPara": [
-        10
-      ],
-      "finishCount": null,
       "optionType": null,
       "ResultType": null
     },
     {
       "ID": 9003,
       "conciseEventMessage": null,
+      "EventConditionMessage": null,
       "LanID": [
         2036
       ],
       "NPCID": null,
-      "ConditionType": null,
-      "finishCount": null,
       "optionType": 1,
       "optionPara1": [
         9004,
@@ -627,12 +573,11 @@
     {
       "ID": 9004,
       "conciseEventMessage": null,
+      "EventConditionMessage": null,
       "LanID": [
         2037
       ],
       "NPCID": null,
-      "ConditionType": null,
-      "finishCount": null,
       "optionType": 2,
       "optionPara1": [
         100001
@@ -646,42 +591,33 @@
     {
       "ID": 9005,
       "conciseEventMessage": null,
+      "EventConditionMessage": null,
       "LanID": [
         2038
       ],
       "NPCID": null,
-      "ConditionType": null,
-      "finishCount": null,
       "optionType": null,
       "ResultType": null
     },
     {
       "ID": 9006,
       "conciseEventMessage": null,
+      "EventConditionMessage": null,
       "LanID": [
         2039
       ],
       "NPCID": null,
-      "ConditionType": 6,
-      "ConditionPara": [
-        1001
-      ],
-      "finishCount": 10,
       "optionType": null,
       "ResultType": null
     },
     {
       "ID": 9007,
       "conciseEventMessage": null,
+      "EventConditionMessage": null,
       "LanID": [
         2040
       ],
       "NPCID": null,
-      "ConditionType": 6,
-      "ConditionPara": [
-        1001
-      ],
-      "finishCount": null,
       "optionType": 4,
       "ResultType": 1,
       "ResultOptions": [
@@ -691,9 +627,8 @@
     {
       "ID": 9008,
       "conciseEventMessage": null,
+      "EventConditionMessage": null,
       "NPCID": null,
-      "ConditionType": null,
-      "finishCount": null,
       "optionType": 3,
       "PrizeIDs": [
         1001
@@ -702,6 +637,56 @@
         999
       ],
       "ResultType": null
+    },
+    {
+      "ID": 9025,
+      "conciseEventMessage": 2074,
+      "EventConditionMessage": 2073,
+      "LanID": [
+        2074
+      ],
+      "NPCID": null,
+      "optionType": 1,
+      "optionPara1": [
+        9026
+      ],
+      "optionPara2": [
+        2075
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 9026,
+      "conciseEventMessage": null,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "optionType": null,
+      "ResultType": 3,
+      "ResultOptions": [
+        9014
+      ]
+    },
+    {
+      "ID": 9014,
+      "conciseEventMessage": 2070,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "ConditionId": [
+        3
+      ],
+      "optionType": null,
+      "ResultType": null
+    },
+    {
+      "ID": 9031,
+      "conciseEventMessage": 2076,
+      "EventConditionMessage": 2077,
+      "NPCID": null,
+      "optionType": 2,
+      "optionPara1": [
+        100001
+      ],
+      "ResultType": null
     }
   ]
 }

Assets/Res/Config/LanguageChineseConfig.json

@@ -7602,11 +7602,11 @@
     },
     {
       "ID": 1901,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 1902,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 1903,
@@ -7742,39 +7742,39 @@
     },
     {
       "ID": 1936,
-      "txt": "你发现一只奄奄一息的狼，决定上前一探究竟。"
+      "txt": ""
     },
     {
       "ID": 1937,
-      "txt": "附近的小树林闹的不可开交，你决定去看看怎么回事。"
+      "txt": ""
     },
     {
       "ID": 1938,
-      "txt": "附近的小树林闹的不可开交，你决定去看看怎么回事。"
+      "txt": ""
     },
     {
       "ID": 1939,
-      "txt": "不远处有一个小红点，走近一看你发现是一个带血的背包。"
+      "txt": ""
     },
     {
       "ID": 1940,
-      "txt": "底下一座矿山甚是磅礴雄伟，走，去看一看。"
+      "txt": ""
     },
     {
       "ID": 1941,
-      "txt": "你被一男一女的吵架声吸引。"
+      "txt": ""
     },
     {
       "ID": 1942,
-      "txt": "远处一座道观仙气缭绕，似有仙人在此。"
+      "txt": ""
     },
     {
       "ID": 1943,
-      "txt": "受伤的鸟"
+      "txt": ""
     },
     {
       "ID": 1944,
-      "txt": "你发现一只奄奄一息的鸟，决定上前一探究竟。"
+      "txt": ""
     },
     {
       "ID": 1945,
@@ -8266,26 +8266,90 @@
     },
     {
       "ID": 2067,
-      "txt": "0"
+      "txt": "惠子.没用的大葫芦"
     },
     {
       "ID": 2068,
-      "txt": "0"
+      "txt": "惠子种的葫芦没用，他非常生气"
     },
     {
       "ID": 2069,
-      "txt": "0"
+      "txt": "发现魔修"
     },
     {
       "ID": 2070,
-      "txt": "0"
+      "txt": "发现一群魔修，正在夺人钱财"
     },
     {
       "ID": 2071,
-      "txt": "0"
+      "txt": "魔修"
     },
     {
       "ID": 2072,
+      "txt": "打败魔休"
+    },
+    {
+      "ID": 2073,
+      "txt": "和惠子交谈"
+    },
+    {
+      "ID": 2074,
+      "txt": "惠子种的葫芦没用，他非常生气，需要打败魔休"
+    },
+    {
+      "ID": 2075,
+      "txt": "接受任务"
+    },
+    {
+      "ID": 2076,
+      "txt": "出现Boss魔修"
+    },
+    {
+      "ID": 2077,
+      "txt": "打败魔修"
+    },
+    {
+      "ID": 2078,
+      "txt": "0"
+    },
+    {
+      "ID": 2079,
+      "txt": "0"
+    },
+    {
+      "ID": 2080,
+      "txt": "0"
+    },
+    {
+      "ID": 2081,
+      "txt": "0"
+    },
+    {
+      "ID": 2082,
+      "txt": "0"
+    },
+    {
+      "ID": 2083,
+      "txt": "0"
+    },
+    {
+      "ID": 2084,
+      "txt": "0"
+    },
+    {
+      "ID": 2085,
+      "txt": "0"
+    },
+    {
+      "ID": 2086,
+      "txt": "0"
+    },
+    {
+      "ID": 2087,
+      "txt": "0"
+    },
+    {
+      "ID": 2088,
       "txt": "0"
     }
   ]

Assets/Res/UI/SkillSelectPanel/SkillWidget.prefab

@@ -893,14 +893,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: btn_Circle118
+  _icon_name: dec_yuanhuan_quse
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 08bcd577b76e3c94cacfc8e9783bd09a, type: 3}
   packInfo:
-    packName: tongyong
-    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
-    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
-    lasetJsonGUID: 8de890b954c861b7d182629dcafc0d3a
+    packName: battle
+    packgJsonPath: /Art/UIAssets/TextrueJson\battle.txt
+    packgSpritePath: Assets/Res/UIAtlas/battle.spriteatlasv2
+    lasetJsonGUID: b30151c7ca91f3adc1fcb725072e1a9f
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}

Assets/Scripts/GameData/ExcelConfig/EventConditionConfig.cs

@@ -0,0 +1,50 @@
+// Auto Generated Code By excel2json
+// Generate From Excel\EventConfig.xlsx. SheetName: EventConditionConfig
+
+using System;
+using Fort23.GameData;
+
+namespace Excel2Json
+{
+	[Config(prefab = "EventConditionConfig.json")]
+	public partial class EventConditionConfigHolder : ConfigHolder<EventConditionConfig>
	{
+	}
+
+
+	[Serializable]
+	public struct EventConditionConfig : IConfig
	{
+		public int GetID() {return ID;} 
+		/// <summary>
+		///ID
+		/// </summary>
+public int ID;
+
+
+		/// <summary>
+		///描述
+		/// </summary>
+public int message;
+
+
+		/// <summary>
+		///条件判断类型
+		/// </summary>
+public int ConditionType;
+
+
+		/// <summary>
+		///条件判断值
+		/// </summary>
+public int[] ConditionPara;
+
+
+		/// <summary>
+		///条件完成次数or数量
+		/// </summary>
+public int finishCount;
+
+
+	}
+
+}
+// End of Auto Generated Code

Assets/Scripts/GameData/ExcelConfig/EventConditionConfig.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: WXIZtS2tVSiBZUDE6OQx7Oc8jzgGsZ74GhKLfvS2F89BNCDcJgsAw6WaeBW9
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/GameData/ExcelConfig/EventConfig.cs

@@ -62,6 +62,36 @@ public int EventQuality;
 public int EventConditionId;
 
 
+		/// <summary>
+		///事件结局奖励
+		/// </summary>
+public int[] PrizeIDs;
+
+
+		/// <summary>
+		///事件结局奖励数量
+		/// </summary>
+public int[] PrizeNums;
+
+
+		/// <summary>
+		///关联的事件Id
+		/// </summary>
+public int[] RelatedEvents;
+
+
+		/// <summary>
+		///刷新的概率 （100=100%）
+		/// </summary>
+public int RefreshProbability;
+
+
+		/// <summary>
+		///最大刷新数量
+		/// </summary>
+public int RefreshCount;
+
+
 		/// <summary>
 		///触发效果值
 		/// </summary>

Assets/Scripts/GameData/ExcelConfig/EventLinkConfig.cs

@@ -21,39 +21,33 @@ public int ID;
 
 
 		/// <summary>
-		///事件描述
+		///事件简介描述
 		/// </summary>
 public int conciseEventMessage;
 
 
 		/// <summary>
-		///文本语言表ID
-		/// </summary>
-public int[] LanID;
-
-
-		/// <summary>
-		///对话NPCID
+		///简介目标描述
 		/// </summary>
-public int NPCID;
+public int EventConditionMessage;
 
 
 		/// <summary>
-		///条件判断类型
+		///文本语言表ID
 		/// </summary>
-public int ConditionType;
+public int[] LanID;
 
 
 		/// <summary>
-		///条件判断值
+		///对话NPCID
 		/// </summary>
-public int[] ConditionPara;
+public int NPCID;
 
 
 		/// <summary>
-		///条件完成次数or数量
+		///条件判断Id
 		/// </summary>
-public int finishCount;
+public int[] ConditionId;
 
 
 		/// <summary>

Assets/Scripts/GameUI/EventManager/DialogueManager.cs

@@ -51,11 +51,11 @@ public class DialogueManager : Singleton<DialogueManager>
         // 找到当前对话组
         var dialogueConfig = ConfigComponent.Instance.Get<EventLinkConfig>(dialogueID);
 
-        if (!EventSystemManager.Instance.IsEvenkLinkComplete(currentDialogueID) && dialogueConfig.optionType == 2 && !(dialogueConfig.ConditionType == 5 && dialogueConfig.ConditionPara[0] == dialogueConfig.optionPara1[0]))
-        {
-            onCancel?.Invoke();
-            return;
-        }
+        // if (!EventSystemManager.Instance.IsEvenkLinkComplete(currentDialogueID) && dialogueConfig.optionType == 2 && !(dialogueConfig.ConditionType == 5 && dialogueConfig.ConditionPara[0] == dialogueConfig.optionPara1[0]))
+        // {
+        //     onCancel?.Invoke();
+        //     return;
+        // }
 
 
         //神识探索的事件记录步骤
@@ -223,10 +223,10 @@ public class DialogueManager : Singleton<DialogueManager>
                 await OpenRewardsPanel(eventConfig.ID, itemInfos);
                 LogTool.Log("对话结束，获得奖励");
                 break;
-            //扣除道具
-            case 4:
-                PlayerManager.Instance.BagController.DeductItem(dialogueConfig.ConditionPara[0], dialogueConfig.finishCount);
-                break;
+            // //扣除道具
+            // case 4:
+            //     PlayerManager.Instance.BagController.DeductItem(dialogueConfig.ConditionPara[0], dialogueConfig.finishCount);
+            //     break;
         }
 
         if (!EventSystemManager.Instance.IsEvenkLinkComplete(currentDialogueID))

Assets/Scripts/GameUI/EventManager/EventHelper.cs

@@ -15,43 +15,43 @@ public static class EventHelper
             AccountFileInfo.Instance.playerData.eventLinkDatas.FirstOrDefault(e => e.eventLinkId == eventConfigId);
 
         int fishCount = eventLinkData == null ? 0 : eventLinkData.fishCount;
-        switch (eventCondition.ConditionType)
-        {
-            case 1:
-                ItemConfig itemConfig = ConfigComponent.Instance.Get<ItemConfig>(eventCondition.ConditionPara[0]);
-                result =
-                    $"需要拥有{LanguageManager.Instance.Text(itemConfig.itemName)} {fishCount}/{eventCondition.finishCount}";
-                // result = LanguageManager.Instance.Text(eventCondition.conciseEventMessage,fishCount, eventCondition.finishCount.ToString() + "个");
-
-                break;
-            case 3:
-                HeroPowerUpConfig heroPowerUpConfig =
-                    ConfigComponent.Instance.Get<HeroPowerUpConfig>(eventCondition.ConditionPara[0]);
-                string jingjie = LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[0]) +
-                                 LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[1]) +
-                                 LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[2]);
-
-                result =
-                    $"需要达到境界{jingjie}";
-                // result = LanguageManager.Instance.Text(eventCondition.conciseEventMessage, jingjie);
-                break;
-
-            case 5:
-                // result = LanguageManager.Instance.Text(eventCondition.conciseEventMessage, fishCount.ToString(), eventCondition.finishCount.ToString());
-                result =
-                    $"需要完成战斗{eventCondition.ConditionPara[0]} {fishCount}/{eventCondition.finishCount}";
-                break;
-            case 6:
-
-                ItemConfig itemConfig1 = ConfigComponent.Instance.Get<ItemConfig>(eventCondition.ConditionPara[0]);
-                // result = LanguageManager.Instance.Text(eventCondition.conciseEventMessage, fishCount.ToString(), eventCondition.finishCount.ToString());
-                result =
-                    $"需要获得{LanguageManager.Instance.Text(itemConfig1.itemName)} {fishCount}/{eventCondition.finishCount}";
-                break;
-            default:
-                // result =LanguageManager.Instance.Text(eventCondition.conciseEventMessage);
-                break;
-        }
+        // switch (eventCondition.ConditionType)
+        // {
+        //     case 1:
+        //         ItemConfig itemConfig = ConfigComponent.Instance.Get<ItemConfig>(eventCondition.ConditionPara[0]);
+        //         result =
+        //             $"需要拥有{LanguageManager.Instance.Text(itemConfig.itemName)} {fishCount}/{eventCondition.finishCount}";
+        //         // result = LanguageManager.Instance.Text(eventCondition.conciseEventMessage,fishCount, eventCondition.finishCount.ToString() + "个");
+        //
+        //         break;
+        //     case 3:
+        //         HeroPowerUpConfig heroPowerUpConfig =
+        //             ConfigComponent.Instance.Get<HeroPowerUpConfig>(eventCondition.ConditionPara[0]);
+        //         string jingjie = LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[0]) +
+        //                          LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[1]) +
+        //                          LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[2]);
+        //
+        //         result =
+        //             $"需要达到境界{jingjie}";
+        //         // result = LanguageManager.Instance.Text(eventCondition.conciseEventMessage, jingjie);
+        //         break;
+        //
+        //     case 5:
+        //         // result = LanguageManager.Instance.Text(eventCondition.conciseEventMessage, fishCount.ToString(), eventCondition.finishCount.ToString());
+        //         result =
+        //             $"需要完成战斗{eventCondition.ConditionPara[0]} {fishCount}/{eventCondition.finishCount}";
+        //         break;
+        //     case 6:
+        //
+        //         ItemConfig itemConfig1 = ConfigComponent.Instance.Get<ItemConfig>(eventCondition.ConditionPara[0]);
+        //         // result = LanguageManager.Instance.Text(eventCondition.conciseEventMessage, fishCount.ToString(), eventCondition.finishCount.ToString());
+        //         result =
+        //             $"需要获得{LanguageManager.Instance.Text(itemConfig1.itemName)} {fishCount}/{eventCondition.finishCount}";
+        //         break;
+        //     default:
+        //         // result =LanguageManager.Instance.Text(eventCondition.conciseEventMessage);
+        //         break;
+        // }
 
         return result;
     }

Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -372,15 +372,15 @@ public class EventSystemManager : Singleton<EventSystemManager>
     public bool IsEvenkLinkComplete(int eventLinkId)
     {
         EventLinkConfig eventLinkConfig = ConfigComponent.Instance.Get<EventLinkConfig>(eventLinkId);
-        if (eventLinkConfig.ConditionType == 0)
-            return true;
-
-        AccountFileInfo.EventLinkData eventLinkData = AccountFileInfo.Instance.playerData.eventLinkDatas.FirstOrDefault(el => el.eventLinkId == eventLinkId);
-
-        if (eventLinkData != null)
-        {
-            return eventLinkData.fishCount >= eventLinkConfig.finishCount;
-        }
+        // if (eventLinkConfig.ConditionType == 0)
+        //     return true;
+        //
+        // AccountFileInfo.EventLinkData eventLinkData = AccountFileInfo.Instance.playerData.eventLinkDatas.FirstOrDefault(el => el.eventLinkId == eventLinkId);
+        //
+        // if (eventLinkData != null)
+        // {
+        //     return eventLinkData.fishCount >= eventLinkConfig.finishCount;
+        // }
 
         return false;
     }
@@ -405,61 +405,61 @@ public class EventSystemManager : Singleton<EventSystemManager>
         EventLinkConfig eventLinkConfig = ConfigComponent.Instance.Get<EventLinkConfig>(eventLiknId);
         switch (type)
         {
-            //检测背包道具
-            case 1:
-                if (eventLinkConfig.ConditionType == 1)
-                {
-                    eventLinkData.fishCount += (int)PlayerManager.Instance.BagController.GetItemCount(eventLinkConfig.ConditionPara[0]);
-
-                    if (IsEvenkLinkComplete(eventLiknId))
-                    {
-                        CompleteTask(eventLiknId);
-                    }
-                }
-
-                break;
-
-            //境界检测
-            case 3:
-                if (eventLinkConfig.ConditionType == 3 && PlayerManager.Instance.myHero.powerUpConfig.ID >= eventLinkConfig.ConditionPara[0])
-                {
-                    eventLinkData.fishCount++;
-
-                    if (IsEvenkLinkComplete(eventLiknId))
-                    {
-                        CompleteTask(eventLiknId);
-                    }
-                }
-
-                break;
-
-            //战斗胜利
-            case 5:
-                if (eventLinkConfig.ConditionType == 5 && eventLinkConfig.ConditionPara[0] == value[0])
-                {
-                    eventLinkData.fishCount++;
-
-                    if (IsEvenkLinkComplete(eventLiknId))
-                    {
-                        CompleteEvent(eventLiknId);
-                    }
-                }
-
-                break;
-
-            //获得道具
-            case 6:
-                if (eventLinkConfig.ConditionType == 6 && eventLinkConfig.ConditionPara[0] == value[0])
-                {
-                    eventLinkData.fishCount += value[1];
-
-                    if (IsEvenkLinkComplete(eventLiknId))
-                    {
-                        CompleteEvent(eventLinkData);
-                    }
-                }
-
-                break;
+            // //检测背包道具
+            // case 1:
+            //     if (eventLinkConfig.ConditionType == 1)
+            //     {
+            //         eventLinkData.fishCount += (int)PlayerManager.Instance.BagController.GetItemCount(eventLinkConfig.ConditionPara[0]);
+            //
+            //         if (IsEvenkLinkComplete(eventLiknId))
+            //         {
+            //             CompleteTask(eventLiknId);
+            //         }
+            //     }
+            //
+            //     break;
+            //
+            // //境界检测
+            // case 3:
+            //     if (eventLinkConfig.ConditionType == 3 && PlayerManager.Instance.myHero.powerUpConfig.ID >= eventLinkConfig.ConditionPara[0])
+            //     {
+            //         eventLinkData.fishCount++;
+            //
+            //         if (IsEvenkLinkComplete(eventLiknId))
+            //         {
+            //             CompleteTask(eventLiknId);
+            //         }
+            //     }
+            //
+            //     break;
+            //
+            // //战斗胜利
+            // case 5:
+            //     if (eventLinkConfig.ConditionType == 5 && eventLinkConfig.ConditionPara[0] == value[0])
+            //     {
+            //         eventLinkData.fishCount++;
+            //
+            //         if (IsEvenkLinkComplete(eventLiknId))
+            //         {
+            //             CompleteEvent(eventLiknId);
+            //         }
+            //     }
+            //
+            //     break;
+            //
+            // //获得道具
+            // case 6:
+            //     if (eventLinkConfig.ConditionType == 6 && eventLinkConfig.ConditionPara[0] == value[0])
+            //     {
+            //         eventLinkData.fishCount += value[1];
+            //
+            //         if (IsEvenkLinkComplete(eventLiknId))
+            //         {
+            //             CompleteEvent(eventLinkData);
+            //         }
+            //     }
+            //
+            //     break;
         }
 
 

Assets/Scripts/GameUI/UI/DialoguePanel/DialoguePanel.cs

@@ -162,14 +162,14 @@ namespace Fort23.Mono
                 }
                 else
                 {
-                    if (eventConditionConfig.ID != 0 && eventConditionConfig.ConditionType != 0)
-                    {
-                        if (!EventSystemManager.Instance.IsEvenkLinkComplete(eventConditionConfig.ID))
-                        {
-                            TipMessagePanel.OpenTipMessagePanel(EventHelper.GetTaskMessage(eventConditionConfig.ID));
-                            return;
-                        }
-                    }
+                    // if (eventConditionConfig.ID != 0 && eventConditionConfig.ConditionType != 0)
+                    // {
+                    //     if (!EventSystemManager.Instance.IsEvenkLinkComplete(eventConditionConfig.ID))
+                    //     {
+                    //         TipMessagePanel.OpenTipMessagePanel(EventHelper.GetTaskMessage(eventConditionConfig.ID));
+                    //         return;
+                    //     }
+                    // }
 
 
                     // 无选项，关闭面板，返回 null
@@ -242,14 +242,14 @@ namespace Fort23.Mono
         private void SelectOption(DialogueOptionWidget obj)
         {
             int selectedOptionID = obj.eventConditionConfig.ID;
-            if (obj.eventConditionConfig.ID != 0 && obj.eventConditionConfig.ConditionType != 0)
-            {
-                if (!EventSystemManager.Instance.IsEvenkLinkComplete(selectedOptionID))
-                {
-                    TipMessagePanel.OpenTipMessagePanel(EventHelper.GetTaskMessage(selectedOptionID));
-                    return;
-                }
-            }
+            // if (obj.eventConditionConfig.ID != 0 && obj.eventConditionConfig.ConditionType != 0)
+            // {
+            //     if (!EventSystemManager.Instance.IsEvenkLinkComplete(selectedOptionID))
+            //     {
+            //         TipMessagePanel.OpenTipMessagePanel(EventHelper.GetTaskMessage(selectedOptionID));
+            //         return;
+            //     }
+            // }
 
             UIManager.Instance.HideUIUIPanel(this);
             finish?.Invoke(selectedOptionID);

UserSettings/Layouts/default-2022.dwlt

@@ -1,54 +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: -1476
-    y: 473
-    width: 783
-    height: 820
-  m_ShowMode: 0
-  m_Title: Console
-  m_RootView: {fileID: 5}
-  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}
-  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: -1338
-    y: 560
-    width: 1046
-    height: 748
-  m_ShowMode: 0
-  m_Title: DaoYouaaFfixWidget
-  m_RootView: {fileID: 7}
-  m_MinSize: {x: 275, y: 121}
-  m_MaxSize: {x: 4000, y: 4021}
-  m_Maximized: 0
---- !u!114 &3
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -67,114 +19,12 @@ MonoBehaviour:
     width: 2560
     height: 1349
   m_ShowMode: 4
-  m_Title: Inspector
-  m_RootView: {fileID: 8}
+  m_Title: Hierarchy
+  m_RootView: {fileID: 2}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_Maximized: 1
---- !u!114 &4
-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: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: ConsoleWindow
-  m_EditorClassIdentifier: 
-  m_Children: []
-  m_Position:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 783
-    height: 820
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 16}
-  m_Panes:
-  - {fileID: 16}
-  m_Selected: 0
-  m_LastSelected: 0
---- !u!114 &5
-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: 12010, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Children:
-  - {fileID: 4}
-  m_Position:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 783
-    height: 820
-  m_MinSize: {x: 100, y: 121}
-  m_MaxSize: {x: 4000, y: 4021}
-  vertical: 0
-  controlID: 47320
-  draggingID: 0
---- !u!114 &6
-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: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: PropertyEditor
-  m_EditorClassIdentifier: 
-  m_Children: []
-  m_Position:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1046
-    height: 748
-  m_MinSize: {x: 275, y: 100}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 17}
-  m_Panes:
-  - {fileID: 17}
-  m_Selected: 0
-  m_LastSelected: 0
---- !u!114 &7
-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: 12010, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Children:
-  - {fileID: 6}
-  m_Position:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1046
-    height: 748
-  m_MinSize: {x: 275, y: 121}
-  m_MaxSize: {x: 4000, y: 4021}
-  vertical: 0
-  controlID: 46605
-  draggingID: 0
---- !u!114 &8
+--- !u!114 &2
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -187,9 +37,9 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 9}
-  - {fileID: 10}
-  - {fileID: 11}
+  - {fileID: 3}
+  - {fileID: 4}
+  - {fileID: 5}
   m_Position:
     serializedVersion: 2
     x: 0
@@ -202,7 +52,7 @@ MonoBehaviour:
   m_TopViewHeight: 30
   m_UseBottomView: 1
   m_BottomViewHeight: 20
---- !u!114 &9
+--- !u!114 &3
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -223,8 +73,8 @@ MonoBehaviour:
     height: 30
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
-  m_LastLoadedLayoutName: 1
---- !u!114 &10
+  m_LastLoadedLayoutName: 
+--- !u!114 &4
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -237,10 +87,10 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 15}
-  - {fileID: 12}
-  - {fileID: 13}
-  - {fileID: 14}
+  - {fileID: 9}
+  - {fileID: 6}
+  - {fileID: 7}
+  - {fileID: 8}
   m_Position:
     serializedVersion: 2
     x: 0
@@ -250,9 +100,9 @@ MonoBehaviour:
   m_MinSize: {x: 400, y: 50}
   m_MaxSize: {x: 32384, y: 8096}
   vertical: 0
-  controlID: 304
+  controlID: 222
   draggingID: 0
---- !u!114 &11
+--- !u!114 &5
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -273,7 +123,7 @@ MonoBehaviour:
     height: 20
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
---- !u!114 &12
+--- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -292,14 +142,14 @@ MonoBehaviour:
     y: 0
     width: 411
     height: 1299
-  m_MinSize: {x: 202, y: 221}
-  m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 18}
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 10}
   m_Panes:
-  - {fileID: 18}
+  - {fileID: 10}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &13
+--- !u!114 &7
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -320,12 +170,12 @@ MonoBehaviour:
     height: 1299
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
-  m_ActualView: {fileID: 20}
+  m_ActualView: {fileID: 12}
   m_Panes:
-  - {fileID: 20}
+  - {fileID: 12}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &14
+--- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -344,14 +194,14 @@ MonoBehaviour:
     y: 0
     width: 573
     height: 1299
-  m_MinSize: {x: 276, y: 71}
-  m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 19}
+  m_MinSize: {x: 275, y: 50}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 11}
   m_Panes:
-  - {fileID: 19}
+  - {fileID: 11}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &15
+--- !u!114 &9
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -372,92 +222,13 @@ MonoBehaviour:
     height: 1299
   m_MinSize: {x: 201, y: 221}
   m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 22}
+  m_ActualView: {fileID: 14}
   m_Panes:
-  - {fileID: 22}
-  - {fileID: 21}
+  - {fileID: 14}
+  - {fileID: 13}
   m_Selected: 0
   m_LastSelected: 1
---- !u!114 &16
-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: 12003, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_TitleContent:
-    m_Text: Console
-    m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0}
-    m_Tooltip: 
-  m_Pos:
-    serializedVersion: 2
-    x: -1476
-    y: 473
-    width: 783
-    height: 799
-  m_SerializedDataModeController:
-    m_DataMode: 0
-    m_PreferredDataMode: 0
-    m_SupportedDataModes: 
-    isAutomatic: 1
-  m_ViewDataDictionary: {fileID: 0}
-  m_OverlayCanvas:
-    m_LastAppliedPresetName: Default
-    m_SaveData: []
-    m_OverlaysVisible: 1
---- !u!114 &17
-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: 13961, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_MinSize: {x: 275, y: 100}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_TitleContent:
-    m_Text: DaoYouaaFfixWidget
-    m_Image: {fileID: -8204150473280056172, guid: 0000000000000000d000000000000000, type: 0}
-    m_Tooltip: DaoYouaaFfixWidget/Canvas (Environment)/DaoYouaaFfixWidget (Reference
-      Collector (Script))
-  m_Pos:
-    serializedVersion: 2
-    x: -1338
-    y: 560
-    width: 1046
-    height: 727
-  m_SerializedDataModeController:
-    m_DataMode: 1
-    m_PreferredDataMode: 1
-    m_SupportedDataModes: 010000000200000003000000
-    isAutomatic: 1
-  m_ViewDataDictionary: {fileID: 0}
-  m_OverlayCanvas:
-    m_LastAppliedPresetName: Default
-    m_SaveData: []
-    m_OverlaysVisible: 1
-  m_ObjectsLockedBeforeSerialization: []
-  m_InstanceIDsLockedBeforeSerialization: 
-  m_PreviewResizer:
-    m_CachedPref: 411
-    m_ControlHash: 1412526313
-    m_PrefName: Preview_InspectorPreview
-  m_LastInspectedObjectInstanceID: -1
-  m_LastVerticalScrollValue: 0
-  m_GlobalObjectId: GlobalObjectId_V1-2-00000000000000000000000000000000-6374737024246323474-0
-  m_InspectorMode: 0
---- !u!114 &18
+--- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -494,9 +265,9 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 36a60400
-      m_LastClickedID: 304694
-      m_ExpandedIDs: f618faff0419faff36a60400
+      m_SelectedIDs: 
+      m_LastClickedID: 0
+      m_ExpandedIDs: b2e4ffff78faffff24bc0000c8bc0000f2bc00009cbd0000
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -512,7 +283,7 @@ MonoBehaviour:
         m_IsRenaming: 0
         m_OriginalEventType: 11
         m_IsRenamingFilename: 0
-        m_ClientGUIView: {fileID: 12}
+        m_ClientGUIView: {fileID: 6}
       m_SearchString: 
     m_ExpandedScenes: []
     m_CurrenRootInstanceID: 0
@@ -520,7 +291,7 @@ MonoBehaviour:
       m_IsLocked: 0
     m_CurrentSortingName: TransformSorting
   m_WindowGUID: 468457e0d3add1041b6fec0b00b6a014
---- !u!114 &19
+--- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -567,7 +338,7 @@ MonoBehaviour:
   m_LockTracker:
     m_IsLocked: 0
   m_PreviewWindow: {fileID: 0}
---- !u!114 &20
+--- !u!114 &12
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -602,7 +373,7 @@ MonoBehaviour:
     m_SaveData: []
     m_OverlaysVisible: 1
   m_SearchFilter:
-    m_NameFilter: PlacesConfig
+    m_NameFilter: 
     m_ClassNames: []
     m_AssetLabels: []
     m_AssetBundleNames: []
@@ -614,7 +385,7 @@ MonoBehaviour:
     m_Folders:
     - Assets/Scripts/GameUI/UI/DaoYouPanel
     m_Globs: []
-    m_OriginalText: PlacesConfig
+    m_OriginalText: 
     m_ImportLogFlags: 0
     m_FilterByTypeIntersection: 0
   m_ViewMode: 1
@@ -626,10 +397,10 @@ MonoBehaviour:
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 102}
-    m_SelectedIDs: baf10000
-    m_LastClickedID: 61882
-    m_ExpandedIDs: 000000001ce200001ee2000020e2000022e2000024e2000026e2000028e200002ae200002ce200002ee2000030e2000032e2000034e20000fce200000ee3000000ca9a3b
+    scrollPos: {x: 0, y: 0}
+    m_SelectedIDs: c0e20000
+    m_LastClickedID: 58048
+    m_ExpandedIDs: 000000001ce200001ee2000020e2000022e2000024e2000026e2000028e200002ae200002ce200002ee2000030e2000032e2000034e20000a6e2000000ca9a3b
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -657,7 +428,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 000000001ce200001ee2000020e2000022e2000024e2000026e2000028e200002ae200002ce200002ee2000030e2000032e2000034e2000000ca9a3b
+    m_ExpandedIDs: 000000001ce200001ee2000020e2000022e2000024e2000026e2000028e200002ae200002ce200002ee2000030e2000032e2000034e20000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -688,20 +459,20 @@ MonoBehaviour:
     m_ExpandedInstanceIDs: 
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: DaoYouInfoPanel
-      m_OriginalName: DaoYouInfoPanel
+      m_Name: 
+      m_OriginalName: 
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 61070
+      m_UserData: 0
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
-      m_OriginalEventType: 0
+      m_OriginalEventType: 11
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 13}
+      m_ClientGUIView: {fileID: 7}
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
       m_InstanceID: 0
@@ -713,7 +484,7 @@ MonoBehaviour:
     m_GridSize: 16
   m_SkipHiddenPackages: 0
   m_DirectoriesAreaWidth: 115
---- !u!114 &21
+--- !u!114 &13
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -780,7 +551,7 @@ MonoBehaviour:
     m_HSlider: 0
     m_VSlider: 0
     m_IgnoreScrollWheelUntilClicked: 0
-    m_EnableMouseInput: 1
+    m_EnableMouseInput: 0
     m_EnableSliderZoomHorizontal: 0
     m_EnableSliderZoomVertical: 0
     m_UniformScale: 1
@@ -811,7 +582,7 @@ MonoBehaviour:
   m_LowResolutionForAspectRatios: 01000001000000000000
   m_XRRenderMode: 0
   m_RenderTexture: {fileID: 0}
---- !u!114 &22
+--- !u!114 &14
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -889,7 +660,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 25}
+      snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 1
       id: unity-search-toolbar
       index: 1
@@ -941,7 +712,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 25}
+      snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: Scene View/Light Settings
       index: 2
@@ -967,7 +738,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 25}
+      snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: Scene View/Cloth Constraints
       index: 3
@@ -980,7 +751,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 25}
+      snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: Scene View/Cloth Collisions
       index: 4
@@ -1032,7 +803,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 25}
+      snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: Scene View/Occlusion Culling
       index: 5
@@ -1045,7 +816,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 25}
+      snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: Scene View/Physics Debugger
       index: 6
@@ -1058,7 +829,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 25}
+      snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: Scene View/Scene Visibility
       index: 7
@@ -1071,7 +842,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 25}
+      snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: Scene View/Particles
       index: 8
@@ -1211,17 +982,17 @@ MonoBehaviour:
     m_OverlaysVisible: 1
   m_WindowGUID: 3de2bc164a2229345aaffb3c6f51b287
   m_Gizmos: 1
-  m_OverrideSceneCullingMask: 0
-  m_SceneIsLit: 0
+  m_OverrideSceneCullingMask: 6917529027641081856
+  m_SceneIsLit: 1
   m_SceneLighting: 1
   m_2DMode: 1
   m_isRotationLocked: 0
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 146.52304, y: 78.60742, z: 0}
+    m_Target: {x: -2.1231275, y: -4.4526124, z: 0.0023821448}
     speed: 2
-    m_Value: {x: 146.52304, y: 78.60742, z: 0}
+    m_Value: {x: -2.1231275, y: -4.4526124, z: 0.0023821448}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -1232,7 +1003,7 @@ MonoBehaviour:
   m_SceneViewState:
     m_AlwaysRefresh: 0
     showFog: 1
-    showSkybox: 0
+    showSkybox: 1
     showFlares: 1
     showImageEffects: 1
     showParticleSystems: 1
@@ -1271,9 +1042,9 @@ MonoBehaviour:
     speed: 2
     m_Value: {x: 0, y: 0, z: 0, w: 1}
   m_Size:
-    m_Target: 82.08773
+    m_Target: 5.0554814
     speed: 2
-    m_Value: 82.08773
+    m_Value: 5.0554814
   m_Ortho:
     m_Target: 1
     speed: 2
@@ -1293,7 +1064,7 @@ MonoBehaviour:
     m_OcclusionCulling: 0
     m_EnableGDRP: 1
     m_BackfaceCulling: 0
-  m_LastSceneViewRotation: {x: 0.00003075304, y: 0.9947717, z: -0.10213139, w: 0.00029927064}
+  m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226}
   m_LastSceneViewOrtho: 0
   m_ReplacementShader: {fileID: 0}
   m_ReplacementString: