Browse Source

导航栏

lzx 2 ngày trước cách đây
mục cha
commit
3b59255d0c
25 tập tin đã thay đổi với 173 bổ sung49 xóa
  1. 1 1
      Assets/Res/UI/TipMessagePanel/TipMessagePanel.prefab
  2. 2 0
      Assets/Scripts/Core/Pool/CObject/Entity.cs
  3. 42 12
      Assets/Scripts/Core/UI/Core/UIManager.cs
  4. 14 1
      Assets/Scripts/Core/UI/Core/UIPanel.cs
  5. 14 13
      Assets/Scripts/GameLogic/Hero/SkillInfo.cs
  6. 11 4
      Assets/Scripts/GameUI/Combat/CombatDrive.cs
  7. 22 6
      Assets/Scripts/GameUI/UI/AppBarPanel/AppBarPanel.cs
  8. 2 1
      Assets/Scripts/GameUI/UI/CombatPanel/CombatHPPanel.cs
  9. 2 0
      Assets/Scripts/GameUI/UI/CombatPanel/CombatPanel.cs
  10. 1 0
      Assets/Scripts/GameUI/UI/CombatPanel/CombatShowTextPanel.cs
  11. 15 1
      Assets/Scripts/GameUI/UI/CombatPanel/SkillSelectPanel.cs
  12. 1 0
      Assets/Scripts/GameUI/UI/DialoguePanel/DialogueBubblePanel.cs
  13. 1 0
      Assets/Scripts/GameUI/UI/DialoguePanel/DialoguePanel.cs
  14. 1 0
      Assets/Scripts/GameUI/UI/GongFaUpgradePanel/GongFaUpgradePanel.cs
  15. 4 3
      Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroBreakthroughPanel.cs
  16. 3 1
      Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroBreakthroughSuccessPanel.cs
  17. 7 0
      Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroInformationPanel.cs
  18. 2 1
      Assets/Scripts/GameUI/UI/HeroInformationPanel/SelectBreakthroughItemPanel.cs
  19. 2 1
      Assets/Scripts/GameUI/UI/HeroInformationPanel/SelectElixirPanel.cs
  20. 5 2
      Assets/Scripts/GameUI/UI/HeroInformationPanel/UseExpElixirPanel.cs
  21. 9 0
      Assets/Scripts/GameUI/UI/MainHeroPnael/MainHeroPanel.cs
  22. 8 0
      Assets/Scripts/GameUI/UI/MainHeroPnael/SelectFaBaoPanel.cs
  23. 1 0
      Assets/Scripts/GameUI/UI/MainPanel/MainPanel.cs
  24. 3 2
      Assets/Scripts/GameUI/UI/TipMessagePanel/TipMessagePanel.cs
  25. 0 0
      Assets/StreamingAssets/assetConfig.txt

+ 1 - 1
Assets/Res/UI/TipMessagePanel/TipMessagePanel.prefab

@@ -36,7 +36,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 567, y: -1968}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 750, y: 1624}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &6560399385940932289

+ 2 - 0
Assets/Scripts/Core/Pool/CObject/Entity.cs

@@ -321,6 +321,8 @@ namespace Fort23.Core
 
             return (K) component;
         }
