修改bug

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

@@ -9,15 +9,15 @@ namespace GameLogic.Combat.CombatState
 {
     public class CombatUpdateState : CombatStateBasic
     {
-        /// <summary>
-        /// 下次遇见怪的时间
-        /// </summary>
-        private float _nextMonsterTime;
-
-        /// <summary>
-        /// 是否没有敌人
-        /// </summary>
-        protected bool isNullMonster;
+        // /// <summary>
+        // /// 下次遇见怪的时间
+        // /// </summary>
+        // private float _nextMonsterTime;
+        //
+        // /// <summary>
+        // /// 是否没有敌人
+        // /// </summary>
+        // protected bool isNullMonster;
 
         public CombatUpdateState(CombatController combatController) : base(combatController)
         {
@@ -38,8 +38,8 @@ namespace GameLogic.Combat.CombatState
                     new TriggerData());
             }
 
-            _nextMonsterTime = Random.Range(5, 10);
-            isNullMonster = true;
+            // _nextMonsterTime = Random.Range(5, 10);
+            // isNullMonster = true;
             CombatController.MagicWeaponCombatSence.CloseSecene();
         }
 
@@ -51,20 +51,20 @@ namespace GameLogic.Combat.CombatState
                 return;
             }
 
-            if (isNullMonster)
-            {
-                _nextMonsterTime -= t;
-
-                if (_nextMonsterTime < 0)
-                {
-                    isNullMonster = false;
-                    TestCombatType testCombatType = CombatController.currActiveCombat.CombatTypeBasic as TestCombatType;
-                    if (testCombatType != null)
-                    {
-                        testCombatType.CreateEnemy(new CTaskAwaitBuffer());
-                    }
-                }
-            }
+            // if (isNullMonster)
+            // {
+            //     _nextMonsterTime -= t;
+            //
+            //     if (_nextMonsterTime < 0)
+            //     {
+            //         isNullMonster = false;
+            //         TestCombatType testCombatType = CombatController.currActiveCombat.CombatTypeBasic as TestCombatType;
+            //         if (testCombatType != null)
+            //         {
+            //             testCombatType.CreateEnemy(new CTaskAwaitBuffer());
+            //         }
+            //     }
+            // }
 
 
             CombatHeroEntity[] allHero =

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

@@ -4,6 +4,7 @@ using Common.Utility.CombatTimer;
 using Core.Audio;
 using Core.Event.Event;
 using Core.State;
+using Excel2Json;
 using Fort23.Core;
 using GameLogic.Combat.CombatGuide;
 using GameLogic.Combat.CombatState;
@@ -30,7 +31,7 @@ namespace GameLogic.Combat.CombatTool
         public GameTimeLineParticleFactory GameTimeLineParticleFactory;
         public MagicWeaponCombatSence MagicWeaponCombatSence;
         public RandomEventController RandomEventController;
-        
+
         public bool isUpdate;
 
         /// <summary>
@@ -92,6 +93,8 @@ namespace GameLogic.Combat.CombatTool
             CombatEventManager.Instance.Dispatch(CombatEventType.GameStart, null);
         }
 
