修改升级技能

Assets/Scripts/Core/Event/Event/CustomEventType.cs

@@ -47,5 +47,9 @@ namespace Fort23.Core
       /// </summary>
       ShowBattleExp,
       StartBossBattle,
+      /// <summary>
+      /// 刷新全屏UI
+      /// </summary>
+      RefreshFull,
     }
 }

Assets/Scripts/Core/Event/Event/RefreshFullEventData.cs

@@ -0,0 +1,9 @@
+using Core.Utility.Event;
+
+namespace Core.Event.Event
+{
+    public class RefreshFullEventData: EventDataBasic<RefreshFullEventData>
+    {
+        public bool isFullShow;
+    }
+}

Assets/Scripts/Core/Event/Event/RefreshFullEventData.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: e25f6e890d8f4b78813996d93d6481cf
+timeCreated: 1733282363

Assets/Scripts/Core/UI/Core/UIManager.cs

@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Reflection;
+using Core.Event.Event;
 using Fort23.Core;
 using Fort23.UTool;
 using UnityEngine;
@@ -161,7 +162,7 @@ namespace Fort23.Mono
                 UILayers[3] = prefab.transform.GetChild(3);
                 UICamera = prefab.transform.GetComponentInChildren<Camera>();
             }
-                
+
 
             // if (MaskWordData == null)
             // {
@@ -440,62 +441,67 @@ namespace Fort23.Mono
         {
             Graphic min = null;
             UIPanel[] allPanel = GetComponentAll<UIPanel>();
-            if (allPanel == null)
-            {
-                return;
-            }
-
-            for (int i = 0; i < allPanel.Length; i++)
+            bool isFull = false;
+            if (allPanel != null)
             {
-                UIPanel panel = allPanel[i];
-                if (panel != null && panel.minDepth != null && !panel.IsClose && panel.isShow &&
-                    panel.GObjectPoolInterface.activeSelf && panel.isFullUI)
+                
+                for (int i = 0; i < allPanel.Length; i++)
                 {
-                    if (min == null)
+                    UIPanel panel = allPanel[i];
+                    if (panel != null && panel.minDepth != null && !panel.IsClose && panel.isShow &&
+                        panel.GObjectPoolInterface.activeSelf && panel.isFullUI)
                     {
-                        min = panel.minDepth;
-                        continue;
+                        if (min == null)
+                        {
+                            min = panel.minDepth;
+                            continue;
+                        }
+
+                        if (min != null && panel.minDepth.canvasRenderer.absoluteDepth >
+                            min.canvasRenderer.absoluteDepth)
+                        {
+                            min = panel.minDepth;
+                        }
                     }
+                }
+
+                if (min != null)
+                {
+                    UGUIIamgeTool.minDepth = min.canvasRenderer.absoluteDepth;
+                    UGUIIamgeTool.renderOrder = min.canvas.renderOrder;
+                }
+                else
+                {
+                    UGUIIamgeTool.minDepth = -1;
+                    UGUIIamgeTool.renderOrder = 0;
+                }
 
-                    if (min != null && panel.minDepth.canvasRenderer.absoluteDepth > min.canvasRenderer.absoluteDepth)
+                currDeapthGraphic = min;
+              
+                for (int i = 0; i < allPanel.Length; i++)
+                {
+                    UIPanel panel = allPanel[i];
+                    if (panel != null && !panel.IsClose && panel.isShow && panel.GObjectPoolInterface.activeSelf &&
+                        panel.isFullUI)
                     {
-                        min = panel.minDepth;
+                        isFull = true;
+                        break;
                     }
                 }
             }
 
-            if (min != null)
-            {
-                UGUIIamgeTool.minDepth = min.canvasRenderer.absoluteDepth;
-                UGUIIamgeTool.renderOrder = min.canvas.renderOrder;
-            }
-            else
-            {
-                UGUIIamgeTool.minDepth = -1;
-                UGUIIamgeTool.renderOrder = 0;
-            }
 
-            currDeapthGraphic = min;
+     
+
+            RefreshFullEventData refreshFullEventData = RefreshFullEventData.Create();
+            refreshFullEventData.isFullShow = isFull;
+            EventManager.Instance.Dispatch(CustomEventType.RefreshFull, refreshFullEventData);
 
             if (_currCustomCameraStack == null)
             {
                 // URPTool.Instance.IsNotRenderMainCamera = false;
                 return;
             }
-
-
-            bool isFull = false;
-            for (int i = 0; i < allPanel.Length; i++)
-            {
-                UIPanel panel = allPanel[i];
-                if (panel != null && !panel.IsClose && panel.isShow && panel.GObjectPoolInterface.activeSelf &&
-                    panel.isFullUI)
-                {
-                    isFull = true;
-                    break;
-                }
-            }
-
             // URPTool.Instance.IsNotRenderMainCamera = isFull;
         }
 

