Merge branch 'master' of http://fort23.cn:3000/ck/XiuXianGame

# Conflicts:
#	UserSettings/Layouts/default-2022.dwlt   resolved by master version

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);