فهرست منبع

修改切换场景

DESKTOP-BGJIU14\ck 10 ساعت پیش
والد
کامیت
1bb049a4a4
28فایلهای تغییر یافته به همراه5142 افزوده شده و 744 حذف شده
  1. 38 0
      Assets/Res/Config/EventConditionConfig.json
  2. 688 6
      Assets/Res/Config/EventConfig.json
  3. 3146 0
      Assets/Res/Config/EventLinkConfig.json
  4. 48 0
      Assets/Res/Config/EventNPC.json
  5. 219 219
      Assets/Res/Config/LanguageChineseConfig.json
  6. 20 10
      Assets/Res/Config/SmallPlacesConfig.json
  7. 315 0
      Assets/Res/UI/LoadingPanel.prefab
  8. 7 0
      Assets/Res/UI/LoadingPanel.prefab.meta
  9. 57 0
      Assets/Res/UIAnimRes/TweenAssetInfoLodingPanel.asset
  10. 8 0
      Assets/Res/UIAnimRes/TweenAssetInfoLodingPanel.asset.meta
  11. 1 1
      Assets/Resources/Shader/Shader Graphs_ShengShiShader.mat
  12. 212 0
      Assets/Scenes/testCombat.scene
  13. 9 1
      Assets/Scripts/Core/Event/Event/CustomEventType.cs
  14. 10 0
      Assets/Scripts/GameData/ExcelConfig/SmallPlacesConfig.cs
  15. 90 0
      Assets/Scripts/GameLogic/Combat/CombatState/CombatSceneSwitchState.cs
  16. 3 0
      Assets/Scripts/GameLogic/Combat/CombatState/CombatSceneSwitchState.cs.meta
  17. 11 1
      Assets/Scripts/GameLogic/Combat/CombatTool/CombatController.cs
  18. 1 9
      Assets/Scripts/GameLogic/Combat/CombatTool/CombatHeroController.cs
  19. 26 99
      Assets/Scripts/GameLogic/Combat/CombatTool/SceneTool/CombatSenceController.cs
  20. 13 0
      Assets/Scripts/GameLogic/Combat/CombatTool/SceneTool/SceneCJ2MonoConfig.cs
  21. 9 0
      Assets/Scripts/GameLogic/Combat/CombatTool/SceneTool/SceneMonoConfig.cs
  22. 14 1
      Assets/Scripts/GameLogic/Combat/CombatTool/SceneTool/SceneMonoConfigBasic.cs
  23. 10 0
      Assets/Scripts/GameUI/Combat/CombatDrive.cs
  24. 29 0
      Assets/Scripts/GameUI/UI/CombatPanel/LoadingPanel.cs
  25. 11 0
      Assets/Scripts/GameUI/UI/CombatPanel/LoadingPanel.cs.meta
  26. 0 0
      Assets/StreamingAssets/assetConfig.txt
  27. BIN
      Excel2Json/Excel/Maps.xlsx
  28. 147 397
      UserSettings/Layouts/default-2022.dwlt

+ 38 - 0
Assets/Res/Config/EventConditionConfig.json

@@ -767,6 +767,44 @@
         3,
         3,
         4
         4
       ]
       ]
+    },
+    {
+      "ID": 47,
+      "message": 9046,
+      "Operation": 0,
+      "ConditionType": 5,
+      "ConditionPara": [
+        30023
+      ],
+      "finishCount": 5,
+      "RelatedEvents": [
+        30023
+      ],
+      "SkiptoIds": [
+        1,
+        2,
+        3,
+        4
+      ]
+    },
+    {
+      "ID": 48,
+      "message": 9047,
+      "Operation": 0,
+      "ConditionType": 5,
+      "ConditionPara": [
+        30024
+      ],
+      "finishCount": 5,
+      "RelatedEvents": [
+        30024
+      ],
+      "SkiptoIds": [
+        1,
+        2,
+        3,
+        4
+      ]
     }
     }
   ]
   ]
 }
 }

+ 688 - 6
Assets/Res/Config/EventConfig.json

@@ -3049,6 +3049,60 @@
       "EventName": 4242,
       "EventName": 4242,
       "Description": 4243
       "Description": 4243
     },
     },
+    {
+      "ID": 30023,
+      "EventLinksId": [
+        3002301,
+        102
+      ],
+      "EventTriggerType": 98,
+      "EventTag": 6,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        1
+      ],
+      "RefreshProbability": 20,
+      "RefreshCount": 1,
+      "placeID": 1,
+      "SmallPlacesId": 0,
+      "XiantuID": 0,
+      "EventConditionId": 0,
+      "EventCount": 5,
+      "EventName": 4278,
+      "Description": 4279
+    },
+    {
+      "ID": 30024,
+      "EventLinksId": [
+        3002401,
+        102
+      ],
+      "EventTriggerType": 98,
+      "EventTag": 6,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        1
+      ],
+      "RefreshProbability": 20,
+      "RefreshCount": 1,
+      "placeID": 1,
+      "SmallPlacesId": 0,
+      "XiantuID": 0,
+      "EventConditionId": 0,
+      "EventCount": 5,
+      "EventName": 4280,
+      "Description": 4281
+    },
     {
     {
       "ID": 5001,
       "ID": 5001,
       "EventLinksId": [
       "EventLinksId": [
@@ -4800,17 +4854,18 @@
     },
     },
     {
     {
       "ID": 9125,
       "ID": 9125,
+      "EventLinksId": [
+        912501,
+        912502,
+        912503,
+        912504,
+        102
+      ],
       "EventTriggerType": 6,
       "EventTriggerType": 6,
       "EventTag": 2,
       "EventTag": 2,
       "EventType": 1,
       "EventType": 1,
       "Score": 0,
       "Score": 0,
       "EventQuality": 3,
       "EventQuality": 3,
-      "PrizeIDs": [
-        20014
-      ],
-      "PrizeNums": [
-        1
-      ],
       "RefreshProbability": 30,
       "RefreshProbability": 30,
       "RefreshCount": 1,
       "RefreshCount": 1,
       "placeID": 1,
       "placeID": 1,
@@ -4823,6 +4878,633 @@
       "EventCount": 3,
       "EventCount": 3,
       "EventName": 4258,
       "EventName": 4258,
       "Description": 0
       "Description": 0
+    },
+    {
+      "ID": 9126,
+      "EventLinksId": [
+        912601,
+        912602,
+        912603,
+        912604,
+        912605,
+        912606,
+        912607,
+        912608,
+        912609,
+        102
+      ],
+      "EventTriggerType": 6,
+      "EventTag": 2,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 3,
+      "RefreshProbability": 30,
+      "RefreshCount": 1,
+      "placeID": 1,
+      "SmallPlacesId": 3,
+      "XiantuID": 0,
+      "EventConditionId": 10,
+      "EventValue": [
+        9117
+      ],
+      "EventCount": 3,
+      "EventName": 4259,
+      "Description": 0
+    },
+    {
+      "ID": 9127,
+      "EventLinksId": [
+        912701,
+        912702,
+        912703,
+        912704,
+        912705,
+        912706,
+        912707,
+        102
+      ],
+      "EventTriggerType": 6,
+      "EventTag": 2,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 3,
+      "RefreshProbability": 30,
+      "RefreshCount": 1,
+      "placeID": 1,
+      "SmallPlacesId": 3,
+      "XiantuID": 0,
+      "EventConditionId": 10,
+      "EventValue": [
+        9126
+      ],
+      "EventCount": 3,
+      "EventName": 4260,
+      "Description": 0
+    },
+    {
+      "ID": 9128,
+      "EventLinksId": [
+        912801,
+        912802,
+        912803,
+        912804,
+        912805,
+        912806,
+        912807,
+        912808,
+        912809,
+        912810,
+        912811,
+        912812,
+        912813,
+        912814,
+        912815,
+        102
+      ],
+      "EventTriggerType": 6,
+      "EventTag": 2,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 3,
+      "RefreshProbability": 30,
+      "RefreshCount": 1,
+      "placeID": 1,
+      "SmallPlacesId": 3,
+      "XiantuID": 0,
+      "EventConditionId": 10,
+      "EventValue": [
+        9127
+      ],
+      "EventCount": 3,
+      "EventName": 4261,
+      "Description": 0
+    },
+    {
+      "ID": 9129,
+      "EventLinksId": [
+        912901,
+        912902,
+        912903,
+        912904,
+        912905,
+        912906,
+        912907,
+        102
+      ],
+      "EventTriggerType": 6,
+      "EventTag": 2,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 3,
+      "RefreshProbability": 30,
+      "RefreshCount": 1,
+      "placeID": 1,
+      "SmallPlacesId": 3,
+      "XiantuID": 0,
+      "EventConditionId": 10,
+      "EventValue": [
+        9128
+      ],
+      "EventCount": 3,
+      "EventName": 4262,
+      "Description": 0
+    },
+    {
+      "ID": 9130,
+      "EventLinksId": [
+        913001,
+        913002,
+        913003,
+        913004,
+        102
+      ],
+      "EventTriggerType": 6,
+      "EventTag": 2,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 3,
+      "RefreshProbability": 30,
+      "RefreshCount": 1,
+      "placeID": 1,
+      "SmallPlacesId": 3,
+      "XiantuID": 0,
+      "EventConditionId": 10,
+      "EventValue": [
+        9129
+      ],
+      "EventCount": 3,
+      "EventName": 4263,
+      "Description": 0
+    },
+    {
+      "ID": 9131,
+      "EventLinksId": [
+        913101,
+        913102,
+        913103,
+        913104,
+        913105,
+        913106,
+        913107,
+        913108,
+        913109,
+        913110,
+        913111,
+        913112,
+        913113,
+        102
+      ],
+      "EventTriggerType": 6,
+      "EventTag": 2,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 3,
+      "RefreshProbability": 30,
+      "RefreshCount": 1,
+      "placeID": 1,
+      "SmallPlacesId": 3,
+      "XiantuID": 0,
+      "EventConditionId": 10,
+      "EventValue": [
+        9130
+      ],
+      "EventCount": 3,
+      "EventName": 4264,
+      "Description": 0
+    },
+    {
+      "ID": 9132,
+      "EventLinksId": [
+        913201,
+        913202,
+        913203,
+        913204,
+        913205,
+        913206,
+        913207,
+        913208,
+        913209,
+        102
+      ],
+      "EventTriggerType": 6,
+      "EventTag": 2,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 3,
+      "RefreshProbability": 30,
+      "RefreshCount": 1,
+      "placeID": 1,
+      "SmallPlacesId": 3,
+      "XiantuID": 0,
+      "EventConditionId": 10,
+      "EventValue": [
+        9131
+      ],
+      "EventCount": 3,
+      "EventName": 4265,
+      "Description": 0
+    },
+    {
+      "ID": 9133,
+      "EventLinksId": [
+        913301,
+        913302,
+        913303,
+        913304,
+        913305,
+        913306,
+        913307,
+        913308,
+        913309,
+        913310,
+        913311,
+        913312,
+        913313,
+        913314,
+        913315,
+        913316,
+        913317,
+        102
+      ],
+      "EventTriggerType": 6,
+      "EventTag": 2,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 3,
+      "RefreshProbability": 30,
+      "RefreshCount": 1,
+      "placeID": 1,
+      "SmallPlacesId": 3,
+      "XiantuID": 0,
+      "EventConditionId": 10,
+      "EventValue": [
+        9132
+      ],
+      "EventCount": 3,
+      "EventName": 4266,
+      "Description": 0
+    },
+    {
+      "ID": 9134,
+      "EventLinksId": [
+        913401,
+        913402,
+        102
+      ],
+      "EventTriggerType": 6,
+      "EventTag": 2,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 3,
+      "RefreshProbability": 30,
+      "RefreshCount": 1,
+      "placeID": 1,
+      "SmallPlacesId": 3,
+      "XiantuID": 0,
+      "EventConditionId": 10,
+      "EventValue": [
+        9133
+      ],
+      "EventCount": 3,
+      "EventName": 4267,
+      "Description": 0
+    },
+    {
+      "ID": 9135,
+      "EventLinksId": [
+        913501,
+        913502,
+        913503,
+        913504,
+        913505,
+        913506,
+        102
+      ],
+      "EventTriggerType": 6,
+      "EventTag": 2,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 3,
+      "RefreshProbability": 30,
+      "RefreshCount": 1,
+      "placeID": 1,
+      "SmallPlacesId": 3,
+      "XiantuID": 0,
+      "EventConditionId": 10,
+      "EventValue": [
+        9134
+      ],
+      "EventCount": 3,
+      "EventName": 4268,
+      "Description": 0
+    },
+    {
+      "ID": 9136,
+      "EventLinksId": [
+        913601,
+        913602,
+        913603,
+        913604,
+        913605,
+        913606,
+        913607,
+        102
+      ],
+      "EventTriggerType": 6,
+      "EventTag": 2,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 3,
+      "RefreshProbability": 30,
+      "RefreshCount": 1,
+      "placeID": 1,
+      "SmallPlacesId": 3,
+      "XiantuID": 0,
+      "EventConditionId": 10,
+      "EventValue": [
+        9135
+      ],
+      "EventCount": 3,
+      "EventName": 4269,
+      "Description": 0
+    },
+    {
+      "ID": 9137,
+      "EventLinksId": [
+        913701,
+        913702,
+        913703,
+        913704,
+        913705,
+        913706,
+        913707,
+        913708,
+        913709,
+        102
+      ],
+      "EventTriggerType": 6,
+      "EventTag": 2,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 3,
+      "RefreshProbability": 30,
+      "RefreshCount": 1,
+      "placeID": 1,
+      "SmallPlacesId": 3,
+      "XiantuID": 0,
+      "EventConditionId": 10,
+      "EventValue": [
+        9139
+      ],
+      "EventCount": 3,
+      "EventName": 4270,
+      "Description": 0
+    },
+    {
+      "ID": 9138,
+      "EventLinksId": [
+        913801,
+        913802,
+        913803,
+        913804,
+        913805,
+        913806,
+        913807,
+        913808,
+        102
+      ],
+      "EventTriggerType": 6,
+      "EventTag": 2,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 3,
+      "RefreshProbability": 30,
+      "RefreshCount": 1,
+      "placeID": 1,
+      "SmallPlacesId": 3,
+      "XiantuID": 0,
+      "EventConditionId": 10,
+      "EventValue": [
+        9136
+      ],
+      "EventCount": 3,
+      "EventName": 4271,
+      "Description": 0
+    },
+    {
+      "ID": 9139,
+      "EventLinksId": [
+        913901,
+        913902,
+        102
+      ],
+      "EventTriggerType": 6,
+      "EventTag": 2,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 3,
+      "RefreshProbability": 30,
+      "RefreshCount": 1,
+      "placeID": 1,
+      "SmallPlacesId": 3,
+      "XiantuID": 0,
+      "EventConditionId": 10,
+      "EventValue": [
+        9138
+      ],
+      "EventCount": 3,
+      "EventName": 4272,
+      "Description": 0
+    },
+    {
+      "ID": 9140,
+      "EventLinksId": [
+        914001,
+        914002,
+        914003,
+        914004,
+        914005,
+        102
+      ],
+      "EventTriggerType": 6,
+      "EventTag": 2,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 3,
+      "RefreshProbability": 30,
+      "RefreshCount": 1,
+      "placeID": 1,
+      "SmallPlacesId": 3,
+      "XiantuID": 0,
+      "EventConditionId": 10,
+      "EventValue": [
+        9137
+      ],
+      "EventCount": 3,
+      "EventName": 4273,
+      "Description": 0
+    },
+    {
+      "ID": 9141,
+      "EventLinksId": [
+        914101,
+        914102,
+        914103,
+        914104,
+        914105,
+        914106,
+        102
+      ],
+      "EventTriggerType": 6,
+      "EventTag": 2,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 3,
+      "RefreshProbability": 30,
+      "RefreshCount": 1,
+      "placeID": 1,
+      "SmallPlacesId": 3,
+      "XiantuID": 0,
+      "EventConditionId": 10,
+      "EventValue": [
+        9140
+      ],
+      "EventCount": 3,
+      "EventName": 4274,
+      "Description": 0
+    },
+    {
+      "ID": 9142,
+      "EventLinksId": [
+        914201,
+        914202,
+        914203,
+        914204,
+        914205,
+        914206,
+        914207,
+        914208,
+        914209,
+        914210,
+        914211,
+        914212,
+        102
+      ],
+      "EventTriggerType": 6,
+      "EventTag": 2,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 3,
+      "RefreshProbability": 30,
+      "RefreshCount": 1,
+      "placeID": 1,
+      "SmallPlacesId": 3,
+      "XiantuID": 0,
+      "EventConditionId": 10,
+      "EventValue": [
+        9141
+      ],
+      "EventCount": 3,
+      "EventName": 4275,
+      "Description": 0
+    },
+    {
+      "ID": 9143,
+      "EventLinksId": [
+        914301,
+        914302,
+        914303,
+        914304,
+        102
+      ],
+      "EventTriggerType": 6,
+      "EventTag": 2,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 3,
+      "RefreshProbability": 30,
+      "RefreshCount": 1,
+      "placeID": 1,
+      "SmallPlacesId": 3,
+      "XiantuID": 0,
+      "EventConditionId": 10,
+      "EventValue": [
+        9142
+      ],
+      "EventCount": 3,
+      "EventName": 4276,
+      "Description": 0
+    },
+    {
+      "ID": 9144,
+      "EventLinksId": [
+        914401,
+        914402,
+        914403,
+        914404,
+        914405,
+        914406,
+        914407,
+        914408,
+        914409,
+        914410,
+        914411,
+        914412,
+        914413,
+        102
+      ],
+      "EventTriggerType": 6,
+      "EventTag": 2,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 3,
+      "RefreshProbability": 30,
+      "RefreshCount": 1,
+      "placeID": 1,
+      "SmallPlacesId": 3,
+      "XiantuID": 0,
+      "EventConditionId": 10,
+      "EventValue": [
+        9143
+      ],
+      "EventCount": 3,
+      "EventName": 4277,
+      "Description": 0
+    },
+    {
+      "ID": 9145,
+      "EventLinksId": [
+        914501,
+        914502,
+        914503,
+        914504,
+        914505,
+        914506,
+        914507,
+        914508,
+        914509,
+        914510,
+        914511,
+        914512,
+        102
+      ],
+      "EventTriggerType": 6,
+      "EventTag": 2,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 3,
+      "RefreshProbability": 30,
+      "RefreshCount": 1,
+      "placeID": 1,
+      "SmallPlacesId": 3,
+      "XiantuID": 0,
+      "EventConditionId": 10,
+      "EventValue": [
+        9144
+      ],
+      "EventCount": 3,
+      "EventName": 4279,
+      "Description": 0
     }
     }
   ]
   ]
 }
 }