Assets/Scripts/GameLogic/Combat/CombatEvent/HeroPowerUpEventData.cs

@@ -6,6 +6,12 @@ namespace Common.Utility.CombatEvent
     public class HeroPowerUpEventData : EventDataBasic<HeroPowerUpEventData>
     {
         public int heroModelID;
+
+        /// <summary>
+        /// 技能是否有更新
+        /// </summary>
+        public bool isSkillUp;
+
         /// <summary>
         /// 英雄提升类型
         /// </summary>

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

@@ -43,8 +43,6 @@ namespace GameLogic.Combat.CombatTool
             {
                 _followHeroId = heroId;
             }
-            
-            
         }
 
         private void ShakeFinish()
@@ -63,6 +61,7 @@ namespace GameLogic.Combat.CombatTool
                 }
 
                 Vector3 p = Vector3.zero;
+                bool isHero = false;
                 if (_followHeroId != -1)
                 {
                     for (int i = 0; i < combatHeroEntities.Length; i++)
@@ -70,11 +69,13 @@ namespace GameLogic.Combat.CombatTool
                         if (combatHeroEntities[i].CurrCombatHeroInfo.modelID == _followHeroId)
                         {
                             p = combatHeroEntities[i].dotPos;
+                            isHero = true;
                             break;
                         }
                     }
                 }
-                else
+
+                if (!isHero)
                 {
                     for (int i = 0; i < combatHeroEntities.Length; i++)
                     {

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

@@ -1,6 +1,8 @@
-using Common.Utility.CombatEvent;
+using System;
+using Common.Utility.CombatEvent;
 using Common.Utility.CombatTimer;
 using Core.Audio;
+using Core.Event.Event;
 using Core.State;
 using Fort23.Core;
 using GameLogic.Combat.CombatState;
@@ -14,7 +16,7 @@ using UTool.CustomizeTimeLogic.FxLogic.TimeLineEventLogic;
 
 namespace GameLogic.Combat.CombatTool
 {
-    public class CombatController : ITimeLineAudio
+    public class CombatController : ITimeLineAudio,IDisposable
     {
         public static CombatController currActiveCombat;
         public CombatHeroController CombatHeroController;
@@ -33,6 +35,8 @@ namespace GameLogic.Combat.CombatTool
 
         public float speed = 1;
 
+        private bool _isFullUIShow;
+        
         public CombatStateBasic CurrState
         {
             get { return stateControl.CurrIState as CombatStateBasic; }
@@ -72,6 +76,13 @@ namespace GameLogic.Combat.CombatTool
             await CombatTypeBasic.StartGame();
             ChangeState("update");
             isUpdate = true;
+            EventManager.Instance.AddEventListener(CustomEventType.RefreshFull, RefreshFull);
+        }
+
+        private void RefreshFull(IEventData eventData)
+        {
+            RefreshFullEventData data = (RefreshFullEventData)eventData;
+            _isFullUIShow = data.isFullShow;
         }
 
 
@@ -82,7 +93,7 @@ namespace GameLogic.Combat.CombatTool
 
         public void Update(float t)
         {
-            if (!isUpdate)
+            if (!isUpdate||_isFullUIShow)
             {
                 return;
             }
@@ -98,5 +109,18 @@ namespace GameLogic.Combat.CombatTool
         {
             AudioManager.Instance.PlayAudio(audioName, isLoop);
         }
+
+        public void Dispose()
+        {
+            TimeLineSingletonEventManager.Instance.RemoveTimeLineBasic(this);
+            CombatTypeBasic?.Dispose();
+            CombatHeroController?.Dispose();
+            CombatCameraControllder?.Dispose();
+            CombatSenceController?.Dispose();
+            GameTimeLineParticleFactory?.Dispose();
+            EventManager.Instance.RemoveAllEventListener(CustomEventType.RefreshFull);
+           
+            
+        }
     }
 }

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

@@ -1,5 +1,7 @@
 using System;
+using System.Collections.Generic;
 using Common.Utility.CombatEvent;
+using Excel2Json;
 using Fort23.Core;
 using Fort23.UTool;
 using GameLogic.Combat.Hero;
@@ -34,13 +36,12 @@ namespace GameLogic.Combat.CombatTool
         {
             this.combatController = combatController;
             CombatEventManager.Instance.AddEventListener(CombatEventType.UseSkill, CombatUseSkillEventData);
-            EventManager.Instance.AddEventListener(CustomEventType.HeroLvUp, HeroUpgrade);
+            EventManager.Instance.AddEventListener(CustomEventType.HeroPowerUp, HeroPowerUp);
         }
 
-        private void HeroUpgrade(IEventData eventData)
+        private void HeroPowerUp(IEventData eventData)
         {
             HeroPowerUpEventData heroPowerUpEventData = eventData as HeroPowerUpEventData;
-            
             int id = heroPowerUpEventData.heroModelID;
             CombatHeroEntity combatHeroEntity = null;
             for (int i = 0; i < myHero.Count; i++)
@@ -65,6 +66,17 @@ namespace GameLogic.Combat.CombatTool
             }
 
             CombatHeroInfo combatHeroInfo = PlayerManager.Instance.heroController.GetHeroInfo(id);
+
+
+            UpLevelHero(heroPowerUpEventData.isSkillUp, combatHeroEntity, combatHeroInfo);
+        }
+
+
+        private void UpLevelHero(bool isSkillUp, CombatHeroEntity combatHeroEntity, CombatHeroInfo combatHeroInfo)
+        {
+            // int id = heroPowerUpEventData.heroModelID;
+
+
             long addHp = combatHeroInfo.hp.Value - combatHeroEntity.MaxCombatHeroInfo.hp.Value;
             combatHeroEntity.MaxCombatHeroInfo.hp = combatHeroInfo.hp;
             combatHeroEntity.MaxCombatHeroInfo.defense = combatHeroInfo.defense;
@@ -79,9 +91,14 @@ namespace GameLogic.Combat.CombatTool
                 }
                 else
                 {
-                    
                 }
             }
+
+            if (isSkillUp)
+            {
+                List<SkillConfig> skillConfigs = combatHeroInfo.skillConfigs;
+                combatHeroEntity.CombatHeroSkillControl.UpdateSkill(skillConfigs);
+            }
         }
 
         public void RemoveDieHero(CombatHeroEntity combatHeroEntity)

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

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using Fort23.Core;
 using GameLogic.CombatScenesTool;