+        
+       
 
         public virtual K[] GetComponentAll<K>() where K : Entity
         {

+ 42 - 12
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)
                         {
@@ -411,32 +411,41 @@ namespace Fort23.Mono
                     // 等待数据准备好才初始化UI
                     if (await uiPanel.AsyncInit(uiData))
                     {
-                        if (uiPanel.IsBreadcrumbBarPanel) //打开界面之前判断是否已经在堆栈当中 如果是就移除此界面往后的堆栈 保持他时在堆栈的最上方
+                        if (uiPanel.isAddStack)
                         {
-                            if (TopUIPanels.Contains(uiPanel))
+                            if (uiPanel.IsBreadcrumbBarPanel) //打开界面之前判断是否已经在堆栈当中 如果是就移除此界面往后的堆栈 保持他时在堆栈的最上方
                             {
-                                int index = TopUIPanels.IndexOf(uiPanel);
-                                int count = TopUIPanels.Count - index;
-
-                                for (int i = index + 1; i < TopUIPanels.Count; i++)
+                                if (TopUIPanels.Contains(uiPanel))
                                 {
-                                    if (TopUIPanels[i].isShow)
+                                    int index = TopUIPanels.IndexOf(uiPanel);
+                                    int count = TopUIPanels.Count - index;
+
+                                    for (int i = index + 1; i < TopUIPanels.Count; i++)
                                     {
-                                        HideUIUIPanel(TopUIPanels[i]);
+                                        if (TopUIPanels[i].isShow)
+                                        {
+                                            HideUIUIPanel(TopUIPanels[i]);
+                                        }
                                     }
-                                }
 
 
-                                TopUIPanels.RemoveRange(index, count);
+                                    TopUIPanels.RemoveRange(index, count);
+                                }
                             }
+
+                            AddTopStack(uiPanel);
                         }
 
+
                         if (layer == UILayer.Top && !NoFocusTopUIPanels.Contains(uiPanel))
                             NoFocusTopUIPanels.Add(uiPanel);
                         uiPanel.isActiveAnima = isActiveAnima;
                         await uiPanel.Open();
                         AudioManager.Instance.PlayAudio("openui.wav");
-                        currOpenPanel = uiPanel;
+                        // if (uiPanel.isAddStack)
+                        {
+                            currOpenPanel = uiPanel;
+                        }
 
                         if (current != null)
                         {
@@ -859,6 +868,27 @@ namespace Fort23.Mono
             // CloseTopUI();
             // OpenTopUI();
 
+
+            if (uiPanel.IsBreadcrumbBarPanel &&
+                uiPanel.isAddStack &&
+                uiDestroyType != UIDestroyType.ImmediatelyDestroy) //如果显示导航栏的面板就只做隐藏 导航返回自动处理关闭
+            {
+                // if (isBreadcrumbBarPanel)
+                {
+                    uiPanel.IsBreadcrumbBarPanel = false;
+                    UIPanel uiPanel1 = CloseTopUI();
+
+
+                    LastUIPanel = uiPanel1;
+                    OpenTopUI();
+                    return;
+                }
+
+                // uiPanel.Hide();
+
+                // return;
+            }
+
             if (!NoFocusTopUIPanels.Contains(uiPanel)) NoFocusTopUIPanels.Remove(uiPanel);
             uiPanel.Close();
             RemoveTopStack(uiPanel); //如果要删除界面判断是否在跳转堆栈 如果是则移除堆栈

+ 14 - 1
Assets/Scripts/Core/UI/Core/UIPanel.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Reflection;
 using Fort23.Core;
 using UnityEngine;
 using UnityEngine.UI;
@@ -94,6 +95,9 @@ namespace Fort23.Mono
         /// </summary>
         public bool IsBreadcrumbBarPanel = false;
 
+        //是否加入堆栈
+        public bool isAddStack = false;
+
         /// <summary>
         /// 面板名字
         /// </summary>
@@ -138,7 +142,6 @@ namespace Fort23.Mono
         }
 
 
-      
         protected override void OnDestroy()
         {
             DelEvent();
@@ -274,6 +277,16 @@ namespace Fort23.Mono
         {
             if (isFocus)
             {
+                if (!IsShowAppBar)
+                {
+                    Assembly assembly =Assembly.Load("Fort23.Mono");
+                    Type AppBarPanel = assembly.GetType(" Fort23.Mono.AppBarPanel");
+                    UIPanel uiPanel = UIManager.Instance.GetComponent(AppBarPanel) as UIPanel;
+                    if (uiPanel != null)
+                    {
+                        uiPanel.Hide();
+                    }
+                }
                 UIManager.Instance.currOpenPanel = this;
                 // if (UIManager.Instance.lastOpenPropSourcePanel == this)
                 // {

+ 14 - 13
Assets/Scripts/GameLogic/Hero/SkillInfo.cs

@@ -15,22 +15,25 @@ namespace GameLogic.Hero
         public float[] effectValue;
 
         public AccountFileInfo.SkillData SkillData;
-        
-        
-        public SkillInfo(int skill ,int skillPowerup)
+
+
+        public SkillInfo(int skill, int skillPowerup)
         {
             skillConfig = ConfigComponent.Instance.Get<SkillConfig>(skill);
             SkillPowerupConfig = ConfigComponent.Instance.Get<SkillPowerupConfig>(skillPowerup);
-            effectValue = new float[skillConfig.effectValue.Length];
-            Array.Copy(skillConfig.effectValue, effectValue, skillConfig.effectValue.Length);
-            if (skillConfig.intensifierIndex != null)
+            if (skillConfig.ID != 0)
             {
-                for (int i = 0; i < skillConfig.intensifierIndex.Length; i++)
+                effectValue = new float[skillConfig.effectValue.Length];
+                Array.Copy(skillConfig.effectValue, effectValue, skillConfig.effectValue.Length);
+                if (skillConfig.intensifierIndex != null)
                 {
-                    int index = skillConfig.intensifierIndex[i] - 1;
-                    if (index >= 0 && index < effectValue.Length)
+                    for (int i = 0; i < skillConfig.intensifierIndex.Length; i++)
                     {
-                        effectValue[index] = effectValue[index] * SkillPowerupConfig.SkillPower1 * 0.01f;
+                        int index = skillConfig.intensifierIndex[i] - 1;
+                        if (index >= 0 && index < effectValue.Length)
+                        {
+                            effectValue[index] = effectValue[index] * SkillPowerupConfig.SkillPower1 * 0.01f;
+                        }
                     }
                 }
             }
@@ -40,7 +43,6 @@ namespace GameLogic.Hero
             index = 0;
         }
 
- 
 
         public void CustomInt(AccountFileInfo.SkillData skillId)
         {
@@ -64,13 +66,12 @@ namespace GameLogic.Hero
 
             qiangDu = (long)(SkillPowerupConfig.MainPower * skillConfig.power);
         }
-        
+
 
         public SkillInfo(AccountFileInfo.SkillData skillId)
         {
             CustomInt(skillId);
             index = 0;
         }
-        
     }
 }

+ 11 - 4
Assets/Scripts/GameUI/Combat/CombatDrive.cs

@@ -83,19 +83,26 @@ namespace GameLogic.Combat
             // await cTaskAwaitBuffer.WaitAll();
             // await CombatHPPanel.OpenCombatHPPanel();
 
+            UIManager.Instance.HindCurrAllShowPanel();
             await CombatPanel.OpenCombatPanel();
             ///播放动画
-            MainPanel mainPanel = UIManager.Instance.GetComponent<MainPanel>();
-            mainPanel.transform.gameObject.SetActive(false);
+
+         
+            // MainPanel mainPanel = UIManager.Instance.GetComponent<MainPanel>();
+            // mainPanel.transform.gameObject.SetActive(false);
             CombatController.ChangeState(CombatController.update);
         }
 
         protected void CombatFinish(bool isWin)
         {
             caombatFinish?.Invoke(isWin);
+            
+            
             ///播放动画
-            MainPanel mainPanel = UIManager.Instance.GetComponent<MainPanel>();
-            mainPanel.transform.gameObject.SetActive(true);
+        
+            UIManager.Instance.ShowLastHindAllShowPanel();
+            // MainPanel mainPanel = UIManager.Instance.GetComponent<MainPanel>();
+            // mainPanel.transform.gameObject.SetActive(true);
             UIManager.Instance.HideUIUIPanel<CombatPanel>();
         }
 

+ 22 - 6
Assets/Scripts/GameUI/UI/AppBarPanel/AppBarPanel.cs

@@ -15,6 +15,7 @@ namespace Fort23.Mono
 
         private void Init()
         {
+            isAddStack = false;
         }
 
         protected override void AddEvent()
@@ -29,7 +30,8 @@ namespace Fort23.Mono
 
         private void DivineSensePointChange(IEventData e)
         {
-            Text_divineSensePoint.text = $"{AccountFileInfo.Instance.playerData.divineSensePoint}/{PlayerManager.Instance.gameConstantConfig.DetectEventCount}";
+            Text_divineSensePoint.text =
+                $"{AccountFileInfo.Instance.playerData.divineSensePoint}/{PlayerManager.Instance.gameConstantConfig.DetectEventCount}";
         }
 
         public override void AddButtonEvent()
@@ -81,7 +83,7 @@ namespace Fort23.Mono
             {
                 UIManager.Instance.HideUIUIPanel(currentOpenUIPanel);
                 currentOpenUIPanel = null;
-                UIManager.Instance.GetComponent<MainPanel>().Show();
+                // UIManager.Instance.GetComponent<MainPanel>().Show();
                 // MainPanel.OpenPanel();
             });
         }