+    
+
         private void RefreshFull(IEventData eventData)
         {
             RefreshFullEventData data = (RefreshFullEventData)eventData;

Assets/Scripts/GameLogic/Combat/CombatType/CombatTypeBasic.cs

@@ -9,6 +9,7 @@ using UnityEngine;
 #if UNITY_WEIXINMINIGAME
 using WeChatWASM;
 #endif
+
 namespace GameLogic.Combat.CombatType
 {
     public class CombatTypeBasic : IDisposable
@@ -22,7 +23,7 @@ namespace GameLogic.Combat.CombatType
 
         protected CombatController combatController;
         protected int _currIndex = 0;
- 
+
 
         public IHero currBannerHero;
         public bool isActiveCombat = false;
@@ -52,7 +53,6 @@ namespace GameLogic.Combat.CombatType
         {
         }
 
-  
 
         private void OnTriggerEnterEvent(Collider collider)
         {
@@ -78,6 +78,18 @@ namespace GameLogic.Combat.CombatType
             await ProStartGame();
         }
 
+        /// <summary>
+        /// 开始战斗
+        /// </summary>
+        public async CTask StartCombat()
+        {
+            ProStartCombat();
+        }
+
+        protected async CTask ProStartCombat()
+        {
+        }
+
         public void Dispose()
         {
             CombatEventManager.Instance.RemoveEventListener(CombatEventType.HeroDie, HeroDieEventData);

Assets/Scripts/GameLogic/Combat/CombatType/LevelBattleCombatType.cs

@@ -4,6 +4,7 @@ using CombatLibrary.CombatLibrary.CombatCore;
 using Common.Utility.CombatEvent;
 using Common.Utility.CombatTimer;
 using Core.Audio;
+using Core.Utility;
 using Excel2Json;
 using Fort23.Core;
 using Fort23.Mono;
@@ -21,114 +22,125 @@ namespace GameLogic.Combat.CombatType
 {
     public class LevelBattleCombatType : CombatTypeBasic
     {
-       
-
-
-        //
-        //
-        // protected override void ProHeroDie(CombatHeroEntity combatHeroEntity, HarmReturnInfo harmReturnInfo)
-        // {
-        //
-        // }
-        //
-        //
-        // private void PlayBgm()
-        // {
-        //     AudioManager.Instance.PlayBGM("combatBattle.wav");
-        // }
-        //
-        // private void ResurrectionFinish()
-        // {
-        //   
-        // }
-        //
-        //
-        //
-        //
-        //
-        //
-        // protected override async CTask ProStartGame()
-        // {
-        //     CTaskAwaitBuffer cTaskAwaitBuffer = new CTaskAwaitBuffer();
-        //     // TestCombat(cTaskAwaitBuffer);
-        //     InitPlayerHero(cTaskAwaitBuffer);
-        //     InitTestCombatBoChi();
-        //     CreateEnemy(cTaskAwaitBuffer);
-        //     await cTaskAwaitBuffer.WaitAll();
-        //     CombatController.currActiveCombat.CombatHeroController.SetFollowTarget();
-        // }
-        //
-        //
-        //
-        //
-        // public void StartBossCombat()
-        // {
-        //
-        // }
-        //
-        // public void StartBossBattle()
-        // {
-        //     CombatController.currActiveCombat.isStopAi = false;
-        // }
-        //
-        //
-        // protected void InitTestCombatBoChi()
-        // {
-        //
-        // }
-        //
-        //
-        // private void CreateEnemy(CTaskAwaitBuffer cTaskAwaitBuffer)
-        // {
-        //
-        // }
-        //
-        // private void CreateEnemy(CTaskAwaitBuffer cTaskAwaitBuffer, int monsterId, int level, int star, int index,
-        //     Vector3 pos,
-        //     System.Action<CombatHeroEntity> callBack = null)
-        // {
-        //     CombatHeroEntity heroEntity = CObjectPool.Instance.Fetch<CombatHeroEntity>();
-        //     heroEntity.IsEnemy = true;
-        //     CombatHeroInfo combatHeroInfo = new CombatHeroInfo();
-        //     combatHeroInfo.InitMonster(monsterId, level, star);
-        //
-        //     cTaskAwaitBuffer.AddTask(heroEntity.Init(new CombatAIBasic(), combatHeroInfo, pos,
-        //         delegate(CombatHeroEntity entity)
-        //         {
-        //             combatController.CombatHeroController.AddHero(entity);
-        //             callBack?.Invoke(entity);
-        //         }));
-        // }
-        //
-        //
-        //
-        // protected override void ProUpdate(float t)
-        // {
-        //
-        // }
-        //
-        //
-        // private void InitPlayerHero(CTaskAwaitBuffer cTaskAwaitBuffer)
-        // {
-        //     // int i = 0;
-        //     // foreach (KeyValuePair<int, HeroInfo> keyValuePair in PlayerManager.Instance.heroController.heroDicInLead)
-        //     // {
-        //     //     int index = i;
-        //     //     CombatHeroEntity heroEntity = CObjectPool.Instance.Fetch<CombatHeroEntity>();
-        //     //     heroEntity.IsEnemy = false;
-        //     //     heroEntity.number = i;
-        //     //     Vector3 pos = _combatScenesConfig.heroPoint[index].position;
-        //     //     cTaskAwaitBuffer.AddTask(heroEntity.Init(new CombatAIBasic(), keyValuePair.Value, pos,
-        //     //         delegate(CombatHeroEntity entity) { combatController.CombatHeroController.AddHero(entity); }));
-        //     //
-        //     //     i++;
-        //     // }
-        //     //
-        //     // Vector3 p = _combatScenesConfig.heroPoint[0].position;
-        //     // combatController.CombatCameraControllder.root.position = new Vector3(p.x,
-        //     //     combatController.CombatCameraControllder.root.position.y, p.z + 13);
-        // }
-
-       
+        private float _currTime;
+
+        private int _currBoChi;
+
+
+        protected Vector3[] enemyHeroPosOff =
+        {
+            new Vector3(0, 0, 0),
+            new Vector3(2, 0, -2),
+            new Vector3(-2, 0, -2)
+        };
+
+        protected override void ProInit()
+        {
+        }
+
+        protected override void ProHeroDie(CombatHeroEntity combatHeroEntity, HarmReturnInfo harmReturnInfo)
+        {
+            CombatItemShowEventData combatItemShowEventData = CombatItemShowEventData.Create();
+            combatItemShowEventData.count = Random.Range(3, 5);
+            combatItemShowEventData.startPos_WorldPos = combatHeroEntity.combatHeroGameObject.position;
+            EventManager.Instance.Dispatch(CustomEventType.Combat_ItemShow, combatItemShowEventData);
+
+
+            ShowTextEventData showTextEventData = ShowTextEventData.Create();
+            showTextEventData.text = "+金币 20";
+            showTextEventData.Color = new Color(1f, 0.64f, 0.22f);
+            showTextEventData.worldPos = combatHeroEntity.combatHeroGameObject.position;
+            EventManager.Instance.Dispatch(CustomEventType.ShowText, showTextEventData);
+            CombatHeroEntity[] allHero = combatController.CombatHeroController.GetHero(true);
+        }
+
+
+        protected override async CTask ProStartGame()
+        {
+            CTaskAwaitBuffer cTaskAwaitBuffer = new CTaskAwaitBuffer();
+            TestCombat(cTaskAwaitBuffer);
+
+            await cTaskAwaitBuffer.WaitAll();
+            CombatController.currActiveCombat.CombatHeroController.SetFollowTarget();
+        }
+
+
+        public async CTask LoadCombat(int levelBattleId)
+        {
+            LevelbattleConfig levelbattleConfig = ConfigComponent.Instance.Get<LevelbattleConfig>(levelBattleId);
+            CTaskAwaitBuffer cTaskAwaitBuffer = new CTaskAwaitBuffer();
+            for (int i = 0; i < levelbattleConfig.Group.Length; i++)
+            {
+                int group = levelbattleConfig.Group[i];
+                GroupConfig groupConfig = ConfigComponent.Instance.Get<GroupConfig>(group);
+                int[] monster = groupConfig.GroupMonster;
+                for (int j = 0; j < monster.Length; j++)
+                {
+                    HeroInfo heroInfo = new HeroInfo();
+                    heroInfo.InitMonster(monster[j], groupConfig.GroupMonsterLevel[j]);
+                    CreateEnemy(cTaskAwaitBuffer, heroInfo, j);
+                }
+            }
+
+            await cTaskAwaitBuffer.WaitAll();
+            cTaskAwaitBuffer.Dispose();
+        }
+
+        public void CreateEnemy(CTaskAwaitBuffer cTaskAwaitBuffer, HeroInfo heroInfo, int index)
+        {
+            // return;
+            _currBoChi += 1;
+            float d = CombatController.currActiveCombat.CombatSenceController.currTime + 0.4f;
+            Vector3 startPos =
+                CombatController.currActiveCombat.CombatSenceController.GetTarget(d) + new Vector3(0, 1, 0);
+            Vector3 startPos2 =
+                CombatController.currActiveCombat.CombatSenceController.GetTarget(d + 0.01f) + new Vector3(0, 1, 0);
+            Vector3 dir = startPos2 - startPos;
+            Quaternion quaternion = Quaternion.LookRotation(dir);
+
+
+            CombatHeroEntity heroEntity = new CombatHeroEntity();
+            heroEntity.IsEnemy = true;
+            Vector3 pos = startPos + quaternion * enemyHeroPosOff[index];
+            cTaskAwaitBuffer.AddTask(heroEntity.Init(new CombatHeroAi(), heroInfo, pos,
+                delegate(CombatHeroEntity entity) { combatController.CombatHeroController.AddHero(entity); }));
+        }
+
+        protected override void ProUpdate(float t)
+        {
+            if (!isActiveCombat)
+            {
+                return;
+            }
+        }
+
+        private void TestCombat(CTaskAwaitBuffer cTaskAwaitBuffer)
+        {
+            Vector3 heroPoint = CombatController.currActiveCombat.CombatSenceController.GetTarget(0);
+            CombatController.currActiveCombat.MagicWeaponCombatSence.SetMagicWeaponCombatSence(heroPoint,
+                Vector3.forward);
+            TestCombatHeroConfig testCombatHeroConfig = GameObject.FindObjectOfType<TestCombatHeroConfig>();
+            if (testCombatHeroConfig != null)
+            {
+                TestCombatHeroConfig.TestHeroInfoConfig testHeroInfoConfig = testCombatHeroConfig.myHeroInfo[0];
+                PlayerManager.Instance.AddTestHeroInfo(testHeroInfoConfig.heroID, testHeroInfoConfig.level,
+                    testHeroInfoConfig.skill, testHeroInfoConfig.magicWeaponId);
+
+
+                CombatHeroEntity heroEntity = new CombatHeroEntity();
+                CombatController.currActiveCombat.CombatHeroController.playerHeroEntity = heroEntity;
+                heroEntity.IsEnemy = false;
+                heroEntity.number = 0;
+
+                Vector3 pos = heroPoint;
+                cTaskAwaitBuffer.AddTask(heroEntity.Init(new CombatHeroAi(), PlayerManager.Instance.myHero, pos,
+                    delegate(CombatHeroEntity entity)
+                    {
+                        entity.CurrCombatHeroInfo.hp = (EncryptionLong)(20000);
+                        entity.MaxCombatHeroInfo.hp = (EncryptionLong)(20000);
+                        combatController.CombatHeroController.AddHero(entity);
+                    }, isPlayer: true));
+            }
+        }
     }
 }

Assets/Scripts/GameLogic/Combat/CombatType/TestCombatType.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using Common.Utility.CombatEvent;
 using Core.Utility;
+using Excel2Json;
 using Fort23.Core;
 using Fort23.UTool;
 using GameLogic.Combat.CombatTool;
@@ -69,6 +70,25 @@ namespace GameLogic.Combat.CombatType
             currEnemyIndex++;
         }
 
+        public async CTask LoadCombat(int levelBattleId)
+        {
+            LevelbattleConfig levelbattleConfig = ConfigComponent.Instance.Get<LevelbattleConfig>(levelBattleId);
+            CTaskAwaitBuffer cTaskAwaitBuffer = new CTaskAwaitBuffer();
+            for (int i = 0; i < levelbattleConfig.Group.Length; i++)
+            {
+                int group = levelbattleConfig.Group[i];
+                GroupConfig groupConfig = ConfigComponent.Instance.Get<GroupConfig>(group);
+                int[] monster = groupConfig.GroupMonster;
+                for (int j = 0; j < monster.Length; j++)
+                {
+                    
+                }
+            }
+
+            await cTaskAwaitBuffer.WaitAll();
+            cTaskAwaitBuffer.Dispose();
+        }
+
         public void CreateEnemy(CTaskAwaitBuffer cTaskAwaitBuffer)
         {
             // return;
@@ -77,7 +97,7 @@ namespace GameLogic.Combat.CombatType
             Vector3 startPos =
                 CombatController.currActiveCombat.CombatSenceController.GetTarget(d) + new Vector3(0, 1, 0);
             Vector3 startPos2 =
-                CombatController.currActiveCombat.CombatSenceController.GetTarget(d+0.01f) + new Vector3(0, 1, 0);
+                CombatController.currActiveCombat.CombatSenceController.GetTarget(d + 0.01f) + new Vector3(0, 1, 0);
             Vector3 dir = startPos2 - startPos;
             Quaternion quaternion = Quaternion.LookRotation(dir);
             for (int i = 0; i < enemyHeroInfo.Count; i++)

Assets/Scripts/GameUI/Combat/CombatDrive.cs

@@ -37,19 +37,29 @@ namespace GameLogic.Combat
             CombatEquipFallManager.Instance.Dispose();
             CombatEquipFallManager.Instance.Init();
             CTaskAwaitBuffer cTaskAwaitBuffer = new CTaskAwaitBuffer();
-            CombatPanel.OpenCombatPanel(cTaskAwaitBuffer);
+            // CombatPanel.OpenCombatPanel(cTaskAwaitBuffer);
             CombatShowTextPanel.OpenCombatShowTextPanel(cTaskAwaitBuffer);
 
             cTaskAwaitBuffer.AddTask(combatMonoBaisc.Init(CombatController));
             await cTaskAwaitBuffer.WaitAll();
             await CombatHPPanel.OpenCombatHPPanel();
-         
+
 
             LogTool.Log("战斗逻辑自己写");
             await CombatController.InitCombat(startCombatInfo);
             StaticUpdater.Instance.AddRenderUpdateCallBack(Update);
         }
 
+        public async CTask LoadLevelBattleCombat(int levelBattleId)
+        {
+            LevelBattleCombatType levelBattleCombatType = CombatController.CombatTypeBasic as LevelBattleCombatType;
+            if (levelBattleCombatType != null)
+            {
+                await levelBattleCombatType.LoadCombat(levelBattleId);
+            }
+            await CombatPanel.OpenCombatPanel();
+        }
+
         public void Update()
         {
             float t = Time.deltaTime;

Assets/Scripts/GameUI/UI/CombatPanel/CombatPanel.cs

@@ -15,9 +15,10 @@ namespace Fort23.Mono
     {
         private ZhuanPanPanel zhuanPanLogic;
 
-        public static void OpenCombatPanel(CTaskAwaitBuffer cTaskAwaitBuffer)
+        public static async CTask OpenCombatPanel()
         {
-            cTaskAwaitBuffer.AddTask(UIManager.Instance.LoadAndOpenPanel<CombatPanel>(null, UILayer.Middle));
+            CombatPanel combatPanel = await UIManager.Instance.LoadAndOpenPanel<CombatPanel>(null, UILayer.Middle);
+            await combatPanel.ShowPanel();
         }
 
         protected override async CTask ProOpen()
@@ -34,7 +35,6 @@ namespace Fort23.Mono
         protected override void AddEvent()
         {
             CombatEventManager.Instance.AddEventListener(CombatEventType.AddRandomEvent, AddRandomEventEventData);
-            CombatEventManager.Instance.AddEventListener(CombatEventType.GameStart, GameStart);
             CombatEventManager.Instance.AddEventListener(CombatEventType.AddMagicWeaponHeroEntity,
                 AddMagicWeaponHeroEntity);
             CombatEventManager.Instance.AddEventListener(CombatEventType.AddUseGongFa, AddUseGongFa);
@@ -82,7 +82,7 @@ namespace Fort23.Mono
             shengShiEventWidget.InitShengShiEventWidget(configId);
         }
 
-        private async void GameStart(IEventData ieveData)
+        public async CTask ShowPanel()
         {
             HeroHpWidget heroHpWidget =
                 await UIManager.Instance.CreateGComponentForObject<HeroHpWidget>(PlayerHpWidget, null);

UserSettings/Layouts/default-2022.dwlt

@@ -14,17 +14,43 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_PixelRect:
     serializedVersion: 2
-    x: 0
-    y: 43
+    x: 8
+    y: 51
     width: 2560
     height: 1349
   m_ShowMode: 4
-  m_Title: Game
-  m_RootView: {fileID: 7}
+  m_Title: Inspector
+  m_RootView: {fileID: 8}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
-  m_Maximized: 1
+  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: SceneView
+  m_EditorClassIdentifier: 
+  m_Children: []
+  m_Position:
+    serializedVersion: 2
+    x: 624
+    y: 0
+    width: 722
+    height: 1299
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 20}
+  m_Panes:
+  - {fileID: 20}
+  m_Selected: 0
+  m_LastSelected: 0
+--- !u!114 &3
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -41,16 +67,16 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 799
+    width: 144
     height: 989
-  m_MinSize: {x: 102, y: 121}
-  m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 13}
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 14}
   m_Panes:
-  - {fileID: 13}
+  - {fileID: 14}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &3
+--- !u!114 &4
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -67,16 +93,16 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 989
-    width: 799
+    width: 144
     height: 310
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
-  m_ActualView: {fileID: 17}
+  m_ActualView: {fileID: 18}
   m_Panes:
-  - {fileID: 17}
+  - {fileID: 18}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &4
+--- !u!114 &5
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -89,20 +115,20 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 2}
   - {fileID: 3}
+  - {fileID: 4}
   m_Position:
     serializedVersion: 2
-    x: 936
+    x: 1346
     y: 0
-    width: 799
+    width: 144
     height: 1299
   m_MinSize: {x: 100, y: 100}
   m_MaxSize: {x: 8096, y: 16192}
   vertical: 1
-  controlID: 35
+  controlID: 47
   draggingID: 0
---- !u!114 &5
+--- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -121,15 +147,15 @@ MonoBehaviour:
     y: 0
     width: 491
     height: 1299
-  m_MinSize: {x: 275, y: 50}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 16}
+  m_MinSize: {x: 276, y: 71}
+  m_MaxSize: {x: 4001, y: 4021}
+  m_ActualView: {fileID: 17}
   m_Panes:
