From c3284032cc8cdb7b3c0c0fa660652a261ec11712 Mon Sep 17 00:00:00 2001
From: BobSong <605277374@qq.com>
Date: Mon, 13 Oct 2025 23:10:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=BF=AB=E6=8D=B7=E9=94=AE?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Assets/Scripts/Fishing2/Role/RoleBag.cs         |  3 +++
 Assets/Scripts/UI/Common/List/CommonItemList.cs | 15 +++++++++++++++
 Assets/Scripts/UI/Common/Menu/CommonMenu.cs     | 11 +++++++++++
 Assets/Scripts/UI/Common/Menu/CommonSubMenu.cs  | 11 +++++++++++
 Assets/Scripts/UI/Shops/FishingShopPanel.cs     |  3 ++-
 5 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/Assets/Scripts/Fishing2/Role/RoleBag.cs b/Assets/Scripts/Fishing2/Role/RoleBag.cs
index c5e3f3d5d..f67fa96a0 100644
--- a/Assets/Scripts/Fishing2/Role/RoleBag.cs
+++ b/Assets/Scripts/Fishing2/Role/RoleBag.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using NBC;
 using NBC.Entitas;
+using Newtonsoft.Json;
 
 namespace NBF.Fishing2
 {
@@ -18,6 +19,8 @@ namespace NBF.Fishing2
             {
                 Items.AddRange(response.Items);
                 Rigs.AddRange(response.Rigs);
+                Log.Debug(
+                    $"获取背包数据成功！Items={JsonConvert.SerializeObject(Items)} Rigs={JsonConvert.SerializeObject(Rigs)}");
             }
         }
     }
diff --git a/Assets/Scripts/UI/Common/List/CommonItemList.cs b/Assets/Scripts/UI/Common/List/CommonItemList.cs
index a83722fc0..01c5fe543 100644
--- a/Assets/Scripts/UI/Common/List/CommonItemList.cs
+++ b/Assets/Scripts/UI/Common/List/CommonItemList.cs
@@ -5,6 +5,7 @@ using System.Linq;
 using UnityEngine;
 using FairyGUI;
 using NBC;
+using UIPanel = NBC.UIPanel;
 
 namespace NBF
 {
@@ -13,6 +14,12 @@ namespace NBF
         private List<TabItemData> _tabList = new List<TabItemData>();
         private TabItemData _currentTab;
 
+        public void SetPanel(UIPanel panel)
+        {
+            Menu.SetPanel(panel);
+            SubMenu.SetPanel(panel);
+        }
+
         private void OnInited()
         {
             Menu.OnTabChange += ChangeTab;
@@ -55,8 +62,10 @@ namespace NBF
 
         private void ChangeTab(int index)
         {
+            if (index < 0) return;
             var tabListData = _tabList[index];
             _currentTab = tabListData;
+            var id1 = this.GetHashCode();
             if (style.selectedIndex == 0)
             {
                 //只有一级菜单
@@ -70,6 +79,12 @@ namespace NBF
 
         private void ChangeSubTab(int index)
         {
+            if (index < 0) return;
+            if (_currentTab == null)
+            {
+                return;
+            }
+
             var subList = _currentTab.Children[index];
             List.SetListData(subList.Items);
         }
diff --git a/Assets/Scripts/UI/Common/Menu/CommonMenu.cs b/Assets/Scripts/UI/Common/Menu/CommonMenu.cs
index 84fa39ad3..c3b2ee79a 100644
--- a/Assets/Scripts/UI/Common/Menu/CommonMenu.cs
+++ b/Assets/Scripts/UI/Common/Menu/CommonMenu.cs
@@ -5,12 +5,19 @@ using System.Collections.Generic;
 using UnityEngine;
 using FairyGUI;
 using NBC;
+using UIPanel = NBC.UIPanel;
 
 namespace NBF
 {
     public partial class CommonMenu : GLabel
     {
         public event Action<int> OnTabChange;
+        private UIPanel _panel;
+
+        public void SetPanel(UIPanel panel)
+        {
+            _panel = panel;
+        }
 
         private void OnInited()
         {
@@ -21,6 +28,7 @@ namespace NBF
             Game.Input.OnUICanceled += OnUICanceled;
         }
 
+
         public override void Dispose()
         {
             Game.Input.OnUICanceled -= OnUICanceled;
@@ -29,6 +37,9 @@ namespace NBF
 
         private void OnUICanceled(string action)
         {
+            if (_panel == null) return;
+            if (!_panel.IsShowing) return;
+            if (!_panel.IsTop) return;
             if (action == InputDef.UI.Prev)
             {
                 OnClickBtnPrev();
diff --git a/Assets/Scripts/UI/Common/Menu/CommonSubMenu.cs b/Assets/Scripts/UI/Common/Menu/CommonSubMenu.cs
index 251d91f7d..cad27562a 100644
--- a/Assets/Scripts/UI/Common/Menu/CommonSubMenu.cs
+++ b/Assets/Scripts/UI/Common/Menu/CommonSubMenu.cs
@@ -5,12 +5,19 @@ using System.Collections.Generic;
 using UnityEngine;
 using FairyGUI;
 using NBC;
+using UIPanel = NBC.UIPanel;
 
 namespace NBF
 {
     public partial class CommonSubMenu : GComponent
     {
         public event Action<int> OnTabChange;
+        private UIPanel _panel;
+
+        public void SetPanel(UIPanel panel)
+        {
+            _panel = panel;
+        }
 
         private void OnInited()
         {
@@ -29,6 +36,10 @@ namespace NBF
 
         private void OnUICanceled(string action)
         {
+            if (_panel == null) return;
+            if (!_panel.IsShowing) return;
+            if (!_panel.IsTop) return;
+            
             if (action == InputDef.UI.SubPrev)
             {
                 OnClickBtnPrev();
diff --git a/Assets/Scripts/UI/Shops/FishingShopPanel.cs b/Assets/Scripts/UI/Shops/FishingShopPanel.cs
index 1015e5d3a..26c54905e 100644
--- a/Assets/Scripts/UI/Shops/FishingShopPanel.cs
+++ b/Assets/Scripts/UI/Shops/FishingShopPanel.cs
@@ -47,6 +47,7 @@ namespace NBF
                 tabItemList.Add(tabItem);
             }
 
+            ItemList.SetPanel(this);
             ItemList.SetData(tabItemList, true, true);
         }
 
@@ -73,7 +74,7 @@ namespace NBF
             // if (btn == BtnClose)
             // {
             //     Hide();
-            // }
+            // } 
         }
 
         protected override void OnDestroy()