Bladeren bron

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

# Conflicts:
#	Assets/Res/Config/LanguageChineseConfig.json   resolved by origin/master(远端) version
#	Excel2Json/Excel/EventConfig.xlsx   resolved by origin/master(远端) version
#	Excel2Json/Excel/Language.xlsx   resolved by origin/master(远端) version
liao 1 dag geleden
bovenliggende
commit
a514bca092
32 gewijzigde bestanden met toevoegingen van 3739 en 1894 verwijderingen
  1. 25 25
      Assets/Res/Config/DivineSenseConfig.json
  2. 123 123
      Assets/Res/Config/EventLinkConfig.json
  3. 97 49
      Assets/Res/Config/EventNPC.json
  4. 1351 1351
      Assets/Res/Config/LanguageChineseConfig.json
  5. 20 10
      Assets/Res/Config/SmallPlacesConfig.json
  6. 315 0
      Assets/Res/UI/LoadingPanel.prefab
  7. 7 0
      Assets/Res/UI/LoadingPanel.prefab.meta
  8. 57 0
      Assets/Res/UIAnimRes/TweenAssetInfoLodingPanel.asset
  9. 8 0
      Assets/Res/UIAnimRes/TweenAssetInfoLodingPanel.asset.meta
  10. 1 1
      Assets/Resources/Shader/Shader Graphs_ShengShiShader.mat
  11. 212 0
      Assets/Scenes/testCombat.scene
  12. 9 1
      Assets/Scripts/Core/Event/Event/CustomEventType.cs
  13. 10 0
      Assets/Scripts/GameData/ExcelConfig/SmallPlacesConfig.cs
  14. 90 0
      Assets/Scripts/GameLogic/Combat/CombatState/CombatSceneSwitchState.cs
  15. 3 0
      Assets/Scripts/GameLogic/Combat/CombatState/CombatSceneSwitchState.cs.meta
  16. 11 1
      Assets/Scripts/GameLogic/Combat/CombatTool/CombatController.cs
  17. 1 9
      Assets/Scripts/GameLogic/Combat/CombatTool/CombatHeroController.cs
  18. 26 99
      Assets/Scripts/GameLogic/Combat/CombatTool/SceneTool/CombatSenceController.cs
  19. 13 0
      Assets/Scripts/GameLogic/Combat/CombatTool/SceneTool/SceneCJ2MonoConfig.cs
  20. 9 0
      Assets/Scripts/GameLogic/Combat/CombatTool/SceneTool/SceneMonoConfig.cs
  21. 14 1
      Assets/Scripts/GameLogic/Combat/CombatTool/SceneTool/SceneMonoConfigBasic.cs
  22. 10 0
      Assets/Scripts/GameUI/Combat/CombatDrive.cs
  23. 29 0
      Assets/Scripts/GameUI/UI/CombatPanel/LoadingPanel.cs
  24. 11 0
      Assets/Scripts/GameUI/UI/CombatPanel/LoadingPanel.cs.meta
  25. 33 15
      Assets/Scripts/GameUI/UI/DivineSence/DivineSenceInfoPanel.cs
  26. 12 28
      Assets/Scripts/GameUI/UI/GuidePanel/PlayerGuideManager.cs
  27. 0 0
      Assets/StreamingAssets/assetConfig.txt
  28. BIN
      Excel2Json/Excel/DivineSenseConfig.xlsx
  29. BIN
      Excel2Json/Excel/EventConfig.xlsx
  30. BIN
      Excel2Json/Excel/Language.xlsx
  31. 149 181
      UserSettings/Layouts/default-2022.dwlt
  32. 1093 0
      layout-zouge.wlt

+ 25 - 25
Assets/Res/Config/DivineSenseConfig.json

@@ -11,8 +11,8 @@
         0.0,
         1.0
       ],
-      "exp": 300,
-      "MaxNum": 1
+      "exp": 1000,
+      "MaxNum": 2
     },
     {
       "ID": 2,
@@ -25,8 +25,8 @@
         0.0,
         2.0
       ],
-      "exp": 600,
-      "MaxNum": 2
+      "exp": 3000,
+      "MaxNum": 3
     },
     {
       "ID": 3,
@@ -39,8 +39,8 @@
         0.0,
         3.0
       ],
-      "exp": 900,
-      "MaxNum": 3
+      "exp": 6000,
+      "MaxNum": 4
     },
     {
       "ID": 4,
@@ -53,8 +53,8 @@
         0.0,
         4.0
       ],
-      "exp": 1200,
-      "MaxNum": 4
+      "exp": 10000,
+      "MaxNum": 5
     },
     {
       "ID": 5,
@@ -67,8 +67,8 @@
         0.0,
         5.0
       ],
-      "exp": 1500,
-      "MaxNum": 5
+      "exp": 15000,
+      "MaxNum": 6
     },
     {
       "ID": 6,
@@ -81,7 +81,7 @@
         0.0,
         6.0
       ],
-      "exp": 1500,
+      "exp": 21000,
       "MaxNum": 6
     },
     {
@@ -95,7 +95,7 @@
         0.0,
         7.0
       ],
-      "exp": 1500,
+      "exp": 27000,
       "MaxNum": 6
     },
     {
@@ -109,7 +109,7 @@
         0.0,
         8.0
       ],
-      "exp": 1500,
+      "exp": 33000,
       "MaxNum": 6
     },
     {
@@ -123,7 +123,7 @@
         0.0,
         9.0
       ],
-      "exp": 1500,
+      "exp": 39000,
       "MaxNum": 6
     },
     {
@@ -136,7 +136,7 @@
         14.0,
         0.0
       ],
-      "exp": 1500,
+      "exp": 45000,
       "MaxNum": 6
     },
     {
@@ -149,7 +149,7 @@
         15.0,
         0.0
       ],
-      "exp": 1500,
+      "exp": 51000,
       "MaxNum": 6
     },
     {
@@ -162,7 +162,7 @@
         16.0,
         0.0
       ],
-      "exp": 1500,
+      "exp": 57000,
       "MaxNum": 6
     },
     {
@@ -175,7 +175,7 @@
         17.0,
         0.0
       ],
-      "exp": 1500,
+      "exp": 63000,
       "MaxNum": 6
     },
     {
@@ -188,7 +188,7 @@
         18.0,
         0.0
       ],
-      "exp": 1500,
+      "exp": 69000,
       "MaxNum": 6
     },
     {
@@ -201,7 +201,7 @@
         19.0,
         0.0
       ],
-      "exp": 1500,
+      "exp": 75000,
       "MaxNum": 6
     },
     {
@@ -214,7 +214,7 @@
         20.0,
         0.0
       ],
-      "exp": 1500,
+      "exp": 81000,
       "MaxNum": 6
     },
     {
@@ -227,7 +227,7 @@
         21.0,
         0.0
       ],
-      "exp": 1500,
+      "exp": 87000,
       "MaxNum": 6
     },
     {
@@ -240,7 +240,7 @@
         22.0,
         0.0
       ],
-      "exp": 1500,
+      "exp": 93000,
       "MaxNum": 6
     },
     {
@@ -253,7 +253,7 @@
         23.0,
         0.0
       ],
-      "exp": 1500,
+      "exp": 99000,
       "MaxNum": 6
     },
     {
@@ -266,7 +266,7 @@
         24.0,
         0.0
       ],
-      "exp": 1500,
+      "exp": 105000,
       "MaxNum": 6
     }
   ]

File diff suppressed because it is too large
+ 123 - 123
Assets/Res/Config/EventLinkConfig.json


+ 97 - 49
Assets/Res/Config/EventNPC.json