-  - {fileID: 16}
-  - {fileID: 14}
+  - {fileID: 17}
+  - {fileID: 15}
   m_Selected: 0
   m_LastSelected: 1
---- !u!114 &6
+--- !u!114 &7
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -139,25 +165,24 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: SceneView
+  m_Name: GameView
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 936
+    width: 624
     height: 1299
   m_MinSize: {x: 201, y: 221}
   m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 19}
   m_Panes:
-  - {fileID: 18}
   - {fileID: 19}
-  - {fileID: 12}
-  m_Selected: 1
+  - {fileID: 13}
+  m_Selected: 0
   m_LastSelected: 0
---- !u!114 &7
+--- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -170,9 +195,9 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 8}
   - {fileID: 9}
   - {fileID: 10}
+  - {fileID: 11}
   m_Position:
     serializedVersion: 2
     x: 0
@@ -185,7 +210,7 @@ MonoBehaviour:
   m_TopViewHeight: 30
   m_UseBottomView: 1
   m_BottomViewHeight: 20
---- !u!114 &8
+--- !u!114 &9
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -207,7 +232,7 @@ MonoBehaviour:
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
   m_LastLoadedLayoutName: 
---- !u!114 &9
+--- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -220,22 +245,23 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 6}
-  - {fileID: 4}
-  - {fileID: 11}
+  - {fileID: 7}
+  - {fileID: 2}
   - {fileID: 5}