@@ -90,7 +92,8 @@ namespace Fort23.Mono
         {
             // EventSystemManager.Instance.DetectRandomEvents();
 
-            if (AccountFileInfo.Instance.playerData.divineSensePoint < PlayerManager.Instance.gameConstantConfig.DetectEventCount)
+            if (AccountFileInfo.Instance.playerData.divineSensePoint <
+                PlayerManager.Instance.gameConstantConfig.DetectEventCount)
             {
                 TipMessagePanel.OpenTipMessagePanel("神识值不够!");
                 return;
@@ -129,7 +132,8 @@ namespace Fort23.Mono
                     eventLists.Remove(reeultEventList);
                 }
 
-                DivineSenceEventResultPanel divineSenceEventResultPanel = await DivineSenceEventResultPanel.OpenPanel(reeultEventLists, count);
+                DivineSenceEventResultPanel divineSenceEventResultPanel =
+                    await DivineSenceEventResultPanel.OpenPanel(reeultEventLists, count);
                 await divineSenceEventResultPanel.UIClosed();
             }
 
@@ -159,13 +163,25 @@ namespace Fort23.Mono
 
         public async static CTask OpenPanel(UIPanel uiPanel)
         {
-            AppBarPanel appBarPanel = await UIManager.Instance.LoadAndOpenPanel<AppBarPanel>(null, UILayer.Top);
+            AppBarPanel appBarPanel = null;
+            if (UIManager.Instance.GetComponent<AppBarPanel>() == null)
+            {
+                appBarPanel = await UIManager.Instance.LoadAndOpenPanel<AppBarPanel>(null, UILayer.Top);
+            }
+            else
+            {
+                appBarPanel = UIManager.Instance.GetComponent<AppBarPanel>();
+                await appBarPanel.Show();
+            }
+
             appBarPanel.CustomInit(uiPanel);
         }
 
         public async static CTask ClosePanel()
         {
-            UIManager.Instance.HideUIUIPanel<AppBarPanel>();
+            // UIManager.Instance.HideUIUIPanel<AppBarPanel>();
+
+            UIManager.Instance.GetComponent<AppBarPanel>()?.Hide();
         }
     }
 }