@@ -224,174 +224,222 @@
     },
     {
       "ID": 126,
-      "name": 0,
-      "icon": "",
+      "name": 2102,
+      "icon": "bg_lh_huizi",
       "DaoyouID": 0
     },
     {
       "ID": 127,
-      "name": 0,
-      "icon": "",
+      "name": 2103,
+      "icon": "bg_lh_huizi",
       "DaoyouID": 0
     },
     {
       "ID": 128,
-      "name": 0,
-      "icon": "",
+      "name": 2104,
+      "icon": "bg_lh_huizi",
       "DaoyouID": 0
     },
     {
       "ID": 129,
-      "name": 0,
-      "icon": "",
+      "name": 2105,
+      "icon": "bg_lh_huizi",
       "DaoyouID": 0
     },
     {
       "ID": 130,
-      "name": 0,
-      "icon": "",
+      "name": 2106,
+      "icon": "bg_lh_huizi",
       "DaoyouID": 0
     },
     {
       "ID": 131,
-      "name": 0,
-      "icon": "",
+      "name": 2107,
+      "icon": "bg_lh_huizi",
       "DaoyouID": 0
     },
     {
       "ID": 132,
-      "name": 0,
-      "icon": "",
+      "name": 2108,
+      "icon": "bg_lh_huizi",
       "DaoyouID": 0
     },
     {
       "ID": 133,
-      "name": 0,
-      "icon": "",
+      "name": 2109,
+      "icon": "bg_lh_huizi",
       "DaoyouID": 0
     },
     {
       "ID": 134,
-      "name": 0,
-      "icon": "",
+      "name": 2110,
+      "icon": "bg_lh_huizi",
       "DaoyouID": 0
     },
     {
       "ID": 135,
-      "name": 0,
-      "icon": "",
+      "name": 2111,
+      "icon": "bg_lh_huizi",
       "DaoyouID": 0
     },
     {
       "ID": 136,
-      "name": 0,
-      "icon": "",
+      "name": 2112,
+      "icon": "bg_lh_huizi",
       "DaoyouID": 0
     },
     {
       "ID": 137,
-      "name": 0,
-      "icon": "",
+      "name": 2113,
+      "icon": "bg_lh_huizi",
       "DaoyouID": 0
     },
     {
       "ID": 138,
-      "name": 0,
-      "icon": "",
+      "name": 2114,
+      "icon": "bg_lh_huizi",
       "DaoyouID": 0
     },
     {
       "ID": 139,
-      "name": 0,
-      "icon": "",
+      "name": 2115,
+      "icon": "bg_lh_huizi",
       "DaoyouID": 0
     },
     {
       "ID": 140,
-      "name": 0,
-      "icon": "",
+      "name": 2116,
+      "icon": "bg_lh_huizi",
       "DaoyouID": 0
     },
     {
       "ID": 141,
-      "name": 0,
-      "icon": "",
+      "name": 2117,
+      "icon": "bg_lh_huizi",
       "DaoyouID": 0
     },
     {
       "ID": 142,
-      "name": 0,
-      "icon": "",
+      "name": 2118,
+      "icon": "bg_lh_huizi",
       "DaoyouID": 0
     },
     {
       "ID": 143,
-      "name": 0,
-      "icon": "",
+      "name": 2119,
+      "icon": "bg_lh_huizi",
       "DaoyouID": 0
     },
     {
       "ID": 144,
-      "name": 0,
-      "icon": "",
+      "name": 2120,
+      "icon": "bg_lh_huizi",
       "DaoyouID": 0
     },
     {
       "ID": 145,
-      "name": 0,
-      "icon": "",
+      "name": 2121,
+      "icon": "bg_lh_huizi",
       "DaoyouID": 0
     },
     {
       "ID": 146,
-      "name": 0,
-      "icon": "",
+      "name": 2122,
+      "icon": "bg_lh_huizi",
       "DaoyouID": 0
     },
     {
       "ID": 147,
+      "name": 2123,
+      "icon": "bg_lh_huizi",
+      "DaoyouID": 0
+    },
+    {
+      "ID": 148,
+      "name": 2124,
+      "icon": "bg_lh_huizi",
+      "DaoyouID": 0
+    },
+    {
+      "ID": 149,
+      "name": 2125,
+      "icon": "bg_lh_huizi",
+      "DaoyouID": 0
+    },
+    {
+      "ID": 150,
+      "name": 2126,
+      "icon": "bg_lh_huizi",
+      "DaoyouID": 0
+    },
+    {
+      "ID": 151,
+      "name": 2127,
+      "icon": "bg_lh_huizi",
+      "DaoyouID": 0
+    },
+    {
+      "ID": 152,
+      "name": 2128,
+      "icon": "bg_lh_huizi",
+      "DaoyouID": 0
+    },
+    {
+      "ID": 153,
+      "name": 2129,
+      "icon": "bg_lh_huizi",
+      "DaoyouID": 0
+    },
+    {
+      "ID": 154,
+      "name": 2130,
+      "icon": "bg_lh_huizi",
+      "DaoyouID": 0
+    },
+    {
+      "ID": 138,
       "name": 0,
       "icon": "",
       "DaoyouID": 0
     },
     {
-      "ID": 148,
+      "ID": 139,
       "name": 0,
       "icon": "",
       "DaoyouID": 0
     },
     {
-      "ID": 149,
+      "ID": 140,
       "name": 0,
       "icon": "",
       "DaoyouID": 0
     },
     {
-      "ID": 150,
+      "ID": 141,
       "name": 0,
       "icon": "",
       "DaoyouID": 0
     },
     {
-      "ID": 151,
+      "ID": 142,
       "name": 0,
       "icon": "",
       "DaoyouID": 0
     },
     {
-      "ID": 152,
+      "ID": 143,
       "name": 0,
       "icon": "",
       "DaoyouID": 0
     },
     {
-      "ID": 153,
+      "ID": 144,
       "name": 0,
       "icon": "",
       "DaoyouID": 0
     },
     {
-      "ID": 154,
+      "ID": 145,
       "name": 0,
       "icon": "",
       "DaoyouID": 0

File diff suppressed because it is too large
+ 1351 - 1351
Assets/Res/Config/LanguageChineseConfig.json


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

@@ -5,70 +5,80 @@
       "placeName": 10037,
       "PlacesId": 1,
       "CompletionEventCount": 10,
-      "UnlockEnvetid": 10001
+      "UnlockEnvetid": 10001,
+      "sceneName": "LevelBattle02"
     },
     {
       "ID": 2,
       "placeName": 10038,
       "PlacesId": 1,
       "CompletionEventCount": 10,
-      "UnlockEnvetid": 10004
+      "UnlockEnvetid": 10004,
+      "sceneName": "LevelBattle02"
     },
     {
       "ID": 3,
       "placeName": 10039,
       "PlacesId": 1,
       "CompletionEventCount": 10,
-      "UnlockEnvetid": 10009
+      "UnlockEnvetid": 10009,
+      "sceneName": "LevelBattle01"
     },
     {
       "ID": 4,
       "placeName": 10040,
       "PlacesId": 1,
       "CompletionEventCount": 5,
-      "UnlockEnvetid": 10012
+      "UnlockEnvetid": 10012,
+      "sceneName": "LevelBattle02"
     },
     {
       "ID": 5,
       "placeName": 10041,
       "PlacesId": 2,
       "CompletionEventCount": 10,
-      "UnlockEnvetid": 10013
+      "UnlockEnvetid": 10013,
+      "sceneName": "LevelBattle03"
     },
     {
       "ID": 6,
       "placeName": 10042,
       "PlacesId": 2,
       "CompletionEventCount": 10,
-      "UnlockEnvetid": 10018
+      "UnlockEnvetid": 10018,
+      "sceneName": "LevelBattle02"
     },
     {
       "ID": 7,
       "placeName": 10043,
       "PlacesId": 2,
       "CompletionEventCount": 5,
-      "UnlockEnvetid": 10022
+      "UnlockEnvetid": 10022,
+      "sceneName": "LevelBattle02"
     },
     {
       "ID": 8,
       "placeName": 10044,
       "PlacesId": 3,
       "CompletionEventCount": 10,
-      "UnlockEnvetid": 10025
+      "UnlockEnvetid": 10025,
+      "sceneName": "LevelBattle02"
     },
     {
       "ID": 9,
       "placeName": 10045,
       "PlacesId": 3,
       "CompletionEventCount": 10,
-      "UnlockEnvetid": 10028
+      "UnlockEnvetid": 10028,
+      "sceneName": "LevelBattle02"
     },
     {
       "ID": 10,
       "placeName": 10046,
       "PlacesId": 3,
       "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:
     - _mainColor: {r: 0.21314356, g: 1.4060051, b: 2.1517377, 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: []

+ 212 - 0
Assets/Scenes/testCombat.scene

@@ -890,6 +890,110 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 442218246}
   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
 GameObject:
   m_ObjectHideFlags: 0
@@ -1205,6 +1309,11 @@ RectTransform:
   m_AnchoredPosition: {x: -5, y: 0}
   m_SizeDelta: {x: -20, y: 0}
   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
 GameObject:
   m_ObjectHideFlags: 0
@@ -1371,6 +1480,108 @@ MonoBehaviour:
   m_OnValueChanged:
     m_PersistentCalls:
       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
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1487,3 +1698,4 @@ SceneRoots:
   - {fileID: 5102730602139337721}
   - {fileID: 293130736}
   - {fileID: 6588466611375917160}
+  - {fileID: 515822005}

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

@@ -119,7 +119,15 @@ namespace Fort23.Core
       UpdateZuiZhongEvent,
       CancelEvent,
       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
 		
 
+		/// <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("fight", new CombatFightState(this));
                 stateControl.AddState("combatfinish", new CombatFinishState(this));
+                stateControl.AddState("sceneSwitch", new CombatSceneSwitchState(this));
 
              
                 if (CombatSenceController == null)
                 {
                     CombatSenceController = new CombatSenceController();
-                    await CombatSenceController.InitScenes(startCombatInfo.levelBattleId);
+                    await CombatSenceController.InitScenes("LevelBattle02");
                 }
 
                 if (CombatDataController == null)
@@ -147,6 +148,14 @@ namespace GameLogic.Combat.CombatTool
                 return;
             }
 