+ 3146 - 0
Assets/Res/Config/EventLinkConfig.json

@@ -10499,6 +10499,50 @@
         101
         101
       ]
       ]
     },
     },
+    {
+      "ID": 3002301,
+      "conciseEventMessage": 5768,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        5769
+      ],
+      "DialogueType": 0,
+      "EventID": 30023,
+      "optionType": 2,
+      "optionPara1": [
+        3014
+      ],
+      "ResultType": 2,
+      "ResultOptions": [
+        3002302,
+        101
+      ]
+    },
+    {
+      "ID": 3002401,
+      "conciseEventMessage": 5770,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        5771
+      ],
+      "DialogueType": 0,
+      "EventID": 30024,
+      "optionType": 2,
+      "optionPara1": [
+        3015
+      ],
+      "ResultType": 2,
+      "ResultOptions": [
+        3002402,
+        101
+      ]
+    },
     {
     {
       "ID": 600101,
       "ID": 600101,
       "conciseEventMessage": 5768,
       "conciseEventMessage": 5768,
@@ -17399,6 +17443,3108 @@
       "EventID": 9124,
       "EventID": 9124,
       "optionType": 0,
       "optionType": 0,
       "ResultType": 0
       "ResultType": 0
+    },
+    {
+      "ID": 912501,
+      "conciseEventMessage": 6260,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 134,
+      "LanID": [
+        6261
+      ],
+      "DialogueType": 0,
+      "EventID": 9125,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        912502
+      ]
+    },
+    {
+      "ID": 912502,
+      "conciseEventMessage": 6260,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        6262
+      ],
+      "DialogueType": 0,
+      "EventID": 9125,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        912503
+      ]
+    },
+    {
+      "ID": 912503,
+      "conciseEventMessage": 6260,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 134,
+      "LanID": [
+        6263
+      ],
+      "DialogueType": 0,
+      "EventID": 9125,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        912504
+      ]
+    },
+    {
+      "ID": 912504,
+      "conciseEventMessage": 6260,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 134,
+      "LanID": [
+        6264
+      ],
+      "DialogueType": 0,
+      "EventID": 9125,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 912601,
+      "conciseEventMessage": 6265,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 131,
+      "LanID": [
+        6266
+      ],
+      "DialogueType": 0,
+      "EventID": 9126,
+      "optionType": 1,
+      "optionPara1": [
+        912602,
+        912603
+      ],
+      "optionPara2": [
+        6267,
+        6268
+      ],
+      "ResultType": 1,
+      "ResultOptions": [
+        912602
+      ]
+    },
+    {
+      "ID": 912602,
+      "conciseEventMessage": 6265,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 131,
+      "LanID": [
+        6269
+      ],
+      "DialogueType": 0,
+      "EventID": 9126,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        912604
+      ]
+    },
+    {
+      "ID": 912603,
+      "conciseEventMessage": 6265,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 131,
+      "LanID": [
+        6270
+      ],
+      "DialogueType": 0,
+      "EventID": 9126,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        912604
+      ]
+    },
+    {
+      "ID": 912604,
+      "conciseEventMessage": 6265,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        6271
+      ],
+      "DialogueType": 0,
+      "EventID": 9126,
+      "optionType": 2,
+      "optionPara1": [
+        4010
+      ],
+      "ResultType": 2,
+      "ResultOptions": [
+        912605,
+        101
+      ]
+    },
+    {
+      "ID": 912605,
+      "conciseEventMessage": 6265,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 131,
+      "LanID": [
+        6272
+      ],
+      "DialogueType": 0,
+      "EventID": 9126,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        912606
+      ]
+    },
+    {
+      "ID": 912606,
+      "conciseEventMessage": 6265,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        6273
+      ],
+      "DialogueType": 0,
+      "EventID": 9126,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        912607
+      ]
+    },
+    {
+      "ID": 912607,
+      "conciseEventMessage": 6265,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 131,
+      "LanID": [
+        6274
+      ],
+      "DialogueType": 0,
+      "EventID": 9126,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        912608
+      ]
+    },
+    {
+      "ID": 912608,
+      "conciseEventMessage": 6265,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 131,
+      "LanID": [
+        6275
+      ],
+      "DialogueType": 0,
+      "EventID": 9126,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        912609
+      ]
+    },
+    {
+      "ID": 912609,
+      "conciseEventMessage": 6265,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        6276
+      ],
+      "DialogueType": 0,
+      "EventID": 9126,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 912701,
+      "conciseEventMessage": 6277,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 123,
+      "LanID": [
+        6278
+      ],
+      "DialogueType": 0,
+      "EventID": 9127,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        912702
+      ]
+    },
+    {
+      "ID": 912702,
+      "conciseEventMessage": 6277,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 131,
+      "LanID": [
+        6279
+      ],
+      "DialogueType": 0,
+      "EventID": 9127,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        912703
+      ]
+    },
+    {
+      "ID": 912703,
+      "conciseEventMessage": 6277,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 123,
+      "LanID": [
+        6280
+      ],
+      "DialogueType": 0,
+      "EventID": 9127,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        912704
+      ]
+    },
+    {
+      "ID": 912704,
+      "conciseEventMessage": 6277,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 131,
+      "LanID": [
+        6281
+      ],
+      "DialogueType": 0,
+      "EventID": 9127,
+      "optionType": 2,
+      "optionPara1": [
+        4011
+      ],
+      "ResultType": 2,
+      "ResultOptions": [
+        912705,
+        101
+      ]
+    },
+    {
+      "ID": 912705,
+      "conciseEventMessage": 6277,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 131,
+      "LanID": [
+        6282
+      ],
+      "DialogueType": 0,
+      "EventID": 9127,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        912706
+      ]
+    },
+    {
+      "ID": 912706,
+      "conciseEventMessage": 6277,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        6283
+      ],
+      "DialogueType": 0,
+      "EventID": 9127,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        912707
+      ]
+    },
+    {
+      "ID": 912707,
+      "conciseEventMessage": 6277,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 131,
+      "LanID": [
+        6284
+      ],
+      "DialogueType": 0,
+      "EventID": 9127,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 912801,
+      "conciseEventMessage": 6285,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 138,
+      "LanID": [
+        6286
+      ],
+      "DialogueType": 0,
+      "EventID": 9128,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        912802
+      ]
+    },
+    {
+      "ID": 912802,
+      "conciseEventMessage": 6285,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 131,
+      "LanID": [
+        6287
+      ],
+      "DialogueType": 0,
+      "EventID": 9128,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        912803
+      ]
+    },
+    {
+      "ID": 912803,
+      "conciseEventMessage": 6285,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 138,
+      "LanID": [
+        6288
+      ],
+      "DialogueType": 0,
+      "EventID": 9128,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        912804
+      ]
+    },
+    {
+      "ID": 912804,
+      "conciseEventMessage": 6285,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 139,
+      "LanID": [
+        6289
+      ],
+      "DialogueType": 0,
+      "EventID": 9128,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        912805
+      ]
+    },
+    {
+      "ID": 912805,
+      "conciseEventMessage": 6285,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 131,
+      "LanID": [
+        6290
+      ],
+      "DialogueType": 0,
+      "EventID": 9128,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        912806
+      ]
+    },
+    {
+      "ID": 912806,
+      "conciseEventMessage": 6285,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 138,
+      "LanID": [
+        6291
+      ],
+      "DialogueType": 0,
+      "EventID": 9128,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        912807
+      ]
+    },
+    {
+      "ID": 912807,
+      "conciseEventMessage": 6285,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 131,
+      "LanID": [
+        6292
+      ],
+      "DialogueType": 0,
+      "EventID": 9128,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        912808
+      ]
+    },
+    {
+      "ID": 912808,
+      "conciseEventMessage": 6285,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 138,
+      "LanID": [
+        6293
+      ],
+      "DialogueType": 0,
+      "EventID": 9128,
+      "optionType": 2,
+      "optionPara1": [
+        4012
+      ],
+      "ResultType": 2,
+      "ResultOptions": [
+        912809,
+        101
+      ]
+    },
+    {
+      "ID": 912809,
+      "conciseEventMessage": 6285,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 131,
+      "LanID": [
+        6294
+      ],
+      "DialogueType": 0,
+      "EventID": 9128,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        912810
+      ]
+    },
+    {
+      "ID": 912810,
+      "conciseEventMessage": 6285,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 139,
+      "LanID": [
+        6295
+      ],
+      "DialogueType": 0,
+      "EventID": 9128,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        912811
+      ]
+    },
+    {
+      "ID": 912811,
+      "conciseEventMessage": 6285,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        6296
+      ],
+      "DialogueType": 0,
+      "EventID": 9128,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        912812
+      ]
+    },
+    {
+      "ID": 912812,
+      "conciseEventMessage": 6285,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 139,
+      "LanID": [
+        6297
+      ],
+      "DialogueType": 0,
+      "EventID": 9128,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        912813
+      ]
+    },
+    {
+      "ID": 912813,
+      "conciseEventMessage": 6285,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        6298
+      ],
+      "DialogueType": 0,
+      "EventID": 9128,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        912814
+      ]
+    },
+    {
+      "ID": 912814,
+      "conciseEventMessage": 6285,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 131,
+      "LanID": [
+        6299
+      ],
+      "DialogueType": 0,
+      "EventID": 9128,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        912815
+      ]
+    },
+    {
+      "ID": 912815,
+      "conciseEventMessage": 6285,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 131,
+      "LanID": [
+        6300
+      ],
+      "DialogueType": 0,
+      "EventID": 9128,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 912901,
+      "conciseEventMessage": 6301,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 139,
+      "LanID": [
+        6302
+      ],
+      "DialogueType": 0,
+      "EventID": 9129,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        912902
+      ]
+    },
+    {
+      "ID": 912902,
+      "conciseEventMessage": 6301,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        6303
+      ],
+      "DialogueType": 0,
+      "EventID": 9129,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        912903
+      ]
+    },
+    {
+      "ID": 912903,
+      "conciseEventMessage": 6301,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 139,
+      "LanID": [
+        6304
+      ],
+      "DialogueType": 0,
+      "EventID": 9129,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        912904
+      ]
+    },
+    {
+      "ID": 912904,
+      "conciseEventMessage": 6301,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        6305
+      ],
+      "DialogueType": 0,
+      "EventID": 9129,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        912905
+      ]
+    },
+    {
+      "ID": 912905,
+      "conciseEventMessage": 6301,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 139,
+      "LanID": [
+        6306
+      ],
+      "DialogueType": 0,
+      "EventID": 9129,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        912906
+      ]
+    },
+    {
+      "ID": 912906,
+      "conciseEventMessage": 6301,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        6307
+      ],
+      "DialogueType": 0,
+      "EventID": 9129,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        912907
+      ]
+    },
+    {
+      "ID": 912907,
+      "conciseEventMessage": 6301,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 139,
+      "LanID": [
+        6308
+      ],
+      "DialogueType": 0,
+      "EventID": 9129,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 913001,
+      "conciseEventMessage": 6309,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        6310
+      ],
+      "DialogueType": 0,
+      "EventID": 9130,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        913002
+      ]
+    },
+    {
+      "ID": 913002,
+      "conciseEventMessage": 6309,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 131,
+      "LanID": [
+        6311
+      ],
+      "DialogueType": 0,
+      "EventID": 9130,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        913003
+      ]
+    },
+    {
+      "ID": 913003,
+      "conciseEventMessage": 6309,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        6312
+      ],
+      "DialogueType": 0,
+      "EventID": 9130,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        913004
+      ]
+    },
+    {
+      "ID": 913004,
+      "conciseEventMessage": 6309,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 131,
+      "LanID": [
+        6313
+      ],
+      "DialogueType": 0,
+      "EventID": 9130,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 913101,
+      "conciseEventMessage": 6314,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 131,
+      "LanID": [
+        6315
+      ],
+      "DialogueType": 0,
+      "EventID": 9131,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        913102
+      ]
+    },
+    {
+      "ID": 913102,
+      "conciseEventMessage": 6314,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 140,
+      "LanID": [
+        6316
+      ],
+      "DialogueType": 0,
+      "EventID": 9131,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        913103
+      ]
+    },
+    {
+      "ID": 913103,
+      "conciseEventMessage": 6314,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 131,
+      "LanID": [
+        6317
+      ],
+      "DialogueType": 0,
+      "EventID": 9131,
+      "optionType": 2,
+      "optionPara1": [
+        4013
+      ],
+      "ResultType": 2,
+      "ResultOptions": [
+        913104,
+        101
+      ]
+    },
+    {
+      "ID": 913104,
+      "conciseEventMessage": 6314,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 140,
+      "LanID": [
+        6318
+      ],
+      "DialogueType": 0,
+      "EventID": 9131,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        913105
+      ]
+    },
+    {
+      "ID": 913105,
+      "conciseEventMessage": 6314,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        6319
+      ],
+      "DialogueType": 0,
+      "EventID": 9131,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        913106
+      ]
+    },
+    {
+      "ID": 913106,
+      "conciseEventMessage": 6314,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 139,
+      "LanID": [
+        6320
+      ],
+      "DialogueType": 0,
+      "EventID": 9131,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        913107
+      ]
+    },
+    {
+      "ID": 913107,
+      "conciseEventMessage": 6314,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        6321
+      ],
+      "DialogueType": 0,
+      "EventID": 9131,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        913108
+      ]
+    },
+    {
+      "ID": 913108,
+      "conciseEventMessage": 6314,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 131,
+      "LanID": [
+        6322
+      ],
+      "DialogueType": 0,
+      "EventID": 9131,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        913109
+      ]
+    },
+    {
+      "ID": 913109,
+      "conciseEventMessage": 6314,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 135,
+      "LanID": [
+        6323
+      ],
+      "DialogueType": 0,
+      "EventID": 9131,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        913110
+      ]
+    },
+    {
+      "ID": 913110,
+      "conciseEventMessage": 6314,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        6324
+      ],
+      "DialogueType": 0,
+      "EventID": 9131,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        913111
+      ]
+    },
+    {
+      "ID": 913111,
+      "conciseEventMessage": 6314,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 131,
+      "LanID": [
+        6325
+      ],
+      "DialogueType": 0,
+      "EventID": 9131,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        913112
+      ]
+    },
+    {
+      "ID": 913112,
+      "conciseEventMessage": 6314,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 139,
+      "LanID": [
+        6326
+      ],
+      "DialogueType": 0,
+      "EventID": 9131,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        913113
+      ]
+    },
+    {
+      "ID": 913113,
+      "conciseEventMessage": 6314,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 139,
+      "LanID": [
+        6327
+      ],
+      "DialogueType": 0,
+      "EventID": 9131,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 913201,
+      "conciseEventMessage": 6328,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 133,
+      "LanID": [
+        6329
+      ],
+      "DialogueType": 0,
+      "EventID": 9132,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        913202
+      ]
+    },
+    {
+      "ID": 913202,
+      "conciseEventMessage": 6328,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        6330
+      ],
+      "DialogueType": 0,
+      "EventID": 9132,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        913203
+      ]
+    },
+    {
+      "ID": 913203,
+      "conciseEventMessage": 6328,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 133,
+      "LanID": [
+        6331
+      ],
+      "DialogueType": 0,
+      "EventID": 9132,
+      "optionType": 1,
+      "optionPara1": [
+        913204,
+        913205
+      ],
+      "optionPara2": [
+        6332,
+        6333
+      ],
+      "ResultType": 1,
+      "ResultOptions": [
+        913204
+      ]
+    },
+    {
+      "ID": 913204,
+      "conciseEventMessage": 6328,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 133,
+      "LanID": [
+        6334
+      ],
+      "DialogueType": 0,
+      "EventID": 9132,
+      "optionType": 1,
+      "optionPara1": [
+        913206
+      ],
+      "optionPara2": [
+        6335
+      ],
+      "ResultType": 1,
+      "ResultOptions": [
+        913205
+      ]
+    },
+    {
+      "ID": 913205,
+      "conciseEventMessage": 6328,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 133,
+      "LanID": [
+        6336
+      ],
+      "DialogueType": 0,
+      "EventID": 9132,
+      "optionType": 1,
+      "optionPara1": [
+        913206
+      ],
+      "optionPara2": [
+        6337
+      ],
+      "ResultType": 1,
+      "ResultOptions": [
+        913206
+      ]
+    },
+    {
+      "ID": 913206,
+      "conciseEventMessage": 6328,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "DialogueType": 0,
+      "EventID": 9132,
+      "optionType": 2,
+      "optionPara1": [
+        4014
+      ],
+      "ResultType": 2,
+      "ResultOptions": [
+        913207,
+        101
+      ]
+    },
+    {
+      "ID": 913207,
+      "conciseEventMessage": 6328,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 133,
+      "LanID": [
+        6338
+      ],
+      "DialogueType": 0,
+      "EventID": 9132,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        913208
+      ]
+    },
+    {
+      "ID": 913208,
+      "conciseEventMessage": 6328,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        6339
+      ],
+      "DialogueType": 0,
+      "EventID": 9132,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        913209
+      ]
+    },
+    {
+      "ID": 913209,
+      "conciseEventMessage": 6328,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 133,
+      "LanID": [
+        6340
+      ],
+      "DialogueType": 0,
+      "EventID": 9132,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 913301,
+      "conciseEventMessage": 6341,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 133,
+      "LanID": [
+        6342
+      ],
+      "DialogueType": 0,
+      "EventID": 9133,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        913302
+      ]
+    },
+    {
+      "ID": 913302,
+      "conciseEventMessage": 6341,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 141,
+      "LanID": [
+        6343
+      ],
+      "DialogueType": 0,
+      "EventID": 9133,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        913303
+      ]
+    },
+    {
+      "ID": 913303,
+      "conciseEventMessage": 6341,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 133,
+      "LanID": [
+        6344
+      ],
+      "DialogueType": 0,
+      "EventID": 9133,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        913304
+      ]
+    },
+    {
+      "ID": 913304,
+      "conciseEventMessage": 6341,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        6345
+      ],
+      "DialogueType": 0,
+      "EventID": 9133,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        913305
+      ]
+    },
+    {
+      "ID": 913305,
+      "conciseEventMessage": 6341,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        6346
+      ],
+      "DialogueType": 0,
+      "EventID": 9133,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        913306
+      ]
+    },
+    {
+      "ID": 913306,
+      "conciseEventMessage": 6341,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 133,
+      "LanID": [
+        6347
+      ],
+      "DialogueType": 0,
+      "EventID": 9133,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        913307
+      ]
+    },
+    {
+      "ID": 913307,
+      "conciseEventMessage": 6341,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        6348
+      ],
+      "DialogueType": 0,
+      "EventID": 9133,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        913308
+      ]
+    },
+    {
+      "ID": 913308,
+      "conciseEventMessage": 6341,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 141,
+      "LanID": [
+        6349
+      ],
+      "DialogueType": 0,
+      "EventID": 9133,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        913309
+      ]
+    },
+    {
+      "ID": 913309,
+      "conciseEventMessage": 6341,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        6350
+      ],
+      "DialogueType": 0,
+      "EventID": 9133,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        913310
+      ]
+    },
+    {
+      "ID": 913310,
+      "conciseEventMessage": 6341,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 133,
+      "LanID": [
+        6351
+      ],
+      "DialogueType": 0,
+      "EventID": 9133,
+      "optionType": 2,
+      "optionPara1": [
+        4015
+      ],
+      "ResultType": 2,
+      "ResultOptions": [
+        913311,
+        101
+      ]
+    },
+    {
+      "ID": 913311,
+      "conciseEventMessage": 6341,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 141,
+      "LanID": [
+        6352
+      ],
+      "DialogueType": 0,
+      "EventID": 9133,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        913312
+      ]
+    },
+    {
+      "ID": 913312,
+      "conciseEventMessage": 6341,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        6353
+      ],
+      "DialogueType": 0,
+      "EventID": 9133,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        913313
+      ]
+    },
+    {
+      "ID": 913313,
+      "conciseEventMessage": 6341,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 141,
+      "LanID": [
+        6354
+      ],
+      "DialogueType": 0,
+      "EventID": 9133,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        913314
+      ]
+    },
+    {
+      "ID": 913314,
+      "conciseEventMessage": 6341,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        6355
+      ],
+      "DialogueType": 0,
+      "EventID": 9133,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        913315
+      ]
+    },
+    {
+      "ID": 913315,
+      "conciseEventMessage": 6341,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 141,
+      "LanID": [
+        6356
+      ],
+      "DialogueType": 0,
+      "EventID": 9133,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        913316
+      ]
+    },
+    {
+      "ID": 913316,
+      "conciseEventMessage": 6341,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        6357
+      ],
+      "DialogueType": 0,
+      "EventID": 9133,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        913317
+      ]
+    },
+    {
+      "ID": 913317,
+      "conciseEventMessage": 6341,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 141,
+      "LanID": [
+        6358
+      ],
+      "DialogueType": 0,
+      "EventID": 9133,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 913401,
+      "conciseEventMessage": 6359,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 133,
+      "LanID": [
+        6360
+      ],
+      "DialogueType": 0,
+      "EventID": 9134,
+      "optionType": 2,
+      "optionPara1": [
+        4016
+      ],
+      "ResultType": 2,
+      "ResultOptions": [
+        913402,
+        101
+      ]
+    },
+    {
+      "ID": 913402,
+      "conciseEventMessage": 6359,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 141,
+      "LanID": [
+        6361
+      ],
+      "DialogueType": 0,
+      "EventID": 9134,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 913501,
+      "conciseEventMessage": 6362,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 142,
+      "LanID": [
+        6363
+      ],
+      "DialogueType": 0,
+      "EventID": 9135,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        913502
+      ]
+    },
+    {
+      "ID": 913502,
+      "conciseEventMessage": 6362,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 141,
+      "LanID": [
+        6364
+      ],
+      "DialogueType": 0,
+      "EventID": 9135,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        913503
+      ]
+    },
+    {
+      "ID": 913503,
+      "conciseEventMessage": 6362,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 142,
+      "LanID": [
+        6365
+      ],
+      "DialogueType": 0,
+      "EventID": 9135,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        913504
+      ]
+    },
+    {
+      "ID": 913504,
+      "conciseEventMessage": 6362,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        6366
+      ],
+      "DialogueType": 0,
+      "EventID": 9135,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        913505
+      ]
+    },
+    {
+      "ID": 913505,
+      "conciseEventMessage": 6362,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 141,
+      "LanID": [
+        6367
+      ],
+      "DialogueType": 0,
+      "EventID": 9135,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        913506
+      ]
+    },
+    {
+      "ID": 913506,
+      "conciseEventMessage": 6362,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 142,
+      "LanID": [
+        6368
+      ],
+      "DialogueType": 0,
+      "EventID": 9135,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 913601,
+      "conciseEventMessage": 6369,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 141,
+      "LanID": [
+        6370
+      ],
+      "DialogueType": 0,
+      "EventID": 9136,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        913602
+      ]
+    },
+    {
+      "ID": 913602,
+      "conciseEventMessage": 6369,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        6371
+      ],
+      "DialogueType": 0,
+      "EventID": 9136,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        913603
+      ]
+    },
+    {
+      "ID": 913603,
+      "conciseEventMessage": 6369,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 141,
+      "LanID": [
+        6372
+      ],
+      "DialogueType": 0,
+      "EventID": 9136,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        913604
+      ]
+    },
+    {
+      "ID": 913604,
+      "conciseEventMessage": 6369,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        6373
+      ],
+      "DialogueType": 0,
+      "EventID": 9136,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        913605
+      ]
+    },
+    {
+      "ID": 913605,
+      "conciseEventMessage": 6369,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 141,
+      "LanID": [
+        6374
+      ],
+      "DialogueType": 0,
+      "EventID": 9136,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        913606
+      ]
+    },
+    {
+      "ID": 913606,
+      "conciseEventMessage": 6369,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 141,
+      "LanID": [
+        6375
+      ],
+      "DialogueType": 0,
+      "EventID": 9136,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        913607
+      ]
+    },
+    {
+      "ID": 913607,
+      "conciseEventMessage": 6369,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        6376
+      ],
+      "DialogueType": 0,
+      "EventID": 9136,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 913701,
+      "conciseEventMessage": 6377,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 141,
+      "LanID": [
+        6378
+      ],
+      "DialogueType": 0,
+      "EventID": 9137,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 913702,
+      "conciseEventMessage": 6377,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        6379
+      ],
+      "DialogueType": 0,
+      "EventID": 9137,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        913703
+      ]
+    },
+    {
+      "ID": 913703,
+      "conciseEventMessage": 6377,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 141,
+      "LanID": [
+        6380
+      ],
+      "DialogueType": 0,
+      "EventID": 9137,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        913704
+      ]
+    },
+    {
+      "ID": 913704,
+      "conciseEventMessage": 6377,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        6381
+      ],
+      "DialogueType": 0,
+      "EventID": 9137,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        913705
+      ]
+    },
+    {
+      "ID": 913705,
+      "conciseEventMessage": 6377,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 141,
+      "LanID": [
+        6382
+      ],
+      "DialogueType": 0,
+      "EventID": 9137,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        913706
+      ]
+    },
+    {
+      "ID": 913706,
+      "conciseEventMessage": 6377,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        6383
+      ],
+      "DialogueType": 0,
+      "EventID": 9137,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        913707
+      ]
+    },
+    {
+      "ID": 913707,
+      "conciseEventMessage": 6377,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 141,
+      "LanID": [
+        6384
+      ],
+      "DialogueType": 0,
+      "EventID": 9137,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        913708
+      ]
+    },
+    {
+      "ID": 913708,
+      "conciseEventMessage": 6377,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        6385
+      ],
+      "DialogueType": 0,
+      "EventID": 9137,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        913709
+      ]
+    },
+    {
+      "ID": 913709,
+      "conciseEventMessage": 6377,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 141,
+      "LanID": [
+        6386
+      ],
+      "DialogueType": 0,
+      "EventID": 9137,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 913801,
+      "conciseEventMessage": 6379,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 133,
+      "LanID": [
+        6380
+      ],
+      "DialogueType": 0,
+      "EventID": 9138,
+      "optionType": 1,
+      "optionPara1": [
+        913802,
+        913803
+      ],
+      "optionPara2": [
+        6381,
+        6382
+      ],
+      "ResultType": 1,
+      "ResultOptions": [
+        913802
+      ]
+    },
+    {
+      "ID": 913802,
+      "conciseEventMessage": 6379,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 133,
+      "LanID": [
+        6383
+      ],
+      "DialogueType": 0,
+      "EventID": 9138,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        913805
+      ]
+    },
+    {
+      "ID": 913803,
+      "conciseEventMessage": 6379,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 133,
+      "LanID": [
+        6384
+      ],
+      "DialogueType": 0,
+      "EventID": 9138,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        913804
+      ]
+    },
+    {
+      "ID": 913804,
+      "conciseEventMessage": 6379,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        6385
+      ],
+      "DialogueType": 0,
+      "EventID": 9138,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        913805
+      ]
+    },
+    {
+      "ID": 913805,
+      "conciseEventMessage": 6379,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 133,
+      "LanID": [
+        6386
+      ],
+      "DialogueType": 0,
+      "EventID": 9138,
+      "optionType": 2,
+      "optionPara1": [
+        4017
+      ],
+      "ResultType": 2,
+      "ResultOptions": [
+        913806,
+        101
+      ]
+    },
+    {
+      "ID": 913806,
+      "conciseEventMessage": 6379,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 133,
+      "LanID": [
+        6387
+      ],
+      "DialogueType": 0,
+      "EventID": 9138,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        913807
+      ]
+    },
+    {
+      "ID": 913807,
+      "conciseEventMessage": 6379,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        6388
+      ],
+      "DialogueType": 0,
+      "EventID": 9138,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        913808
+      ]
+    },
+    {
+      "ID": 913808,
+      "conciseEventMessage": 6379,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        6389
+      ],
+      "DialogueType": 0,
+      "EventID": 9138,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 913901,
+      "conciseEventMessage": 6390,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 133,
+      "LanID": [
+        6391
+      ],
+      "DialogueType": 0,
+      "EventID": 9139,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        913902
+      ]
+    },
+    {
+      "ID": 913902,
+      "conciseEventMessage": 6390,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        6392
+      ],
+      "DialogueType": 0,
+      "EventID": 9139,
+      "optionType": 2,
+      "optionPara1": [
+        4018
+      ],
+      "ResultType": 2,
+      "ResultOptions": [
+        913903,
+        101
+      ]
+    },
+    {
+      "ID": 914001,
+      "conciseEventMessage": 6393,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 143,
+      "LanID": [
+        6394
+      ],
+      "DialogueType": 0,
+      "EventID": 9140,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        914002
+      ]
+    },
+    {
+      "ID": 914002,
+      "conciseEventMessage": 6393,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        6395
+      ],
+      "DialogueType": 0,
+      "EventID": 9140,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        914003
+      ]
+    },
+    {
+      "ID": 914003,
+      "conciseEventMessage": 6393,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 143,
+      "LanID": [
+        6396
+      ],
+      "DialogueType": 0,
+      "EventID": 9140,
+      "optionType": 1,
+      "optionPara1": [
+        913904,
+        913405
+      ],
+      "optionPara2": [
+        6397,
+        6398
+      ],
+      "ResultType": 1,
+      "ResultOptions": [
+        914004
+      ]
+    },
+    {
+      "ID": 914004,
+      "conciseEventMessage": 6393,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 143,
+      "LanID": [
+        6399
+      ],
+      "DialogueType": 0,
+      "EventID": 9140,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        914005
+      ]
+    },
+    {
+      "ID": 914005,
+      "conciseEventMessage": 6393,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 143,
+      "LanID": [
+        6400
+      ],
+      "DialogueType": 0,
+      "EventID": 9140,
+      "ConditionId": [
+        47
+      ],
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 914101,
+      "conciseEventMessage": 6401,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 143,
+      "LanID": [
+        6402
+      ],
+      "DialogueType": 0,
+      "EventID": 9141,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        914102
+      ]
+    },
+    {
+      "ID": 914102,
+      "conciseEventMessage": 6401,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        6403
+      ],
+      "DialogueType": 0,
+      "EventID": 9141,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        914103
+      ]
+    },
+    {
+      "ID": 914103,
+      "conciseEventMessage": 6401,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 143,
+      "LanID": [
+        6404
+      ],
+      "DialogueType": 0,
+      "EventID": 9141,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        914104
+      ]
+    },
+    {
+      "ID": 914104,
+      "conciseEventMessage": 6401,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        6405
+      ],
+      "DialogueType": 0,
+      "EventID": 9141,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        914105
+      ]
+    },
+    {
+      "ID": 914105,
+      "conciseEventMessage": 6401,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 143,
+      "LanID": [
+        6406
+      ],
+      "DialogueType": 0,
+      "EventID": 9141,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        914106
+      ]
+    },
+    {
+      "ID": 914106,
+      "conciseEventMessage": 6401,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        6407
+      ],
+      "DialogueType": 0,
+      "EventID": 9141,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 914201,
+      "conciseEventMessage": 6408,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 131,
+      "LanID": [
+        6409
+      ],
+      "DialogueType": 0,
+      "EventID": 9142,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        914202
+      ]
+    },
+    {
+      "ID": 914202,
+      "conciseEventMessage": 6408,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 144,
+      "LanID": [
+        6410
+      ],
+      "DialogueType": 0,
+      "EventID": 9142,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        914203
+      ]
+    },
+    {
+      "ID": 914203,
+      "conciseEventMessage": 6408,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 131,
+      "LanID": [
+        6411
+      ],
+      "DialogueType": 0,
+      "EventID": 9142,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        914204
+      ]
+    },
+    {
+      "ID": 914204,
+      "conciseEventMessage": 6408,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 144,
+      "LanID": [
+        6412
+      ],
+      "DialogueType": 0,
+      "EventID": 9142,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        914205
+      ]
+    },
+    {
+      "ID": 914205,
+      "conciseEventMessage": 6408,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        6413
+      ],
+      "DialogueType": 0,
+      "EventID": 9142,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        914206
+      ]
+    },
+    {
+      "ID": 914206,
+      "conciseEventMessage": 6408,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 131,
+      "LanID": [
+        6414
+      ],
+      "DialogueType": 0,
+      "EventID": 9142,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        914207
+      ]
+    },
+    {
+      "ID": 914207,
+      "conciseEventMessage": 6408,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 144,
+      "LanID": [
+        6415
+      ],
+      "DialogueType": 0,
+      "EventID": 9142,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        914208
+      ]
+    },
+    {
+      "ID": 914208,
+      "conciseEventMessage": 6408,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        6416
+      ],
+      "DialogueType": 0,
+      "EventID": 9142,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        914209
+      ]
+    },
+    {
+      "ID": 914209,
+      "conciseEventMessage": 6408,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 144,
+      "LanID": [
+        6417
+      ],
+      "DialogueType": 0,
+      "EventID": 9142,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        914210
+      ]
+    },
+    {
+      "ID": 914210,
+      "conciseEventMessage": 6408,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        6418
+      ],
+      "DialogueType": 0,
+      "EventID": 9142,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        914211
+      ]
+    },
+    {
+      "ID": 914211,
+      "conciseEventMessage": 6408,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 144,
+      "LanID": [
+        6419
+      ],
+      "DialogueType": 0,
+      "EventID": 9142,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        914212
+      ]
+    },
+    {
+      "ID": 914212,
+      "conciseEventMessage": 6408,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 131,
+      "LanID": [
+        6420
+      ],
+      "DialogueType": 0,
+      "EventID": 9142,
+      "ConditionId": [
+        48
+      ],
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 914301,
+      "conciseEventMessage": 6421,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 131,
+      "LanID": [
+        6422
+      ],
+      "DialogueType": 0,
+      "EventID": 9143,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        914302
+      ]
+    },
+    {
+      "ID": 914302,
+      "conciseEventMessage": 6421,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 144,
+      "LanID": [
+        6423
+      ],
+      "DialogueType": 0,
+      "EventID": 9143,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        914303
+      ]
+    },
+    {
+      "ID": 914303,
+      "conciseEventMessage": 6421,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        6424
+      ],
+      "DialogueType": 0,
+      "EventID": 9143,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        914304
+      ]
+    },
+    {
+      "ID": 914304,
+      "conciseEventMessage": 6421,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 144,
+      "LanID": [
+        6425
+      ],
+      "DialogueType": 0,
+      "EventID": 9143,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 914401,
+      "conciseEventMessage": 6426,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 144,
+      "LanID": [
+        6427
+      ],
+      "DialogueType": 0,
+      "EventID": 9144,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        914402
+      ]
+    },
+    {
+      "ID": 914402,
+      "conciseEventMessage": 6426,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 131,
+      "LanID": [
+        6428
+      ],
+      "DialogueType": 0,
+      "EventID": 9144,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        914403
+      ]
+    },
+    {
+      "ID": 914403,
+      "conciseEventMessage": 6426,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 144,
+      "LanID": [
+        6429
+      ],
+      "DialogueType": 0,
+      "EventID": 9144,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        914404
+      ]
+    },
+    {
+      "ID": 914404,
+      "conciseEventMessage": 6426,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        6430
+      ],
+      "DialogueType": 0,
+      "EventID": 9144,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        914405
+      ]
+    },
+    {
+      "ID": 914405,
+      "conciseEventMessage": 6426,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 144,
+      "LanID": [
+        6431
+      ],
+      "DialogueType": 0,
+      "EventID": 9144,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        914406
+      ]
+    },
+    {
+      "ID": 914406,
+      "conciseEventMessage": 6426,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 145,
+      "LanID": [
+        6432
+      ],
+      "DialogueType": 0,
+      "EventID": 9144,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        914407
+      ]
+    },
+    {
+      "ID": 914407,
+      "conciseEventMessage": 6426,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 131,
+      "LanID": [
+        6433
+      ],
+      "DialogueType": 0,
+      "EventID": 9144,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        914408
+      ]
+    },
+    {
+      "ID": 914408,
+      "conciseEventMessage": 6426,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 144,
+      "LanID": [
+        6434
+      ],
+      "DialogueType": 0,
+      "EventID": 9144,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        914409
+      ]
+    },
+    {
+      "ID": 914409,
+      "conciseEventMessage": 6426,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 145,
+      "LanID": [
+        6435
+      ],
+      "DialogueType": 0,
+      "EventID": 9144,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        914410
+      ]
+    },
+    {
+      "ID": 914410,
+      "conciseEventMessage": 6426,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 131,
+      "LanID": [
+        6436
+      ],
+      "DialogueType": 0,
+      "EventID": 9144,
+      "optionType": 2,
+      "optionPara1": [
+        4019
+      ],
+      "ResultType": 2,
+      "ResultOptions": [
+        914411,
+        101
+      ]
+    },
+    {
+      "ID": 914411,
+      "conciseEventMessage": 6426,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 145,
+      "LanID": [
+        6437
+      ],
+      "DialogueType": 0,
+      "EventID": 9144,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        914412
+      ]
+    },
+    {
+      "ID": 914412,
+      "conciseEventMessage": 6426,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 131,
+      "LanID": [
+        6438
+      ],
+      "DialogueType": 0,
+      "EventID": 9144,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        914413
+      ]
+    },
+    {
+      "ID": 914413,
+      "conciseEventMessage": 6426,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        6439
+      ],
+      "DialogueType": 0,
+      "EventID": 9144,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 914501,
+      "conciseEventMessage": 6440,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 131,
+      "LanID": [
+        6441
+      ],
+      "DialogueType": 0,
+      "EventID": 9145,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        914502
+      ]
+    },
+    {
+      "ID": 914502,
+      "conciseEventMessage": 6440,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        6442
+      ],
+      "DialogueType": 0,
+      "EventID": 9145,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        914503
+      ]
+    },
+    {
+      "ID": 914503,
+      "conciseEventMessage": 6440,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 144,
+      "LanID": [
+        6443
+      ],
+      "DialogueType": 0,
+      "EventID": 9145,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        914504
+      ]
+    },
+    {
+      "ID": 914504,
+      "conciseEventMessage": 6440,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 144,
+      "LanID": [
+        6444
+      ],
+      "DialogueType": 0,
+      "EventID": 9145,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        914505
+      ]
+    },
+    {
+      "ID": 914505,
+      "conciseEventMessage": 6440,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        6445
+      ],
+      "DialogueType": 0,
+      "EventID": 9145,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        914506
+      ]
+    },
+    {
+      "ID": 914506,
+      "conciseEventMessage": 6440,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 131,
+      "LanID": [
+        6446
+      ],
+      "DialogueType": 0,
+      "EventID": 9145,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        914507
+      ]
+    },
+    {
+      "ID": 914507,
+      "conciseEventMessage": 6440,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        6447
+      ],
+      "DialogueType": 0,
+      "EventID": 9145,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        914508
+      ]
+    },
+    {
+      "ID": 914508,
+      "conciseEventMessage": 6440,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 131,
+      "LanID": [
+        6448
+      ],
+      "DialogueType": 0,
+      "EventID": 9145,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        914509
+      ]
+    },
+    {
+      "ID": 914509,
+      "conciseEventMessage": 6440,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 144,
+      "LanID": [
+        6449
+      ],
+      "DialogueType": 0,
+      "EventID": 9145,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        914510
+      ]
+    },
+    {
+      "ID": 914510,
+      "conciseEventMessage": 6440,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 131,
+      "LanID": [
+        6450
+      ],
+      "DialogueType": 0,
+      "EventID": 9145,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        914511
+      ]
+    },
+    {
+      "ID": 914511,
+      "conciseEventMessage": 6440,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        6451
+      ],
+      "DialogueType": 0,
+      "EventID": 9145,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        914512
+      ]
+    },
+    {
+      "ID": 914512,
+      "conciseEventMessage": 6440,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        6452
+      ],
+      "DialogueType": 0,
+      "EventID": 9145,
+      "optionType": 0,
+      "ResultType": 0
     }
     }
   ]
   ]
 }
 }