+ 2 - 1
Assets/Scripts/GameUI/UI/CombatPanel/CombatHPPanel.cs

@@ -14,7 +14,7 @@ namespace Fort23.Mono
         {
             await UIManager.Instance.LoadAndOpenPanel<CombatHPPanel>(null, UILayer.Bottom);
         }
-        
+
         public static async CTask CloseCombatHPPanel()
         {
             UIManager.Instance.HideUIUIPanel<CombatHPPanel>();
@@ -23,6 +23,7 @@ namespace Fort23.Mono
 
         private void Init()
         {
+            isAddStack = false;
         }
 
         protected override void AddEvent()

+ 2 - 0
Assets/Scripts/GameUI/UI/CombatPanel/CombatPanel.cs

@@ -32,6 +32,8 @@ namespace Fort23.Mono
 
         private void Init()
         {
+            isAddStack = false;
+            IsShowAppBar = false;
         }
 
         public override void Hide()

+ 1 - 0
Assets/Scripts/GameUI/UI/CombatPanel/CombatShowTextPanel.cs

@@ -25,6 +25,7 @@ namespace Fort23.Mono
 
         private void Init()
         {
+            isAddStack = false;
         }
 
         protected override void AddEvent()

+ 15 - 1
Assets/Scripts/GameUI/UI/CombatPanel/SkillSelectPanel.cs

@@ -44,12 +44,26 @@ namespace Fort23.Mono
 
         public override CTask GetFocus()
         {
-            AppBarPanel.OpenPanel(this);
+            if (infoType == 1)
+            {
+                AppBarPanel.OpenPanel(this);
+            }
+            else if (infoType == 2)
+            {
+                AppBarPanel.ClosePanel();
+            }
+            // AppBarPanel.OpenPanel(this);
             return base.GetFocus();
         }
+        public override CTask LoseFocus()
+        {
+            // AppBarPanel.ClosePanel();
+            return base.LoseFocus();
+        }
 
         private void Init()
         {
+            isAddStack = true;
         }
 
         protected override void AddEvent()

+ 1 - 0
Assets/Scripts/GameUI/UI/DialoguePanel/DialogueBubblePanel.cs

@@ -37,6 +37,7 @@ namespace Fort23.Mono
 
         private void Init()
         {
+            isAddStack = false;
             _skipTyping = false;
             _isShowingOptions = false;
         }

+ 1 - 0
Assets/Scripts/GameUI/UI/DialoguePanel/DialoguePanel.cs

@@ -39,6 +39,7 @@ namespace Fort23.Mono
 
         private void Init()
         {
+            isAddStack = false;
             _skipTyping = false;
             _isShowingOptions = false;
         }

+ 1 - 0
Assets/Scripts/GameUI/UI/GongFaUpgradePanel/GongFaUpgradePanel.cs

@@ -25,6 +25,7 @@ namespace Fort23.Mono
 
         private void Init()
         {
+            IsShowAppBar = false;
         }
 
         protected override void AddEvent()

+ 4 - 3
Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroBreakthroughPanel.cs

@@ -26,6 +26,7 @@ namespace Fort23.Mono
 
         private void Init()
         {
+         
         }
 
         protected override void AddEvent()
@@ -153,7 +154,7 @@ namespace Fort23.Mono
                 if (PlayerManager.Instance.myHero.heroData.isCombat)
                     return;
 
-                UIManager.Instance.HindCurrAllShowPanel();
+                // UIManager.Instance.HindCurrAllShowPanel();
 
                 CombatDrive.Instance.LoadLevelBattleCombat(heroPowerUpConfig.DujieLevelbattleID,
                     delegate(bool isWin)
@@ -166,7 +167,7 @@ namespace Fort23.Mono
                             Btn_StartCombat.gameObject.SetActive(false);
                             CombatTrue.gameObject.SetActive(true);
                             RefenceSuccessProbability(PlayerManager.Instance.myHero);
-                            UIManager.Instance.ShowLastHindAllShowPanel();
+                            // UIManager.Instance.ShowLastHindAllShowPanel();
                         }
                     });
             });