+  - {fileID: 12}
+  - {fileID: 6}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 30
     width: 2560
     height: 1299
-  m_MinSize: {x: 400, y: 100}
-  m_MaxSize: {x: 32384, y: 16192}
+  m_MinSize: {x: 500, y: 100}
+  m_MaxSize: {x: 40480, y: 16192}
   vertical: 0
-  controlID: 19
+  controlID: 19642
   draggingID: 0
---- !u!114 &10
+--- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -256,7 +282,7 @@ MonoBehaviour:
     height: 20
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
---- !u!114 &11
+--- !u!114 &12
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -271,18 +297,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1735
+    x: 1490
     y: 0
-    width: 334
+    width: 579
     height: 1299
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 15}
+  m_MinSize: {x: 202, y: 221}
+  m_MaxSize: {x: 4002, y: 4021}
+  m_ActualView: {fileID: 16}
   m_Panes:
-  - {fileID: 15}
+  - {fileID: 16}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &12
+--- !u!114 &13
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -392,7 +418,7 @@ MonoBehaviour:
       type: {class: TransitionLibraryAliasesPage, ns: Animancer.Editor.TransitionLibraries, asm: Kybernetik.Animancer.Editor}
       data:
         _ScrollPosition: {x: 0, y: 0}
---- !u!114 &13
+--- !u!114 &14
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -412,9 +438,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 936
-    y: 73
-    width: 797
+    x: 1354
+    y: 81
+    width: 142
     height: 968
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -435,7 +461,7 @@ MonoBehaviour:
   m_SequencePath:
     m_SelectionRoot: 0
     m_SubElements: []