+            
+            if (Input.GetKeyDown(KeyCode.A))
+            {
+               ChangeState("sceneSwitch");
+            }
+
+         
+            
             t *= speed;
             if (!IsGameOver)
             {
@@ -179,6 +188,7 @@ namespace GameLogic.Combat.CombatTool
                     }
                 }
             }
+           
         }
 
         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)
         {
-            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++)

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

@@ -15,6 +15,7 @@ namespace GameLogic.Combat.CombatTool
     public class CombatSenceController : IDisposable
     {
         private static readonly int Ran = Shader.PropertyToID("_ran");
+
         private static readonly int Pos = Shader.PropertyToID("_pos");
         // public CombatSencePath currBesselPath;
         //
@@ -28,7 +29,7 @@ namespace GameLogic.Combat.CombatTool
         public float currTime;
         public Transform moveRoot;
 
-        private List<CombatSencePath> reclaimSence = new List<CombatSencePath>();
+        // private List<CombatSencePath> reclaimSence = new List<CombatSencePath>();
 
         // protected GameObjectPool ShengShiQiuTi;
 
@@ -46,15 +47,30 @@ namespace GameLogic.Combat.CombatTool
         private float shengShiRan;
 
         // 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");
-            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
             TestCombatHeroConfig testCombatHeroConfig = GameObject.FindObjectOfType<TestCombatHeroConfig>();
             if (testCombatHeroConfig != null)
@@ -78,23 +94,15 @@ namespace GameLogic.Combat.CombatTool
                 });
             cTaskAwaitBuffer.AddTask(task_a);
 
-        
+
             lasetDir = Vector3.forward;
             lasetPos = new Vector3(0, 20, 0);
             await cTaskAwaitBuffer.WaitAll();
             // currBesselPath = InitBesselPath(lasetPos);
             SceneMonoConfig.Init(Camera.main.transform.parent, moveRoot);
-       
+            SceneMonoConfig.UpdateScene();
         }
 
-
-      
-       
-
-      
-
-    
-
         private async CTask<SceneDecoration> GetSceneDecoration(SceneObjectConfig sceneObjectConfig)
         {
             GameObjectPool gameObjectPool = await sceneObjectConfig.GetNewPrefab();
@@ -105,70 +113,6 @@ namespace GameLogic.Combat.CombatTool
             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)
         {
@@ -188,15 +132,7 @@ namespace GameLogic.Combat.CombatTool
         {
             moveRoot.transform.position = CombatController.currActiveCombat.CombatHeroController.GetTarget(0);
             SceneMonoConfig?.UpdateScene();
-            // if (currBesselPath != null)
-            // {
-            //     currBesselPath.Update(t);
-            // }
-            //
-            // if (NextBesselPath != null)
-            // {
-            //     NextBesselPath.Update(t);
-            // }
+     
 
 
             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);
             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);
             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 UnityEngine;
 
 namespace GameLogic.Combat.CombatTool.SceneTool
 {
-    public class SceneMonoConfigBasic: MonoBehaviour
+    public class SceneMonoConfigBasic: MonoBehaviour,IDisposable
     {
         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";
             AssetHandle assetHandle = await AssetBundleLoadManager.Instance.LoadAssetAsyncTask<GameObject>(name);
             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)
         {
             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: 

+ 33 - 15
Assets/Scripts/GameUI/UI/DivineSence/DivineSenceInfoPanel.cs

@@ -59,7 +59,6 @@ namespace Fort23.Mono
 
                 callback?.Invoke(useCount, useItems);
                 UIManager.Instance.HideUIUIPanel(this);
-            
             });
             Btn_Close.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
             Slider_Count.onValueChanged.AddListener((c) => { Slider_Count_OnValueChanged(c); });
@@ -67,15 +66,19 @@ namespace Fort23.Mono
             Btn_Tip.onClick.AddListener(() => { DivineSenceLevelPreviewPanel.OpenPanel(); });
 
 