@@ -418,7 +419,7 @@ namespace Fort23.Mono
 
         public async static CTask<HeroBreakthroughPanel> OpenPanel()
         {
-            HeroBreakthroughPanel heroBreakthroughPanel = await UIManager.Instance.LoadAndOpenPanel<HeroBreakthroughPanel>(null);
+            HeroBreakthroughPanel heroBreakthroughPanel = await UIManager.Instance.LoadAndOpenPanel<HeroBreakthroughPanel>(null,UILayer.Top,isFocus:false);
             heroBreakthroughPanel.CustomInit();
             return heroBreakthroughPanel;
         }

+ 3 - 1
Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroBreakthroughSuccessPanel.cs

@@ -14,6 +14,8 @@ namespace Fort23.Mono
 
         private void Init()
         {
+          
+          
         }
 
         protected override void AddEvent()
@@ -31,7 +33,7 @@ namespace Fort23.Mono
 
         public async static CTask<HeroBreakthroughSuccessPanel> OpenPanel(List<HeroAttributeData> heroAttributes)
         {
-            HeroBreakthroughSuccessPanel heroBreakthroughSuccessPanel = await UIManager.Instance.LoadAndOpenPanel<HeroBreakthroughSuccessPanel>(null);
+            HeroBreakthroughSuccessPanel heroBreakthroughSuccessPanel = await UIManager.Instance.LoadAndOpenPanel<HeroBreakthroughSuccessPanel>(null,UILayer.Top,isFocus:false);
             heroBreakthroughSuccessPanel.CustomInit(heroAttributes);
             return heroBreakthroughSuccessPanel;
         }

