相关UILUOJI

2025-05-22 22:49:32 +08:00
parent 10de589722
commit 2ca8eac832
27 changed files with 172 additions and 35 deletions
--- a/Assets/Resources/Fgui/Common/Common_atlas0.png
+++ b/Assets/Resources/Fgui/Common/Common_atlas0.png
--- a/Assets/Resources/Fgui/Common/Common_fui.bytes
+++ b/Assets/Resources/Fgui/Common/Common_fui.bytes
--- a/Assets/Resources/Fgui/Shop/Shop_fui.bytes
+++ b/Assets/Resources/Fgui/Shop/Shop_fui.bytes
--- 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);
        }

--- a/Assets/Scripts/Startup/.idea/.gitignore
+++ b/Assets/Scripts/Startup/.idea/.gitignore
--- a/Assets/Scripts/Startup/.idea/indexLayout.xml
+++ b/Assets/Scripts/Startup/.idea/indexLayout.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="UserContentModel">
+    <attachedFolders />
+    <explicitIncludes />
+    <explicitExcludes />
+  </component>
+</project>
--- a/Assets/Scripts/Startup/.idea/projectSettingsUpdater.xml
+++ b/Assets/Scripts/Startup/.idea/projectSettingsUpdater.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RiderProjectSettingsUpdater">
+    <option name="singleClickDiffPreview" value="1" />
+    <option name="unhandledExceptionsIgnoreList" value="1" />
+    <option name="vcsConfiguration" value="3" />
+  </component>
+</project>
--- a/Assets/Scripts/Startup/.idea/workspace.xml
+++ b/Assets/Scripts/Startup/.idea/workspace.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="265254c0-2de4-4dbb-9070-f3735cb8287c" name="更改" comment="" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="ProjectColorInfo"><![CDATA[{
+  "associatedIndex": 8
+}]]></component>
+  <component name="ProjectId" id="2xQz8hiEtmyRPBheCJwsdJTvao0" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "ModuleVcsDetector.initialDetectionPerformed": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "nodejs_package_manager_path": "npm",
+    "vue.rearranger.settings.migration": "true"
+  }
+}]]></component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="默认任务">
+      <changelist id="265254c0-2de4-4dbb-9070-f3735cb8287c" name="更改" comment="" />
+      <created>1747884929312</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1747884929312</updated>
+      <workItem from="1747884931095" duration="47000" />
+    </task>
+    <servers />
+  </component>
+  <component name="UnityProjectConfiguration" hasMinimizedUI="false" />
+  <component name="VcsManagerConfiguration">
+    <option name="CLEAR_INITIAL_COMMIT_MESSAGE" value="true" />
+  </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager>
+      <breakpoints>
+        <breakpoint enabled="true" type="DotNet_Exception_Breakpoints">
+          <properties exception="System.OperationCanceledException" breakIfHandledByOtherCode="false" displayValue="System.OperationCanceledException" />
+          <option name="timeStamp" value="1" />
+        </breakpoint>
+        <breakpoint enabled="true" type="DotNet_Exception_Breakpoints">
+          <properties exception="System.Threading.Tasks.TaskCanceledException" breakIfHandledByOtherCode="false" displayValue="System.Threading.Tasks.TaskCanceledException" />
+          <option name="timeStamp" value="2" />
+        </breakpoint>
+        <breakpoint enabled="true" type="DotNet_Exception_Breakpoints">
+          <properties exception="System.Threading.ThreadAbortException" breakIfHandledByOtherCode="false" displayValue="System.Threading.ThreadAbortException" />
+          <option name="timeStamp" value="3" />
+        </breakpoint>
+      </breakpoints>
+    </breakpoint-manager>
+  </component>
+</project>
--- a/Assets/Scripts/Startup/App.cs
+++ b/Assets/Scripts/Startup/App.cs
@@ -85,9 +85,9 @@ namespace NBF

        public void StartGame()
        {
-            // UI.Inst.OpenUI<LoadPanel>();
+            UI.Inst.OpenUI<FishingShopPanel>();
            LoadData();
-            Fishing.Inst.Go(1);
+            //Fishing.Inst.Go(1);
        }

        private void LoadData()