-            Btn_Event.onClick.AddListener(() => { DivineSenceEventPreviewPanel.OpenPanel(); });
+            Btn_Event.onClick.AddListener(async () =>
+            {
+                await DivineSenceEventPreviewPanel.OpenPanel();
+                UIManager.Instance.HideUIUIPanel(this,isBreadcrumbBarPanel:false);
+            });
         }
 
         private void Slider_Count_OnValueChanged(float value)
         {
             useCount = (int)value;
-            Text_Count.text = LanguageManager.Instance.Text(10253,value);
+            Text_Count.text = LanguageManager.Instance.Text(10253, value);
             // Text_shenshishangxian.text = $"({EventSystemManager.Instance.GetShenShiCount()}<color=green>+{value}</color>/{maxCount})";
-            Text_shenshishangxian.text = $"({EventSystemManager.Instance.GetShenShiCount() + value }/{maxCount})";
+            Text_shenshishangxian.text = $"({EventSystemManager.Instance.GetShenShiCount() + value}/{maxCount})";
             foreach (var senceInfoBtnWidget in _divineSenceInfoBtnWidgets)
             {
                 senceInfoBtnWidget.UpdateItermCount(useCount);
@@ -88,12 +91,15 @@ namespace Fort23.Mono
             {
                 PlayerGuideManager.Instance.NextGuide();
             }
+
             if (PlayerGuideManager.Instance.GuideIsCanDo(3, 1))
             {
                 PlayerGuideManager.Instance.NextGuide();
             }
+
             _divineSenceInfoBtnWidgets.Clear();
-            divineSenseConfig = ConfigComponent.Instance.Get<DivineSenseConfig>(AccountFileInfo.Instance.playerData.divineSenseLevel);
+            divineSenseConfig =
+                ConfigComponent.Instance.Get<DivineSenseConfig>(AccountFileInfo.Instance.playerData.divineSenseLevel);
             HeroPowerUpConfig heroPowerUpConfig = PlayerManager.Instance.myHero.powerUpConfig;
 
             Text_Level.text =
@@ -102,10 +108,13 @@ namespace Fort23.Mono
             Slider_Exp.maxValue = divineSenseConfig.exp;
             Slider_Exp.value = AccountFileInfo.Instance.playerData.divineSenseexp;
 
-            int count = (int)(AccountFileInfo.Instance.playerData.divineSensePoint / PlayerManager.Instance.gameConstantConfig.DetectEventCount);
+            int count = (int)(AccountFileInfo.Instance.playerData.divineSensePoint /
+                              PlayerManager.Instance.gameConstantConfig.DetectEventCount);
             maxCount = heroPowerUpConfig.ShenshiMax / PlayerManager.Instance.gameConstantConfig.DetectEventCount;
-            maxCount = maxCount > 10 ? 10 : maxCount;
-            count = count + EventSystemManager.Instance.GetShenShiCount() > maxCount ? maxCount - EventSystemManager.Instance.GetShenShiCount() : count;
+            maxCount = maxCount > divineSenseConfig.MaxNum ? divineSenseConfig.MaxNum : maxCount;
+            count = count + EventSystemManager.Instance.GetShenShiCount() > maxCount
+                ? maxCount - EventSystemManager.Instance.GetShenShiCount()
+                : count;
 
 
             if (count == 1)
@@ -132,11 +141,15 @@ namespace Fort23.Mono
                 Text_qs[i].text = $"{probabilities[i] * 100:F2}%";
             }
 
-            DivineSenceInfoBtnWidget divineSenceInfoBtnWidget = await UIManager.Instance.CreateGComponentForObject<DivineSenceInfoBtnWidget>(DivineSenceInfoBtnWidgetGam0, null);
+            DivineSenceInfoBtnWidget divineSenceInfoBtnWidget =
+                await UIManager.Instance.CreateGComponentForObject<DivineSenceInfoBtnWidget>(
+                    DivineSenceInfoBtnWidgetGam0, null);
             divineSenceInfoBtnWidget.CustomInit(-1, 1);
             divineSenceInfoBtnWidget.OnClick = OnClick;
             _divineSenceInfoBtnWidgets.Add(divineSenceInfoBtnWidget);
-            divineSenceInfoBtnWidget = await UIManager.Instance.CreateGComponentForObject<DivineSenceInfoBtnWidget>(DivineSenceInfoBtnWidgetGam1, null);
+            divineSenceInfoBtnWidget =
+                await UIManager.Instance.CreateGComponentForObject<DivineSenceInfoBtnWidget>(
+                    DivineSenceInfoBtnWidgetGam1, null);
             divineSenceInfoBtnWidget.CustomInit(-1, 2);
             divineSenceInfoBtnWidget.OnClick = OnClick;
             _divineSenceInfoBtnWidgets.Add(divineSenceInfoBtnWidget);
@@ -157,7 +170,8 @@ namespace Fort23.Mono
             List<int> selectType = new List<int>();
             foreach (var senceInfoBtnWidget in _divineSenceInfoBtnWidgets)
             {
-                if (senceInfoBtnWidget != divineSenceInfoBtnWidget && senceInfoBtnWidget.type != 1 && senceInfoBtnWidget.ItemInfo != null)
+                if (senceInfoBtnWidget != divineSenceInfoBtnWidget && senceInfoBtnWidget.type != 1 &&
+                    senceInfoBtnWidget.ItemInfo != null)
                 {
                     selectType.Add(senceInfoBtnWidget.ItemInfo.config.associateID);
                 }
@@ -181,15 +195,18 @@ namespace Fort23.Mono
             Map<int, int> probabilitiesMap = new Map<int, int>();
             foreach (var senceInfoBtnWidget in _divineSenceInfoBtnWidgets)
             {
-                if (senceInfoBtnWidget.type == 2 && senceInfoBtnWidget.ItemInfo != null && senceInfoBtnWidget.ItemInfo.config.associateID == 6)
+                if (senceInfoBtnWidget.type == 2 && senceInfoBtnWidget.ItemInfo != null &&
+                    senceInfoBtnWidget.ItemInfo.config.associateID == 6)
                 {
                     if (!probabilitiesMap.ContainsKey(senceInfoBtnWidget.ItemInfo.config.associateVlaue[0]))
                     {
-                        probabilitiesMap.Add(senceInfoBtnWidget.ItemInfo.config.associateVlaue[0], senceInfoBtnWidget.ItemInfo.config.associateVlaue[1]);
+                        probabilitiesMap.Add(senceInfoBtnWidget.ItemInfo.config.associateVlaue[0],
+                            senceInfoBtnWidget.ItemInfo.config.associateVlaue[1]);
                     }
                     else
                     {
-                        probabilitiesMap[senceInfoBtnWidget.ItemInfo.config.associateVlaue[0]] += senceInfoBtnWidget.ItemInfo.config.associateVlaue[1];
+                        probabilitiesMap[senceInfoBtnWidget.ItemInfo.config.associateVlaue[0]] +=
+                            senceInfoBtnWidget.ItemInfo.config.associateVlaue[1];
                     }
                 }
 
@@ -213,7 +230,8 @@ namespace Fort23.Mono
 
         public async static CTask OpenPanel(Action<int, List<ItemInfo>> callback)
         {
-            DivineSenceInfoPanel divineSenceInfoPanel = await UIManager.Instance.LoadAndOpenPanel<DivineSenceInfoPanel>(null, UILayer.Middle);
+            DivineSenceInfoPanel divineSenceInfoPanel =
+                await UIManager.Instance.LoadAndOpenPanel<DivineSenceInfoPanel>(null, UILayer.Middle);
             divineSenceInfoPanel.CustomInit(callback);
         }
     }

+ 12 - 28
Assets/Scripts/GameUI/UI/GuidePanel/PlayerGuideManager.cs

@@ -653,8 +653,8 @@ namespace Fort23.Mono
                     break;
             }
         }
-        
-        
+
+
         public void SetfxTransImageVisiable(bool b, int type = 0)
         {
             switch (type)
@@ -707,20 +707,15 @@ namespace Fort23.Mono
                 }
             }
 
-            HideDialogBox(false);
-            // if (guideConfig.SpeakerStyle == 3)
-            // {
-            //     HideDialogBox(false);
-            // }
-            // else
-            // {
-            //     HideDialogBox();
-            // }
-            // if (IsUseServerData)
-            // {
-            //     PlayerManager.Instance.PlayerGuideDataComponent.UpdateData(configID);
-            //     await HttpSendManager.Instance.SendSaveGuideDataRequest(configID, SaveGuideDataCallBack); //记录服务器
-            // }
+            if (guideConfig.desc == -1)
+            {
+                HideDialogBox();
+            }
+            else
+            {
+                HideDialogBox(false);
+            }
+
 
             if (guideConfig.IsSkip == 1)
             {
@@ -737,7 +732,6 @@ namespace Fort23.Mono
 
             int[] fPos = guideConfig.fingerPos;
             int[] dPos = guideConfig.dialogPos;
-          
 
 
             isReadFingerPos = true;
@@ -747,14 +741,13 @@ namespace Fort23.Mono
             SetFingerPos(fPos);
 
             SetDialogPos(dPos);
-            
+
             SetBlackBaseVisiable(true);
 
             SetBlackAlpha(guideConfig.blackAlpha);
             ShowDialogBox(action, str);
             await dialogBox.SetDiTex(guideConfig, guideConfig.SpeakerImage);
             UIManager.Instance.SetEventSystemEnable(true);
-
         }
 
         /// <summary>
@@ -1219,15 +1212,6 @@ namespace Fort23.Mono
             _customVectorTween?.Kill();
             _customVectorTween = null;
             UIManager.Instance.GetComponent<GuidePanel>().transform.SetAsLastSibling();
-
-            // if (guideConfig.SpeakerStyle == 3)
-            // {
-            //     HideDialogBox(false);
-            // }
-            // else
-            // {
-            //     HideDialogBox();
-            // }
             HideDialogBox();
             SetfxTransVisiable(false);
             SetMaskTarget(null);

File diff suppressed because it is too large
+ 0 - 0
Assets/StreamingAssets/assetConfig.txt


BIN
Excel2Json/Excel/DivineSenseConfig.xlsx


BIN
Excel2Json/Excel/EventConfig.xlsx


BIN
Excel2Json/Excel/Language.xlsx


+ 149 - 181
UserSettings/Layouts/default-2022.dwlt

@@ -17,14 +17,40 @@ MonoBehaviour:
     x: 0
     y: 43
     width: 2560
-    height: 1349
+    height: 1357
   m_ShowMode: 4
-  m_Title: Game
-  m_RootView: {fileID: 2}
+  m_Title: Inspector
+  m_RootView: {fileID: 3}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_Maximized: 1
 --- !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: 12006, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: GameView