+ 7 - 0
Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroInformationPanel.cs

@@ -24,6 +24,7 @@ namespace Fort23.Mono
 
         private void Init()
         {
+            isAddStack = true;
         }
 
         protected override void AddEvent()
@@ -39,6 +40,12 @@ namespace Fort23.Mono
             AppBarPanel.OpenPanel(this);
             return base.GetFocus();
         }
+        
+        public override CTask LoseFocus()
+        {
+            // AppBarPanel.ClosePanel();
+            return base.LoseFocus();
+        }
 
         public override void AddButtonEvent()
         {

+ 2 - 1
Assets/Scripts/GameUI/UI/HeroInformationPanel/SelectBreakthroughItemPanel.cs

@@ -20,6 +20,7 @@ namespace Fort23.Mono
 
         private void Init()
         {
+         
         }
 
         protected override void AddEvent()
@@ -104,7 +105,7 @@ namespace Fort23.Mono
 
         public async static CTask<SelectBreakthroughItemPanel> OpenPanel(BreakthroughItemWidget breakthroughItemWidget, Action callBack)
         {
-            SelectBreakthroughItemPanel selectBreakthroughItemPanel = await UIManager.Instance.LoadAndOpenPanel<SelectBreakthroughItemPanel>(null);
+            SelectBreakthroughItemPanel selectBreakthroughItemPanel = await UIManager.Instance.LoadAndOpenPanel<SelectBreakthroughItemPanel>(null,UILayer.Top,isFocus:false);
 
             selectBreakthroughItemPanel.CustomInit(breakthroughItemWidget, callBack);
             return selectBreakthroughItemPanel;

+ 2 - 1
Assets/Scripts/GameUI/UI/HeroInformationPanel/SelectElixirPanel.cs

@@ -26,6 +26,7 @@ namespace Fort23.Mono
 
         private void Init()
         {
+            
         }
 
         protected override void AddEvent()
@@ -160,7 +161,7 @@ namespace Fort23.Mono
 
         public async static CTask<SelectElixirPanel> OpenPanel(BreakthroughItemWidget itemInfo, Action<ElixirItemWidget> callback = null)
         {
-            SelectElixirPanel selectElixirPanel = await UIManager.Instance.LoadAndOpenPanel<SelectElixirPanel>(null);
+            SelectElixirPanel selectElixirPanel = await UIManager.Instance.LoadAndOpenPanel<SelectElixirPanel>(null,UILayer.Top,isFocus:false);
             selectElixirPanel.CustomInit(itemInfo, callback);
             return selectElixirPanel;
         }

+ 5 - 2
Assets/Scripts/GameUI/UI/HeroInformationPanel/UseExpElixirPanel.cs

@@ -35,7 +35,8 @@ namespace Fort23.Mono
             List<ItemConfig> itemConfigs2 = itemConfigs.Where(i => i.itemTag == 5).ToList();
             foreach (var itemConfig in itemConfigs2)
             {
-                ExpElixirItemWidget elixirItemWidget = await UIManager.Instance.CreateGComponent<ExpElixirItemWidget>(null, Content);
+                ExpElixirItemWidget elixirItemWidget =
+                    await UIManager.Instance.CreateGComponent<ExpElixirItemWidget>(null, Content);
                 elixirItemWidget.CustomInit(itemConfig.ID);
                 elixirItemWidget.onClick = OnClick;
                 _expElixirItemWidgets.Add(elixirItemWidget);
@@ -64,12 +65,14 @@ namespace Fort23.Mono
                 TipMessagePanel.OpenTipMessagePanel("道具不足!");
                 return;
             }
+
             Text_UseCount.text = $"今日\n{AccountFileInfo.Instance.playerData.todayUseExpElixrPanelCount}/20";
         }
 
         public async static CTask<UseExpElixirPanel> OpenPanel()
         {
-            UseExpElixirPanel useExpElixirPanel = await UIManager.Instance.LoadAndOpenPanel<UseExpElixirPanel>(null);
+            UseExpElixirPanel useExpElixirPanel =
+                await UIManager.Instance.LoadAndOpenPanel<UseExpElixirPanel>(null, UILayer.Top, isFocus: false);
             useExpElixirPanel.CustomInit();
             return useExpElixirPanel;
         }

+ 9 - 0
Assets/Scripts/GameUI/UI/MainHeroPnael/MainHeroPanel.cs

@@ -10,6 +10,7 @@ namespace Fort23.Mono
 
         private void Init()
         {
+            isAddStack = true;
         }
 
         protected override void AddEvent()
@@ -25,6 +26,12 @@ namespace Fort23.Mono
             return base.GetFocus();
         }
 