@@ -6,7 +7,7 @@ using UnityEngine;
 
 namespace GameLogic.Combat.CombatTool
 {
-    public class CombatSenceController
+    public class CombatSenceController: IDisposable
     {
         private AssetHandle scenesHandle;
         private AssetHandle scenesHandle2;
@@ -99,5 +100,21 @@ namespace GameLogic.Combat.CombatTool
 
             _navMeshSurface.BuildNavMesh();
         }
+
+        public void Dispose()
+        {
+            if (scenesHandle != null)
+            {
+                scenesHandle.Release();
+            }
+            if (scenesHandle2 != null)
+            {
+                scenesHandle2.Release();
+            }
+            if (_navMeshSurface != null)
+            {
+                _navMeshSurface.gameObject.SetActive(false);
+            }
+        }
     }
 }

Assets/Scripts/GameLogic/Combat/Hero/CombatAIBasic.cs

@@ -22,6 +22,7 @@ public class CombatAIBasic : IDisposable
     // public NavMeshObstacle NavMeshObstacle;
     protected CombatHeroEntity _combatHeroEntity;
     protected float _r = 5;
+    public bool isAlert;
 
     /// <summary>
     /// 当前聚焦的目标
@@ -183,7 +184,7 @@ public class CombatAIBasic : IDisposable
 
 
         stateControl.Update(t);
-        if (currFocusTarget != null && !_combatHeroEntity.isDie)
+        if (currFocusTarget != null && !_combatHeroEntity.isDie && !isAlert)
         {
             if (!stateControl.CurrStateName.Equals(CombatHeroStateType.move) &&
                 !stateControl.CurrStateName.Equals(CombatHeroStateType.followMove) &&

Assets/Scripts/GameLogic/Combat/Hero/CombatHeroSkillControl.cs

@@ -1,6 +1,8 @@
 using System;
+using System.Collections.Generic;
 using Common.Utility.CombatEvent;
 using Excel2Json;
+using Fort23.Core;
 using Fort23.UTool;
 using GameLogic.Combat.CombatTool;
 using GameLogic.Combat.Skill;
@@ -36,6 +38,7 @@ namespace GameLogic.Combat.Hero
         public void Init(CombatHeroEntity combatHeroEntity)
         {
             _combatHeroEntity = combatHeroEntity;
+
             // int[] skillId = _combatHeroEntity.CurrCombatHeroInfo.skillId;
             // if (skillId != null)
             // {
@@ -52,6 +55,40 @@ namespace GameLogic.Combat.Hero
             }
         }
 
+
+        public void UpdateSkill(List<SkillConfig> skillConfigs)
+        {
+            for (int i = 0; i < skillConfigs.Count; i++)
+            {
+                SkillConfig skillConfig = skillConfigs[i];
+                SkillBasic skillBasic= GetSkillBasic(skillConfig.IDGroup);
+                if (skillBasic == null)
+                {
+                    AddSkill(skillConfig);
+                }
+                else
+                {
+                    if (skillBasic.SelfSkillConfig.ID != skillConfig.ID)
+                    {
+                        skillBasic.InitSkillConfig(skillConfig);
+                    }
+                }
+            }
+        }
+
+        private SkillBasic GetSkillBasic(int skillGroupId)
+        {
+            for (int i = 0; i < SkillCommands.Count; i++)
+            {
+                if (SkillCommands[i].SelfSkillConfig.IDGroup == skillGroupId)
+                {
+                    return SkillCommands[i];
+                }
+            }
+
+            return null;
+        }
+
         public void AddSkill(SkillConfig skillConfig)
         {
             SkillBasic skillBasic = SkillScriptManager.Instance.CreateSkillBasic(skillConfig);

Assets/Scripts/GameLogic/Combat/Hero/State/CombatHeroActiveState.cs

@@ -20,12 +20,14 @@ namespace GameLogic.Combat.Hero.State
                 {
                     combatHeroEntity.GetMainHotPoin<CombatHeroHitPoint>(true).IsHide = false;
                     combatHeroEntity.CombatAIBasic.ChangeState(CombatHeroStateType.idle);
+                    combatHeroEntity.CombatAIBasic.isAlert = false;
                 };
                 combatHeroEntity.combatHeroTimeLineControl.AddEventLogicGroup(timeLineEventLogicGroup);
             }
             else
             {
                 combatHeroEntity.GetMainHotPoin<CombatHeroHitPoint>(true).IsHide = false;
+                combatHeroEntity.CombatAIBasic.isAlert = false;
                 combatHeroEntity.CombatAIBasic.ChangeState(CombatHeroStateType.idle);
             }
         }