+ 48 - 0
Assets/Res/Config/EventNPC.json

@@ -293,6 +293,54 @@
       "name": 0,
       "name": 0,
       "icon": "",
       "icon": "",
       "DaoyouID": 0
       "DaoyouID": 0
+    },
+    {
+      "ID": 138,
+      "name": 0,
+      "icon": "",
+      "DaoyouID": 0
+    },
+    {
+      "ID": 139,
+      "name": 0,
+      "icon": "",
+      "DaoyouID": 0
+    },
+    {
+      "ID": 140,
+      "name": 0,
+      "icon": "",
+      "DaoyouID": 0
+    },
+    {
+      "ID": 141,
+      "name": 0,
+      "icon": "",
+      "DaoyouID": 0
+    },
+    {
+      "ID": 142,
+      "name": 0,
+      "icon": "",
+      "DaoyouID": 0
+    },
+    {
+      "ID": 143,
+      "name": 0,
+      "icon": "",
+      "DaoyouID": 0
+    },
+    {
+      "ID": 144,
+      "name": 0,
+      "icon": "",
+      "DaoyouID": 0
+    },
+    {
+      "ID": 145,
+      "name": 0,
+      "icon": "",
+      "DaoyouID": 0
     }
     }
   ]
   ]
 }
 }

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 219 - 219
Assets/Res/Config/LanguageChineseConfig.json


