瀏覽代碼

添加一些跳转

lzx 2 天之前
父節點
當前提交
4345c66916

+ 2 - 2
Assets/Scripts/GameUI/UI/AppBarPanel/AppBarPanel.cs

@@ -108,7 +108,7 @@ namespace Fort23.Mono
             await DivineSenceInfoPanel.OpenPanel((count, useItems) => { Bnt_shengShi_onClick(count, useItems); });
         }
 
-        public async void Btn_Shop_Click()
+        public async void Btn_Shop_Click(int shopId = 0)
         {
             CloseMenu();
             if (currentOpenUIPanel is ShopPanel)
@@ -120,7 +120,7 @@ namespace Fort23.Mono
             UIPanel uiPanel = currentOpenUIPanel;
 
             CombatDrive.Instance.CombatController.isUpdate = false;
-            ShopPanel shopPanel = await ShopPanel.OpenPanel();
+            ShopPanel shopPanel = await ShopPanel.OpenPanel(shopId);
             if (uiPanel is CaveMainPanel || uiPanel is SkillSelectPanel || uiPanel is ShopPanel ||
                 uiPanel is MainHeroPanel)
             {

+ 4 - 2
Assets/Scripts/GameUI/UI/BoxPanel/BoxPanel.cs

@@ -33,7 +33,8 @@ namespace Fort23.Mono
                 }
                 else
                 {
-                    TipMessagePanel.OpenTipMessagePanel("道具不足", Vector2.zero);
+                    ItemSourcePanel.OpenPanel(openBoxConfig.CostItemID);
+                    // TipMessagePanel.OpenTipMessagePanel("道具不足", Vector2.zero);
                     return null;
                 }
             }
@@ -58,7 +59,8 @@ namespace Fort23.Mono
                 }
                 else
                 {
-                    TipMessagePanel.OpenTipMessagePanel("道具不足", Vector2.zero);
+                    ItemSourcePanel.OpenPanel(openBoxConfig.CostItemID);
+                    // TipMessagePanel.OpenTipMessagePanel("道具不足", Vector2.zero);
                     return null;
                 }
             }

+ 13 - 5
Assets/Scripts/GameUI/UI/ShopPanel/ShopPanel.cs

@@ -42,7 +42,6 @@ namespace Fort23.Mono
 
         public override CTask GetFocus()
         {
-         
             AppBarPanel.OpenPanel(this);
 
             return base.GetFocus();
@@ -62,6 +61,7 @@ namespace Fort23.Mono
 
         public async override CTask<bool> AsyncInit(object[] uiData)
         {
+            int shopId = int.Parse(uiData[0].ToString());
             List<ShopGroupConfig> shopGroupConfigs = ConfigComponent.Instance.GetAll<ShopGroupConfig>().ToList();
             shopGroupConfigs.Sort(Sort);
             foreach (var shopGroupConfig in shopGroupConfigs)
@@ -73,14 +73,22 @@ namespace Fort23.Mono
                 shopBtnWidget.CustomInit(shopGroupConfig);
                 shopBtnWidget.OnClick = OnClick;
                 _shopBtnWidgets.Add(shopBtnWidget);
-                if (currentSelectedShopBtnWidget == null)
+                if (shopGroupConfig.ID == shopId)
                 {
                     currentSelectedShopBtnWidget = shopBtnWidget;
                 }
             }
 
             ShopBtnContent.GetComponent<UIToggleList>().GetChildObj();
-            currentSelectedShopBtnWidget.OnPointerClick();
+            if (currentSelectedShopBtnWidget == null)
+            {
+                _shopBtnWidgets[0]?.OnPointerClick();
+            }
+            else
+            {
+                currentSelectedShopBtnWidget.OnPointerClick();
+            }
+
 
             // isPauseCombat = uiData[0] as bool? == true;
             return await base.AsyncInit(uiData);
@@ -201,10 +209,10 @@ namespace Fort23.Mono
             await base.Close();
         }
 
-        public static async CTask<ShopPanel> OpenPanel(bool isPauseCombat = false)
+        public static async CTask<ShopPanel> OpenPanel(int shopId)
         {
             ShopPanel shopPanel =
-                await UIManager.Instance.LoadAndOpenPanel<ShopPanel>(null, uiData: new object[] { isPauseCombat },
+                await UIManager.Instance.LoadAndOpenPanel<ShopPanel>(null, uiData: new object[] { shopId },
                     isFullUI: true);
 
             AudioManager.Instance.PlayAudio("ui_shangdian.wav");

+ 19 - 1
Assets/Scripts/GameUI/Utility/SkiptoHelper.cs

@@ -32,13 +32,31 @@ namespace Mono.Utility
                     return;
                 //商店界面
                 case 4:
-                    UIManager.Instance.GetComponent<AppBarPanel>().Btn_Shop_Click();
+                    UIManager.Instance.GetComponent<AppBarPanel>().Btn_Shop_Click(skiptoConfig.SkipArguments[0]);
                     return;
                 //实用神识界面
                 case 5:
                     UIManager.Instance.GetComponent<AppBarPanel>().Bnt_ShengShi_Click();
                     return;
 
+                //命运峰
+                case 6:
+                    TowerPanel.OpenPanel(1);
+                    return;
+                //神识背包
+                case 7:
+                    DivineSenceEventPreviewPanel.OpenPanel();
+                    return;
+                //探宝
+                case 8:
+                    BoxPanel.OpenBoxPanel();
+                    return;
+                //岁酬
+                case 9:
+                    QiankundaiPanel.OpenPanel();
+                    return;
+       
+
                 default:
                     return;
             }