Assets/Scripts/GameLogic/Combat/Hero/State/CombatHeroMoveState.cs

@@ -1,4 +1,7 @@
 using Animancer;
+using Core.Event.Event;
+using Fort23.Core;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.Logical;
 using UnityEngine;
 using UnityEngine.AI;
 
@@ -11,13 +14,20 @@ namespace GameLogic.Combat.Hero.State
         protected Vector3 lastMovePoint;
         protected HeroPlayStateInfoBasic _transitionAsset;
 
+        protected bool isStop;
         public CombatHeroMoveState(CombatHeroEntity combatHeroEntity) : base(combatHeroEntity)
         {
         }
 
         protected override void ProEnter()
         {
+            EventManager.Instance.AddEventListener(CustomEventType.RefreshFull,RefreshFull);
             combatHeroEntity.CombatAIBasic.NavMeshAgent.Warp(combatHeroEntity.dotPos);
+            Start();
+        }
+
+        protected void Start()
+        {
             lasetTaregtPoint = new Vector3(999999, 99999, 99999);
             _transitionAsset = combatHeroEntity.combatHeroAnimtion.Play("run");
             combatHeroEntity.CombatAIBasic.NavMeshAgent.updateRotation = false;
@@ -32,8 +42,26 @@ namespace GameLogic.Combat.Hero.State
             combatHeroEntity.CombatAIBasic.NavMeshAgent.avoidancePriority = 40;
         }
 