+ 20 - 10
Assets/Res/Config/SmallPlacesConfig.json

@@ -5,70 +5,80 @@
       "placeName": 10037,
       "placeName": 10037,
       "PlacesId": 1,
       "PlacesId": 1,
       "CompletionEventCount": 10,
       "CompletionEventCount": 10,
-      "UnlockEnvetid": 10001
+      "UnlockEnvetid": 10001,
+      "sceneName": "LevelBattle02"
     },
     },
     {
     {
       "ID": 2,
       "ID": 2,
       "placeName": 10038,
       "placeName": 10038,
       "PlacesId": 1,
       "PlacesId": 1,
       "CompletionEventCount": 10,
       "CompletionEventCount": 10,
-      "UnlockEnvetid": 10004
+      "UnlockEnvetid": 10004,
+      "sceneName": "LevelBattle02"
     },
     },
     {
     {
       "ID": 3,
       "ID": 3,
       "placeName": 10039,
       "placeName": 10039,
       "PlacesId": 1,
       "PlacesId": 1,
       "CompletionEventCount": 10,
       "CompletionEventCount": 10,
-      "UnlockEnvetid": 10009
+      "UnlockEnvetid": 10009,
+      "sceneName": "LevelBattle01"
     },
     },
     {
     {
       "ID": 4,
       "ID": 4,
       "placeName": 10040,
       "placeName": 10040,
       "PlacesId": 1,
       "PlacesId": 1,
       "CompletionEventCount": 5,
       "CompletionEventCount": 5,
-      "UnlockEnvetid": 10012
+      "UnlockEnvetid": 10012,
+      "sceneName": "LevelBattle02"
     },
     },
     {
     {
       "ID": 5,
       "ID": 5,
       "placeName": 10041,
       "placeName": 10041,
       "PlacesId": 2,
       "PlacesId": 2,
       "CompletionEventCount": 10,
       "CompletionEventCount": 10,
-      "UnlockEnvetid": 10013
+      "UnlockEnvetid": 10013,
+      "sceneName": "LevelBattle03"
     },
     },
     {
     {
       "ID": 6,
       "ID": 6,
       "placeName": 10042,
       "placeName": 10042,
       "PlacesId": 2,
       "PlacesId": 2,
       "CompletionEventCount": 10,
       "CompletionEventCount": 10,
-      "UnlockEnvetid": 10018
+      "UnlockEnvetid": 10018,
+      "sceneName": "LevelBattle02"
     },
     },
     {
     {
       "ID": 7,
       "ID": 7,
       "placeName": 10043,
       "placeName": 10043,
       "PlacesId": 2,
       "PlacesId": 2,
       "CompletionEventCount": 5,
       "CompletionEventCount": 5,
-      "UnlockEnvetid": 10022
+      "UnlockEnvetid": 10022,
+      "sceneName": "LevelBattle02"
     },
     },
     {
     {
       "ID": 8,
       "ID": 8,
       "placeName": 10044,
       "placeName": 10044,
       "PlacesId": 3,
       "PlacesId": 3,
       "CompletionEventCount": 10,
       "CompletionEventCount": 10,
-      "UnlockEnvetid": 10025
+      "UnlockEnvetid": 10025,
+      "sceneName": "LevelBattle02"
     },
     },
     {
     {
       "ID": 9,
       "ID": 9,
       "placeName": 10045,
       "placeName": 10045,
       "PlacesId": 3,
       "PlacesId": 3,
       "CompletionEventCount": 10,
       "CompletionEventCount": 10,
-      "UnlockEnvetid": 10028
+      "UnlockEnvetid": 10028,
+      "sceneName": "LevelBattle02"
     },
     },
     {
     {
       "ID": 10,
       "ID": 10,
       "placeName": 10046,
       "placeName": 10046,
       "PlacesId": 3,
       "PlacesId": 3,
       "CompletionEventCount": -1,
       "CompletionEventCount": -1,
-      "UnlockEnvetid": -1
+      "UnlockEnvetid": -1,
+      "sceneName": "LevelBattle02"
     }
     }
   ]
   ]
 }
 }