---- !u!114 &14
+--- !u!114 &15
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -469,7 +495,7 @@ MonoBehaviour:
     m_LastAppliedPresetName: Default
     m_SaveData: []
     m_OverlaysVisible: 1
---- !u!114 &15
+--- !u!114 &16
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -489,9 +515,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1735
-    y: 73
-    width: 332
+    x: 1498
+    y: 81
+    width: 577
     height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -505,26 +531,26 @@ MonoBehaviour:
     m_OverlaysVisible: 1
   m_SceneHierarchy:
     m_TreeViewState:
-      scrollPos: {x: 0, y: 0}
+      scrollPos: {x: 0, y: 279}
       m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: 9ac4f8ff48fbf8ff4cfbf8ff54fbf8ff5afbf8ff6cfbf8ff38fff9ff9efff9ffbefff9fff8fff9fffefff9ff1a00faff9200faffa000faffa63dfaff7256faff8a56faff3a85faff5285faff7c88faff8288faffd4f0fbff8605fcff2e09fcff3409fcff4409fcff740cfcffae0ffcff7885fdff2287fdff5887fdff94cffdff9acffdffaacffdffd6dafdffdcdafdff2e12feffdc17feff0a25feff6a25feff7025feffaebafeffb6bafeffaec9feffbafdfeffbefdfeffc6fdfeffccfdfeffdefdfefff4e0fffff8e0ffffb0e2ffff10e3ffff16e3ffff2ce6ffff5afaffff