+        protected void RefreshFull(IEventData ieEventData)
+        {
+            RefreshFullEventData data = (RefreshFullEventData)ieEventData;
+            if (data.isFullShow&&!isStop)
+            {
+                isStop = true;
+                combatHeroEntity.CombatAIBasic.NavMeshAgent.isStopped = true;
+                combatHeroEntity.CombatAIBasic.NavMeshAgent.velocity = Vector3.zero;
+                combatHeroEntity.CombatAIBasic.NavMeshAgent.avoidancePriority = 50;
+            }
+            else if(isStop)
+            {
+                Start();
+                isStop = false;
+            }
+        }
+
         protected override void ProExit()
         {
+            EventManager.Instance.RemoveEventListener(CustomEventType.RefreshFull,RefreshFull);
             combatHeroEntity.CombatAIBasic.NavMeshAgent.isStopped = true;
             combatHeroEntity.CombatAIBasic.NavMeshAgent.velocity = Vector3.zero;
             combatHeroEntity.CombatAIBasic.NavMeshAgent.avoidancePriority = 50;
@@ -51,6 +79,7 @@ namespace GameLogic.Combat.Hero.State
 
         protected override void ProUpdate(float t)
         {
+            
             if (combatHeroEntity.CombatAIBasic.currFocusTarget == null)
             {
                 combatHeroEntity.CombatAIBasic.ChangeState(CombatHeroStateType.idle);

Assets/Scripts/GameLogic/Combat/Hero/State/CombatHeroXiuMianState.cs

@@ -22,7 +22,7 @@ namespace GameLogic.Combat.Hero.State
                 combatHeroEntity.CombatAIBasic.ChangeState(CombatHeroStateType.idle);
                 return;
             }
-
+            combatHeroEntity.CombatAIBasic.isAlert = true;
             combatHeroEntity.GetMainHotPoin<CombatHeroHitPoint>(true).IsHide = true;
             CombatEventManager.Instance.AddEventListener(CombatEventType.ActiveCombat, ActiveCombat);
             TimeLineEventLogicGroupBasic timeLineEventLogicGroup =

Assets/Scripts/GameLogic/Combat/Skill/S10001.cs

@@ -14,7 +14,7 @@ namespace GameLogic.Combat.Skill
         protected float _harm;
 
         // protected 
-        protected override void ProInitSkill()
+        protected override void ProInitSkillConfig()
         {
             _harm = SelfSkillConfig.effectValue[0];
             AddTriggerCallBack("sk1_fashe", Sk1_fasheTrigger);

Assets/Scripts/GameLogic/Combat/Skill/S110001.cs

@@ -12,7 +12,7 @@ namespace GameLogic.Combat.Skill
     {
         private float _harm;
 
-        protected override void ProInitSkill()
+        protected override void ProInitSkillConfig()
         {
             _harm = SelfSkillConfig.effectValue[0];
         }

Assets/Scripts/GameLogic/Combat/Skill/S110002.cs

@@ -15,7 +15,7 @@ namespace GameLogic.Combat.Skill
         private bool _isUpdate;
 
         // protected BetterList<CombatHeroEntity> 
-        protected override void ProInitSkill()
+        protected override void ProInitSkillConfig()
         {
             _harm = SelfSkillConfig.effectValue[0];
         }

Assets/Scripts/GameLogic/Combat/Skill/S120001.cs

@@ -27,7 +27,7 @@ namespace GameLogic.Combat.Skill
         private float _currAddTime;
 
         // protected BetterList<CombatHeroEntity> 
-        protected override void ProInitSkill()
+        protected override void ProInitSkillConfig()
         {
             _harm = SelfSkillConfig.effectValue[0];
         }

Assets/Scripts/GameLogic/Combat/Skill/S130001.cs

@@ -11,7 +11,7 @@ namespace GameLogic.Combat.Skill
     public class S130001 : SkillBasic
     {
         private float _harm;
-        protected override void ProInitSkill()
+        protected override void ProInitSkillConfig()
         {
             _harm = SelfSkillConfig.effectValue[0];
         }

Assets/Scripts/GameLogic/Combat/Skill/S140001.cs

@@ -11,7 +11,7 @@ namespace GameLogic.Combat.Skill
     public class S140001 : SkillBasic
     {
         private float _harm;
-        protected override void ProInitSkill()
+        protected override void ProInitSkillConfig()
         {
             _harm = SelfSkillConfig.effectValue[0];
         }

Assets/Scripts/GameLogic/Combat/Skill/S140003.cs

@@ -19,7 +19,7 @@ namespace GameLogic.Combat.Skill
 
         protected float _currTime;
         protected float _addTime;
-        protected override void ProInitSkill()
+        protected override void ProInitSkillConfig()
         {
             _harm = SelfSkillConfig.effectValue[0];
             _addTime=1.0f/0.37f;

Assets/Scripts/GameLogic/Combat/Skill/S20001.cs

@@ -12,7 +12,7 @@ namespace GameLogic.Combat.Skill
     {
         protected float recoverValue;
 
-        protected override void ProInitSkill()
+        protected override void ProInitSkillConfig()
         {
             recoverValue = SelfSkillConfig.effectValue[0];
         }

Assets/Scripts/GameLogic/Combat/Skill/S30001.cs

@@ -23,7 +23,7 @@ namespace GameLogic.Combat.Skill
         // protected float addXuanZhuang = 0.5f;
         // protected float _allAddJiaoDu;
 
-        protected override void ProInitSkill()
+        protected override void ProInitSkillConfig()
         {
             _harm = SelfSkillConfig.effectValue[0];
             _maxTime = 3;

Assets/Scripts/GameLogic/Combat/Skill/S40001.cs

@@ -16,7 +16,7 @@ namespace GameLogic.Combat.Skill
         protected int _count;
         protected int _currCount;
 
-        protected override void ProInitSkill()
+        protected override void ProInitSkillConfig()
         {
             _harm = SelfSkillConfig.effectValue[0];
             _count = 3;

Assets/Scripts/GameLogic/Combat/Skill/SkillBasic.cs

@@ -191,9 +191,15 @@ namespace GameLogic.Combat.Skill
 
             UseCount = skillConfig.SkillType * 100000;
             skillGuid = skillConfig.ID;
+            ProInitSkillConfig();
             // LogTool.Log("初始化技能"+skillConfig.scriptName);
         }
 
+        protected virtual void ProInitSkillConfig()
+        {
+            
+        }
+
         /// <summary>
         /// 设置激活的TimeLine名字
         /// </summary>
@@ -541,7 +547,11 @@ namespace GameLogic.Combat.Skill
         }
 
 
-        protected abstract void ProInitSkill();
+        protected virtual void ProInitSkill()
+        {
+            
+        }
+
         protected abstract void ProUseSkill();
 
         protected virtual ILifetCycleHitPoint[] ProGetTineLineTargetEntity(

Assets/Scripts/GameLogic/Hero/SkillData.cs

@@ -113,6 +113,7 @@ namespace GameLogic.Hero
                     heroInfo.skillConfigs.Add(combatSkill.skillConfig);
                 }
             }
+            
         }
         
         

Assets/Scripts/GameUI/UI/Hero/WidgetHero.cs

@@ -98,7 +98,7 @@ namespace Fort23.Mono
             // {
             //     heroDetailPanel = await UIManager.Instance.LoadAndOpenPanel<HeroDetailPanel>(Callback);
             // }
-            HeroDetailPanel heroDetailPanel = await UIManager.Instance.LoadAndOpenPanel<HeroDetailPanel>(Callback,UILayer.Top);
+            HeroDetailPanel heroDetailPanel = await UIManager.Instance.LoadAndOpenPanel<HeroDetailPanel>(Callback,UILayer.Top,isFullUI:true);
             heroDetailPanel.InitHeroDetailPanel(heroInfo);
         }
 

UserSettings/Layouts/default-2022.dwlt

@@ -17,7 +17,7 @@ MonoBehaviour:
     x: 0
     y: 43
     width: 2560
-    height: 1357
+    height: 1349
   m_ShowMode: 4
   m_Title: Hierarchy
   m_RootView: {fileID: 7}
@@ -34,20 +34,20 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: TimelineWindow
+  m_Name: GameView
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 0
-    y: 651
-    width: 605
-    height: 250
-  m_MinSize: {x: 100, y: 100}
+    x: 574
+    y: 0
+    width: 615
+    height: 1040
+  m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 18}
+  m_ActualView: {fileID: 23}
   m_Panes:
-  - {fileID: 18}
+  - {fileID: 23}
   m_Selected: 0
   m_LastSelected: 0
 --- !u!114 &3
@@ -63,18 +63,18 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 6}
+  - {fileID: 15}
   - {fileID: 2}
   m_Position:
     serializedVersion: 2
-    x: 584
+    x: 0
     y: 0
-    width: 605
-    height: 901
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 8096, y: 16192}
-  vertical: 1
-  controlID: 97
+    width: 1189
+    height: 1040
+  m_MinSize: {x: 200, y: 50}
+  m_MaxSize: {x: 16192, y: 8096}
+  vertical: 0
+  controlID: 2480
   draggingID: 0
 --- !u!114 &4
 MonoBehaviour:
@@ -86,20 +86,20 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: ConsoleWindow
+  m_Name: TimelineWindow
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 0
+    x: 583
     y: 0
-    width: 584
-    height: 901
-  m_MinSize: {x: 101, y: 121}
-  m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 19}
+    width: 606
+    height: 259
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 18}
   m_Panes:
