Game/Fishing2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改提交shop修改

Browse Source
This commit is contained in:
BobSong
2026-02-03 14:31:39 +08:00
parent 55a92d9b23
commit da95507d5a
31 changed files with 181 additions and 335 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Assets/Scripts/UI/Bag/BagPanel.cs
View File

@@ -31,7 +31,6 @@ namespace NBF
tabItemList.Add(tabItem);
}
ItemList.SetPanel(this);
ItemList.SetData(tabItemList, true, true);
}

2
Assets/Scripts/UI/Binders/MainBinder.cs
View File

@@ -9,8 +9,6 @@ namespace NBF
[UIExtensionAutoBind]
public static void BindAll()
{
UIObjectFactory.SetPackageItemExtension(KeyboardInput.URL, typeof(KeyboardInput));
UIObjectFactory.SetPackageItemExtension(SettingInputItem.URL, typeof(SettingInputItem));
UIObjectFactory.SetPackageItemExtension(SettingItem.URL, typeof(SettingItem));
UIObjectFactory.SetPackageItemExtension(IntroduceTag.URL, typeof(IntroduceTag));
UIObjectFactory.SetPackageItemExtension(HomeMainPage.URL, typeof(HomeMainPage));

41
Assets/Scripts/UI/Common/List/ClassifyList.cs
View File

@@ -23,48 +23,19 @@ namespace NBF
private int _columnsCount;
public ListSelector _selector;
public ListSelector Selector;
private void OnInited()
{
InputManager.OnUICanceled += OnUICanceled;
List.onClickItem.Add(OnClickListItem);
_selector = new ListSelector(List, typeof(ListTitleItem));
Selector = new ListSelector(List, typeof(ListTitleItem));
}
public override void Dispose()
public void InvokeClickItem(object data)
{
InputManager.OnUICanceled -= OnUICanceled;
base.Dispose();
}
private void OnUICanceled(string action)
{
if (action == InputDef.UI.Right)
{
_selector.Right();
}
else if (action == InputDef.UI.Left)
{
_selector.Left();
}
else if (action == InputDef.UI.Up)
{
_selector.Up();
}
else if (action == InputDef.UI.Down)
{
_selector.Down();
}
else if (action == InputDef.UI.Enter)
{
var selectedItem = _selector.SelectedItem;
if (selectedItem != null)
{
OnClickItem?.Invoke(selectedItem);
}
}
OnClickItem?.Invoke(data);
}
public void SetListData(List<object> listData,
ListSelectionMode selectionMode = ListSelectionMode.Single)
@@ -93,7 +64,7 @@ namespace NBF
}
_columnsCount = 6;
_selector.Refresh();
Selector.Refresh();
}
void OnClickListItem(EventContext context)

6
Assets/Scripts/UI/Common/List/CommonItemList.cs
View File