+      m_ExpandedIDs: ee65f8fff465f8ff460cf9ff1e0df9ff9818f9ffc619f9ff561ef9ff021ff9ff721ff9ff423efaff483efaffcc3efaff2e3ffaff9c3ffaffaa3ffaff72a2faff88a2faff40a7faff62a8faffc2a8faffc8a8faff4ca9faffaea9faff1caafaff2aaafaff10bcfbff26bcfbffdabefbffe0befbffc6bffbff28c1fbff88c1fbff8ec1fbff12c2fbff74c2fbffe2c2fbfff0c2fbff2455fcff64ddfcff66ddfcff4ae0fcfff8eafcff062bfdff8859fdffe8f1ffff72f2ffff76f2ffff84f2ffffa6f2ffffc4f2ffffc8f2ffff28f3ffff2cf3ffff94f3ffffacf3ffffb2f3ffffccf3ffffeef5fffffcf5fffff6f8ffff0cf9ffff66faffffd2b10000
       m_RenameOverlay:
         m_UserAcceptedRename: 0
-        m_Name: fb_wulonglun (Clone)
-        m_OriginalName: fb_wulonglun (Clone)
+        m_Name: cd
+        m_OriginalName: cd
         m_EditFieldRect:
           serializedVersion: 2
           x: 0
           y: 0
           width: 0
           height: 0