+ 315 - 0
Assets/Res/UI/LoadingPanel.prefab

@@ -0,0 +1,315 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &1384161542311662118
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 360525025617545499}
+  - component: {fileID: 8873409753647705352}
+  - component: {fileID: 6563932251621246387}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &360525025617545499
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1384161542311662118}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8311278189826985699}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 160, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8873409753647705352
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1384161542311662118}
+  m_CullTransparentMesh: 1
+--- !u!114 &6563932251621246387
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1384161542311662118}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 14
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u52A0\u8F7D\u4E2D....."
+--- !u!1 &4993911372966654358
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1669281409109345828}
+  - component: {fileID: 5060074385960820424}
+  - component: {fileID: 8936581939649475887}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1669281409109345828
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4993911372966654358}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8311278189826985699}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 800, y: 2000}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5060074385960820424
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4993911372966654358}
+  m_CullTransparentMesh: 1
+--- !u!114 &8936581939649475887
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4993911372966654358}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: 
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 0}
+  packInfo:
+    packName: 
+    packgJsonPath: 
+    packgSpritePath: 
+    lasetJsonGUID: 
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &5484466371172864172
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8311278189826985699}
+  - component: {fileID: 3407904815957371626}
+  - component: {fileID: 25007533786230534}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: LoadingPanel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8311278189826985699
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5484466371172864172}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 1669281409109345828}
+  - {fileID: 360525025617545499}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 750, y: 1624}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &3407904815957371626
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5484466371172864172}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6a23dadfaa104ddf929b8c98dd02623c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  maxDuration: 0.5
+  isUpdate: 0
+  currTime: 0.5034794
+  GrpupInfos:
+  - Foldout: 1
+    isActive: 1
+    animName: 
+    isLoop: 0
+    allTargets:
+    - {fileID: 25007533786230534}
+    TweenAssetInfo: {fileID: 11400000, guid: 20165957822522a4f94a6a1171ee9be1, type: 2}
+    TargetFoldout: 0
+    maxDuration: 0.5
+    isUpdate: 1
+    currTime: 0
+  MinMaxGradient:
+    m_Mode: 0
+    m_GradientMin:
+      serializedVersion: 2
+      key0: {r: 1, g: 1, b: 1, a: 1}
+      key1: {r: 1, g: 1, b: 1, a: 1}
+      key2: {r: 0, g: 0, b: 0, a: 0}
+      key3: {r: 0, g: 0, b: 0, a: 0}
+      key4: {r: 0, g: 0, b: 0, a: 0}
+      key5: {r: 0, g: 0, b: 0, a: 0}
+      key6: {r: 0, g: 0, b: 0, a: 0}
+      key7: {r: 0, g: 0, b: 0, a: 0}
+      ctime0: 0
+      ctime1: 65535
+      ctime2: 0
+      ctime3: 0
+      ctime4: 0
+      ctime5: 0
+      ctime6: 0
+      ctime7: 0
+      atime0: 0
+      atime1: 65535
+      atime2: 0
+      atime3: 0
+      atime4: 0
+      atime5: 0
+      atime6: 0
+      atime7: 0
+      m_Mode: 0
+      m_ColorSpace: -1
+      m_NumColorKeys: 2
+      m_NumAlphaKeys: 2
+    m_GradientMax:
+      serializedVersion: 2
+      key0: {r: 1, g: 1, b: 1, a: 1}
+      key1: {r: 1, g: 1, b: 1, a: 1}
+      key2: {r: 0, g: 0, b: 0, a: 0}
+      key3: {r: 0, g: 0, b: 0, a: 0}
+      key4: {r: 0, g: 0, b: 0, a: 0}
+      key5: {r: 0, g: 0, b: 0, a: 0}
+      key6: {r: 0, g: 0, b: 0, a: 0}
+      key7: {r: 0, g: 0, b: 0, a: 0}
+      ctime0: 0
+      ctime1: 65535
+      ctime2: 0
+      ctime3: 0
+      ctime4: 0
+      ctime5: 0
+      ctime6: 0
+      ctime7: 0
+      atime0: 0
+      atime1: 65535
+      atime2: 0
+      atime3: 0
+      atime4: 0
+      atime5: 0
+      atime6: 0
+      atime7: 0
+      m_Mode: 0
+      m_ColorSpace: -1
+      m_NumColorKeys: 2
+      m_NumAlphaKeys: 2
+    m_ColorMin: {r: 0, g: 0, b: 0, a: 0}
+    m_ColorMax: {r: 0, g: 0, b: 0, a: 0}
+  isLoop: 0
+--- !u!225 &25007533786230534
+CanvasGroup:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5484466371172864172}
+  m_Enabled: 1
+  m_Alpha: 1
+  m_Interactable: 1
+  m_BlocksRaycasts: 1
+  m_IgnoreParentGroups: 0

+ 7 - 0
Assets/Res/UI/LoadingPanel.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: XXkY5iqlBypm23fh8dOBjUgnTxSfXKLvht7qeIBVpx2klTuIsl31LTDNSPVs
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 57 - 0
Assets/Res/UIAnimRes/TweenAssetInfoLodingPanel.asset

@@ -0,0 +1,57 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  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: 11500000, guid: 81c305ba541a4659ad97bd292322e9b3, type: 3}
+  m_Name: TweenAssetInfoLodingPanel
+  m_EditorClassIdentifier: 
+  allTweenInfo:
+  - Foldout: 1
+    TweenType: 1
+    duration: 0.5
+    delay: 0
+    TweenBasic:
+      Foldout: 0
+      duration: 0
+      delay: 0
+      currSchedule: 0
+      TweenRectTransformInfos: []
+    TweenCanvasGroup:
+      Foldout: 1
+      duration: 0.5
+      delay: 0
+      currSchedule: 0
+      TweenLerpType: 0
+      StartAlpha: 0
+      EndAlpha: 1
+      startX:
+        serializedVersion: 2
+        m_Curve: []
+        m_PreInfinity: 2
+        m_PostInfinity: 2
+        m_RotationOrder: 4
+    TweenGraphic:
+      Foldout: 0
+      duration: 0
+      delay: 0
+      currSchedule: 0
+      startColor: {r: 0, g: 0, b: 0, a: 0}
+      endColor: {r: 0, g: 0, b: 0, a: 0}
+      startX:
+        serializedVersion: 2
+        m_Curve: []
+        m_PreInfinity: 2
+        m_PostInfinity: 2
+        m_RotationOrder: 4
+    TweenPlayFx:
+      Foldout: 0
+      duration: 0
+      delay: 0
+      currSchedule: 0

+ 8 - 0
Assets/Res/UIAnimRes/TweenAssetInfoLodingPanel.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: DXoesy+kVnxSk/Q7KvQaN2GS9mgfaYNDHO8VGC74XYoPi8mAznjE3lnAXFRV
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 1 - 1
Assets/Resources/Shader/Shader Graphs_ShengShiShader.mat

@@ -66,5 +66,5 @@ Material:
     m_Colors:
     m_Colors:
     - _mainColor: {r: 0.21314356, g: 1.4060051, b: 2.1517377, a: 0}
     - _mainColor: {r: 0.21314356, g: 1.4060051, b: 2.1517377, a: 0}
     - _off: {r: 0.01, g: 0.01, b: 0, a: 0}
     - _off: {r: 0.01, g: 0.01, b: 0, a: 0}
-    - _pos: {r: -1.8000001, g: -5.3999996, b: -30, a: 0}
+    - _pos: {r: 0, g: -5, b: -30, a: 0}
   m_BuildTextureStacks: []
   m_BuildTextureStacks: []

+ 212 - 0
Assets/Scenes/testCombat.scene

@@ -890,6 +890,110 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 442218246}
   m_GameObject: {fileID: 442218246}
   m_CullTransparentMesh: 1
   m_CullTransparentMesh: 1
+--- !u!1001 &515822005
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 5394572769830370106, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_Name
+      value: Canvas
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370106, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects:
+    - targetCorrespondingSourceObject: {fileID: 7091770935250694576, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 1895189377}
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
 --- !u!1 &753442135
 --- !u!1 &753442135
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -1205,6 +1309,11 @@ RectTransform:
   m_AnchoredPosition: {x: -5, y: 0}
   m_AnchoredPosition: {x: -5, y: 0}
   m_SizeDelta: {x: -20, y: 0}
   m_SizeDelta: {x: -20, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &1113105563 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 7091770935250694576, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+  m_PrefabInstance: {fileID: 515822005}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1312762638
 --- !u!1 &1312762638
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -1371,6 +1480,108 @@ MonoBehaviour:
   m_OnValueChanged:
   m_OnValueChanged:
     m_PersistentCalls:
     m_PersistentCalls:
       m_Calls: []
       m_Calls: []
+--- !u!224 &1895189377 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 8311278189826985699, guid: b37c08dad0bf98f42b569bf67e351455, type: 3}
+  m_PrefabInstance: {fileID: 965542112758883088}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &965542112758883088
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 1113105563}
+    m_Modifications:
+    - target: {fileID: 5484466371172864172, guid: b37c08dad0bf98f42b569bf67e351455, type: 3}
+      propertyPath: m_Name
+      value: LoadingPanel
+      objectReference: {fileID: 0}
+    - target: {fileID: 8311278189826985699, guid: b37c08dad0bf98f42b569bf67e351455, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8311278189826985699, guid: b37c08dad0bf98f42b569bf67e351455, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8311278189826985699, guid: b37c08dad0bf98f42b569bf67e351455, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8311278189826985699, guid: b37c08dad0bf98f42b569bf67e351455, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8311278189826985699, guid: b37c08dad0bf98f42b569bf67e351455, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8311278189826985699, guid: b37c08dad0bf98f42b569bf67e351455, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8311278189826985699, guid: b37c08dad0bf98f42b569bf67e351455, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 750
+      objectReference: {fileID: 0}
+    - target: {fileID: 8311278189826985699, guid: b37c08dad0bf98f42b569bf67e351455, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 1624
+      objectReference: {fileID: 0}
+    - target: {fileID: 8311278189826985699, guid: b37c08dad0bf98f42b569bf67e351455, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8311278189826985699, guid: b37c08dad0bf98f42b569bf67e351455, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8311278189826985699, guid: b37c08dad0bf98f42b569bf67e351455, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8311278189826985699, guid: b37c08dad0bf98f42b569bf67e351455, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8311278189826985699, guid: b37c08dad0bf98f42b569bf67e351455, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8311278189826985699, guid: b37c08dad0bf98f42b569bf67e351455, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8311278189826985699, guid: b37c08dad0bf98f42b569bf67e351455, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8311278189826985699, guid: b37c08dad0bf98f42b569bf67e351455, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8311278189826985699, guid: b37c08dad0bf98f42b569bf67e351455, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8311278189826985699, guid: b37c08dad0bf98f42b569bf67e351455, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8311278189826985699, guid: b37c08dad0bf98f42b569bf67e351455, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8311278189826985699, guid: b37c08dad0bf98f42b569bf67e351455, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: b37c08dad0bf98f42b569bf67e351455, type: 3}
 --- !u!114 &4237119297094294473
 --- !u!114 &4237119297094294473
 MonoBehaviour:
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -1487,3 +1698,4 @@ SceneRoots:
   - {fileID: 5102730602139337721}
   - {fileID: 5102730602139337721}
   - {fileID: 293130736}
   - {fileID: 293130736}
   - {fileID: 6588466611375917160}
   - {fileID: 6588466611375917160}
+  - {fileID: 515822005}

+ 9 - 1
Assets/Scripts/Core/Event/Event/CustomEventType.cs

@@ -119,7 +119,15 @@ namespace Fort23.Core
       UpdateZuiZhongEvent,
       UpdateZuiZhongEvent,
       CancelEvent,
       CancelEvent,
       RefreshULock,
       RefreshULock,
-      NextGuide
+      NextGuide,
+      /// <summary>
+      /// 显示LoadingUI
+      /// </summary>
+      ShowLoadingUI,
+      /// <summary>
+      /// 关闭LoadingUI
+      /// </summary>
+      CloseLoadingUI,
 
 
     }
     }
 }
 }

+ 10 - 0
Assets/Scripts/GameData/ExcelConfig/SmallPlacesConfig.cs

@@ -64,6 +64,16 @@ namespace Excel2Json
 #endif
 #endif
 		
 		
 
 
+		/// <summary>
+		///
+		/// </summary>
+#if !COMBAT_SERVER
+		public string sceneName;
+#else
+		public string sceneName{ set; get; }
+#endif
+		
+
 	}
 	}
 
 
 }
 }

+ 90 - 0
Assets/Scripts/GameLogic/Combat/CombatState/CombatSceneSwitchState.cs

@@ -0,0 +1,90 @@
+using Fort23.Core;
+using GameLogic.Combat.CombatTool;
+using GameLogic.Combat.Hero;
+using UnityEngine;
+
+namespace GameLogic.Combat.CombatState
+{
+    public class CombatSceneSwitchState : CombatStateBasic
+    {
+        private Vector3 dir;
+        private Vector3 moveTargetDir;
+
+        private float currTime;
+        private int state;
+        private Vector3 startPos;
+        private Vector3 startEulerAngles;
+
+        public CombatSceneSwitchState(CombatController combatController) : base(combatController)
+        {
+        }
+
+        protected override void ProEnter()
+        {
+            CombatController.CombatCameraControllder.isStop = true;
+            CombatController.IsFightState = false;
+            CombatController.GameTimeLineParticleFactory.RecycleAllFxAiLogicBasic();
+            CombatHeroEntity playerHeroEntity = CombatController.currActiveCombat.playerHeroEntity;
+            if (playerHeroEntity != null)
+            {
+                playerHeroEntity.PlayAnim(CombatHeroStateType.idle, true, 0, false, 1);
+                CombatController.MagicWeaponCombatSence.CloseSecene();
+            }
+            startPos=playerHeroEntity.GameObject.transform.position;
+            startEulerAngles = playerHeroEntity.GameObject.transform.rotation.eulerAngles;
+
+            // CombatHeroEntity playerHeroEntity = CombatController.currActiveCombat.playerHeroEntity;
+            Vector3 target = playerHeroEntity.GameObject.transform.TransformPoint(new Vector3(1, 2, 1));
+            moveTargetDir = (target - playerHeroEntity.GameObject.transform.forward).normalized;
+            currTime = 0;
+            state = 0;
+        }
+
+        protected override void ProUpdate(float t)
+        {
+            CombatHeroEntity playerHeroEntity = CombatController.currActiveCombat.playerHeroEntity;
+            if (playerHeroEntity == null)
+            {
+                return;
+            }
+
+            currTime += t;
+            if (currTime > 3 && state == 0)
+            {
+                state = 1;
+                EventManager.Instance.Dispatch(CustomEventType.ShowLoadingUI, null);
+                InitScenes();
+                currTime = 0;
+            }
+
+            if (state == 2)
+            {
+                return;
+            }
+
+            Vector3 pos = playerHeroEntity.dotPos;
+
+            Vector3 currDir = Vector3.Lerp(playerHeroEntity.GameObject.transform.forward, moveTargetDir, 0.3f);
+
+
+            pos += currDir.normalized * 15 * t;
+
+            playerHeroEntity.combatHeroGameObject.SetPosition(pos);
+            playerHeroEntity.GameObject.transform.rotation =
+                Quaternion.LookRotation(new Vector3(currDir.x, 0, currDir.z));
+        }
+
+        private async void InitScenes()
+        {
+            await TimerComponent.Instance.WaitAsync(600);
+            state = 2;
+            CombatHeroEntity playerHeroEntity = CombatController.currActiveCombat.playerHeroEntity;
+            playerHeroEntity.GameObject.transform.position = startPos;
+            playerHeroEntity.GameObject.transform.rotation = Quaternion.Euler(startEulerAngles);
+            await CombatController.CombatSenceController.InitScenes("LevelBattle03");
+            EventManager.Instance.Dispatch(CustomEventType.CloseLoadingUI, null);
+            CombatController.CombatCameraControllder.isStop = false;
+            CombatController.ChangeState(CombatController.fight);
+        }
+    }
+}

