diff --git a/Assets/Resources/Fgui/Common/Common_atlas0.png b/Assets/Resources/Fgui/Common/Common_atlas0.png
index 009a54930..d9d4dbbd8 100644
Binary files a/Assets/Resources/Fgui/Common/Common_atlas0.png and b/Assets/Resources/Fgui/Common/Common_atlas0.png differ
diff --git a/Assets/Resources/Fgui/Common/Common_fui.bytes b/Assets/Resources/Fgui/Common/Common_fui.bytes
index d3be8a09f..39ae1c184 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/Resources/Fgui/Shop/Shop_fui.bytes b/Assets/Resources/Fgui/Shop/Shop_fui.bytes
index fdbe405ea..044b38329 100644
Binary files a/Assets/Resources/Fgui/Shop/Shop_fui.bytes and b/Assets/Resources/Fgui/Shop/Shop_fui.bytes differ
diff --git a/Assets/Scripts/Fishing/InputManager.cs b/Assets/Scripts/Fishing/InputManager.cs
index 3bbd236ae..b77f95b52 100644
--- a/Assets/Scripts/Fishing/InputManager.cs
+++ b/Assets/Scripts/Fishing/InputManager.cs
@@ -303,14 +303,12 @@ namespace NBF
private void OnOp1(InputAction.CallbackContext context)
{
IsOp1 = context.performed;
- Debug.Log($"IsOp1={IsOp1}");
OnOp1Action?.Invoke(IsOp1);
}
private void OnOp2(InputAction.CallbackContext context)
{
IsOp2 = context.performed;
- Debug.Log($"OnOp2={IsOp2}");
OnOp2Action?.Invoke(IsOp2);
}
diff --git a/Assets/Scripts/Startup/.idea/.gitignore b/Assets/Scripts/Startup/.idea/.gitignore
new file mode 100644
index 000000000..e69de29bb
diff --git a/Assets/Scripts/Startup/.idea/indexLayout.xml b/Assets/Scripts/Startup/.idea/indexLayout.xml
new file mode 100644
index 000000000..7b08163ce
--- /dev/null
+++ b/Assets/Scripts/Startup/.idea/indexLayout.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Assets/Scripts/Startup/.idea/projectSettingsUpdater.xml b/Assets/Scripts/Startup/.idea/projectSettingsUpdater.xml
new file mode 100644
index 000000000..ef20cb08c
--- /dev/null
+++ b/Assets/Scripts/Startup/.idea/projectSettingsUpdater.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Assets/Scripts/Startup/.idea/workspace.xml b/Assets/Scripts/Startup/.idea/workspace.xml
new file mode 100644
index 000000000..ac3d92246
--- /dev/null
+++ b/Assets/Scripts/Startup/.idea/workspace.xml
@@ -0,0 +1,59 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1747884929312
+
+
+ 1747884929312
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Assets/Scripts/Startup/App.cs b/Assets/Scripts/Startup/App.cs
index 0372be349..b567dce03 100644
--- a/Assets/Scripts/Startup/App.cs
+++ b/Assets/Scripts/Startup/App.cs
@@ -85,9 +85,9 @@ namespace NBF
public void StartGame()
{
- // UI.Inst.OpenUI();
+ UI.Inst.OpenUI();
LoadData();
- Fishing.Inst.Go(1);
+ //Fishing.Inst.Go(1);
}
private void LoadData()
diff --git a/Assets/Scripts/UI/Binders/CommonBinder.cs b/Assets/Scripts/UI/Binders/CommonBinder.cs
index 6bf9ccbcf..f2a69153c 100644
--- a/Assets/Scripts/UI/Binders/CommonBinder.cs
+++ b/Assets/Scripts/UI/Binders/CommonBinder.cs
@@ -8,6 +8,7 @@ namespace NBF
{
public static void BindAll()
{
+ UIObjectFactory.SetPackageItemExtension(CommonMenu.URL, typeof(CommonMenu));
}
}
}
\ No newline at end of file
diff --git a/Assets/Scripts/UI/Common/CommonMenu.Designer.cs b/Assets/Scripts/UI/Common/CommonMenu.Designer.cs
new file mode 100644
index 000000000..3ef51e45f
--- /dev/null
+++ b/Assets/Scripts/UI/Common/CommonMenu.Designer.cs
@@ -0,0 +1,35 @@
+/**本脚本为自动生成，每次生成会覆盖！请勿手动修改，生成插件文档及项目地址：https://git.whoot.com/whoot-games/whoot.fguieditorplugin**/
+
+
+using FairyGUI;
+using FairyGUI.Utils;
+using NBC;
+
+namespace NBF
+{
+ public partial class CommonMenu
+ {
+ public const string URL = "ui://6hgkvlaufcfggr";
+
+ public GImage LongLine;
+ public GList List;
+ public GButton Head;
+ public GTextField TextName;
+ public GComponent Currency;
+ public GButton BtnClose;
+
+ public override void ConstructFromXML(XML xml)
+ {
+ base.ConstructFromXML(xml);
+
+ LongLine = (GImage)GetChild("LongLine");
+ List = (GList)GetChild("List");
+ Head = (GButton)GetChild("Head");
+ TextName = (GTextField)GetChild("TextName");
+ Currency = (GComponent)GetChild("Currency");
+ BtnClose = (GButton)GetChild("BtnClose");
+ OnInited();
+ UILanguage.TrySetComponentLanguage(this);
+ }
+ }
+}
\ No newline at end of file
diff --git a/Assets/Scripts/UI/Common/CommonMenu.Designer.cs.meta b/Assets/Scripts/UI/Common/CommonMenu.Designer.cs.meta
new file mode 100644
index 000000000..0b1c9fe99
--- /dev/null
+++ b/Assets/Scripts/UI/Common/CommonMenu.Designer.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 195be61b5e6ed4de4b8cec3c2ce8d003
\ No newline at end of file
diff --git a/Assets/Scripts/UI/Common/CommonMenu.cs b/Assets/Scripts/UI/Common/CommonMenu.cs
new file mode 100644
index 000000000..6c807f42d
--- /dev/null
+++ b/Assets/Scripts/UI/Common/CommonMenu.cs
@@ -0,0 +1,31 @@
+// 本脚本只在不存在时会生成一次。组件逻辑写在当前脚本内。已存在不会再次生成覆盖
+
+using System;
+using UnityEngine;
+using FairyGUI;
+using NBC;
+
+namespace NBF
+{
+ public partial class CommonMenu : GLabel
+ {
+ public event Action OnClose;
+ public event Action OnTabChange;
+ private void OnInited()
+ {
+ BtnClose.onClick.Add(OnClickClose);
+ }
+
+ public void SetTabs()
+ {
+ List.RemoveChildrenToPool();
+
+ }
+
+
+ private void OnClickClose()
+ {
+ OnClose?.Invoke();
+ }
+ }
+}
\ No newline at end of file
diff --git a/Assets/Scripts/UI/Common/CommonMenu.cs.meta b/Assets/Scripts/UI/Common/CommonMenu.cs.meta
new file mode 100644
index 000000000..19f5ef468
--- /dev/null
+++ b/Assets/Scripts/UI/Common/CommonMenu.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: b18b4ca156e62462ba447a851e105615
\ No newline at end of file
diff --git a/Assets/Scripts/UI/Fishing/InteractiveTag.cs b/Assets/Scripts/UI/Fishing/InteractiveTag.cs
index 39f616c23..d74879437 100644
--- a/Assets/Scripts/UI/Fishing/InteractiveTag.cs
+++ b/Assets/Scripts/UI/Fishing/InteractiveTag.cs
@@ -50,7 +50,7 @@ namespace NBF
{
if (string.IsNullOrEmpty(_interactiveData.Use1)) return;
Debug.Log(_interactiveData.Use1);
- UI.Inst.OpenUI();
+ UI.Inst.OpenUI();
}
public void Use2()
diff --git a/Assets/Scripts/UI/Shops/FishingShop.Designer.cs b/Assets/Scripts/UI/Shops/FishingShopPanel.Designer.cs
similarity index 60%
rename from Assets/Scripts/UI/Shops/FishingShop.Designer.cs
rename to Assets/Scripts/UI/Shops/FishingShopPanel.Designer.cs
index 930d313b5..4400d991d 100644
--- a/Assets/Scripts/UI/Shops/FishingShop.Designer.cs
+++ b/Assets/Scripts/UI/Shops/FishingShopPanel.Designer.cs
@@ -8,13 +8,17 @@ using System.Collections.Generic;
namespace NBF
{
///
- public partial class FishingShop
+ public partial class FishingShopPanel
{
public GObject this[string aKey] => ContentPane.GetChild(aKey);
- [AutoFind(Name = "Banner")]
- public GLabel Banner;
- [AutoFind(Name = "BtnClose")]
- public GButton BtnClose;
+ [AutoFind(Name = "back")]
+ public GImage back;
+ [AutoFind(Name = "Menu")]
+ public CommonMenu Menu;
+ [AutoFind(Name = "divisionLine")]
+ public GImage divisionLine;
+ [AutoFind(Name = "List")]
+ public GList List;
public override string[] GetDependPackages(){ return new string[] {"Common"}; }
diff --git a/Assets/Scripts/UI/Shops/FishingShop.Designer.cs.meta b/Assets/Scripts/UI/Shops/FishingShopPanel.Designer.cs.meta
similarity index 100%
rename from Assets/Scripts/UI/Shops/FishingShop.Designer.cs.meta
rename to Assets/Scripts/UI/Shops/FishingShopPanel.Designer.cs.meta
diff --git a/Assets/Scripts/UI/Shops/FishingShop.cs b/Assets/Scripts/UI/Shops/FishingShopPanel.cs
similarity index 76%
rename from Assets/Scripts/UI/Shops/FishingShop.cs
rename to Assets/Scripts/UI/Shops/FishingShopPanel.cs
index 63a0537a2..7b0c6529b 100644
--- a/Assets/Scripts/UI/Shops/FishingShop.cs
+++ b/Assets/Scripts/UI/Shops/FishingShopPanel.cs
@@ -7,10 +7,10 @@ using UIPanel = NBC.UIPanel;
namespace NBF
{
- public partial class FishingShop : UIPanel
+ public partial class FishingShopPanel : UIPanel
{
public override string UIPackName => "Shop";
- public override string UIResName => "FishingShop";
+ public override string UIResName => "FishingShopPanel";
protected override void OnInit()
{
@@ -25,10 +25,10 @@ namespace NBF
private void OnClick(GComponent btn)
{
- if (btn == BtnClose)
- {
- Hide();
- }
+ // if (btn == BtnClose)
+ // {
+ // Hide();
+ // }
}
protected override void OnHide()
diff --git a/Assets/Scripts/UI/Shops/FishingShop.cs.meta b/Assets/Scripts/UI/Shops/FishingShopPanel.cs.meta
similarity index 100%
rename from Assets/Scripts/UI/Shops/FishingShop.cs.meta
rename to Assets/Scripts/UI/Shops/FishingShopPanel.cs.meta
diff --git a/FGUIProject/assets/Common/Com/Head.xml b/FGUIProject/assets/Common/Com/Head.xml
index c51d9c683..a02003efc 100644
--- a/FGUIProject/assets/Common/Com/Head.xml
+++ b/FGUIProject/assets/Common/Com/Head.xml
@@ -4,7 +4,7 @@
-
+
diff --git a/FGUIProject/assets/Shop/VerticalroScrollBar.xml b/FGUIProject/assets/Common/Com/ScrollBar/VerticalroScrollBar.xml
similarity index 100%
rename from FGUIProject/assets/Shop/VerticalroScrollBar.xml
rename to FGUIProject/assets/Common/Com/ScrollBar/VerticalroScrollBar.xml
diff --git a/FGUIProject/assets/Shop/VerticalroScrollBar_grip.xml b/FGUIProject/assets/Common/Com/ScrollBar/VerticalroScrollBar_grip.xml
similarity index 100%
rename from FGUIProject/assets/Shop/VerticalroScrollBar_grip.xml
rename to FGUIProject/assets/Common/Com/ScrollBar/VerticalroScrollBar_grip.xml
diff --git a/FGUIProject/assets/Common/package.xml b/FGUIProject/assets/Common/package.xml
index 407b96371..cb4a426a5 100644
--- a/FGUIProject/assets/Common/package.xml
+++ b/FGUIProject/assets/Common/package.xml
@@ -112,6 +112,8 @@
+
+
\ No newline at end of file
diff --git a/FGUIProject/assets/Shop/FishingShop.xml b/FGUIProject/assets/Shop/FishingShopPanel.xml
similarity index 81%
rename from FGUIProject/assets/Shop/FishingShop.xml
rename to FGUIProject/assets/Shop/FishingShopPanel.xml
index c74599442..78bf8bbe6 100644
--- a/FGUIProject/assets/Shop/FishingShop.xml
+++ b/FGUIProject/assets/Shop/FishingShopPanel.xml
@@ -2,11 +2,11 @@
-
+
-
+