+        public override CTask LoseFocus()
+        {
+            // AppBarPanel.ClosePanel();
+            return base.LoseFocus();
+        }
+
         public override void AddButtonEvent()
         {
             Btn_Close.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
@@ -60,6 +67,8 @@ namespace Fort23.Mono
             return mainHeroPanel;
         }
 
+   
+        
         public override void Close()
         {
             foreach (var btnFaBaoWidget in btnFaBaoWidgets)

+ 8 - 0
Assets/Scripts/GameUI/UI/MainHeroPnael/SelectFaBaoPanel.cs

@@ -30,6 +30,8 @@ namespace Fort23.Mono
 
         private void Init()
         {
+            IsShowAppBar = false;
+            isAddStack = true;
         }
 
         protected override void AddEvent()
@@ -40,6 +42,12 @@ namespace Fort23.Mono
         {
         }
 
+        public override CTask GetFocus()
+        {
+            // AppBarPanel.ClosePanel();
+            return base.GetFocus();
+        }
+
         public override void AddButtonEvent()
         {
             Btn_Close.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });

+ 1 - 0
Assets/Scripts/GameUI/UI/MainPanel/MainPanel.cs

@@ -14,6 +14,7 @@ namespace Fort23.Mono
     {
         private void Init()
         {
+            isAddStack = true;
         }
 
         protected override void AddEvent()

+ 3 - 2
Assets/Scripts/GameUI/UI/TipMessagePanel/TipMessagePanel.cs

@@ -11,7 +11,7 @@ namespace Fort23.Mono
         public static async CTask<TipMessagePanel> OpenTipMessagePanel(string meg, Vector2 worldPos = default)
         {
             TipMessagePanel tipMessagePanel =
-                await UIManager.Instance.LoadAndOpenPanel<TipMessagePanel>(null, UILayer.Top);
+                await UIManager.Instance.LoadAndOpenPanel<TipMessagePanel>(null, UILayer.Top, isFocus: false);
             tipMessagePanel.SetTipMessage(meg, worldPos);
             return tipMessagePanel;
         }
@@ -19,7 +19,7 @@ namespace Fort23.Mono
         public static async CTask<TipMessagePanel> OpenTipMessagePanel(int meg, Vector2 worldPos = default)
         {
             TipMessagePanel tipMessagePanel =
-                await UIManager.Instance.LoadAndOpenPanel<TipMessagePanel>(null, UILayer.Top);
+                await UIManager.Instance.LoadAndOpenPanel<TipMessagePanel>(null, UILayer.Top, isFocus: false);
             tipMessagePanel.SetTipMessage(LanguageManager.Instance.Text(meg), worldPos);
             return tipMessagePanel;
         }
@@ -32,6 +32,7 @@ namespace Fort23.Mono
 
         private void Init()
         {
+            isAddStack = false;
         }
 
         protected override void AddEvent()

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
Assets/StreamingAssets/assetConfig.txt


Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác