修改bug

Assets/Scripts/GameLogic/Player/PlayerManager.cs

@@ -466,6 +466,7 @@ public class PlayerManager : Singleton<PlayerManager>
 
     public async CTask ChangeMap(int mapId)
     {
+        SmallPlacesConfig currentSmallPlacesConfig = ConfigComponent.Instance.Get<SmallPlacesConfig>(PlayerManager.Instance.CurrentsmallPlaces.id);
         SmallPlacesConfig smallPlacesConfig = ConfigComponent.Instance.Get<SmallPlacesConfig>(mapId);
         if (smallPlacesConfig.ID == 0)
             return;
@@ -515,7 +516,17 @@ public class PlayerManager : Singleton<PlayerManager>
 
         PlayerManager.Instance.CurrentsmallPlaces = smallPlacesData;
 
-        CombatController.currActiveCombat.ChangeState(CombatController.sceneSwitch);
+        if (currentSmallPlacesConfig.PlacesId == smallPlacesConfig.PlacesId)
+        {
+        
+            CombatController.currActiveCombat.ChangeState(CombatController.miniSceneSwitch);
+        }
+        else
+        {
+            CombatController.currActiveCombat.ChangeState(CombatController.sceneSwitch);
+        }
+
+    
         await _cTask;
         UIManager.Instance.ShowLastHindAllShowPanel();
         EventManager.Instance.Dispatch(CustomEventType.ChangeMap, null);

UserSettings/Layouts/default-2022.dwlt

@@ -100,7 +100,7 @@ MonoBehaviour:
   m_MinSize: {x: 400, y: 50}
   m_MaxSize: {x: 32384, y: 8096}
   vertical: 0
-  controlID: 195
+  controlID: 18
   draggingID: 0
 --- !u!114 &5
 MonoBehaviour:
@@ -211,7 +211,7 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 1
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: SceneView
+  m_Name: GameView
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
@@ -222,12 +222,12 @@ MonoBehaviour:
     height: 1299
   m_MinSize: {x: 201, y: 221}
   m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 14}
+  m_ActualView: {fileID: 13}
   m_Panes:
   - {fileID: 14}
   - {fileID: 13}
-  m_Selected: 0
-  m_LastSelected: 1
+  m_Selected: 1
+  m_LastSelected: 0
 --- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -267,18 +267,18 @@ MonoBehaviour:
       scrollPos: {x: 0, y: 0}
       m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: 18c6f6fffacaf6fff8cbf6ffc204f7ffc604f7ffd404f7ff3611f7ff364af7ff444af7ffc21ff8ffe61ff8ff8c20f8ff9020f8ff9420f8ff9820f8ffa220f8ffc223f8ff9a23fbffa023fbff8224fbffe424fbff6846fbff6e46fbffe291fbfff091fbffe04ffcfff68bfcff048cfcff2ca0fcfff6a0fcffd6d9fcffe4d9fcff1a54fdff2054fdff4255fdff5a55fdff7055fdff48f9fdff56f9fdff861bffff6a1dffff9e1dfffffe1dffff161effff5ca2ffff6aa2ffff78faffff
+      m_ExpandedIDs: 442cffff682cffff722cffffd42cffffe62cffffee2cffff2c2dffffa4b9ffffa8b9ffffacb9ffffbab9ffff78faffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
-        m_Name: Btn_StartCombat
-        m_OriginalName: Btn_StartCombat
+        m_Name: Btn_Go
+        m_OriginalName: Btn_Go
         m_EditFieldRect:
           serializedVersion: 2
           x: 0
           y: 0
           width: 0
           height: 0
-        m_UserData: 139560
+        m_UserData: 79938
         m_IsWaitingForDelay: 0
         m_IsRenaming: 0
         m_OriginalEventType: 0
@@ -328,7 +328,7 @@ MonoBehaviour:
   m_ObjectsLockedBeforeSerialization: []
   m_InstanceIDsLockedBeforeSerialization: 
   m_PreviewResizer:
-    m_CachedPref: -160
+    m_CachedPref: 304
     m_ControlHash: -371814159
     m_PrefName: Preview_InspectorPreview
   m_LastInspectedObjectInstanceID: -1
@@ -373,7 +373,7 @@ MonoBehaviour:
     m_SaveData: []
     m_OverlaysVisible: 1
   m_SearchFilter:
-    m_NameFilter: HeroBreakthroughPanel
+    m_NameFilter: 
     m_ClassNames: []
     m_AssetLabels: []
     m_AssetBundleNames: []
@@ -383,24 +383,24 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Scripts/GameUI/UI/HeroInformationPanel
+    - Assets/Res/UI/DivineSence
     m_Globs: []
-    m_OriginalText: HeroBreakthroughPanel
+    m_OriginalText: 
     m_ImportLogFlags: 0
     m_FilterByTypeIntersection: 0
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Scripts/GameUI/UI/HeroInformationPanel
+  - Assets/Res/UI/DivineSence
   m_LastFoldersGridSize: 16
   m_LastProjectPath: D:\FB\XiuXianGame
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
     scrollPos: {x: 0, y: 774}
-    m_SelectedIDs: 8ecb0000
-    m_LastClickedID: 52110
-    m_ExpandedIDs: 00000000c0c80000c2c80000c4c80000c6c80000c8c80000cac80000ccc80000cec80000d0c80000d2c80000d4c80000d6c80000fac8000014c9000072c90000aee70100b0e7010000ca9a3b
+    m_SelectedIDs: 40c90000
+    m_LastClickedID: 51520
+    m_ExpandedIDs: 00000000c0c80000c2c80000c4c80000c6c80000c8c80000cac80000ccc80000cec80000d0c80000d2c80000d4c80000d6c8000070c9000086c9000088c9000000ca9a3b
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -459,18 +459,18 @@ MonoBehaviour:
     m_ExpandedInstanceIDs: f092020000000000b07bf2ff
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: CombatShowTextPanel
-      m_OriginalName: CombatShowTextPanel
+      m_Name: 
+      m_OriginalName: 
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 59690
+      m_UserData: 0
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
-      m_OriginalEventType: 0
+      m_OriginalEventType: 11
       m_IsRenamingFilename: 1
       m_ClientGUIView: {fileID: 7}
     m_CreateAssetUtility:
@@ -990,9 +990,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: -0.14066902, y: -3.5529077, z: 587.3303}
+    m_Target: {x: 194.29974, y: -344.17035, z: 226407.4}
     speed: 2
-    m_Value: {x: -0.14066902, y: -3.5529077, z: 587.3303}
+    m_Value: {x: 194.29974, y: -344.17035, z: 226407.4}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -1042,9 +1042,9 @@ MonoBehaviour:
     speed: 2
     m_Value: {x: 0, y: 0, z: 0, w: 1}
   m_Size:
-    m_Target: 2.8832915
+    m_Target: 998.0005
     speed: 2
-    m_Value: 2.8832915
+    m_Value: 998.0005
   m_Ortho:
     m_Target: 1
     speed: 2