-  - {fileID: 19}
+  - {fileID: 18}
   m_Selected: 0
   m_LastSelected: 0
 --- !u!114 &5
@@ -111,23 +111,23 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
+  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: ConsoleWindow
   m_EditorClassIdentifier: 
-  m_Children:
-  - {fileID: 4}
-  - {fileID: 3}
+  m_Children: []
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 406
-    width: 1189
-    height: 901
-  m_MinSize: {x: 200, y: 100}
-  m_MaxSize: {x: 16192, y: 16192}
-  vertical: 0
-  controlID: 96
-  draggingID: 0
+    y: 0
+    width: 583
+    height: 259
+  m_MinSize: {x: 101, y: 121}
+  m_MaxSize: {x: 4001, y: 4021}
+  m_ActualView: {fileID: 19}
+  m_Panes:
+  - {fileID: 19}
+  m_Selected: 0
+  m_LastSelected: 0
 --- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -137,23 +137,23 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: GameView
+  m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
   m_EditorClassIdentifier: 
-  m_Children: []
+  m_Children:
+  - {fileID: 5}
+  - {fileID: 4}
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 0
-    width: 605
-    height: 651
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 23}
-  m_Panes:
-  - {fileID: 23}
-  m_Selected: 0
-  m_LastSelected: 0
+    y: 1040
+    width: 1189
+    height: 259
+  m_MinSize: {x: 200, y: 50}
+  m_MaxSize: {x: 16192, y: 8096}
+  vertical: 0
+  controlID: 204
+  draggingID: 0
 --- !u!114 &7
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -175,7 +175,7 @@ MonoBehaviour:
     x: 0
     y: 0
     width: 2560
-    height: 1357
+    height: 1349
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_UseTopView: 1
@@ -226,11 +226,11 @@ MonoBehaviour:
     x: 0
     y: 30
     width: 2560
-    height: 1307
-  m_MinSize: {x: 500, y: 150}
-  m_MaxSize: {x: 40480, y: 24288}
+    height: 1299
+  m_MinSize: {x: 500, y: 100}
+  m_MaxSize: {x: 40480, y: 16192}
   vertical: 0
-  controlID: 245
+  controlID: 337
   draggingID: 0
 --- !u!114 &10
 MonoBehaviour:
@@ -248,7 +248,7 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 1337
+    y: 1329
     width: 2560
     height: 20
   m_MinSize: {x: 0, y: 0}
@@ -266,18 +266,18 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 15}
-  - {fileID: 5}
+  - {fileID: 3}
+  - {fileID: 6}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
     width: 1189
-    height: 1307
-  m_MinSize: {x: 200, y: 150}
-  m_MaxSize: {x: 16192, y: 24288}
+    height: 1299
+  m_MinSize: {x: 200, y: 100}
+  m_MaxSize: {x: 16192, y: 16192}
   vertical: 1
-  controlID: 95
+  controlID: 22
   draggingID: 0
 --- !u!114 &12
 MonoBehaviour:
@@ -296,10 +296,10 @@ MonoBehaviour:
     serializedVersion: 2
     x: 1189
     y: 0
-    width: 431
-    height: 1307
-  m_MinSize: {x: 202, y: 221}
-  m_MaxSize: {x: 4002, y: 4021}
+    width: 426
+    height: 1299
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 20}
   m_Panes:
   - {fileID: 20}
@@ -320,10 +320,10 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1620
+    x: 1615
     y: 0
-    width: 452
-    height: 1307
+    width: 457
+    height: 1299
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
   m_ActualView: {fileID: 22}
@@ -349,7 +349,7 @@ MonoBehaviour:
     x: 2072
     y: 0
     width: 488
-    height: 1307
+    height: 1299
   m_MinSize: {x: 276, y: 71}
   m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 21}
@@ -367,24 +367,24 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 1
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: TransitionLibraryWindow
+  m_Name: SceneView
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1189
-    height: 406
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 16}
+    width: 574
+    height: 1040
+  m_MinSize: {x: 201, y: 221}
+  m_MaxSize: {x: 4001, y: 4021}
+  m_ActualView: {fileID: 24}
   m_Panes:
   - {fileID: 24}
   - {fileID: 17}
   - {fileID: 16}
-  m_Selected: 2
-  m_LastSelected: 0
+  m_Selected: 0
+  m_LastSelected: 2
 --- !u!114 &16
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -408,7 +408,7 @@ MonoBehaviour:
     x: 0
     y: 73
     width: 1188
-    height: 385
+    height: 641
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -673,10 +673,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 584
-    y: 1130
-    width: 603
-    height: 229
+    x: 583
+    y: 1113
+    width: 604
+    height: 238
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -717,9 +717,9 @@ MonoBehaviour:
   m_Pos:
     serializedVersion: 2
     x: 0
-    y: 479
-    width: 583
-    height: 880
+    y: 1113
+    width: 582
+    height: 238
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -752,8 +752,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 1189
     y: 73
-    width: 429
-    height: 1286
+    width: 424
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -769,18 +769,18 @@ MonoBehaviour:
       scrollPos: {x: 0, y: 0}
       m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: eee1fdff02e2fdffac15feff6a9cfeff6e9cfeff729cfeff769cfeff7a9cfeff7e9cfeff829cfeff869cfeff8a9cfeff8e9cfeff929cfeff969cfeffd69cfeffda9cfeffde9cfeffe29cfeffe69cfeffea9cfeff169dfeffe430ffffa877ffffe098ffff2c9bffffd29bffff3ed3ffff00d5ffffced6ffffe6d8ffffcef9ffff469e00005a9e0000669e0000
+      m_ExpandedIDs: 3ec3fdff26c4feff2ac4feffaec4feffb2c4feffb8c4feffbcc4feffc0c4feffd4c4feff167cffff3e7cffff0a7dfffff480ffff8081ffff7688ffff7a88ffff8888ffff34efffffbac40000e8c40000
       m_RenameOverlay:
         m_UserAcceptedRename: 0
-        m_Name: Cloak02
-        m_OriginalName: Cloak02
+        m_Name: point1
+        m_OriginalName: point1
         m_EditFieldRect:
           serializedVersion: 2
           x: 0
           y: 0
           width: 0
           height: 0
-        m_UserData: -125544
+        m_UserData: -146630
         m_IsWaitingForDelay: 0
         m_IsRenaming: 0
         m_OriginalEventType: 0
@@ -816,7 +816,7 @@ MonoBehaviour:
     x: 2072
     y: 73
     width: 487
-    height: 1286
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -860,10 +860,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1620
+    x: 1615
     y: 73
-    width: 450
-    height: 1286
+    width: 455
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -885,7 +885,7 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Scripts/GameLogic/Combat/Hero
+    - Assets/Scripts/GameUI
     m_Globs: []
     m_OriginalText: 
     m_ImportLogFlags: 0
@@ -893,16 +893,16 @@ MonoBehaviour:
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Scripts/GameLogic/Combat/Hero
+  - Assets/Scripts/GameUI
   m_LastFoldersGridSize: 16