-        m_UserData: -371062
+        m_UserData: -455608
         m_IsWaitingForDelay: 0
         m_IsRenaming: 0
         m_OriginalEventType: 0
         m_IsRenamingFilename: 0
-        m_ClientGUIView: {fileID: 11}
+        m_ClientGUIView: {fileID: 12}
       m_SearchString: 
     m_ExpandedScenes: []
     m_CurrenRootInstanceID: 0
@@ -532,7 +558,7 @@ MonoBehaviour:
       m_IsLocked: 0
     m_CurrentSortingName: TransformSorting
   m_WindowGUID: f7da054d227971a4d8e6d4985252c187
---- !u!114 &16
+--- !u!114 &17
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -552,8 +578,8 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 2069
-    y: 73
+    x: 2077
+    y: 81
     width: 490
     height: 1278
   m_SerializedDataModeController:
@@ -579,7 +605,7 @@ MonoBehaviour:
   m_LockTracker:
     m_IsLocked: 0
   m_PreviewWindow: {fileID: 0}
---- !u!114 &17
+--- !u!114 &18
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -599,9 +625,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 936
-    y: 1062
-    width: 797
+    x: 1354
+    y: 1070
+    width: 142
     height: 289
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -624,7 +650,7 @@ MonoBehaviour:
     m_SkipHidden: 1
     m_SearchArea: 1
     m_Folders:
-    - Assets/Art/ArtHero/FaBao
+    - Assets/Scripts/GameLogic/Combat/Hero
     m_Globs: []
     m_OriginalText: 
     m_ImportLogFlags: 0
@@ -632,32 +658,32 @@ MonoBehaviour:
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Art/ArtHero/FaBao
+  - Assets/Scripts/GameLogic/Combat/Hero
   m_LastFoldersGridSize: 16
   m_LastProjectPath: D:\unityProject\XiuXianGame
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: c8190100
-    m_LastClickedID: 72136
-    m_ExpandedIDs: 00000000e4be0000e6be0000e8be0000eabe0000ecbe0000eebe0000f0be0000f2be0000f4be0000f6be0000f8be0000fabe0000fcbe0000febe000000bf000002bf000004bf000006bf000008bf00000abf00000cbf0000a8bf0000acbf0000babf00008ac100008ec100008e79010000ca9a3bffffff7f
+    scrollPos: {x: 0, y: 1395}
+    m_SelectedIDs: 8a1e0200
+    m_LastClickedID: 138890
+    m_ExpandedIDs: 00000000febe000000bf000002bf000004bf000006bf000008bf00000abf00000cbf00000ebf000010bf000012bf000014bf000016bf000018bf00001abf00001cbf00001ebf000020bf000022bf000024bf000026bf000028bf00002abf00002cbf0000aac1000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: Chapter
-      m_OriginalName: Chapter
+      m_Name: 
+      m_OriginalName: 
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 49066
+      m_UserData: 0
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
-      m_OriginalEventType: 0
+      m_OriginalEventType: 11
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 3}
+      m_ClientGUIView: {fileID: 4}
     m_SearchString: 
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
@@ -669,7 +695,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 00000000e4be0000e6be0000e8be0000eabe0000ecbe0000eebe0000f0be0000f2be0000f4be0000f6be0000f8be0000fabe0000fcbe0000febe000000bf000002bf000004bf000006bf000008bf00000abf00000cbf0000
+    m_ExpandedIDs: 00000000febe000000bf000002bf000004bf000006bf000008bf00000abf00000cbf00000ebf000010bf000012bf000014bf000016bf000018bf00001abf00001cbf00001ebf000020bf000022bf000024bf000026bf000028bf00002abf00002cbf0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -700,20 +726,20 @@ MonoBehaviour:
     m_ExpandedInstanceIDs: bc7400008ebd000008bd0000300b0100b0ae00005cdf0000c8480100f630010094b1000014b3000090b4000088b4000042b40000aab40000fcb3000044b30000a2b400007cb400008cb4000048a501003eb2000022b2000070de000056dc000020af00001cad00001aad000074c8000070c800000eac0000e4f90200ccd70200eaf90200f0f90200f6f902005cd10000dab300004cb20000d4b30000eab3000006960200beac0000acb60000b4b60000b0b600003a2401003c240100b42601002ec00000b026010048b200000000000052c60000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: RenWuShader
