修改bug

Assets/Res/Config/SmallPlacesConfig.json

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

Assets/Scripts/GameData/ExcelConfig/SkillConfig.cs

@@ -1,5 +1,5 @@
 // Auto Generated Code By excel2json
-// Generate From Excel\skill.xlsx. SheetName: SkillConfig
+// Generate From Excel\Skill.xlsx. SheetName: SkillConfig
 
 using System;
 using Fort23.GameData;

Assets/Scripts/GameData/ExcelConfig/SkillConstant.cs

@@ -1,5 +1,5 @@
 // Auto Generated Code By excel2json
-// Generate From Excel\skill.xlsx. SheetName: SkillConstant
+// Generate From Excel\Skill.xlsx. SheetName: SkillConstant
 
 using System;
 using Fort23.GameData;

Assets/Scripts/GameData/ExcelConfig/SkillPowerupConfig.cs

@@ -1,5 +1,5 @@
 // Auto Generated Code By excel2json
-// Generate From Excel\skill.xlsx. SheetName: SkillPowerupConfig
+// Generate From Excel\Skill.xlsx. SheetName: SkillPowerupConfig
 
 using System;
 using Fort23.GameData;

Assets/Scripts/GameData/ExcelConfig/SmallPlacesConfig.cs

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

Assets/Scripts/GameLogic/Combat/CombatState/CombatSceneSwitchState.cs

@@ -1,4 +1,6 @@
-using Fort23.Core;
+using Excel2Json;
+using Fort23.Core;
+using Fort23.UTool;
 using GameLogic.Combat.CombatTool;
 using GameLogic.Combat.Hero;
 using UnityEngine;
@@ -30,7 +32,8 @@ namespace GameLogic.Combat.CombatState
                 playerHeroEntity.PlayAnim(CombatHeroStateType.idle, true, 0, false, 1);
                 CombatController.MagicWeaponCombatSence.CloseSecene();
             }
-            startPos=playerHeroEntity.GameObject.transform.position;
+
+            startPos = playerHeroEntity.GameObject.transform.position;
             startEulerAngles = playerHeroEntity.GameObject.transform.rotation.eulerAngles;
 
             // CombatHeroEntity playerHeroEntity = CombatController.currActiveCombat.playerHeroEntity;
@@ -81,10 +84,13 @@ namespace GameLogic.Combat.CombatState
             CombatHeroEntity playerHeroEntity = CombatController.currActiveCombat.playerHeroEntity;
             playerHeroEntity.GameObject.transform.position = startPos;
             playerHeroEntity.GameObject.transform.rotation = Quaternion.Euler(startEulerAngles);
-            await CombatController.CombatSenceController.InitScenes("LevelBattle03");
+            SmallPlacesConfig smallPlacesConfig =
+                ConfigComponent.Instance.Get<SmallPlacesConfig>(PlayerManager.Instance.CurrentsmallPlaces.id);
+            await CombatController.CombatSenceController.InitScenes(smallPlacesConfig.scencName);
             EventManager.Instance.Dispatch(CustomEventType.CloseLoadingUI, null);
             CombatController.CombatCameraControllder.isStop = false;
             CombatController.ChangeState(CombatController.fight);
+         
         }
     }
 }

Assets/Scripts/GameLogic/Combat/CombatTool/CombatController.cs

@@ -26,6 +26,7 @@ namespace GameLogic.Combat.CombatTool
         public static string idle = "idle";
         public static string update = "update";
         public static string fight = "fight";
+        public static string sceneSwitch = "sceneSwitch";
 
         public static CombatController currActiveCombat;
         public CombatHeroController CombatHeroController;
@@ -85,7 +86,7 @@ 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));
+                stateControl.AddState(sceneSwitch, new CombatSceneSwitchState(this));
 
              
                 if (CombatSenceController == null)