diff --git a/Assets/Resources/Fgui/Common/Common_fui.bytes b/Assets/Resources/Fgui/Common/Common_fui.bytes index 54cebc1ff..baf4eb628 100644 Binary files a/Assets/Resources/Fgui/Common/Common_fui.bytes and b/Assets/Resources/Fgui/Common/Common_fui.bytes differ diff --git a/Assets/Scripts/UI/Common/ClassifyList.cs b/Assets/Scripts/UI/Common/ClassifyList.cs index 2bbbb6272..05d48d1fa 100644 --- a/Assets/Scripts/UI/Common/ClassifyList.cs +++ b/Assets/Scripts/UI/Common/ClassifyList.cs @@ -13,8 +13,6 @@ namespace NBF private readonly List _listData = new List(); public event Action OnClickItem; - - public int SelectedIndex => List.selectedIndex; private void OnInited() { @@ -23,21 +21,22 @@ namespace NBF List.onClickItem.Add(OnClickListItem); } - public void SetListData(List listData) + public void SetListData(List listData,ListSelectionMode selectionMode = ListSelectionMode.Single) { _listData.Clear(); foreach (var obj in listData) { _listData.Add(obj); } + + List.selectionMode = selectionMode; List.numItems = _listData.Count; List.ScrollToView(0); } void OnClickListItem(EventContext context) { - Debug.Log($"con={context.data} nm={context.sender}"); - OnClickItem?.Invoke(null); + OnClickItem?.Invoke(context.data); } void OnRenderItem(int index, GObject obj) diff --git a/Assets/Scripts/UI/Shops/FishingShopPanel.cs b/Assets/Scripts/UI/Shops/FishingShopPanel.cs index a61255e27..54b505f8d 100644 --- a/Assets/Scripts/UI/Shops/FishingShopPanel.cs +++ b/Assets/Scripts/UI/Shops/FishingShopPanel.cs @@ -35,6 +35,8 @@ namespace NBF } Menu.OnTabChange += ChangeTab; + + List.OnClickItem += OnClickItem; } protected override void OnShow() @@ -51,6 +53,13 @@ namespace NBF List.SetListData(listData.ListData); } + + private void OnClickItem(object item) + { + if(item is not ShopGearItem shopGearItem) return; + Log.Info($"click item ={shopGearItem.GearData.title}"); + } + private void OnClick(GComponent btn) { // if (btn == BtnClose) diff --git a/FGUIProject/assets/Common/Com/BtnCommon.xml b/FGUIProject/assets/Common/Com/Buttons/BtnCommon.xml similarity index 100% rename from FGUIProject/assets/Common/Com/BtnCommon.xml rename to FGUIProject/assets/Common/Com/Buttons/BtnCommon.xml diff --git a/FGUIProject/assets/Common/Com/ButtonDef.xml b/FGUIProject/assets/Common/Com/Buttons/ButtonDef.xml similarity index 100% rename from FGUIProject/assets/Common/Com/ButtonDef.xml rename to FGUIProject/assets/Common/Com/Buttons/ButtonDef.xml diff --git a/FGUIProject/assets/Common/Com/Buttons/ButtonTab.xml b/FGUIProject/assets/Common/Com/Buttons/ButtonTab.xml index d5f51572c..941601e00 100644 --- a/FGUIProject/assets/Common/Com/Buttons/ButtonTab.xml +++ b/FGUIProject/assets/Common/Com/Buttons/ButtonTab.xml @@ -7,7 +7,7 @@ - +