@@ -15,11 +15,7 @@ namespace NBF
private List<TabItemData> _tabList = new List<TabItemData>();
private TabItemData _currentTab;
public void SetPanel(UIPanel panel)
{
Menu.SetPanel(panel);
}
private void OnInited()
{
Menu.OnTabChange += ChangeTab;

2
Assets/Scripts/UI/Common/Menu/BottomMenu.cs
View File

@@ -10,8 +10,6 @@ namespace NBF
{
public partial class BottomMenu : GComponent
{
private UIPanel _panel;
private void OnInited()
{
List.onClickItem.Add(OnClickItem);

34
Assets/Scripts/UI/Common/Menu/CommonMenu.cs
View File

@@ -12,46 +12,28 @@ 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()
{
List.onClickItem.Add(OnClickItem);
BtnPrev.onClick.Add(OnClickBtnPrev);
BtnNext.onClick.Add(OnClickBtnNext);
InputManager.OnUICanceled += OnUICanceled;
}
private string _leftActionName;
private string _rightActionName;
public override void Dispose()
public void SetBtnActionName(string leftActionName, string rightActionName)
{
InputManager.OnUICanceled -= OnUICanceled;
base.Dispose();
}
private void OnUICanceled(string action)
{
if (_panel == null) return;
if (!_panel.IsShowing) return;
if (!_panel.IsTop) return;
if (action == InputDef.UI.Prev)
{
OnClickBtnPrev();
}
else if (action == InputDef.UI.Next)
{
OnClickBtnNext();
}
_leftActionName = leftActionName;
_rightActionName = rightActionName;
BtnPrev.SetData(leftActionName, string.Empty);
BtnNext.SetData(rightActionName, string.Empty);
}
public void SetTabs(List<TabItemData> tabList, int selectIndex = 0)
{
SetBtnActionName(InputDef.UI.Prev, InputDef.UI.Next);
List.RemoveChildrenToPool();
var listWidth = 0f;
for (int i = 0; i < tabList.Count; i++)

3
Assets/Scripts/UI/Login/LoginPanel.cs
View File

@@ -36,8 +36,9 @@ namespace NBF
// BagPanel.Show();
// BagSlotPanel.Show();
// SettingPanel.Show();
HomePanel.Show();
// FishingShopPanel.Show();
SettingPanel.Show();
Del();
}

2
Assets/Scripts/UI/Settings/SettingPanel.cs
View File

@@ -269,7 +269,7 @@ namespace NBF
});
}
[InputInvoke(InputDef.UI.Back, UIInputButtonShowMode.BottomRight, "返回")]
[InputInvoke(InputDef.UI.Back, UIInputButtonShowMode.BottomRight)]
private void OnBack()
{
if (Settings.Instance.HaveNotAppleSettings())

81
Assets/Scripts/UI/Shops/FishingShopPanel.cs
View File

@@ -19,31 +19,14 @@ namespace NBF
protected override void OnShow()
{
InputManager.Instance.On(this);
ItemList.List.OnClickItem += OnClickItem;
InputManager.OnUICanceled += OnUICanceled;
List<TabItemData> tabItemList = GoodsConfigHelper.TabItemList;
ItemList.SetPanel(this);
ItemList.SetData(tabItemList, true, true);
}
private void OnUICanceled(string action)
{
if (!IsTop) return;
if (action == InputDef.UI.SubPrev)
{
}
else if (action == InputDef.UI.SubNext)
{
}
else if (action == InputDef.UI.Up)
{
}
else if (action == InputDef.UI.Down)
{
}
}
private void OnClickItem(object item)
{
@@ -52,11 +35,69 @@ namespace NBF
// ItemDetailsPanel.Show(bagItem.ItemInfo);
ShopDetailsPanel.Show(gearItem.Config);
}
#region UI事件
[InputInvoke(InputDef.UI.Prev, UIInputButtonShowMode.MenuLeft)]
private void OnPrev()
{
ItemList.Menu.OnClickBtnPrev();
}
[InputInvoke(InputDef.UI.Next, UIInputButtonShowMode.MenuRight)]
private void OnNext()
{
ItemList.Menu.OnClickBtnNext();
}
[InputInvoke(InputDef.UI.Left, UIInputButtonShowMode.BottomLeft)]
private void OnLeft()
{
ItemList.List.Selector.Left();
}
[InputInvoke(InputDef.UI.Right, UIInputButtonShowMode.BottomLeft)]
private void OnRight()
{
ItemList.List.Selector.Right();
}
[InputInvoke(InputDef.UI.Up, UIInputButtonShowMode.BottomLeft)]
private void OnUp()
{
ItemList.List.Selector.Up();
// ChangeListSelected();
}
[InputInvoke(InputDef.UI.Down, UIInputButtonShowMode.BottomLeft)]
private void OnDown()
{
ItemList.List.Selector.Down();
}
[InputInvoke(InputDef.UI.Enter, UIInputButtonShowMode.BottomLeft, "查看")]
private void OnApplySettings()
{
var selectedItem = ItemList.List.Selector.SelectedItem;
if (selectedItem != null)
{
ItemList.List.InvokeClickItem(selectedItem);
}
}
[InputInvoke(InputDef.UI.Back, UIInputButtonShowMode.BottomRight)]
private void OnBack()
{
Hide();
}
#endregion
protected override void OnHide()
{
InputManager.OnUICanceled -= OnUICanceled;
ItemList.List.OnClickItem -= OnClickItem;
InputManager.Instance.Off(this);
}
protected override void OnDestroy()

39
Assets/Scripts/UI/Shops/ShopDetailsPanel.cs
View File

@@ -10,6 +10,45 @@ namespace NBF
protected override void OnShow()
{
// Model.SetData(ItemInfo);
InputManager.Instance.On(this);
}
#region UI输入事件
[InputInvoke(InputDef.UI.Up, UIInputButtonShowMode.BottomLeft)]
private void OnUp()
{
// ItemList.List.Selector.Up();
// ChangeListSelected();
}
[InputInvoke(InputDef.UI.Down, UIInputButtonShowMode.BottomLeft)]
private void OnDown()
{
// ItemList.List.Selector.Down();
}
[InputInvoke(InputDef.UI.Enter, UIInputButtonShowMode.BottomLeft, "购买")]
private void OnApplySettings()
{
// var selectedItem = ItemList.List.Selector.SelectedItem;
// if (selectedItem != null)
// {
// ItemList.List.InvokeClickItem(selectedItem);
// }
}
[InputInvoke(InputDef.UI.Back, UIInputButtonShowMode.BottomRight)]
private void OnBack()
{
Hide();
}
#endregion
protected override void OnHide()
{
InputManager.Instance.Off(this);
}
}
}

2
Assets/Scripts/UI/Tools/PreviewPanel.cs
View File

@@ -41,7 +41,7 @@ namespace NBF
tabItemList.Add(tabItem);
}
ItemList.SetPanel(this);
// ItemList.SetPanel(this);
ItemList.SetData(tabItemList, true, true);
}