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

4
Assets/AssetCaches.asset
View File

@@ -22830,8 +22830,8 @@ MonoBehaviour:
Filter: '*'
Bundles:
- Name: main/ui.bundle
Hash: f08e8dd58157955ebca6ffc7dbe79a1c
Size: 7664401
Hash: b5960cf3a8b37f3a62a4e92771a6be08
Size: 7611844
Assets:
- Path: Assets/ResRaw/Fgui/Common/Common_atlas0.png
Address: UI/Common_atlas0

BIN
Assets/ResRaw/Fgui/Common/Common_atlas0.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 971 KiB

After

Width:  |  Height:  |  Size: 1.0 MiB

BIN
Assets/ResRaw/Fgui/Common/Common_fui.bytes
View File

Binary file not shown.

BIN
Assets/ResRaw/Fgui/Main/Main_fui.bytes
View File

Binary file not shown.

195
Assets/Scenes/StartUp.unity
View File

@@ -909,85 +909,6 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &869065583
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 869065584}
- component: {fileID: 869065586}
- component: {fileID: 869065585}
m_Layer: 5
m_Name: Text (Legacy)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &869065584
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 869065583}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1439106037}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -20.035}
m_SizeDelta: {x: 160, y: 70.0701}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &869065585
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 869065583}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Text
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: 9ca2618301686b342867f34f731938f0, type: 3}
m_FontSize: 32
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 2
m_MaxSize: 40
m_Alignment: 0
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u9009\u9879"
--- !u!222 &869065586
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 869065583}
m_CullTransparentMesh: 1
--- !u!1 &884989002
GameObject:
m_ObjectHideFlags: 0
@@ -1207,121 +1128,6 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!1 &1439106032
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1439106037}
- component: {fileID: 1439106036}
- component: {fileID: 1439106035}
- component: {fileID: 1439106034}
- component: {fileID: 1439106033}
m_Layer: 5
m_Name: Canvas
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1439106033
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1439106032}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b189222c6db8433db1239d314f92cf9f, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::DontDestroy
--- !u!114 &1439106034
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1439106032}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
m_Name:
m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.GraphicRaycaster
m_IgnoreReversedGraphics: 1
m_BlockingObjects: 0
m_BlockingMask:
serializedVersion: 2
m_Bits: 4513599
--- !u!114 &1439106035
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1439106032}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
m_Name:
m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.CanvasScaler
m_UiScaleMode: 0
m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1
m_ReferenceResolution: {x: 800, y: 600}
m_ScreenMatchMode: 0
m_MatchWidthOrHeight: 0
m_PhysicalUnit: 3
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
m_PresetInfoIsWorld: 0
--- !u!223 &1439106036
Canvas:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1439106032}
m_Enabled: 1
serializedVersion: 3
m_RenderMode: 0
m_Camera: {fileID: 0}
m_PlaneDistance: 100
m_PixelPerfect: 0
m_ReceivesEvents: 1
m_OverrideSorting: 0
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_VertexColorAlwaysGammaSpace: 0
m_AdditionalShaderChannelsFlag: 0
m_UpdateRectTransformForStandalone: 0
m_SortingLayerID: 0
m_SortingOrder: 0
m_TargetDisplay: 0
--- !u!224 &1439106037
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1439106032}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 869065584}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0}
--- !u!1 &1729919008
GameObject:
m_ObjectHideFlags: 0
@@ -2052,4 +1858,3 @@ SceneRoots:
- {fileID: 1199298675}
- {fileID: 646846706}
- {fileID: 159075240}
- {fileID: 1439106037}

4
Assets/Scripts/Editor/Builder/Tasks/BuildAppTask.cs
View File

@@ -70,7 +70,7 @@ namespace NBF
string outputPath = $"{ProjectDir}/Release";
string location =
$"{outputPath}/{_context.Ver}_{DateTime.Now:yyyyMMddHHmm}/Fishing.exe";
$"{outputPath}/{_context.Ver}/Fishing.exe";
BuildTarget activeTarget = EditorUserBuildSettings.activeBuildTarget;
switch (activeTarget)
@@ -94,7 +94,7 @@ namespace NBF
var buildOptions = BuildOptions.CompressWithLz4;
BuildPlayerOptions buildPlayerOptions = new BuildPlayerOptions()
{
scenes = new[] { "Assets/Scenes/Main.unity" },
scenes = new[] { "Assets/Scenes/StartUp.unity" },//Assets/Scenes/StartUp.unity
locationPathName = location,
options = buildOptions,
target = activeTarget,

4
Assets/Scripts/Init.cs
View File

@@ -60,8 +60,8 @@ namespace NBF
{
// await Task.Delay(100);
CommonTopPanel.Show();
SettingPanel.Show();
// LoginPanel.Show();
// SettingPanel.Show();
LoginPanel.Show();
// PreviewPanel.Show();
}
}

1
Assets/Scripts/NBC/Language/Runtime/Lan.cs
View File

@@ -35,6 +35,7 @@ namespace NBC
public static void SetLanguage(this GObject child, string key, params object[] args)
{
if(string.IsNullOrEmpty(key)) return;
if (Text == null) return;
child.lang = key;

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);
}