From d6327c7946e30f017f030531426cbef91fbc9b48 Mon Sep 17 00:00:00 2001 From: xmac Date: Fri, 23 May 2025 18:10:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=87=E6=8D=A2=E6=A0=87=E7=AD=BE=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Resources/Fgui/Common/Common_fui.bytes | Bin 16572 -> 16570 bytes Assets/Scripts/UI/Common/ClassifyList.cs | 9 ++--- Assets/Scripts/UI/Shops/FishingShopPanel.cs | 9 +++++ .../Common/Com/{ => Buttons}/BtnCommon.xml | 0 .../Common/Com/{ => Buttons}/ButtonDef.xml | 0 .../assets/Common/Com/Buttons/ButtonTab.xml | 2 +- .../Common/Com/{ => ComboBox}/ComboBox1.xml | 0 .../Com/{ => ComboBox}/ComboBox1_item.xml | 0 .../Com/{ => ComboBox}/ComboBox1_popup.xml | 0 .../Common/Com/{ => Items}/CurrencyTag1.xml | 0 .../Common/Com/{ => Items}/CurrencyTag2.xml | 0 .../assets/Common/Com/Items/ListTitleItem.xml | 2 +- .../Common/Com/{ => Tags}/CurrencyGroup.xml | 0 .../assets/Common/Com/Tags/SearchTag.xml | 8 ++++ .../Common/Com/{ => Tags}/TextCenterTag.xml | 0 .../assets/Common/Com/{ => Tags}/TextTag.xml | 0 FGUIProject/assets/Common/package.xml | 35 +++++++++--------- FGUIProject/assets/Shop/FishingShopPanel.xml | 3 ++ FGUIProject/assets/Shop/SelectTextItem.xml | 8 ++++ FGUIProject/assets/Shop/package.xml | 1 + FGUIProject/settings/whoot/146ra2lqdrkwa.json | 1 + 21 files changed, 54 insertions(+), 24 deletions(-) rename FGUIProject/assets/Common/Com/{ => Buttons}/BtnCommon.xml (100%) rename FGUIProject/assets/Common/Com/{ => Buttons}/ButtonDef.xml (100%) rename FGUIProject/assets/Common/Com/{ => ComboBox}/ComboBox1.xml (100%) rename FGUIProject/assets/Common/Com/{ => ComboBox}/ComboBox1_item.xml (100%) rename FGUIProject/assets/Common/Com/{ => ComboBox}/ComboBox1_popup.xml (100%) rename FGUIProject/assets/Common/Com/{ => Items}/CurrencyTag1.xml (100%) rename FGUIProject/assets/Common/Com/{ => Items}/CurrencyTag2.xml (100%) rename FGUIProject/assets/Common/Com/{ => Tags}/CurrencyGroup.xml (100%) create mode 100644 FGUIProject/assets/Common/Com/Tags/SearchTag.xml rename FGUIProject/assets/Common/Com/{ => Tags}/TextCenterTag.xml (100%) rename FGUIProject/assets/Common/Com/{ => Tags}/TextTag.xml (100%) create mode 100644 FGUIProject/assets/Shop/SelectTextItem.xml create mode 100644 FGUIProject/settings/whoot/146ra2lqdrkwa.json diff --git a/Assets/Resources/Fgui/Common/Common_fui.bytes b/Assets/Resources/Fgui/Common/Common_fui.bytes index 54cebc1ff83d17a4d323493bf8604c57fa614cf1..baf4eb62818e8432ff77febd7885fb63489dbda0 100644 GIT binary patch delta 113 zcmdnf$hfPKae@u!7X~me3ESv;N|do^vVfSFd^iV4ObLkff!LdYfzben&4Abwh`lGf zitQAPU}t0yV6bIyWbg&531x_w%rEZ1%f!sU3*<5|0ukTj2mE4_8@Plww~L!<0sxoO B6FdL_ delta 115 zcmdnh$hfDGae@u!HwG{;iP-3RN|do=vVfSFd?W`*ObLkff!LdYfzb$vEr1xr_MPl1 zwo@>QosmI+!Ir_1!563|oFQs5zqkWGGcSWMP#6dpfrxMNMH#Wl4P3&TTg6Q^0lrWZ AaR2}S 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 @@ - +