-      m_OriginalName: RenWuShader
+      m_Name: 
+      m_OriginalName: 
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 71258
+      m_UserData: 0
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
-      m_OriginalEventType: 0
+      m_OriginalEventType: 11
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 3}
+      m_ClientGUIView: {fileID: 4}
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
       m_InstanceID: 0
@@ -721,11 +747,11 @@ MonoBehaviour:
       m_Icon: {fileID: 0}
       m_ResourceFile: 
     m_NewAssetIndexInList: -1
-    m_ScrollPosition: {x: 0, y: 0}
+    m_ScrollPosition: {x: 0, y: 103}
     m_GridSize: 16
   m_SkipHiddenPackages: 1
-  m_DirectoriesAreaWidth: 261
---- !u!114 &18
+  m_DirectoriesAreaWidth: 92
+--- !u!114 &19
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -745,9 +771,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 0
-    y: 73
-    width: 935
+    x: 8
+    y: 81
+    width: 623
     height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -792,7 +818,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
@@ -801,29 +827,29 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 935
+      width: 623
       height: 1257
     m_Scale: {x: 0.7740148, y: 0.7740148}
-    m_Translation: {x: 467.5, y: 628.5}
+    m_Translation: {x: 311.5, y: 628.5}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -603.99365
+      x: -402.4471
       y: -812
-      width: 1207.9873
+      width: 804.8942
       height: 1624
     m_MinimalGUI: 1
   m_defaultScale: 0.7740148
-  m_LastWindowPixelSize: {x: 935, y: 1278}
+  m_LastWindowPixelSize: {x: 623, y: 1278}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000000000000000000
   m_XRRenderMode: 0
   m_RenderTexture: {fileID: 0}
---- !u!114 &19
+--- !u!114 &20
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -843,9 +869,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 0
-    y: 73
-    width: 935
+    x: 632
+    y: 81
+    width: 720
     height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -1213,14 +1239,14 @@ MonoBehaviour:
   m_OverrideSceneCullingMask: 6917529027641081856
   m_SceneIsLit: 1
   m_SceneLighting: 1
-  m_2DMode: 0
+  m_2DMode: 1
   m_isRotationLocked: 0
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: -138.50616, y: 26.82835, z: 164.81555}
+    m_Target: {x: -0.6307365, y: -0.41716468, z: -0.01976281}
     speed: 2
-    m_Value: {x: -138.50616, y: 26.82835, z: 164.81555}
+    m_Value: {x: -0.6307365, y: -0.41716468, z: -0.01976281}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -1248,17 +1274,17 @@ MonoBehaviour:
       m_Size: {x: 0, y: 0}
     yGrid:
       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}
     zGrid:
       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}
@@ -1266,17 +1292,17 @@ MonoBehaviour:
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
-    m_Target: {x: -0.00013747625, y: 1.000145, z: -0.0048106136, w: 0.0002849014}
+    m_Target: {x: 0, y: 0, z: 0, w: 1}
     speed: 2
-    m_Value: {x: -0.00013745474, y: 0.99998844, z: -0.0048098606, w: 0.00028485683}
+    m_Value: {x: 0, y: 0, z: 0, w: 1}
   m_Size:
-    m_Target: 3.566151
+    m_Target: 2.8423035
     speed: 2
-    m_Value: 3.566151
+    m_Value: 2.8423035
   m_Ortho:
-    m_Target: 0
+    m_Target: 1
     speed: 2
-    m_Value: 0
+    m_Value: 1
   m_CameraSettings:
     m_Speed: 1
     m_SpeedNormalized: 0.5
@@ -1292,7 +1318,7 @@ MonoBehaviour:
     m_OcclusionCulling: 0
     m_EnableGDRP: 1
     m_BackfaceCulling: 0
-  m_LastSceneViewRotation: {x: -0.104260124, y: 0.65795135, z: -0.09249639, w: -0.7402586}
+  m_LastSceneViewRotation: {x: -0.00013747625, y: 1.000145, z: -0.0048106136, w: 0.0002849014}
   m_LastSceneViewOrtho: 0
   m_ReplacementShader: {fileID: 0}
   m_ReplacementString: