导航栏修改

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

@@ -360,7 +360,7 @@ namespace Fort23.Mono
                 // TDManager.Instance.PartCount(uiBindingAttribute.prefab);
                 if (isFocus)
                 {
-                    if (currOpenPanel != null )
+                    if (currOpenPanel != null)
                     {
                         if (currOpenPanel.isShow)
                         {
@@ -877,16 +877,13 @@ namespace Fort23.Mono
                 {
                     uiPanel.IsBreadcrumbBarPanel = false;
                     UIPanel uiPanel1 = CloseTopUI();
-
-
-                    LastUIPanel = uiPanel1;
-                    OpenTopUI();
-                    return;
+                    if (uiPanel != null)
+                    {
+                        LastUIPanel = uiPanel1;
+                        OpenTopUI();
+                        return;
+                    }
                 }
-
-                // uiPanel.Hide();
-
-                // return;
             }
 
             if (!NoFocusTopUIPanels.Contains(uiPanel)) NoFocusTopUIPanels.Remove(uiPanel);

Assets/Scripts/GameUI/UI/AppBarPanel/AppBarPanel.cs

@@ -11,7 +11,7 @@ namespace Fort23.Mono
     [UIBinding(prefab = "AppBarPanel")]
     public partial class AppBarPanel : UIPanel
     {
-        UIPanel currentOpenUIPanel;
+        public UIPanel currentOpenUIPanel;
 
         private void Init()
         {
@@ -46,7 +46,6 @@ namespace Fort23.Mono
 
                 UIManager.Instance.HideUIUIPanel(currentOpenUIPanel);
                 SkillSelectPanel skillSelectPanel = await SkillSelectPanel.OpenSkillSelectPanel();
-                currentOpenUIPanel = skillSelectPanel;
             });
             Btn_HeroInfomation.onClick.AddListener(async () =>
             {
@@ -58,7 +57,6 @@ namespace Fort23.Mono
                 UIManager.Instance.HideUIUIPanel(currentOpenUIPanel);
                 EventSystemManager.Instance.isOpenUi = true;
                 MainHeroPanel mainHeroPanel = await MainHeroPanel.OpenPanel();
-                currentOpenUIPanel = mainHeroPanel;
                 await mainHeroPanel.UIClosed();
                 EventSystemManager.Instance.isOpenUi = false;
             });
@@ -73,7 +71,6 @@ namespace Fort23.Mono
                 EventSystemManager.Instance.isOpenUi = true;
                 CombatDrive.Instance.CombatController.isUpdate = false;
                 HeroInformationPanel heroInformationPanel = await HeroInformationPanel.OpenPanel();
-                currentOpenUIPanel = heroInformationPanel;
                 await heroInformationPanel.UIClosed();
                 CombatDrive.Instance.CombatController.isUpdate = true;
                 EventSystemManager.Instance.isOpenUi = false;
@@ -119,6 +116,7 @@ namespace Fort23.Mono
             if (eventLists != null && eventLists.Count > 0)
             {
                 EventSystemManager.Instance.isOpenUi = true;
+
                 DivineSenceEventResultPanel divineSenceEventResultPanel =
                     await DivineSenceEventResultPanel.OpenPanel(eventLists);
                 await divineSenceEventResultPanel.UIClosed();
@@ -143,6 +141,7 @@ namespace Fort23.Mono
             {
                 Btn_Back.gameObject.SetActive(true);
                 bnt_shengShi.gameObject.SetActive(false);
+                currentOpenUIPanel = uiPanel;
             }
         }
 

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

@@ -32,7 +32,7 @@ namespace Fort23.Mono
 
         private void Init()
         {
-            isAddStack = false;
+            isAddStack = true;
             IsShowAppBar = false;
         }
 

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

@@ -38,7 +38,7 @@ namespace Fort23.Mono
         public static async CTask<SkillSelectPanel> OpenSkillSelectPanel()
         {
             CombatDrive.Instance.CombatController.isUpdate = false;
-            SkillSelectPanel skillSelectPanel  = await UIManager.Instance.LoadAndOpenPanel<SkillSelectPanel>(null, UILayer.Middle);
+            SkillSelectPanel skillSelectPanel = await UIManager.Instance.LoadAndOpenPanel<SkillSelectPanel>(null, UILayer.Middle);
             return skillSelectPanel;
         }
 
@@ -52,9 +52,11 @@ namespace Fort23.Mono
             {
                 AppBarPanel.ClosePanel();
             }
+
             // AppBarPanel.OpenPanel(this);
             return base.GetFocus();
         }
+
         public override CTask LoseFocus()
         {
             // AppBarPanel.ClosePanel();
@@ -551,7 +553,7 @@ namespace Fort23.Mono
                     dianjiSkillKongWidget = skillKongWidget;
                     Btn_RemoveGongFa.transform.position = dianjiSkillKongWidget.RemovePos.position;
                     Btn_RemoveGongFa.gameObject.SetActive(true);
-                    SelectSkill(skillKongWidget.SkillInfo,false);
+                    SelectSkill(skillKongWidget.SkillInfo, false);
                 }
                 else
                 {
@@ -712,11 +714,11 @@ namespace Fort23.Mono
                 Btn_RemoveGongFa.gameObject.SetActive(false);
                 if (count >= 4)
                 {
-                    SelectSkill(skillWidget.skillConfigId,true);
+                    SelectSkill(skillWidget.skillConfigId, true);
                 }
                 else
                 {
-                    SelectSkill(skillWidget.skillConfigId,false);
+                    SelectSkill(skillWidget.skillConfigId, false);
                 }
             }
         }
@@ -751,7 +753,7 @@ namespace Fort23.Mono
             Icon_Select.gameObject.SetActive(false);
             _wuXingGongFaWidgets.Clear();
             CloseSelect();
-            ChangeInfoType(1);
+            // ChangeInfoType(1);
             base.Close();
         }
     }

Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroInformationPanel.cs

@@ -37,7 +37,7 @@ namespace Fort23.Mono
         
         public override CTask GetFocus()
         {
-            AppBarPanel.OpenPanel(this);
+             AppBarPanel.OpenPanel(this);
             return base.GetFocus();
         }