修改bug

Assets/Res/UI/Canvas/Canvas.prefab

@@ -435,7 +435,7 @@ MonoBehaviour:
     m_Bits: 0
   m_VolumeTrigger: {fileID: 0}
   m_VolumeFrameworkUpdateModeOption: 2
-  m_RenderPostProcessing: 0
+  m_RenderPostProcessing: 1
   m_Antialiasing: 0
   m_AntialiasingQuality: 2
   m_StopNaN: 0

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: []

Assets/Scenes/testCombat.scene

@@ -890,6 +890,76 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 442218246}
   m_CullTransparentMesh: 1
+--- !u!1001 &471604613
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 2035678242}
+    m_Modifications:
+    - target: {fileID: 3683907582521372588, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
+      propertyPath: m_Name
+      value: Mountain010 (1)
+      objectReference: {fileID: 0}
+    - target: {fileID: 8909352204525286337, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8909352204525286337, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8909352204525286337, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8909352204525286337, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8909352204525286337, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -8.51
+      objectReference: {fileID: 0}
+    - target: {fileID: 8909352204525286337, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8909352204525286337, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8909352204525286337, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8909352204525286337, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8909352204525286337, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8909352204525286337, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8909352204525286337, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: -20.114
+      objectReference: {fileID: 0}
+    - target: {fileID: 8909352204525286337, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents:
+    - {fileID: 8479685889786791212, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
 --- !u!1001 &515822005
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -1314,6 +1384,11 @@ RectTransform:
   m_CorrespondingSourceObject: {fileID: 7091770935250694576, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
   m_PrefabInstance: {fileID: 515822005}
   m_PrefabAsset: {fileID: 0}
+--- !u!4 &1123038626 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 8909352204525286337, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
+  m_PrefabInstance: {fileID: 471604613}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1312762638
 GameObject:
   m_ObjectHideFlags: 0
@@ -1480,11 +1555,83 @@ MonoBehaviour:
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1001 &1814571273
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 3683907582521372588, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
+      propertyPath: m_Name
+      value: Mountain010
+      objectReference: {fileID: 0}
+    - target: {fileID: 3683907582521372588, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8909352204525286337, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -37.3
+      objectReference: {fileID: 0}
+    - target: {fileID: 8909352204525286337, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -0.1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8909352204525286337, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 31.9
+      objectReference: {fileID: 0}
+    - target: {fileID: 8909352204525286337, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.9846344
+      objectReference: {fileID: 0}
+    - target: {fileID: 8909352204525286337, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8909352204525286337, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0.17462842
+      objectReference: {fileID: 0}
+    - target: {fileID: 8909352204525286337, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8909352204525286337, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8909352204525286337, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: -20.114
+      objectReference: {fileID: 0}
+    - target: {fileID: 8909352204525286337, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents:
+    - {fileID: 8479685889786791212, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
+    - {fileID: 3660374313649103400, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
+    - {fileID: 2068246416621670301, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
+    m_RemovedGameObjects: []
+    m_AddedGameObjects:
+    - targetCorrespondingSourceObject: {fileID: 8909352204525286337, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 1123038626}
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
 --- !u!224 &1895189377 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 8311278189826985699, guid: b37c08dad0bf98f42b569bf67e351455, type: 3}
   m_PrefabInstance: {fileID: 965542112758883088}
   m_PrefabAsset: {fileID: 0}
+--- !u!4 &2035678242 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 8909352204525286337, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
+  m_PrefabInstance: {fileID: 1814571273}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &965542112758883088
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -1699,3 +1846,4 @@ SceneRoots:
   - {fileID: 293130736}
   - {fileID: 6588466611375917160}
   - {fileID: 515822005}
+  - {fileID: 1814571273}

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

@@ -0,0 +1,98 @@
+using Excel2Json;
+using Fort23.Core;
+using Fort23.UTool;
+using GameLogic.Combat.CombatTool;
+using GameLogic.Combat.Hero;
+using UnityEngine;
+using Utility.UITool;
+
+namespace GameLogic.Combat.CombatState
+{
+    public class CombatMiniSceneSwitchState: CombatStateBasic
+    {
+        private Vector3 dir;
+        private Vector3 moveTargetDir;
+
+        private float currTime;
+        private int state;
+        private Vector3 startPos;
+        private Vector3 startEulerAngles;
+        private float speed=0.5f;
+        private float feiXingCurTime;
+
+        public CombatMiniSceneSwitchState(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;
+            InitScenes();
+            // CombatHeroEntity playerHeroEntity = CombatController.currActiveCombat.playerHeroEntity;
+            // Vector3 target = playerHeroEntity.GameObject.transform.TransformPoint(new Vector3(2, 2, 1));
+            // moveTargetDir = (target - playerHeroEntity.GameObject.transform.forward).normalized;
+            // dir = playerHeroEntity.GameObject.transform.forward;
+            // currTime = 0;
+            state = 0;
+            // feiXingCurTime = 0;
+        }
+
+        protected override void ProUpdate(float t)
+        {
+            CombatHeroEntity playerHeroEntity = CombatController.currActiveCombat.playerHeroEntity;
+            if (playerHeroEntity == null||state==2)
+            {
+                return;
+            }
+
+          
+
+        
+            
+
+            float add = 0.1f;
+            Vector3 pos = playerHeroEntity.dotPos;
+            Vector3 dir =  CombatController.currActiveCombat.CombatSenceController.moveDir;
+            float fx = 1;
+            
+            pos += dir.normalized * CombatController.currActiveCombat.CombatHeroController.moveSpeed * t;
+
+            playerHeroEntity.combatHeroGameObject.SetPosition(pos);
+            playerHeroEntity.GameObject.transform.rotation = Quaternion.LookRotation(dir * fx);
+
+
+            CombatController.CombatHeroController.Update(t);
+            CombatController.CombatCameraControllder.Update(t);
+            CombatController.GameTimeLineParticleFactory.CombatUpdate(t);
+        }
+
+        private async void InitScenes()
+        {
+            CombatController.currActiveCombat.CombatSenceController.Flight(3, -90, 10);
+            await TimerComponent.Instance.WaitAsync(2000);
+            EventManager.Instance.Dispatch(CustomEventType.ShowLoadingUI, null);
+            await TimerComponent.Instance.WaitAsync(2000);
+            state = 2;
+            CombatHeroEntity playerHeroEntity =CombatController.currActiveCombat.playerHeroEntity;
+            playerHeroEntity.GameObject.transform.position = startPos;
+            playerHeroEntity.GameObject.transform.rotation = Quaternion.Euler(startEulerAngles);
+            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/CombatState/CombatMiniSceneSwitchState.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 7fdda6bc01594f26b006967ae0204df7
+timeCreated: 1758770917

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

@@ -29,7 +29,7 @@ namespace GameLogic.Combat.CombatTool
         public static string update = "update";
         public static string fight = "fight";
         public static string sceneSwitch = "sceneSwitch";
-
+        public static string miniSceneSwitch = "miniSceneSwitch";
         public static CombatController currActiveCombat;
         public CombatHeroController CombatHeroController;
         public CombatCameraControllder CombatCameraControllder;
@@ -88,6 +88,7 @@ namespace GameLogic.Combat.CombatTool
                 stateControl.AddState("fight", new CombatFightState(this));
                 stateControl.AddState("combatfinish", new CombatFinishState(this));
                 stateControl.AddState(sceneSwitch, new CombatSceneSwitchState(this));
+                stateControl.AddState(miniSceneSwitch, new CombatFinishState(this));
 
              
                 if (CombatSenceController == null)

Assets/Scripts/GameLogic/Combat/CombatTool/SceneTool/SceneCJ2MonoConfig.cs

@@ -161,15 +161,18 @@ namespace GameLogic.Combat.CombatTool.SceneTool
 
         protected override void ProDispose()
         {
-            foreach (var VARIABLE in _downAllGameObjectPools.Values)
+            for (_downAllGameObjectPools.Begin(); _downAllGameObjectPools.Next();)
             {
                 GObjectPool.Instance.Recycle(_downAllGameObjectPools.Value);
             }
 
+   
             _downAllGameObjectPools.Clear();
-            foreach (var VARIABLE in _allGameObjectPools.Values)
+            for (_allGameObjectPools.Begin(); _allGameObjectPools.Next();)
+            {
                 GObjectPool.Instance.Recycle(_allGameObjectPools.Value);
-            _allGameObjectPools.Clear();
+            }
+
         }
     }
 }

Assets/Scripts/GameLogic/Combat/CombatTool/SceneTool/SceneMonoConfig.cs

@@ -97,10 +97,11 @@ namespace GameLogic.Combat.CombatTool.SceneTool
 
         protected override void ProDispose()
         {
-            foreach (var VARIABLE in _allGameObjectPools.Values)
+            for (_allGameObjectPools.Begin(); _allGameObjectPools.Next();)
             {
-                GObjectPool.Instance.Recycle(VARIABLE);
+                GObjectPool.Instance.Recycle(_allGameObjectPools.Value);
             }
+            
             _allGameObjectPools.Clear();
         }
     }