+  m_EditorClassIdentifier: 
+  m_Children: []
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 585
+    height: 1307
+  m_MinSize: {x: 201, y: 221}
+  m_MaxSize: {x: 4001, y: 4021}
+  m_ActualView: {fileID: 14}
+  m_Panes:
+  - {fileID: 14}
+  m_Selected: 0
+  m_LastSelected: 0
+--- !u!114 &3
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -37,22 +63,22 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 3}
   - {fileID: 4}
   - {fileID: 5}
+  - {fileID: 6}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
     width: 2560
-    height: 1349
+    height: 1357
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_UseTopView: 1
   m_TopViewHeight: 30
   m_UseBottomView: 1
   m_BottomViewHeight: 20
---- !u!114 &3
+--- !u!114 &4
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -74,7 +100,7 @@ MonoBehaviour:
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
   m_LastLoadedLayoutName: 
---- !u!114 &4
+--- !u!114 &5
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -87,22 +113,23 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 9}
-  - {fileID: 6}
+  - {fileID: 2}
+  - {fileID: 10}
   - {fileID: 7}
   - {fileID: 8}
+  - {fileID: 9}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 30
     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
-  controlID: 105
+  controlID: 149
   draggingID: 0
---- !u!114 &5
+--- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -118,12 +145,12 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 1329
+    y: 1337
     width: 2560
     height: 20
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
---- !u!114 &6
+--- !u!114 &7
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -138,10 +165,10 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1209
+    x: 1174
     y: 0
-    width: 411
-    height: 1299
+    width: 619
+    height: 1307
   m_MinSize: {x: 202, y: 221}
   m_MaxSize: {x: 4002, y: 4021}
   m_ActualView: {fileID: 11}
@@ -149,7 +176,7 @@ MonoBehaviour:
   - {fileID: 11}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &7
+--- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -164,10 +191,10 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1620
+    x: 1793
     y: 0
-    width: 366
-    height: 1299
+    width: 435
+    height: 1307
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
   m_ActualView: {fileID: 13}
@@ -175,7 +202,7 @@ MonoBehaviour:
   - {fileID: 13}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &8
+--- !u!114 &9
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -190,18 +217,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1986
+    x: 2228
     y: 0
-    width: 574
-    height: 1299
-  m_MinSize: {x: 275, y: 50}
-  m_MaxSize: {x: 4000, y: 4000}
+    width: 332
+    height: 1307
+  m_MinSize: {x: 276, y: 71}
+  m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 12}
   m_Panes:
   - {fileID: 12}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &9
+--- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -211,94 +238,22 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 1
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: GameView
+  m_Name: SceneView
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 0
+    x: 585
     y: 0
-    width: 1209
-    height: 1299
-  m_MinSize: {x: 201, y: 221}
-  m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 14}
+    width: 589
+    height: 1307
+  m_MinSize: {x: 202, y: 221}
+  m_MaxSize: {x: 4002, y: 4021}
+  m_ActualView: {fileID: 15}
   m_Panes:
   - {fileID: 15}
-  - {fileID: 14}
-  - {fileID: 10}
-  m_Selected: 1
+  m_Selected: 0
   m_LastSelected: 0
---- !u!114 &10
-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 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -319,10 +274,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1209
+    x: 1174
     y: 73
-    width: 409
-    height: 1278
+    width: 617
+    height: 1286
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -338,7 +293,7 @@ MonoBehaviour:
       scrollPos: {x: 0, y: 0}
       m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: 58eb3cffa6d33dff1ad73fffd42d4bffec2d4bfff02d4bfff42d4bff022e4bffb24e5fffb84e5fff380d68ff3e0d68ff600e68ff780e68ff7c0e68ff8e0e68ff40236aff46236aff3ce072ff4ee072ff76bd89ff504eb2ff624eb2ff9cf4ffffa2f4ffffc4f5ffffe2f5ffffe6f5fffff4f5ffff78faffff
+      m_ExpandedIDs: 3071feff3671feffa2f4ffff22f5ffff30f5ffff6cfaffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -354,7 +309,7 @@ MonoBehaviour:
         m_IsRenaming: 0
         m_OriginalEventType: 11
         m_IsRenamingFilename: 0
-        m_ClientGUIView: {fileID: 6}
+        m_ClientGUIView: {fileID: 7}
       m_SearchString: 
     m_ExpandedScenes: []
     m_CurrenRootInstanceID: 0
@@ -382,10 +337,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1986
+    x: 2228
     y: 73
-    width: 573
-    height: 1278
+    width: 331
+    height: 1286
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -399,7 +354,7 @@ MonoBehaviour:
   m_ObjectsLockedBeforeSerialization: []
   m_InstanceIDsLockedBeforeSerialization: 
   m_PreviewResizer:
-    m_CachedPref: 160
+    m_CachedPref: 322.00006
     m_ControlHash: -371814159
     m_PrefName: Preview_InspectorPreview
   m_LastInspectedObjectInstanceID: -1
@@ -429,10 +384,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1620
+    x: 1793
     y: 73
-    width: 364
-    height: 1278
+    width: 433
+    height: 1286
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -444,7 +399,7 @@ MonoBehaviour:
     m_SaveData: []
     m_OverlaysVisible: 1
   m_SearchFilter:
-    m_NameFilter: gamerun
+    m_NameFilter: Canv
     m_ClassNames: []
     m_AssetLabels: []
     m_AssetBundleNames: []
@@ -454,24 +409,24 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Res/UI/SkillSelectPanel
+    - Assets/Scripts/GameLogic/Paritcle/ParitcleLogic
     m_Globs: []
-    m_OriginalText: gamerun
+    m_OriginalText: Canv
     m_ImportLogFlags: 0
     m_FilterByTypeIntersection: 0
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Res/UI/SkillSelectPanel
-  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_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: 8cc80000
-    m_LastClickedID: 51340
-    m_ExpandedIDs: 00000000f4c70000f6c70000f8c70000fac70000fcc70000fec7000000c8000002c8000004c8000006c8000008c800000ac8000000ca9a3b
+    scrollPos: {x: 0, y: 334}
+    m_SelectedIDs: d0c80000
+    m_LastClickedID: 51408
+    m_ExpandedIDs: 00000000266a0000f6c70000f8c70000fac70000fcc70000fec7000000c8000002c8000004c8000006c8000008c800000ac800000cc800000ec8000010c8000012c8000054c80000d2c8000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -487,7 +442,7 @@ MonoBehaviour:
       m_IsRenaming: 0
       m_OriginalEventType: 11
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 0}
+      m_ClientGUIView: {fileID: 8}
     m_SearchString: 
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
@@ -499,7 +454,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 00000000f4c70000f6c70000f8c70000fac70000fcc70000fec7000000c8000002c8000004c8000006c8000008c800000ac80000
+    m_ExpandedIDs: 00000000266a0000f6c70000f8c70000fac70000fcc70000fec7000000c8000002c8000004c8000006c8000008c800000ac800000cc800000ec8000010c8000012c80000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -527,7 +482,7 @@ MonoBehaviour:
     m_SelectedInstanceIDs: 
     m_LastClickedInstanceID: 0
     m_HadKeyboardFocusLastEvent: 1
-    m_ExpandedInstanceIDs: 784b0100
+    m_ExpandedInstanceIDs: 
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -543,7 +498,7 @@ MonoBehaviour:
       m_IsRenaming: 0
       m_OriginalEventType: 11
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 7}
+      m_ClientGUIView: {fileID: 8}
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
       m_InstanceID: 0
@@ -554,7 +509,7 @@ MonoBehaviour:
     m_ScrollPosition: {x: 0, y: 0}
     m_GridSize: 16
   m_SkipHiddenPackages: 0
-  m_DirectoriesAreaWidth: 115
+  m_DirectoriesAreaWidth: 173
 --- !u!114 &14
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -577,8 +532,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 73
-    width: 1208
-    height: 1278
+    width: 584
+    height: 1286
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -604,7 +559,7 @@ MonoBehaviour:
   m_VSyncEnabled: 0
   m_Gizmos: 0
   m_Stats: 0
-  m_SelectedSizes: 08000000000000000000000012000000000000000000000000000000000000000000000000000000
+  m_SelectedSizes: 07000000000000000000000011000000000000000000000000000000000000000000000000000000
   m_ZoomArea:
     m_HRangeLocked: 0
     m_VRangeLocked: 0
@@ -622,7 +577,7 @@ MonoBehaviour:
     m_HSlider: 0
     m_VSlider: 0
     m_IgnoreScrollWheelUntilClicked: 0
-    m_EnableMouseInput: 0
+    m_EnableMouseInput: 1
     m_EnableSliderZoomHorizontal: 0
     m_EnableSliderZoomVertical: 0
     m_UniformScale: 1
@@ -631,23 +586,23 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 1208
-      height: 1257
-    m_Scale: {x: 0.7740148, y: 0.7740148}
-    m_Translation: {x: 604, y: 628.5}
+      width: 584
+      height: 1265
+    m_Scale: {x: 0.7786667, y: 0.7786667}
+    m_Translation: {x: 292, y: 632.5}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -780.34686
-      y: -812
-      width: 1560.6937
-      height: 1624
+      x: -375
+      y: -812.28595
+      width: 750
+      height: 1624.5719
     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_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000001000000000000
@@ -673,10 +628,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 0
+    x: 585
     y: 73
-    width: 1208
-    height: 1278
+    width: 587
+    height: 1286
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -691,8 +646,8 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: -179, y: -26}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffset: {x: -164, y: -26}
+      snapOffsetDelta: {x: -15, y: 0}
       snapCorner: 3
       id: Tool Settings
       index: 0
@@ -769,9 +724,9 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: 67.5, y: 86}
+      snapOffset: {x: -111, y: 86}
       snapOffsetDelta: {x: 0, y: 0}
-      snapCorner: 0
+      snapCorner: 1
       id: Orientation
       index: 0
       layout: 4
@@ -907,16 +862,16 @@ MonoBehaviour:
       layout: 4
       size: {x: 0, y: 0}
       sizeOverriden: 0
-    - dockPosition: 1
-      containerId: overlay-container--right
-      floating: 0
+    - dockPosition: 0
+      containerId: Floating
+      floating: 1
       collapsed: 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
-      index: 8
+      index: 0
       layout: 4
       size: {x: 0, y: 0}
       sizeOverriden: 0
@@ -994,7 +949,7 @@ MonoBehaviour:
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: Scene View/Path
-      index: 9
+      index: 8
       layout: 4
       size: {x: 0, y: 0}
       sizeOverriden: 0
@@ -1007,7 +962,7 @@ MonoBehaviour:
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: APV Overlay
-      index: 10
+      index: 9
       layout: 4
       size: {x: 0, y: 0}
       sizeOverriden: 0
@@ -1020,7 +975,7 @@ MonoBehaviour:
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: Scene View/TrailRenderer
-      index: 11
+      index: 10
       layout: 4
       size: {x: 0, y: 0}
       sizeOverriden: 0
@@ -1029,10 +984,23 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: -200, y: -55}
+      snapOffset: {x: 0, y: 48}
       snapOffsetDelta: {x: 0, y: 0}
-      snapCorner: 3
+      snapCorner: 0
       id: Hot Reload
+      index: 11
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 1
+      snapOffset: {x: 48, y: 48}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: UnityEditor.SceneViewCameraOverlay
       index: 12
       layout: 4
       size: {x: 0, y: 0}
@@ -1043,14 +1011,14 @@ MonoBehaviour:
   m_OverrideSceneCullingMask: 6917529027641081856
   m_SceneIsLit: 1
   m_SceneLighting: 1
-  m_2DMode: 1
+  m_2DMode: 0
   m_isRotationLocked: 0
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: -0.20906934, y: 0.6829152, z: -0.011603642}
+    m_Target: {x: 0.40060267, y: 20.545326, z: 17.179375}
     speed: 2
-    m_Value: {x: -0.24608578, y: 0.70919997, z: -0.012543052}
+    m_Value: {x: 0.40060267, y: 20.545326, z: 17.179375}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -1078,17 +1046,17 @@ MonoBehaviour:
       m_Size: {x: 0, y: 0}
     yGrid:
       m_Fade:
-        m_Target: 0
+        m_Target: 1
         speed: 2
-        m_Value: 0
+        m_Value: 1
       m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
       m_Pivot: {x: 0, y: 0, z: 0}
       m_Size: {x: 1, y: 1}
     zGrid:
       m_Fade:
-        m_Target: 1
+        m_Target: 0
         speed: 2
-        m_Value: 1
+        m_Value: 0
       m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
       m_Pivot: {x: 0, y: 0, z: 0}
       m_Size: {x: 1, y: 1}
@@ -1096,13 +1064,13 @@ MonoBehaviour:
     m_GridAxis: 1
     m_gridOpacity: 0.5
   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
-    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_Target: 1.9936346
+    m_Target: 4.558438
     speed: 2
-    m_Value: 2.0875754
+    m_Value: 4.558438
   m_Ortho:
     m_Target: 1
     speed: 2

+ 1093 - 0
layout-zouge.wlt