+ 3 - 0
Assets/Scripts/GameLogic/Combat/CombatState/CombatSceneSwitchState.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 58ae3dac2f2e4eab8d03a055e9328781
+timeCreated: 1758180548

+ 11 - 1
Assets/Scripts/GameLogic/Combat/CombatTool/CombatController.cs

@@ -85,12 +85,13 @@ namespace GameLogic.Combat.CombatTool
                 stateControl.AddState("update", new CombatUpdateState(this));
                 stateControl.AddState("update", new CombatUpdateState(this));
                 stateControl.AddState("fight", new CombatFightState(this));
                 stateControl.AddState("fight", new CombatFightState(this));
                 stateControl.AddState("combatfinish", new CombatFinishState(this));
                 stateControl.AddState("combatfinish", new CombatFinishState(this));
+                stateControl.AddState("sceneSwitch", new CombatSceneSwitchState(this));
 
 
              
              
                 if (CombatSenceController == null)
                 if (CombatSenceController == null)
                 {
                 {
                     CombatSenceController = new CombatSenceController();
                     CombatSenceController = new CombatSenceController();
-                    await CombatSenceController.InitScenes(startCombatInfo.levelBattleId);
+                    await CombatSenceController.InitScenes("LevelBattle02");
                 }
                 }
 
 
                 if (CombatDataController == null)
                 if (CombatDataController == null)
@@ -147,6 +148,14 @@ namespace GameLogic.Combat.CombatTool
                 return;
                 return;
             }
             }
 
 
+            
+            if (Input.GetKeyDown(KeyCode.A))
+            {
+               ChangeState("sceneSwitch");
+            }
+
+         
+            
             t *= speed;
             t *= speed;
             if (!IsGameOver)
             if (!IsGameOver)
             {
             {
@@ -179,6 +188,7 @@ namespace GameLogic.Combat.CombatTool
                     }
                     }
                 }
                 }
             }
             }
+           
         }
         }
 
 
         private void TriggerCombat()
         private void TriggerCombat()

+ 1 - 9
Assets/Scripts/GameLogic/Combat/CombatTool/CombatHeroController.cs

@@ -129,15 +129,7 @@ namespace GameLogic.Combat.CombatTool
 
 
         public void Update(float t)
         public void Update(float t)
         {
         {
-            if (Input.GetKeyDown(KeyCode.A))
-            {
-                CombatController.currActiveCombat.CombatHeroController.Flight(5, -90, 15);
-            }
-
-            if (Input.GetKeyDown(KeyCode.D))
-            {
-                Flight(5, 90, 15);
-            }
+           
 
 
 
 
             for (int i = 0; i < myHero.Count; i++)
             for (int i = 0; i < myHero.Count; i++)

+ 26 - 99
Assets/Scripts/GameLogic/Combat/CombatTool/SceneTool/CombatSenceController.cs

@@ -15,6 +15,7 @@ namespace GameLogic.Combat.CombatTool
     public class CombatSenceController : IDisposable
     public class CombatSenceController : IDisposable
     {
     {
         private static readonly int Ran = Shader.PropertyToID("_ran");
         private static readonly int Ran = Shader.PropertyToID("_ran");
+
         private static readonly int Pos = Shader.PropertyToID("_pos");
         private static readonly int Pos = Shader.PropertyToID("_pos");
         // public CombatSencePath currBesselPath;
         // public CombatSencePath currBesselPath;
         //
         //
@@ -28,7 +29,7 @@ namespace GameLogic.Combat.CombatTool
         public float currTime;
         public float currTime;
         public Transform moveRoot;
         public Transform moveRoot;
 
 
-        private List<CombatSencePath> reclaimSence = new List<CombatSencePath>();
+        // private List<CombatSencePath> reclaimSence = new List<CombatSencePath>();
 
 
         // protected GameObjectPool ShengShiQiuTi;
         // protected GameObjectPool ShengShiQiuTi;
 
 
@@ -46,15 +47,30 @@ namespace GameLogic.Combat.CombatTool
         private float shengShiRan;
         private float shengShiRan;
 
 
         // private List
         // private List
-        public async CTask InitScenes(int levelBattleId)
+        public async CTask InitScenes(string sceneName)
         {
         {
+            if (SceneMonoConfig != null)
+            {
+                SceneMonoConfig.Dispose();
+                GameObject.Destroy(moveRoot.gameObject);
+                GameObject.Destroy(SceneMonoConfig.gameObject);
+                SceneMonoConfig = null;
+            }
+
+            shengShiRan = 0;
+            _isUpdateShengShi = false;
+
             GameObject gameObject = new GameObject("mvoeRoot");
             GameObject gameObject = new GameObject("mvoeRoot");
-            string sceneName = "LevelBattle03";
-            LevelbattleConfig levelbattleConfig = ConfigComponent.Instance.Get<LevelbattleConfig>(levelBattleId);
-            if (levelbattleConfig.ID > 0)
+            if (string.IsNullOrEmpty(sceneName))
             {
             {
-                //sceneName= levelbattleConfig.sceneName;
+                sceneName= "LevelBattle03";
             }
             }
+            // string sceneName = "LevelBattle03";
+            // LevelbattleConfig levelbattleConfig = ConfigComponent.Instance.Get<LevelbattleConfig>(levelBattleId);
+            // if (levelbattleConfig.ID > 0)
+            // {
+            //     //sceneName= levelbattleConfig.sceneName;
+            // }
 #if UNITY_EDITOR
 #if UNITY_EDITOR
             TestCombatHeroConfig testCombatHeroConfig = GameObject.FindObjectOfType<TestCombatHeroConfig>();
             TestCombatHeroConfig testCombatHeroConfig = GameObject.FindObjectOfType<TestCombatHeroConfig>();
             if (testCombatHeroConfig != null)
             if (testCombatHeroConfig != null)
@@ -78,23 +94,15 @@ namespace GameLogic.Combat.CombatTool
                 });
                 });
             cTaskAwaitBuffer.AddTask(task_a);
             cTaskAwaitBuffer.AddTask(task_a);
 
 
-        
+
             lasetDir = Vector3.forward;
             lasetDir = Vector3.forward;
             lasetPos = new Vector3(0, 20, 0);
             lasetPos = new Vector3(0, 20, 0);
             await cTaskAwaitBuffer.WaitAll();
             await cTaskAwaitBuffer.WaitAll();
             // currBesselPath = InitBesselPath(lasetPos);
             // currBesselPath = InitBesselPath(lasetPos);
             SceneMonoConfig.Init(Camera.main.transform.parent, moveRoot);
             SceneMonoConfig.Init(Camera.main.transform.parent, moveRoot);
-       
+            SceneMonoConfig.UpdateScene();
         }
         }
 
 
-
-      
-       
-
-      
-
-    
-
         private async CTask<SceneDecoration> GetSceneDecoration(SceneObjectConfig sceneObjectConfig)
         private async CTask<SceneDecoration> GetSceneDecoration(SceneObjectConfig sceneObjectConfig)
         {
         {
             GameObjectPool gameObjectPool = await sceneObjectConfig.GetNewPrefab();
             GameObjectPool gameObjectPool = await sceneObjectConfig.GetNewPrefab();
@@ -105,70 +113,6 @@ namespace GameLogic.Combat.CombatTool
             return sceneDecoration;
             return sceneDecoration;
         }
         }
 
 
-        // public Vector3 GetTarget(float time)
-        // {
-        //     if (time > 1)
-        //     {
-        //         if (NextBesselPath == null)
-        //         {
-        //             NextBesselPath = InitBesselPath(currBesselPath.b, 0);
-        //         }
-        //
-        //         time = time % 1;
-        //         return NextBesselPath.GetValue(time);
-        //     }
-        //     else
-        //     {
-        //         return currBesselPath.GetValue(time);
-        //     }
-        // }
-
-        // public Vector3 Move(float dis)
-        // {
-        //     float t = dis / currBesselPath.len;
-        //     currTime += t;
-        //     // Debug.Log("移动速度" + t + "/" + currBesselPath.len);
-        //
-        //     Vector3 targetPos = Vector3.zero;
-        //     if (currTime > 0.01f)
-        //     {
-        //         if (NextBesselPath == null)
-        //         {
-        //             // int odds = Random.Range(0, 100);
-        //             // if (odds < 50)
-        //             // {
-        //             //     NextBesselPath = InitBesselPath(currBesselPath.b, Random.Range(0, 100) < 50 ? -1 : 1);
-        //             // }
-        //             // else
-        //             {
-        //                 NextBesselPath = InitBesselPath(currBesselPath.b);
-        //             }
-        //         }
-        //     }
-        //
-        //     if (currTime > 1)
-        //     {
-        //         if (NextBesselPath == null)
-        //         {
-        //             NextBesselPath = InitBesselPath(currBesselPath.b);
-        //         }
-        //
-        //         currTime = currTime % 1;
-        //         // targetPos = NextBesselPath.GetValue(currTime);
-        //         currBesselPath.reclaimTime = 3;
-        //         reclaimSence.Add(currBesselPath);
-        //         currBesselPath = NextBesselPath;
-        //         NextBesselPath = null;
-        //         CombatEventManager.Instance.Dispatch(CombatEventType.SencenBesselPathAlter, null);
-        //     }
-        //     else
-        //     {
-        //     }
-        //
-        //     targetPos = currBesselPath.GetValue(currTime);
-        //     moveRoot.transform.position = targetPos;
-        //     return targetPos;
-        // }
 
 
         public void StartPayShengShi(Transform root)
         public void StartPayShengShi(Transform root)
         {
         {
@@ -188,15 +132,7 @@ namespace GameLogic.Combat.CombatTool
         {
         {
             moveRoot.transform.position = CombatController.currActiveCombat.CombatHeroController.GetTarget(0);
             moveRoot.transform.position = CombatController.currActiveCombat.CombatHeroController.GetTarget(0);
             SceneMonoConfig?.UpdateScene();
             SceneMonoConfig?.UpdateScene();
-            // if (currBesselPath != null)
-            // {
-            //     currBesselPath.Update(t);
-            // }
-            //
-            // if (NextBesselPath != null)
-            // {
-            //     NextBesselPath.Update(t);
-            // }
+     
 
 
 
 
             if (_isUpdateShengShi)
             if (_isUpdateShengShi)
@@ -214,16 +150,7 @@ namespace GameLogic.Combat.CombatTool
                 }
                 }
             }
             }
 
 
-            for (int i = 0; i < reclaimSence.Count; i++)
-            {
-                CombatSencePath sencePath = reclaimSence[i];
-                sencePath.reclaimTime -= t;
-                if (sencePath.reclaimTime < 0)
-                {
-                    sencePath.DormancyObj();
-                    reclaimSence.RemoveAt(i);
-                }
-            }
+       
         }
         }
 
 
 
 

+ 13 - 0
Assets/Scripts/GameLogic/Combat/CombatTool/SceneTool/SceneCJ2MonoConfig.cs

@@ -158,5 +158,18 @@ namespace GameLogic.Combat.CombatTool.SceneTool
                 GObjectPool.Instance.FetchAsyncForGameObject<GameObjectPool>(gameObject, gameObject.name);
                 GObjectPool.Instance.FetchAsyncForGameObject<GameObjectPool>(gameObject, gameObject.name);
             return gameObjectPool;
             return gameObjectPool;
         }
         }
+
+        protected override void ProDispose()
+        {
+            foreach (var VARIABLE in _downAllGameObjectPools.Values)
+            {
+                GObjectPool.Instance.Recycle(_downAllGameObjectPools.Value);
+            }
+
+            _downAllGameObjectPools.Clear();
+            foreach (var VARIABLE in _allGameObjectPools.Values)
+                GObjectPool.Instance.Recycle(_allGameObjectPools.Value);
+            _allGameObjectPools.Clear();
+        }
     }
     }
 }
 }

+ 9 - 0
Assets/Scripts/GameLogic/Combat/CombatTool/SceneTool/SceneMonoConfig.cs

@@ -94,5 +94,14 @@ namespace GameLogic.Combat.CombatTool.SceneTool
                 GObjectPool.Instance.FetchAsyncForGameObject<GameObjectPool>(gameObject, gameObject.name);
                 GObjectPool.Instance.FetchAsyncForGameObject<GameObjectPool>(gameObject, gameObject.name);
             return gameObjectPool;
             return gameObjectPool;
         }
         }
+
+        protected override void ProDispose()
+        {
+            foreach (var VARIABLE in _allGameObjectPools.Values)
+            {
+                GObjectPool.Instance.Recycle(VARIABLE);
+            }
+            _allGameObjectPools.Clear();
+        }
     }
     }
 }
 }

+ 14 - 1
Assets/Scripts/GameLogic/Combat/CombatTool/SceneTool/SceneMonoConfigBasic.cs

@@ -1,9 +1,10 @@
+using System;
 using Fort23.UTool;
 using Fort23.UTool;
 using UnityEngine;
 using UnityEngine;
 
 
 namespace GameLogic.Combat.CombatTool.SceneTool
 namespace GameLogic.Combat.CombatTool.SceneTool
 {
 {
-    public class SceneMonoConfigBasic: MonoBehaviour
+    public class SceneMonoConfigBasic: MonoBehaviour,IDisposable
     {
     {
         public GameObject skyObejct;
         public GameObject skyObejct;
 
 
@@ -31,5 +32,17 @@ namespace GameLogic.Combat.CombatTool.SceneTool
         {
         {
             
             
         }
         }
+
+
+        public void Dispose()
+        {
+            ProDispose();
+            root = null;
+            moveRoot = null;
+        }
+        protected virtual void ProDispose()
+        {
+            
+        }
     }
     }
 }
 }

+ 10 - 0
Assets/Scripts/GameUI/Combat/CombatDrive.cs

@@ -24,10 +24,20 @@ namespace GameLogic.Combat
             string name = "CombatRoot.prefab";
             string name = "CombatRoot.prefab";
             AssetHandle assetHandle = await AssetBundleLoadManager.Instance.LoadAssetAsyncTask<GameObject>(name);
             AssetHandle assetHandle = await AssetBundleLoadManager.Instance.LoadAssetAsyncTask<GameObject>(name);
             assetHandle.AssetObject<GameObject>().SetActive(true);
             assetHandle.AssetObject<GameObject>().SetActive(true);
+            EventManager.Instance.AddEventListener(CustomEventType.ShowLoadingUI, ShowLoadingUI);
+            EventManager.Instance.AddEventListener(CustomEventType.CloseLoadingUI, CloseLoadingUI);
 
 
             // 
             // 
         }
         }
 
 
+        private void ShowLoadingUI(IEventData eventData)
+        {
+            LoadingPanel.OpenLodingPanel();
+        }
+        private void CloseLoadingUI(IEventData eventData)
+        {
+            UIManager.Instance.HideUIUIPanel<LoadingPanel>();
+        }
         public void AddCombatController(CombatController combatController)
         public void AddCombatController(CombatController combatController)
         {
         {
             this.CombatController = combatController;
             this.CombatController = combatController;

+ 29 - 0
Assets/Scripts/GameUI/UI/CombatPanel/LoadingPanel.cs

@@ -0,0 +1,29 @@
+namespace Fort23.Mono
+{
+	[UIBinding(prefab = "LoadingPanel"  )]
+	public partial class LoadingPanel : UIPanel
+	{
+		public static async void OpenLodingPanel()
+		{
+			await UIManager.Instance.LoadAndOpenPanel<LoadingPanel>(null, UILayer.Top);
+		}
+
+		private void Init()
+		{
+
+		}
+		protected override void AddEvent()
+		{
+
+		}
+		protected override void DelEvent()
+		{
+
+		}
+		public override void AddButtonEvent()
+		{
+
+		}
+
+	}
+}

+ 11 - 0
Assets/Scripts/GameUI/UI/CombatPanel/LoadingPanel.cs.meta

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

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
Assets/StreamingAssets/assetConfig.txt


BIN
Excel2Json/Excel/Maps.xlsx


+ 147 - 397
UserSettings/Layouts/default-2022.dwlt

@@ -1,54 +1,6 @@
 %YAML 1.1
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
 %TAG !u! tag:yousandi.cn,2023:
 --- !u!114 &1
 --- !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: -2553
-    y: 377
-    width: 2560
-    height: 1015
-  m_ShowMode: 0
-  m_Title: 
-  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: -2054
-    y: 328
-    width: 892
-    height: 541
-  m_ShowMode: 0
-  m_Title: Console
-  m_RootView: {fileID: 7}
-  m_MinSize: {x: 100, y: 121}
-  m_MaxSize: {x: 4000, y: 4021}
-  m_Maximized: 0
---- !u!114 &3
 MonoBehaviour:
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
   m_CorrespondingSourceObject: {fileID: 0}
@@ -65,65 +17,14 @@ MonoBehaviour:
     x: 0
     x: 0
     y: 43
     y: 43
     width: 2560
     width: 2560
-    height: 1349
+    height: 1357
   m_ShowMode: 4
   m_ShowMode: 4
   m_Title: Inspector
   m_Title: Inspector
-  m_RootView: {fileID: 8}
+  m_RootView: {fileID: 3}
   m_MinSize: {x: 875, y: 300}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_MaxSize: {x: 10000, y: 10000}
   m_Maximized: 1
   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: HotReloadWindow
-  m_EditorClassIdentifier: 
-  m_Children: []
-  m_Position:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 2560
-    height: 1015
-  m_MinSize: {x: 100, y: 121}
-  m_MaxSize: {x: 4000, y: 4021}
-  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: 2560
-    height: 1015
-  m_MinSize: {x: 100, y: 121}
-  m_MaxSize: {x: 4000, y: 4021}
-  vertical: 0
-  controlID: 166
-  draggingID: 0
---- !u!114 &6
+--- !u!114 &2
 MonoBehaviour:
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
   m_CorrespondingSourceObject: {fileID: 0}
@@ -133,48 +34,23 @@ MonoBehaviour:
   m_Enabled: 1
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: ConsoleWindow
+  m_Name: GameView
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   m_Children: []
   m_Children: []
   m_Position:
   m_Position:
     serializedVersion: 2
     serializedVersion: 2
     x: 0
     x: 0
     y: 0
     y: 0
-    width: 892
-    height: 541
-  m_MinSize: {x: 100, y: 121}
-  m_MaxSize: {x: 4000, y: 4021}
-  m_ActualView: {fileID: 17}
+    width: 585
+    height: 1307
+  m_MinSize: {x: 201, y: 221}
+  m_MaxSize: {x: 4001, y: 4021}
+  m_ActualView: {fileID: 14}
   m_Panes:
   m_Panes:
-  - {fileID: 17}
+  - {fileID: 14}
   m_Selected: 0
   m_Selected: 0
   m_LastSelected: 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: 892
-    height: 541
-  m_MinSize: {x: 100, y: 121}
-  m_MaxSize: {x: 4000, y: 4021}
-  vertical: 0
-  controlID: 18
-  draggingID: 0
---- !u!114 &8
+--- !u!114 &3
 MonoBehaviour:
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
   m_CorrespondingSourceObject: {fileID: 0}
@@ -187,22 +63,22 @@ MonoBehaviour:
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   m_Children:
   m_Children:
-  - {fileID: 9}
-  - {fileID: 10}
-  - {fileID: 11}
+  - {fileID: 4}
+  - {fileID: 5}
+  - {fileID: 6}
   m_Position:
   m_Position:
     serializedVersion: 2
     serializedVersion: 2
     x: 0
     x: 0
     y: 0
     y: 0
     width: 2560
     width: 2560
-    height: 1349
+    height: 1357
   m_MinSize: {x: 875, y: 300}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_MaxSize: {x: 10000, y: 10000}
   m_UseTopView: 1
   m_UseTopView: 1
   m_TopViewHeight: 30
   m_TopViewHeight: 30
   m_UseBottomView: 1
   m_UseBottomView: 1
   m_BottomViewHeight: 20
   m_BottomViewHeight: 20
---- !u!114 &9
+--- !u!114 &4
 MonoBehaviour:
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
   m_CorrespondingSourceObject: {fileID: 0}
@@ -224,7 +100,7 @@ MonoBehaviour:
   m_MinSize: {x: 0, y: 0}
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
   m_LastLoadedLayoutName: 
   m_LastLoadedLayoutName: 
---- !u!114 &10
+--- !u!114 &5
 MonoBehaviour:
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
   m_CorrespondingSourceObject: {fileID: 0}
@@ -237,22 +113,23 @@ MonoBehaviour:
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   m_Children:
   m_Children:
-  - {fileID: 15}
-  - {fileID: 12}
-  - {fileID: 13}
-  - {fileID: 14}
+  - {fileID: 2}
+  - {fileID: 10}
+  - {fileID: 7}
+  - {fileID: 8}
+  - {fileID: 9}
   m_Position:
   m_Position:
     serializedVersion: 2
     serializedVersion: 2
     x: 0
     x: 0
     y: 30
     y: 30
     width: 2560
     width: 2560
-    height: 1299
-  m_MinSize: {x: 400, y: 50}
-  m_MaxSize: {x: 32384, y: 8096}
+    height: 1307
+  m_MinSize: {x: 500, y: 50}
+  m_MaxSize: {x: 40480, y: 8096}
   vertical: 0
   vertical: 0
-  controlID: 66
+  controlID: 149
   draggingID: 0
   draggingID: 0
---- !u!114 &11
+--- !u!114 &6
 MonoBehaviour:
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
   m_CorrespondingSourceObject: {fileID: 0}
@@ -268,12 +145,12 @@ MonoBehaviour:
   m_Position:
   m_Position:
     serializedVersion: 2
     serializedVersion: 2
     x: 0
     x: 0
-    y: 1329
+    y: 1337
     width: 2560
     width: 2560
     height: 20
     height: 20
   m_MinSize: {x: 0, y: 0}
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
---- !u!114 &12
+--- !u!114 &7
 MonoBehaviour:
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
   m_CorrespondingSourceObject: {fileID: 0}
@@ -288,18 +165,18 @@ MonoBehaviour:
   m_Children: []
   m_Children: []
   m_Position:
   m_Position:
     serializedVersion: 2
     serializedVersion: 2
-    x: 1209
+    x: 1174
     y: 0
     y: 0
-    width: 411
-    height: 1299
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 19}
+    width: 619
+    height: 1307
+  m_MinSize: {x: 202, y: 221}
+  m_MaxSize: {x: 4002, y: 4021}
+  m_ActualView: {fileID: 11}
   m_Panes:
   m_Panes:
-  - {fileID: 19}
+  - {fileID: 11}
   m_Selected: 0
   m_Selected: 0
   m_LastSelected: 0
   m_LastSelected: 0
---- !u!114 &13
+--- !u!114 &8
 MonoBehaviour:
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
   m_CorrespondingSourceObject: {fileID: 0}
@@ -314,18 +191,18 @@ MonoBehaviour:
   m_Children: []
   m_Children: []
   m_Position:
   m_Position:
     serializedVersion: 2
     serializedVersion: 2
-    x: 1620
+    x: 1793
     y: 0
     y: 0
-    width: 366
-    height: 1299
+    width: 435
+    height: 1307
   m_MinSize: {x: 232, y: 271}
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
   m_MaxSize: {x: 10002, y: 10021}
-  m_ActualView: {fileID: 21}
+  m_ActualView: {fileID: 13}
   m_Panes:
   m_Panes:
-  - {fileID: 21}
+  - {fileID: 13}
   m_Selected: 0
   m_Selected: 0
   m_LastSelected: 0
   m_LastSelected: 0
---- !u!114 &14
+--- !u!114 &9
 MonoBehaviour:
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
   m_CorrespondingSourceObject: {fileID: 0}
@@ -340,18 +217,18 @@ MonoBehaviour:
   m_Children: []
   m_Children: []
   m_Position:
   m_Position:
     serializedVersion: 2
     serializedVersion: 2
-    x: 1986
+    x: 2228
     y: 0
     y: 0
-    width: 574
-    height: 1299
-  m_MinSize: {x: 275, y: 50}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 20}
+    width: 332
+    height: 1307
+  m_MinSize: {x: 276, y: 71}
+  m_MaxSize: {x: 4001, y: 4021}
+  m_ActualView: {fileID: 12}
   m_Panes:
   m_Panes:
-  - {fileID: 20}
+  - {fileID: 12}
   m_Selected: 0
   m_Selected: 0
   m_LastSelected: 0
   m_LastSelected: 0
---- !u!114 &15
+--- !u!114 &10
 MonoBehaviour:
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
   m_CorrespondingSourceObject: {fileID: 0}
@@ -366,158 +243,18 @@ MonoBehaviour:
   m_Children: []
   m_Children: []
   m_Position:
   m_Position:
     serializedVersion: 2
     serializedVersion: 2
-    x: 0
+    x: 585
     y: 0
     y: 0
-    width: 1209
-    height: 1299
-  m_MinSize: {x: 201, y: 221}
-  m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 23}
+    width: 589
+    height: 1307
+  m_MinSize: {x: 202, y: 221}
+  m_MaxSize: {x: 4002, y: 4021}
+  m_ActualView: {fileID: 15}
   m_Panes:
   m_Panes:
-  - {fileID: 23}
-  - {fileID: 22}
-  - {fileID: 18}
+  - {fileID: 15}
   m_Selected: 0
   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: 11500000, guid: f62a84c0b148b0a4582bdd9f1a69e6d3, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_TitleContent:
-    m_Text: ' Hot Reload'
-    m_Image: {fileID: 0}
-    m_Tooltip: 
-  m_Pos:
-    serializedVersion: 2
-    x: -2553
-    y: 377
-    width: 2560
-    height: 994
-  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: 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: -2054
-    y: 328
-    width: 892
-    height: 520
-  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 &18
-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: 12914, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_TitleContent:
-    m_Text: Animator
-    m_Image: {fileID: -1673928668082335149, guid: 0000000000000000d000000000000000, type: 0}
-    m_Tooltip: 
-  m_Pos:
-    serializedVersion: 2
-    x: 0
-    y: 73
-    width: 1208
-    height: 1278
-  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
-  m_ViewTransforms:
-    m_KeySerializationHelper:
-    - {fileID: -3440584703619950180, guid: f2a7efcd63199ab4795e66e996544127, type: 2}
-    m_ValueSerializationHelper:
-    - e00: 1
-      e01: 0
-      e02: 0
-      e03: 0
-      e10: 0
-      e11: 1
-      e12: 0
-      e13: 0
-      e20: 0
-      e21: 0
-      e22: 1
-      e23: 0
-      e30: 0
-      e31: 0
-      e32: 0
-      e33: 1
-  m_PreviewAnimator: {fileID: 0}
-  m_AnimatorController: {fileID: 9100000, guid: f2a7efcd63199ab4795e66e996544127, type: 2}
-  m_BreadCrumbs:
-  - m_Target: {fileID: -3440584703619950180, guid: f2a7efcd63199ab4795e66e996544127, type: 2}
-    m_ScrollPosition: {x: 0, y: 0}
-  stateMachineGraph: {fileID: 0}
-  stateMachineGraphGUI: {fileID: 0}
-  blendTreeGraph: {fileID: 0}
-  blendTreeGraphGUI: {fileID: 0}
-  m_AutoLiveLink: 1
-  m_MiniTool: 0
-  m_LockTracker:
-    m_IsLocked: 0
-  m_CurrentEditor: 0
-  m_LayerEditor:
-    m_SelectedLayerIndex: 0
---- !u!114 &19
+  m_LastSelected: 0
+--- !u!114 &11
 MonoBehaviour:
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
   m_CorrespondingSourceObject: {fileID: 0}
@@ -537,10 +274,10 @@ MonoBehaviour:
     m_Tooltip: 
     m_Tooltip: 
   m_Pos:
   m_Pos:
     serializedVersion: 2
     serializedVersion: 2
-    x: 1209
+    x: 1174
     y: 73
     y: 73
-    width: 409
-    height: 1278
+    width: 617
+    height: 1286
   m_SerializedDataModeController:
   m_SerializedDataModeController:
     m_DataMode: 0
     m_DataMode: 0
     m_PreferredDataMode: 0
     m_PreferredDataMode: 0
@@ -556,7 +293,7 @@ MonoBehaviour:
       scrollPos: {x: 0, y: 0}
       scrollPos: {x: 0, y: 0}
       m_SelectedIDs: 
       m_SelectedIDs: 
       m_LastClickedID: 0
       m_LastClickedID: 0
-      m_ExpandedIDs: 78faffff
+      m_ExpandedIDs: 3071feff3671feffa2f4ffff22f5ffff30f5ffff6cfaffff
       m_RenameOverlay:
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_UserAcceptedRename: 0
         m_Name: 
         m_Name: 
@@ -572,7 +309,7 @@ MonoBehaviour:
         m_IsRenaming: 0
         m_IsRenaming: 0
         m_OriginalEventType: 11
         m_OriginalEventType: 11
         m_IsRenamingFilename: 0
         m_IsRenamingFilename: 0
-        m_ClientGUIView: {fileID: 12}
+        m_ClientGUIView: {fileID: 7}
       m_SearchString: 
       m_SearchString: 
     m_ExpandedScenes: []
     m_ExpandedScenes: []
     m_CurrenRootInstanceID: 0
     m_CurrenRootInstanceID: 0
@@ -580,7 +317,7 @@ MonoBehaviour:
       m_IsLocked: 0
       m_IsLocked: 0
     m_CurrentSortingName: TransformSorting
     m_CurrentSortingName: TransformSorting
   m_WindowGUID: 468457e0d3add1041b6fec0b00b6a014
   m_WindowGUID: 468457e0d3add1041b6fec0b00b6a014
---- !u!114 &20
+--- !u!114 &12
 MonoBehaviour:
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
   m_CorrespondingSourceObject: {fileID: 0}
@@ -600,10 +337,10 @@ MonoBehaviour:
     m_Tooltip: 
     m_Tooltip: 
   m_Pos:
   m_Pos:
     serializedVersion: 2
     serializedVersion: 2
-    x: 1986
+    x: 2228
     y: 73
     y: 73
-    width: 573
-    height: 1278
+    width: 331
+    height: 1286
   m_SerializedDataModeController:
   m_SerializedDataModeController:
     m_DataMode: 0
     m_DataMode: 0
     m_PreferredDataMode: 0
     m_PreferredDataMode: 0
@@ -617,7 +354,7 @@ MonoBehaviour:
   m_ObjectsLockedBeforeSerialization: []
   m_ObjectsLockedBeforeSerialization: []
   m_InstanceIDsLockedBeforeSerialization: 
   m_InstanceIDsLockedBeforeSerialization: 
   m_PreviewResizer:
   m_PreviewResizer:
-    m_CachedPref: 160
+    m_CachedPref: 322.00006
     m_ControlHash: -371814159
     m_ControlHash: -371814159
     m_PrefName: Preview_InspectorPreview
     m_PrefName: Preview_InspectorPreview
   m_LastInspectedObjectInstanceID: -1
   m_LastInspectedObjectInstanceID: -1
@@ -627,7 +364,7 @@ MonoBehaviour:
   m_LockTracker:
   m_LockTracker:
     m_IsLocked: 0
     m_IsLocked: 0
   m_PreviewWindow: {fileID: 0}
   m_PreviewWindow: {fileID: 0}
---- !u!114 &21
+--- !u!114 &13
 MonoBehaviour:
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
   m_CorrespondingSourceObject: {fileID: 0}
@@ -647,10 +384,10 @@ MonoBehaviour:
     m_Tooltip: 
     m_Tooltip: 
   m_Pos:
   m_Pos:
     serializedVersion: 2
     serializedVersion: 2
-    x: 1620
+    x: 1793
     y: 73
     y: 73