--- 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));
        }
    }
 }
--- a/Assets/Scripts/UI/Common/CommonMenu.Designer.cs
+++ 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);
+        }
+    }
+}
--- a/Assets/Scripts/UI/Common/CommonMenu.Designer.cs.meta
+++ b/Assets/Scripts/UI/Common/CommonMenu.Designer.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 195be61b5e6ed4de4b8cec3c2ce8d003
--- a/Assets/Scripts/UI/Common/CommonMenu.cs
+++ 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<int> OnTabChange;
+        private void OnInited()
+        {
+            BtnClose.onClick.Add(OnClickClose);
+        }
+
+        public void SetTabs()
+        {
+            List.RemoveChildrenToPool();
+            
+        }
+
+
+        private void OnClickClose()
+        {
+            OnClose?.Invoke();
+        }
+    }
+}
--- a/Assets/Scripts/UI/Common/CommonMenu.cs.meta
+++ b/Assets/Scripts/UI/Common/CommonMenu.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: b18b4ca156e62462ba447a851e105615
--- 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<FishingShop>();
+            UI.Inst.OpenUI<FishingShopPanel>();
        }

        public void Use2()
--- a/Assets/Scripts/UI/Shops/FishingShopPanel.Designer.cs
+++ b/Assets/Scripts/UI/Shops/FishingShopPanel.Designer.cs
@@ -8,13 +8,17 @@ using System.Collections.Generic;
 namespace NBF
 {
    /// <summary>  </summary>
-    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"}; }


--- a/Assets/Scripts/UI/Shops/FishingShopPanel.Designer.cs.meta
+++ b/Assets/Scripts/UI/Shops/FishingShopPanel.Designer.cs.meta
--- a/Assets/Scripts/UI/Shops/FishingShopPanel.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()
--- a/Assets/Scripts/UI/Shops/FishingShopPanel.cs.meta
+++ b/Assets/Scripts/UI/Shops/FishingShopPanel.cs.meta
--- a/FGUIProject/assets/Common/Com/Head.xml
+++ b/FGUIProject/assets/Common/Com/Head.xml
@@ -4,7 +4,7 @@
    <graph id="n3_fcfg" name="n3" xy="0,0" size="30,30" type="eclipse">
      <relation target="" sidePair="width-width,height-height"/>
    </graph>
-    <loader id="n2_fcfg" name="icon" xy="0,0" size="30,30" fill="scale">
+    <loader id="n2_fcfg" name="icon" xy="0,0" size="30,30" url="ui://6hgkvlaufcfgfs" fill="scale">
      <relation target="" sidePair="width-width,height-height"/>
    </loader>
  </displayList>
--- a/FGUIProject/assets/Common/Com/ScrollBar/VerticalroScrollBar.xml
+++ b/FGUIProject/assets/Common/Com/ScrollBar/VerticalroScrollBar.xml
--- a/FGUIProject/assets/Common/Com/ScrollBar/VerticalroScrollBar_grip.xml
+++ b/FGUIProject/assets/Common/Com/ScrollBar/VerticalroScrollBar_grip.xml
--- a/FGUIProject/assets/Common/package.xml
+++ b/FGUIProject/assets/Common/package.xml
@@ -112,6 +112,8 @@
    <image id="fcfggy" name="icon_controller_28.png" path="/Icon/控制图标/"/>
    <image id="fcfggz" name="icon_controller_29.png" path="/Icon/控制图标/"/>
    <image id="fcfgh0" name="20250521222909_1.jpg" path="/效果图/"/>
+    <component id="oomej" name="VerticalroScrollBar.xml" path="/Com/ScrollBar/" exported="true"/>
+    <component id="oomei" name="VerticalroScrollBar_grip.xml" path="/Com/ScrollBar/"/>
  </resources>
  <publish name="" path="../Assets/Resources/Fgui/Common" packageCount="2" genCode="true"/>
 </packageDescription>
--- a/FGUIProject/assets/Shop/FishingShopPanel.xml
+++ b/FGUIProject/assets/Shop/FishingShopPanel.xml
@@ -2,11 +2,11 @@
 <component size="1920,1080" designImage="ui://146ra2lqfcfg6" designImageAlpha="0">
  <displayList>
    <image id="n2_fcfg" name="back" src="kryob" fileName="Images/Square.png" pkg="6hgkvlau" xy="0,0" size="1920,1080" color="#0a1123"/>
-    <component id="n3_fcfg" name="Menu" src="fcfggr" fileName="CommonMenu.xml" pkg="6hgkvlau" xy="0,0" visible="false">
+    <component id="n3_fcfg" name="Menu" src="fcfggr" fileName="CommonMenu.xml" pkg="6hgkvlau" xy="0,0">
      <relation target="" sidePair="width-width,center-center,top-top"/>
    </component>
    <image id="n4_oome" name="divisionLine" src="kryob" fileName="Images/Square.png" pkg="6hgkvlau" xy="355,176" size="2,800" alpha="0.2"/>
-    <list id="n5_oome" name="List" xy="365,164" size="1534,904" layout="flow_hz" selectionMode="multiple" overflow="scroll" scrollBarFlags="4" margin="10,10,0,0" scrollBarRes="ui://146ra2lqoomej,ui://146ra2lqoomed" clipSoftness="10,10" lineGap="30" colGap="30" defaultItem="ui://146ra2lqoome9" align="center" autoClearItems="true" foldInvisibleItems="true">
+    <list id="n5_oome" name="List" xy="365,164" size="1534,904" layout="flow_hz" selectionMode="multiple" overflow="scroll" scrollBarFlags="4" margin="10,10,0,0" clipSoftness="10,10" lineGap="30" colGap="30" defaultItem="ui://146ra2lqoome9" align="center" autoClearItems="true" foldInvisibleItems="true">
      <item url="ui://146ra2lqoomea"/>
      <item/>
      <item/>
--- a/FGUIProject/assets/Shop/HorizontalProgressBar.xml
+++ b/FGUIProject/assets/Shop/HorizontalProgressBar.xml
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="50,6" extention="ProgressBar">
-  <displayList>
-    <graph id="n0_oome" name="n0" xy="0,0" size="50,6" alpha="0.1" type="rect" lineSize="0" lineColor="#ffa0a0a0" fillColor="#fff0f0f0">
-      <relation target="" sidePair="width-width,height-height"/>
-    </graph>
-    <graph id="n1_oome" name="bar" xy="0,0" size="50,6" alpha="0.8" type="rect" lineSize="0"/>
-  </displayList>
-  <ProgressBar/>
-</component>
--- a/FGUIProject/assets/Shop/package.xml
+++ b/FGUIProject/assets/Shop/package.xml
@@ -8,12 +8,9 @@
    <image id="fcfg4" name="自动贩卖机.jpg" path="/x效果图/"/>
    <image id="fcfg5" name="咖啡店.jpg" path="/x效果图/"/>
    <image id="fcfg6" name="食品店.jpg" path="/x效果图/"/>
-    <component id="fcfg8" name="FishingShop.xml" path="/" exported="true"/>
+    <component id="fcfg8" name="FishingShopPanel.xml" path="/" exported="true"/>
    <component id="oome9" name="TestItem.xml" path="/"/>
    <component id="oomea" name="TitleItem.xml" path="/"/>
-    <component id="oomed" name="HorizontalProgressBar.xml" path="/" exported="true"/>
-    <component id="oomei" name="VerticalroScrollBar_grip.xml" path="/"/>
-    <component id="oomej" name="VerticalroScrollBar.xml" path="/" exported="true"/>
  </resources>
  <publish name="" path="../Assets/Resources/Fgui/Shop" packageCount="2" genCode="true"/>
 </packageDescription>
--- a/FGUIProject/settings/Common.json
+++ b/FGUIProject/settings/Common.json
@@ -14,8 +14,8 @@
    "默认字体"
  ],
  "scrollBars": {
-    "horizontal": "ui://146ra2lqoomed",
-    "vertical": "ui://146ra2lqoomec",
+    "horizontal": "",
+    "vertical": "ui://6hgkvlauoomej",
    "defaultDisplay": "visible"
  },
  "tipsRes": "",