@@ -0,0 +1,1093 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!114 &1
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 1
+  m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_PixelRect:
+    serializedVersion: 2
+    x: 405
+    y: 51
+    width: 1544
+    height: 1333
+  m_ShowMode: 4
+  m_Title: Project
+  m_RootView: {fileID: 4}
+  m_MinSize: {x: 875, y: 300}
+  m_MaxSize: {x: 10000, y: 10000}
+  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: 12006, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: ConsoleWindow
+  m_EditorClassIdentifier: 
+  m_Children: []
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 431
+    width: 828
+    height: 852
+  m_MinSize: {x: 101, y: 121}
+  m_MaxSize: {x: 4001, y: 4021}
+  m_ActualView: {fileID: 10}
+  m_Panes:
+  - {fileID: 11}
+  - {fileID: 10}
+  m_Selected: 1
+  m_LastSelected: 0
+--- !u!114 &3
+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: 8}
+  - {fileID: 2}
+  m_Position:
+    serializedVersion: 2
+    x: 716
+    y: 0
+    width: 828
+    height: 1283
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 8096, y: 16192}
+  vertical: 1
+  controlID: 448
+  draggingID: 0
+--- !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: 1
+  m_Script: {fileID: 12008, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Children:
+  - {fileID: 5}
+  - {fileID: 6}
+  - {fileID: 7}
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1544
+    height: 1333
+  m_MinSize: {x: 875, y: 300}
+  m_MaxSize: {x: 10000, y: 10000}
+  m_UseTopView: 1
+  m_TopViewHeight: 30
+  m_UseBottomView: 1
+  m_BottomViewHeight: 20
+--- !u!114 &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: 1
+  m_Script: {fileID: 12011, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Children: []
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1544
+    height: 30
+  m_MinSize: {x: 0, y: 0}
+  m_MaxSize: {x: 0, y: 0}
+  m_LastLoadedLayoutName: zouge
+--- !u!114 &6
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 1
+  m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Children:
+  - {fileID: 9}
+  - {fileID: 3}
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 30
+    width: 1544
+    height: 1283
+  m_MinSize: {x: 200, y: 100}
+  m_MaxSize: {x: 16192, y: 16192}
+  vertical: 0
+  controlID: 447
+  draggingID: 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: 1
+  m_Script: {fileID: 12042, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Children: []
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 1313
+    width: 1544
+    height: 20
+  m_MinSize: {x: 0, y: 0}
+  m_MaxSize: {x: 0, y: 0}
+--- !u!114 &8
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 1
+  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: ProjectBrowser
+  m_EditorClassIdentifier: 
+  m_Children: []
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 828
+    height: 431
+  m_MinSize: {x: 231, y: 271}
+  m_MaxSize: {x: 10001, y: 10021}
+  m_ActualView: {fileID: 13}
+  m_Panes:
+  - {fileID: 12}
+  - {fileID: 13}
+  m_Selected: 1
+  m_LastSelected: 0
+--- !u!114 &9
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 1
+  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: GameView
+  m_EditorClassIdentifier: 
+  m_Children: []
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 716
+    height: 1283
+  m_MinSize: {x: 201, y: 221}
+  m_MaxSize: {x: 4001, y: 4021}
+  m_ActualView: {fileID: 14}
+  m_Panes:
+  - {fileID: 15}
+  - {fileID: 14}
+  m_Selected: 1
+  m_LastSelected: 0
+--- !u!114 &10
+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: 1121
+    y: 512
+    width: 827
+    height: 831
+  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 &11
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 1
+  m_Script: {fileID: 12061, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_TitleContent:
+    m_Text: Hierarchy
+    m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0}
+    m_Tooltip: 
+  m_Pos:
+    serializedVersion: 2
+    x: 981
+    y: 934
+    width: 664
+    height: 409
+  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_SceneHierarchy:
+    m_TreeViewState:
+      scrollPos: {x: 0, y: 0}
+      m_SelectedIDs: 
+      m_LastClickedID: 0
+      m_ExpandedIDs: 64f8feff3c09ffff
+      m_RenameOverlay:
+        m_UserAcceptedRename: 0
+        m_Name: 
+        m_OriginalName: 
+        m_EditFieldRect:
+          serializedVersion: 2
+          x: 0
+          y: 0
+          width: 0
+          height: 0
+        m_UserData: 0
+        m_IsWaitingForDelay: 0
+        m_IsRenaming: 0
+        m_OriginalEventType: 11
+        m_IsRenamingFilename: 0
+        m_ClientGUIView: {fileID: 0}
+      m_SearchString: 
+    m_ExpandedScenes: []
+    m_CurrenRootInstanceID: 0
+    m_LockTracker:
+      m_IsLocked: 0
+    m_CurrentSortingName: TransformSorting
+  m_WindowGUID: 468457e0d3add1041b6fec0b00b6a014
+--- !u!114 &12
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 1
+  m_Script: {fileID: 12019, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_MinSize: {x: 275, y: 50}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_TitleContent:
+    m_Text: Inspector
+    m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0}
+    m_Tooltip: 
+  m_Pos:
+    serializedVersion: 2
+    x: 981
+    y: 81
+    width: 664
+    height: 832
+  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_ObjectsLockedBeforeSerialization: []
+  m_InstanceIDsLockedBeforeSerialization: 
+  m_PreviewResizer:
+    m_CachedPref: -160
+    m_ControlHash: -371814159
+    m_PrefName: Preview_InspectorPreview
+  m_LastInspectedObjectInstanceID: -1
+  m_LastVerticalScrollValue: 0
+  m_GlobalObjectId: 
+  m_InspectorMode: 0
+  m_LockTracker:
+    m_IsLocked: 0
+  m_PreviewWindow: {fileID: 0}
+--- !u!114 &13
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 1
+  m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_MinSize: {x: 230, y: 250}
+  m_MaxSize: {x: 10000, y: 10000}
+  m_TitleContent:
+    m_Text: Project
+    m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0}
+    m_Tooltip: 
+  m_Pos:
+    serializedVersion: 2
+    x: 1121
+    y: 81
+    width: 827
+    height: 410
+  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_SearchFilter:
+    m_NameFilter: gameruntime
+    m_ClassNames: []
+    m_AssetLabels: []
+    m_AssetBundleNames: []
+    m_ReferencingInstanceIDs: 
+    m_SceneHandles: 
+    m_ShowAllHits: 0
+    m_SkipHidden: 0
+    m_SearchArea: 1
+    m_Folders: []
+    m_Globs: []
+    m_OriginalText: gameruntime
+    m_ImportLogFlags: 0
+    m_FilterByTypeIntersection: 0
+  m_ViewMode: 1
+  m_StartGridSize: 16
+  m_LastFolders:
+  - Assets/Scenes
+  m_LastFoldersGridSize: 16
+  m_LastProjectPath: D:\UGit\XiuXianGame
+  m_LockTracker:
+    m_IsLocked: 0
+  m_FolderTreeState:
+    scrollPos: {x: 0, y: 16}
+    m_SelectedIDs: 03ca9a3b
+    m_LastClickedID: 1000000003
+    m_ExpandedIDs: 00000000befd000000ca9a3bffffff7f
+    m_RenameOverlay:
+      m_UserAcceptedRename: 0
+      m_Name: 
+      m_OriginalName: 
+      m_EditFieldRect:
+        serializedVersion: 2
+        x: 0
+        y: 0
+        width: 0
+        height: 0
+      m_UserData: 0
+      m_IsWaitingForDelay: 0
+      m_IsRenaming: 0
+      m_OriginalEventType: 11
+      m_IsRenamingFilename: 1
+      m_ClientGUIView: {fileID: 8}
+    m_SearchString: 
+    m_CreateAssetUtility:
+      m_EndAction: {fileID: 0}
+      m_InstanceID: 0
+      m_Path: 
+      m_Icon: {fileID: 0}
+      m_ResourceFile: 
+  m_AssetTreeState:
+    scrollPos: {x: 0, y: 0}
+    m_SelectedIDs: 
+    m_LastClickedID: 0
+    m_ExpandedIDs: 00000000befd000000ca9a3bffffff7f
+    m_RenameOverlay:
+      m_UserAcceptedRename: 0
+      m_Name: 
+      m_OriginalName: 
+      m_EditFieldRect:
+        serializedVersion: 2
+        x: 0
+        y: 0
+        width: 0
+        height: 0
+      m_UserData: 0
+      m_IsWaitingForDelay: 0
+      m_IsRenaming: 0
+      m_OriginalEventType: 11
+      m_IsRenamingFilename: 1
+      m_ClientGUIView: {fileID: 0}
+    m_SearchString: 
+    m_CreateAssetUtility:
+      m_EndAction: {fileID: 0}
+      m_InstanceID: 0
+      m_Path: 
+      m_Icon: {fileID: 0}
+      m_ResourceFile: 
+  m_ListAreaState:
+    m_SelectedInstanceIDs: 
+    m_LastClickedInstanceID: 0
+    m_HadKeyboardFocusLastEvent: 1
+    m_ExpandedInstanceIDs: 
+    m_RenameOverlay:
+      m_UserAcceptedRename: 0
+      m_Name: GameRuntimeConfig
+      m_OriginalName: GameRuntimeConfig
+      m_EditFieldRect:
+        serializedVersion: 2
+        x: 0
+        y: 0
+        width: 0
+        height: 0
+      m_UserData: 45392
+      m_IsWaitingForDelay: 0
+      m_IsRenaming: 0
+      m_OriginalEventType: 0
+      m_IsRenamingFilename: 1
+      m_ClientGUIView: {fileID: 8}
+    m_CreateAssetUtility:
+      m_EndAction: {fileID: 0}
+      m_InstanceID: 0
+      m_Path: 
+      m_Icon: {fileID: 0}
+      m_ResourceFile: 
+    m_NewAssetIndexInList: -1
+    m_ScrollPosition: {x: 0, y: 0}
+    m_GridSize: 16
+  m_SkipHiddenPackages: 0
+  m_DirectoriesAreaWidth: 256
+--- !u!114 &14
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 1
+  m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_TitleContent:
+    m_Text: Game
+    m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0}
+    m_Tooltip: 
+  m_Pos:
+    serializedVersion: 2
+    x: 405
+    y: 81
+    width: 715
+    height: 1262
+  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_SerializedViewNames: []
+  m_SerializedViewValues: []
+  m_PlayModeViewName: GameView
+  m_ShowGizmos: 0
+  m_TargetDisplay: 0
+  m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
+  m_TargetSize: {x: 750, y: 1624}
+  m_TextureFilterMode: 0
+  m_TextureHideFlags: 61
+  m_RenderIMGUI: 1
+  m_EnterPlayModeBehavior: 0
+  m_UseMipMap: 0
+  m_VSyncEnabled: 0
+  m_Gizmos: 0
+  m_Stats: 0
+  m_SelectedSizes: 08000000000000000000000011000000000000000000000000000000000000000000000000000000
+  m_ZoomArea:
+    m_HRangeLocked: 0
+    m_VRangeLocked: 0
+    hZoomLockedByDefault: 0
+    vZoomLockedByDefault: 0
+    m_HBaseRangeMin: -375
+    m_HBaseRangeMax: 375
+    m_VBaseRangeMin: -812
+    m_VBaseRangeMax: 812
+    m_HAllowExceedBaseRangeMin: 1
+    m_HAllowExceedBaseRangeMax: 1
+    m_VAllowExceedBaseRangeMin: 1
+    m_VAllowExceedBaseRangeMax: 1
+    m_ScaleWithWindow: 0
+    m_HSlider: 0
+    m_VSlider: 0
+    m_IgnoreScrollWheelUntilClicked: 0
+    m_EnableMouseInput: 1
+    m_EnableSliderZoomHorizontal: 0
+    m_EnableSliderZoomVertical: 0
+    m_UniformScale: 1
+    m_UpDirection: 1
+    m_DrawArea:
+      serializedVersion: 2
+      x: 0
+      y: 21
+      width: 715
+      height: 1241
+    m_Scale: {x: 0.76416254, y: 0.76416254}
+    m_Translation: {x: 357.5, y: 620.5}
+    m_MarginLeft: 0
+    m_MarginRight: 0
+    m_MarginTop: 0
+    m_MarginBottom: 0
+    m_LastShownAreaInsideMargins:
+      serializedVersion: 2
+      x: -467.8324
+      y: -812
+      width: 935.6648
+      height: 1624
+    m_MinimalGUI: 1
+  m_defaultScale: 0.76416254
+  m_LastWindowPixelSize: {x: 715, y: 1262}
+  m_ClearInEditMode: 1
+  m_NoCameraWarning: 1
+  m_LowResolutionForAspectRatios: 01000001000000000000
+  m_XRRenderMode: 0
+  m_RenderTexture: {fileID: 0}
+--- !u!114 &15
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 1
+  m_Script: {fileID: 12013, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_TitleContent:
+    m_Text: Scene
+    m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0}
+    m_Tooltip: 
+  m_Pos:
+    serializedVersion: 2
+    x: 0
+    y: 73
+    width: 1917
+    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:
+    - dockPosition: 0
+      containerId: overlay-toolbar__top
+      floating: 0
+      collapsed: 0
+      displayed: 1
+      snapOffset: {x: -174, y: -26}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 3
+      id: Tool Settings
+      index: 0
+      layout: 1
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 0
+      containerId: overlay-toolbar__top
+      floating: 0
+      collapsed: 0
+      displayed: 1
+      snapOffset: {x: -141, y: 149}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 1
+      id: unity-grid-and-snap-toolbar
+      index: 1
+      layout: 1
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-toolbar__top
+      floating: 0
+      collapsed: 0
+      displayed: 1
+      snapOffset: {x: 0, y: 25}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: unity-scene-view-toolbar
+      index: 0
+      layout: 1
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-toolbar__top
+      floating: 0
+      collapsed: 0
+      displayed: 0
+      snapOffset: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 1
+      id: unity-search-toolbar
+      index: 1
+      layout: 1
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 0
+      containerId: overlay-container--left
+      floating: 0
+      collapsed: 0
+      displayed: 1
+      snapOffset: {x: 0, y: 25}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: unity-transform-toolbar
+      index: 0
+      layout: 2
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 0
+      containerId: overlay-container--left
+      floating: 0
+      collapsed: 0
+      displayed: 1
+      snapOffset: {x: 0, y: 197}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: unity-component-tools
+      index: 1
+      layout: 2
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 0
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 1
+      snapOffset: {x: 67.5, y: 86}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: Orientation
+      index: 0
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 0
+      snapOffset: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: Scene View/Light Settings
+      index: 2
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 0
+      snapOffset: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: Scene View/Camera
+      index: 1
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 0
+      snapOffset: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: Scene View/Cloth Constraints
+      index: 3
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 0
+      snapOffset: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: Scene View/Cloth Collisions
+      index: 4
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 0
+      snapOffset: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: Scene View/Navmesh Display
+      index: 4
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 0
+      snapOffset: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: Scene View/Agent Display
+      index: 5
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 0
+      snapOffset: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: Scene View/Obstacle Display
+      index: 6
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 0
+      snapOffset: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: Scene View/Occlusion Culling
+      index: 5
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 0
+      snapOffset: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: Scene View/Physics Debugger
+      index: 6
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 0
+      snapOffset: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: Scene View/Scene Visibility
+      index: 7
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 0
+      snapOffset: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: Scene View/Particles
+      index: 8
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 0
+      snapOffset: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: Scene View/Tilemap
+      index: 11
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 0
+      snapOffset: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: Scene View/Tilemap Palette Helper
+      index: 12
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 0
+      snapOffset: {x: 48, y: 48}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: Scene View/Open Tile Palette
+      index: 0
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 0
+      snapOffset: {x: 48, y: 48}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: Scene View/Tilemap Focus
+      index: 1
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 1
+      snapOffset: {x: 48, y: 48}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: AINavigationOverlay
+      index: 9
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 0
+      snapOffset: {x: 48, y: 48}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: Scene View/Path
+      index: 9
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 0
+      snapOffset: {x: 48, y: 48}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: APV Overlay
+      index: 10
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 0
+      snapOffset: {x: 48, y: 48}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: Scene View/TrailRenderer
+      index: 11
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 1
+      snapOffset: {x: 48, y: 48}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: Hot Reload
+      index: 12
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    m_OverlaysVisible: 1
+  m_WindowGUID: 3de2bc164a2229345aaffb3c6f51b287
+  m_Gizmos: 1
+  m_OverrideSceneCullingMask: 6917529027641081856
+  m_SceneIsLit: 1
+  m_SceneLighting: 1
+  m_2DMode: 1
+  m_isRotationLocked: 0
+  m_PlayAudio: 0
+  m_AudioPlay: 0
+  m_Position:
+    m_Target: {x: -35.224968, y: -9494.296, z: -2.4642797}
+    speed: 2
+    m_Value: {x: 36.74371, y: -9450.752, z: -1.2592325}
+  m_RenderMode: 0
+  m_CameraMode:
+    drawMode: 0
+    name: Shaded
+    section: Shading Mode
+  m_ValidateTrueMetals: 0
+  m_DoValidateTrueMetals: 0
+  m_SceneViewState:
+    m_AlwaysRefresh: 0
+    showFog: 1
+    showSkybox: 1
+    showFlares: 1
+    showImageEffects: 1
+    showParticleSystems: 1
+    showVisualEffectGraphs: 1
+    m_FxEnabled: 1
+  m_Grid:
+    xGrid:
+      m_Fade:
+        m_Target: 0
+        speed: 2
+        m_Value: 0
+      m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
+      m_Pivot: {x: 0, y: 0, z: 0}
+      m_Size: {x: 0, y: 0}
+    yGrid:
+      m_Fade:
+        m_Target: 0
+        speed: 2
+        m_Value: 0
+      m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
+      m_Pivot: {x: 0, y: 0, z: 0}
+      m_Size: {x: 1, y: 1}
+    zGrid:
+      m_Fade:
+        m_Target: 1
+        speed: 2
+        m_Value: 1
+      m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
+      m_Pivot: {x: 0, y: 0, z: 0}
+      m_Size: {x: 1, y: 1}
+    m_ShowGrid: 1
+    m_GridAxis: 1
+    m_gridOpacity: 0.5
+  m_Rotation:
+    m_Target: {x: 0, y: 0, z: 0, w: 1}
+    speed: 2
+    m_Value: {x: 0, y: 0, z: 0, w: 1}
+  m_Size:
+    m_Target: 249.34792
+    speed: 2
+    m_Value: 128.84317
+  m_Ortho:
+    m_Target: 1
+    speed: 2
+    m_Value: 1
+  m_CameraSettings:
+    m_Speed: 1
+    m_SpeedNormalized: 0.5
+    m_SpeedMin: 0.01
+    m_SpeedMax: 2
+    m_EasingEnabled: 1
+    m_EasingDuration: 0.4
+    m_AccelerationEnabled: 1
+    m_FieldOfViewHorizontalOrVertical: 60
+    m_NearClip: 0.03
+    m_FarClip: 10000
+    m_DynamicClip: 1
+    m_OcclusionCulling: 0
+    m_EnableGDRP: 1
+    m_BackfaceCulling: 0
+  m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226}
+  m_LastSceneViewOrtho: 0
+  m_ReplacementShader: {fileID: 0}
+  m_ReplacementString: 
+  m_SceneVisActive: 1
+  m_LastLockedObject: {fileID: 0}
+  m_ViewIsLockedToObject: 0

Some files were not shown because too many files changed in this diff