-  m_LastProjectPath: D:\UnityProject\XY001\xy001\XY001
+  m_LastProjectPath: D:\unityProject\XY001
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 798}
-    m_SelectedIDs: 4c520100
-    m_LastClickedID: 86604
-    m_ExpandedIDs: 00000000469f0000489f00004a9f00009ea10000a6a10000b4a10000bea1000000db000010db000018db0000740b01001e400100204001002440010044420100504201004e52010000ca9a3bffffff7f
+    scrollPos: {x: 0, y: 342}
+    m_SelectedIDs: ccc50000
+    m_LastClickedID: 50636
+    m_ExpandedIDs: 00000000a6c50000a8c50000aac50000acc50000aec50000b0c50000b2c50000b4c50000b6c50000b8c50000bac50000bcc50000bec50000c0c50000c2c50000c4c50000c6c50000c8c50000cac50000ccc50000cec50000d0c50000d2c50000d4c50000d6c50000d8c50000dac50000dcc50000dec50000e0c50000e2c50000e4c50000e6c50000e8c50000eac50000ecc50000eec50000f0c50000f2c5000078c8000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -930,7 +930,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 00000000469f0000489f00004a9f0000
+    m_ExpandedIDs: 00000000a6c50000a8c50000aac50000acc50000aec50000b0c50000b2c50000b4c50000b6c50000b8c50000bac50000bcc50000bec50000c0c50000c2c50000c4c50000c6c50000c8c50000cac50000ccc50000cec50000d0c50000d2c50000d4c50000d6c50000d8c50000dac50000dcc50000dec50000e0c50000e2c50000e4c50000e6c50000e8c50000eac50000ecc50000eec50000f0c50000f2c50000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -961,18 +961,18 @@ MonoBehaviour:
     m_ExpandedInstanceIDs: d02e01001ef900002afc000092f80000f0f70000d8fa000046fa0000f0f80000dc5b0100d05b0100c85b0100cc5b01004a0b0100de0b0100de0a01009e0b0100220b01002a4201007a490100aa4401008a4301006a4e0100
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: Hero03
-      m_OriginalName: Hero03
+      m_Name: 
+      m_OriginalName: 
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 53952
+      m_UserData: 0
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
-      m_OriginalEventType: 0
+      m_OriginalEventType: 11
       m_IsRenamingFilename: 1
       m_ClientGUIView: {fileID: 13}
     m_CreateAssetUtility:
@@ -1006,10 +1006,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 584
-    y: 479
-    width: 603
-    height: 630
+    x: 574
+    y: 73
+    width: 613
+    height: 1019
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1062,23 +1062,23 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 603
-      height: 609
-    m_Scale: {x: 0.375, y: 0.375}
-    m_Translation: {x: 301.5, y: 304.5}
+      width: 613
+      height: 998
+    m_Scale: {x: 0.614532, y: 0.614532}
+    m_Translation: {x: 306.5, y: 499.00003}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -804
-      y: -812
-      width: 1608
-      height: 1624
+      x: -498.75354
+      y: -812.00006
+      width: 997.5071
+      height: 1624.0001
     m_MinimalGUI: 1
-  m_defaultScale: 0.375
-  m_LastWindowPixelSize: {x: 603, y: 630}
+  m_defaultScale: 0.614532
+  m_LastWindowPixelSize: {x: 613, y: 1019}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000000000000000000
@@ -1106,8 +1106,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 73
-    width: 1188
-    height: 385
+    width: 573
+    height: 1019
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1123,7 +1123,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 1
       snapOffset: {x: -156, y: -26}
-      snapOffsetDelta: {x: -10, y: 0}
+      snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 3
       id: Tool Settings
       index: 0
@@ -1408,7 +1408,7 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: 48, y: 0}
+      snapOffset: {x: 48, y: 25}
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: AINavigationOverlay
@@ -1479,9 +1479,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 0, y: 0, z: 0}
+    m_Target: {x: -1.7693497, y: 0.78333306, z: 23.469297}
     speed: 2
-    m_Value: {x: 0, y: 0, z: 0}
+    m_Value: {x: -1.7693497, y: 0.78333306, z: 23.469297}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -1527,13 +1527,13 @@ MonoBehaviour:
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
-    m_Target: {x: 0.25383064, y: -0.49064386, z: 0.15195572, w: 0.8196861}
+    m_Target: {x: -0.088524535, y: -0.9072912, z: 0.23964652, w: -0.33429593}
     speed: 2
-    m_Value: {x: 0.25381324, y: -0.49061024, z: 0.15194531, w: 0.8196299}
+    m_Value: {x: -0.088515766, y: -0.9072013, z: 0.23962279, w: -0.33426282}
   m_Size:
-    m_Target: 0.9101827
+    m_Target: 1.4658676
     speed: 2
-    m_Value: 0.9101827
+    m_Value: 1.4658676
   m_Ortho:
     m_Target: 0
     speed: 2