-    width: 364
-    height: 1278
+    width: 433
+    height: 1286
   m_SerializedDataModeController:
   m_SerializedDataModeController:
     m_DataMode: 0
     m_DataMode: 0
     m_PreferredDataMode: 0
     m_PreferredDataMode: 0
@@ -662,7 +399,7 @@ MonoBehaviour:
     m_SaveData: []
     m_SaveData: []
     m_OverlaysVisible: 1
     m_OverlaysVisible: 1
   m_SearchFilter:
   m_SearchFilter:
-    m_NameFilter: DivineSenceEventPreviewPanel
+    m_NameFilter: Canv
     m_ClassNames: []
     m_ClassNames: []
     m_AssetLabels: []
     m_AssetLabels: []
     m_AssetBundleNames: []
     m_AssetBundleNames: []
@@ -672,24 +409,24 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SkipHidden: 0
     m_SearchArea: 1
     m_SearchArea: 1
     m_Folders:
     m_Folders:
-    - Assets/Res/UI/DivineSence
+    - Assets/Scripts/GameLogic/Paritcle/ParitcleLogic
     m_Globs: []
     m_Globs: []
-    m_OriginalText: DivineSenceEventPreviewPanel
+    m_OriginalText: Canv
     m_ImportLogFlags: 0
     m_ImportLogFlags: 0
     m_FilterByTypeIntersection: 0
     m_FilterByTypeIntersection: 0
   m_ViewMode: 1
   m_ViewMode: 1
   m_StartGridSize: 16
   m_StartGridSize: 16
   m_LastFolders:
   m_LastFolders:
-  - Assets/Res/UI/DivineSence
-  m_LastFoldersGridSize: -1
-  m_LastProjectPath: D:\FB\XiuXianGame
+  - Assets/Scripts/GameLogic/Paritcle/ParitcleLogic
+  m_LastFoldersGridSize: 16
+  m_LastProjectPath: D:\Server\NetServer\NetServer\XiuXianGame
   m_LockTracker:
   m_LockTracker:
     m_IsLocked: 0
     m_IsLocked: 0
   m_FolderTreeState:
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: 6cc80000
-    m_LastClickedID: 51308
-    m_ExpandedIDs: 00000000ecc70000eec70000f0c70000f2c70000f4c70000f6c70000f8c70000fac70000fcc70000fec7000000c8000002c8000000ca9a3b
+    scrollPos: {x: 0, y: 334}
+    m_SelectedIDs: d0c80000
+    m_LastClickedID: 51408
+    m_ExpandedIDs: 00000000266a0000f6c70000f8c70000fac70000fcc70000fec7000000c8000002c8000004c8000006c8000008c800000ac800000cc800000ec8000010c8000012c8000054c80000d2c8000000ca9a3bffffff7f
     m_RenameOverlay:
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_UserAcceptedRename: 0
       m_Name: 
       m_Name: 
@@ -705,7 +442,7 @@ MonoBehaviour:
       m_IsRenaming: 0
       m_IsRenaming: 0
       m_OriginalEventType: 11
       m_OriginalEventType: 11
       m_IsRenamingFilename: 1
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 0}
+      m_ClientGUIView: {fileID: 8}
     m_SearchString: 
     m_SearchString: 
     m_CreateAssetUtility:
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
       m_EndAction: {fileID: 0}
@@ -717,7 +454,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_SelectedIDs: 
     m_LastClickedID: 0
     m_LastClickedID: 0
-    m_ExpandedIDs: 00000000ecc70000eec70000f0c70000f2c70000f4c70000f6c70000f8c70000fac70000fcc70000fec7000000c8000002c80000
+    m_ExpandedIDs: 00000000266a0000f6c70000f8c70000fac70000fcc70000fec7000000c8000002c8000004c8000006c8000008c800000ac800000cc800000ec8000010c8000012c80000
     m_RenameOverlay:
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_UserAcceptedRename: 0
       m_Name: 
       m_Name: 
@@ -744,8 +481,8 @@ MonoBehaviour:
   m_ListAreaState:
   m_ListAreaState:
     m_SelectedInstanceIDs: 
     m_SelectedInstanceIDs: 
     m_LastClickedInstanceID: 0
     m_LastClickedInstanceID: 0
-    m_HadKeyboardFocusLastEvent: 0
-    m_ExpandedInstanceIDs: 784b0100
+    m_HadKeyboardFocusLastEvent: 1
+    m_ExpandedInstanceIDs: 
     m_RenameOverlay:
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_UserAcceptedRename: 0
       m_Name: 
       m_Name: 
@@ -761,7 +498,7 @@ MonoBehaviour:
       m_IsRenaming: 0
       m_IsRenaming: 0
       m_OriginalEventType: 11
       m_OriginalEventType: 11
       m_IsRenamingFilename: 1
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 13}
+      m_ClientGUIView: {fileID: 8}
     m_CreateAssetUtility:
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
       m_EndAction: {fileID: 0}
       m_InstanceID: 0
       m_InstanceID: 0
@@ -772,8 +509,8 @@ MonoBehaviour:
     m_ScrollPosition: {x: 0, y: 0}
     m_ScrollPosition: {x: 0, y: 0}
     m_GridSize: 16
     m_GridSize: 16
   m_SkipHiddenPackages: 0
   m_SkipHiddenPackages: 0
-  m_DirectoriesAreaWidth: 115
---- !u!114 &22
+  m_DirectoriesAreaWidth: 173
+--- !u!114 &14
 MonoBehaviour:
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
   m_CorrespondingSourceObject: {fileID: 0}
@@ -795,8 +532,8 @@ MonoBehaviour:
     serializedVersion: 2
     serializedVersion: 2
     x: 0
     x: 0
     y: 73
     y: 73
-    width: 1208
-    height: 1278
+    width: 584
+    height: 1286
   m_SerializedDataModeController:
   m_SerializedDataModeController:
     m_DataMode: 0
     m_DataMode: 0
     m_PreferredDataMode: 0
     m_PreferredDataMode: 0
@@ -822,7 +559,7 @@ MonoBehaviour:
   m_VSyncEnabled: 0
   m_VSyncEnabled: 0
   m_Gizmos: 0
   m_Gizmos: 0
   m_Stats: 0
   m_Stats: 0
-  m_SelectedSizes: 08000000000000000000000012000000000000000000000000000000000000000000000000000000
+  m_SelectedSizes: 07000000000000000000000011000000000000000000000000000000000000000000000000000000
   m_ZoomArea:
   m_ZoomArea:
     m_HRangeLocked: 0
     m_HRangeLocked: 0
     m_VRangeLocked: 0
     m_VRangeLocked: 0
@@ -840,7 +577,7 @@ MonoBehaviour:
     m_HSlider: 0
     m_HSlider: 0
     m_VSlider: 0
     m_VSlider: 0
     m_IgnoreScrollWheelUntilClicked: 0
     m_IgnoreScrollWheelUntilClicked: 0
-    m_EnableMouseInput: 0
+    m_EnableMouseInput: 1
     m_EnableSliderZoomHorizontal: 0
     m_EnableSliderZoomHorizontal: 0
     m_EnableSliderZoomVertical: 0
     m_EnableSliderZoomVertical: 0
     m_UniformScale: 1
     m_UniformScale: 1
@@ -849,29 +586,29 @@ MonoBehaviour:
       serializedVersion: 2
       serializedVersion: 2
       x: 0
       x: 0
       y: 21
       y: 21
-      width: 1208
-      height: 1257
-    m_Scale: {x: 0.7740148, y: 0.7740148}
-    m_Translation: {x: 604, y: 628.5}
+      width: 584
+      height: 1265
+    m_Scale: {x: 0.7786667, y: 0.7786667}
+    m_Translation: {x: 292, y: 632.5}
     m_MarginLeft: 0
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
       serializedVersion: 2
-      x: -780.34686
-      y: -812
-      width: 1560.6937
-      height: 1624
+      x: -375
+      y: -812.28595
+      width: 750
+      height: 1624.5719
     m_MinimalGUI: 1
     m_MinimalGUI: 1
-  m_defaultScale: 0.7740148
-  m_LastWindowPixelSize: {x: 1208, y: 1278}
+  m_defaultScale: 0.7786667
+  m_LastWindowPixelSize: {x: 584, y: 1286}
   m_ClearInEditMode: 1
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000001000000000000
   m_LowResolutionForAspectRatios: 01000001000000000000
   m_XRRenderMode: 0
   m_XRRenderMode: 0
   m_RenderTexture: {fileID: 0}
   m_RenderTexture: {fileID: 0}
---- !u!114 &23
+--- !u!114 &15
 MonoBehaviour:
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
   m_CorrespondingSourceObject: {fileID: 0}
@@ -891,10 +628,10 @@ MonoBehaviour:
     m_Tooltip: 
     m_Tooltip: 
   m_Pos:
   m_Pos:
     serializedVersion: 2
     serializedVersion: 2
-    x: 0
+    x: 585
     y: 73
     y: 73
-    width: 1208
-    height: 1278
+    width: 587
+    height: 1286
   m_SerializedDataModeController:
   m_SerializedDataModeController:
     m_DataMode: 0
     m_DataMode: 0
     m_PreferredDataMode: 0
     m_PreferredDataMode: 0
@@ -909,8 +646,8 @@ MonoBehaviour:
       floating: 0
       floating: 0
       collapsed: 0
       collapsed: 0
       displayed: 1
       displayed: 1
-      snapOffset: {x: -179, y: -26}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffset: {x: -164, y: -26}
+      snapOffsetDelta: {x: -15, y: 0}
       snapCorner: 3
       snapCorner: 3
       id: Tool Settings
       id: Tool Settings
       index: 0
       index: 0
@@ -987,9 +724,9 @@ MonoBehaviour:
       floating: 0
       floating: 0
       collapsed: 0
       collapsed: 0
       displayed: 1
       displayed: 1
-      snapOffset: {x: 67.5, y: 86}
+      snapOffset: {x: -111, y: 86}
       snapOffsetDelta: {x: 0, y: 0}
       snapOffsetDelta: {x: 0, y: 0}
-      snapCorner: 0
+      snapCorner: 1
       id: Orientation
       id: Orientation
       index: 0
       index: 0
       layout: 4
       layout: 4
@@ -1125,16 +862,16 @@ MonoBehaviour:
       layout: 4
       layout: 4
       size: {x: 0, y: 0}
       size: {x: 0, y: 0}
       sizeOverriden: 0
       sizeOverriden: 0
-    - dockPosition: 1
-      containerId: overlay-container--right
-      floating: 0
+    - dockPosition: 0
+      containerId: Floating
+      floating: 1
       collapsed: 0
       collapsed: 0
       displayed: 0
       displayed: 0
-      snapOffset: {x: 0, y: 25}
-      snapOffsetDelta: {x: 0, y: 0}
-      snapCorner: 0
+      snapOffset: {x: -233.50002, y: -208.50006}
+      snapOffsetDelta: {x: 0.000015258789, y: 0.000061035156}
+      snapCorner: 3
       id: Scene View/Particles
       id: Scene View/Particles
-      index: 8
+      index: 0
       layout: 4
       layout: 4
       size: {x: 0, y: 0}
       size: {x: 0, y: 0}
       sizeOverriden: 0
       sizeOverriden: 0
@@ -1212,7 +949,7 @@ MonoBehaviour:
       snapOffsetDelta: {x: 0, y: 0}
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       snapCorner: 0
       id: Scene View/Path
       id: Scene View/Path
-      index: 9
+      index: 8
       layout: 4
       layout: 4
       size: {x: 0, y: 0}
       size: {x: 0, y: 0}
       sizeOverriden: 0
       sizeOverriden: 0
@@ -1225,7 +962,7 @@ MonoBehaviour:
       snapOffsetDelta: {x: 0, y: 0}
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       snapCorner: 0
       id: APV Overlay
       id: APV Overlay
-      index: 10
+      index: 9
       layout: 4
       layout: 4
       size: {x: 0, y: 0}
       size: {x: 0, y: 0}
       sizeOverriden: 0
       sizeOverriden: 0
@@ -1238,6 +975,19 @@ MonoBehaviour:
       snapOffsetDelta: {x: 0, y: 0}
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       snapCorner: 0
       id: Scene View/TrailRenderer
       id: Scene View/TrailRenderer
+      index: 10
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 1
+      snapOffset: {x: 0, y: 48}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: Hot Reload
       index: 11
       index: 11
       layout: 4
       layout: 4
       size: {x: 0, y: 0}
       size: {x: 0, y: 0}
@@ -1250,7 +1000,7 @@ MonoBehaviour:
       snapOffset: {x: 48, y: 48}
       snapOffset: {x: 48, y: 48}
       snapOffsetDelta: {x: 0, y: 0}
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       snapCorner: 0
-      id: Hot Reload
+      id: UnityEditor.SceneViewCameraOverlay
       index: 12
       index: 12
       layout: 4
       layout: 4
       size: {x: 0, y: 0}
       size: {x: 0, y: 0}
@@ -1261,14 +1011,14 @@ MonoBehaviour:
   m_OverrideSceneCullingMask: 6917529027641081856
   m_OverrideSceneCullingMask: 6917529027641081856
   m_SceneIsLit: 1
   m_SceneIsLit: 1
   m_SceneLighting: 1
   m_SceneLighting: 1
-  m_2DMode: 1
+  m_2DMode: 0
   m_isRotationLocked: 0
   m_isRotationLocked: 0
   m_PlayAudio: 0
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_AudioPlay: 0
   m_Position:
   m_Position:
-    m_Target: {x: -0.11300865, y: -1.5106583, z: 430.86832}
+    m_Target: {x: 0.40060267, y: 20.545326, z: 17.179375}
     speed: 2
     speed: 2
-    m_Value: {x: -0.11300865, y: -1.5106583, z: 430.86832}
+    m_Value: {x: 0.40060267, y: 20.545326, z: 17.179375}
   m_RenderMode: 0
   m_RenderMode: 0
   m_CameraMode:
   m_CameraMode:
     drawMode: 0
     drawMode: 0
@@ -1296,17 +1046,17 @@ MonoBehaviour:
       m_Size: {x: 0, y: 0}
       m_Size: {x: 0, y: 0}
     yGrid:
     yGrid:
       m_Fade:
       m_Fade:
-        m_Target: 0
+        m_Target: 1
         speed: 2
         speed: 2
-        m_Value: 0
+        m_Value: 1
       m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
       m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
       m_Pivot: {x: 0, y: 0, z: 0}
       m_Pivot: {x: 0, y: 0, z: 0}
       m_Size: {x: 1, y: 1}
       m_Size: {x: 1, y: 1}
     zGrid:
     zGrid:
       m_Fade:
       m_Fade:
-        m_Target: 1
+        m_Target: 0
         speed: 2
         speed: 2
-        m_Value: 1
+        m_Value: 0
       m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
       m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
       m_Pivot: {x: 0, y: 0, z: 0}
       m_Pivot: {x: 0, y: 0, z: 0}
       m_Size: {x: 1, y: 1}
       m_Size: {x: 1, y: 1}
@@ -1314,13 +1064,13 @@ MonoBehaviour:
     m_GridAxis: 1
     m_GridAxis: 1
     m_gridOpacity: 0.5
     m_gridOpacity: 0.5
   m_Rotation:
   m_Rotation:
-    m_Target: {x: 0, y: 0, z: 0, w: 1}
+    m_Target: {x: -0.21113135, y: -0.49431196, z: 0.12489637, w: -0.83409834}
     speed: 2
     speed: 2
-    m_Value: {x: 0, y: 0, z: 0, w: 1}
+    m_Value: {x: -0.21110603, y: -0.49425268, z: 0.124881394, w: -0.8339983}
   m_Size:
   m_Size:
-    m_Target: 3.2990048
+    m_Target: 4.558438
     speed: 2
     speed: 2
-    m_Value: 3.2990048
+    m_Value: 4.558438
   m_Ortho:
   m_Ortho:
     m_Target: 1
     m_Target: 1
     speed: 2
     speed: 2

برخی فایل ها در این مقایسه diff نمایش داده نمی شوند زیرا تعداد فایل ها بسیار زیاد است