From 10de589722f577ce14f091a28ef1040233dea847 Mon Sep 17 00:00:00 2001
From: xmac <xmac@xmacdeMac-mini.local>
Date: Thu, 22 May 2025 11:19:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=BCui?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 FGUIProject/assets/Common/Com/Head.xml        |  2 +-
 FGUIProject/assets/Common/CommonMenu.xml      |  2 +-
 FGUIProject/assets/Shop/FishingShop.xml       | 41 ++++++++++++++++++-
 .../assets/Shop/HorizontalProgressBar.xml     | 10 +++++
 FGUIProject/assets/Shop/TestItem.xml          | 15 +++++++
 FGUIProject/assets/Shop/TitleItem.xml         |  7 ++++
 .../assets/Shop/VerticalroScrollBar.xml       | 13 ++++++
 .../assets/Shop/VerticalroScrollBar_grip.xml  |  9 ++++
 FGUIProject/assets/Shop/package.xml           |  5 +++
 FGUIProject/settings/Common.json              |  4 +-
 FGUIProject/settings/CustomProperties.json    |  1 +
 FGUIProject/settings/i18n.json                |  3 ++
 12 files changed, 106 insertions(+), 6 deletions(-)
 create mode 100644 FGUIProject/assets/Shop/HorizontalProgressBar.xml
 create mode 100644 FGUIProject/assets/Shop/TestItem.xml
 create mode 100644 FGUIProject/assets/Shop/TitleItem.xml
 create mode 100644 FGUIProject/assets/Shop/VerticalroScrollBar.xml
 create mode 100644 FGUIProject/assets/Shop/VerticalroScrollBar_grip.xml
 create mode 100644 FGUIProject/settings/CustomProperties.json
 create mode 100644 FGUIProject/settings/i18n.json

diff --git a/FGUIProject/assets/Common/Com/Head.xml b/FGUIProject/assets/Common/Com/Head.xml
index a02003efc..c51d9c683 100644
--- 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" url="ui://6hgkvlaufcfgfs" fill="scale">
+    <loader id="n2_fcfg" name="icon" xy="0,0" size="30,30" fill="scale">
       <relation target="" sidePair="width-width,height-height"/>
     </loader>
   </displayList>
diff --git a/FGUIProject/assets/Common/CommonMenu.xml b/FGUIProject/assets/Common/CommonMenu.xml
index 6e3190fb5..5d0c39b5f 100644
--- a/FGUIProject/assets/Common/CommonMenu.xml
+++ b/FGUIProject/assets/Common/CommonMenu.xml
@@ -11,7 +11,7 @@
       <item/>
     </list>
     <text id="n4_fcfg" name="title" xy="916,19" pivot="0.5,0.5" size="87,56" font="ui://6hgkvlaugkm7v" fontSize="42" color="#ffffff" align="center" vAlign="middle" shadowColor="#2f406b" shadowOffset="2,2" text="标题"/>
-    <component id="n5_fcfg" name="n5" src="fcfgfu" fileName="Com/UserTopHead.xml" xy="41,21"/>
+    <component id="n5_fcfg" name="Head" src="fcfgfu" fileName="Com/UserTopHead.xml" xy="41,21"/>
     <text id="n6_fcfg" name="TextName" xy="158,62" size="135,39" fontSize="28" color="#7888a0" text="Bob.Song">
       <relation target="n4_fcfg" sidePair="left-left,top-top"/>
     </text>
diff --git a/FGUIProject/assets/Shop/FishingShop.xml b/FGUIProject/assets/Shop/FishingShop.xml
index 0928bbd0e..c74599442 100644
--- a/FGUIProject/assets/Shop/FishingShop.xml
+++ b/FGUIProject/assets/Shop/FishingShop.xml
@@ -1,9 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1920,1080" designImage="ui://146ra2lqfcfg6" designImageAlpha="10">
+<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">
+    <component id="n3_fcfg" name="Menu" src="fcfggr" fileName="CommonMenu.xml" pkg="6hgkvlau" xy="0,0" visible="false">
       <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">
+      <item url="ui://146ra2lqoomea"/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item url="ui://146ra2lqoomea"/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
   </displayList>
 </component>
\ No newline at end of file
diff --git a/FGUIProject/assets/Shop/HorizontalProgressBar.xml b/FGUIProject/assets/Shop/HorizontalProgressBar.xml
new file mode 100644
index 000000000..97e1d14ad
--- /dev/null
+++ b/FGUIProject/assets/Shop/HorizontalProgressBar.xml
@@ -0,0 +1,10 @@
+<?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>
\ No newline at end of file
diff --git a/FGUIProject/assets/Shop/TestItem.xml b/FGUIProject/assets/Shop/TestItem.xml
new file mode 100644
index 000000000..c42d5b411
--- /dev/null
+++ b/FGUIProject/assets/Shop/TestItem.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="224,320" extention="Button">
+  <controller name="button" pages="2,up,3,down,4,over,5,selectedOver,6,disabled,7,selectedDisabled" selected="0"/>
+  <displayList>
+    <graph id="n6_oome" name="n6" xy="0,0" size="224,320" type="rect" fillColor="#ff999999"/>
+    <graph id="n8_oome" name="select" xy="0,0" size="224,320" type="rect" lineSize="2" lineColor="#ff00ff66" fillColor="#ff999999">
+      <gearDisplay controller="button" pages="3,5"/>
+    </graph>
+    <graph id="n9_oome" name="over" xy="0,0" size="224,320" type="rect" lineSize="2" lineColor="#ffccff00" fillColor="#ff999999">
+      <gearDisplay controller="button" pages="4"/>
+    </graph>
+    <text id="n7_oome" name="title" xy="89,143" pivot="0.5,0.5" size="45,29" fontSize="20" align="center" vAlign="middle" text="Title"/>
+  </displayList>
+  <Button mode="Radio"/>
+</component>
\ No newline at end of file
diff --git a/FGUIProject/assets/Shop/TitleItem.xml b/FGUIProject/assets/Shop/TitleItem.xml
new file mode 100644
index 000000000..fbb943f1d
--- /dev/null
+++ b/FGUIProject/assets/Shop/TitleItem.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1457,47">
+  <displayList>
+    <text id="n7_oome" name="n7" xy="0,0" size="51,34" fontSize="24" color="#ffffff" text="标题"/>
+    <image id="n9_oome" name="n9" src="kryob" fileName="Images/Square.png" pkg="6hgkvlau" xy="3,45" size="1454,2" alpha="0.3"/>
+  </displayList>
+</component>
\ No newline at end of file
diff --git a/FGUIProject/assets/Shop/VerticalroScrollBar.xml b/FGUIProject/assets/Shop/VerticalroScrollBar.xml
new file mode 100644
index 000000000..d73912d0c
--- /dev/null
+++ b/FGUIProject/assets/Shop/VerticalroScrollBar.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="6,200" extention="ScrollBar">
+  <displayList>
+    <graph id="n0_oome" name="n0" xy="0,0" size="6,200" alpha="0.1" touchable="false" type="rect" lineSize="0" fillColor="#fff0f0f0">
+      <relation target="" sidePair="width-width,height-height"/>
+    </graph>
+    <graph id="n1_oome" name="bar" xy="0,0" size="17,200" alpha="0.1">
+      <relation target="" sidePair="height-height"/>
+    </graph>
+    <component id="n2_oome" name="grip" src="oomei" fileName="VerticalroScrollBar_grip.xml" xy="0,20"/>
+  </displayList>
+  <ScrollBar/>
+</component>
\ No newline at end of file
diff --git a/FGUIProject/assets/Shop/VerticalroScrollBar_grip.xml b/FGUIProject/assets/Shop/VerticalroScrollBar_grip.xml
new file mode 100644
index 000000000..d0bd0c339
--- /dev/null
+++ b/FGUIProject/assets/Shop/VerticalroScrollBar_grip.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="6,20" extention="Button">
+  <displayList>
+    <graph id="n0_oome" name="n0" xy="0,0" size="6,20" alpha="0.8" touchable="false" type="rect" lineSize="0" fillColor="#ffd0d1d7">
+      <relation target="" sidePair="width-width,height-height"/>
+    </graph>
+  </displayList>
+  <Button/>
+</component>
\ No newline at end of file
diff --git a/FGUIProject/assets/Shop/package.xml b/FGUIProject/assets/Shop/package.xml
index 1bf2708d2..e8b4011bd 100644
--- a/FGUIProject/assets/Shop/package.xml
+++ b/FGUIProject/assets/Shop/package.xml
@@ -9,6 +9,11 @@
     <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="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>
\ No newline at end of file
diff --git a/FGUIProject/settings/Common.json b/FGUIProject/settings/Common.json
index 27b79c2a5..6610b8b44 100644
--- a/FGUIProject/settings/Common.json
+++ b/FGUIProject/settings/Common.json
@@ -14,8 +14,8 @@
     "默认字体"
   ],
   "scrollBars": {
-    "horizontal": "",
-    "vertical": "",
+    "horizontal": "ui://146ra2lqoomed",
+    "vertical": "ui://146ra2lqoomec",
     "defaultDisplay": "visible"
   },
   "tipsRes": "",
diff --git a/FGUIProject/settings/CustomProperties.json b/FGUIProject/settings/CustomProperties.json
new file mode 100644
index 000000000..9e26dfeeb
--- /dev/null
+++ b/FGUIProject/settings/CustomProperties.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/FGUIProject/settings/i18n.json b/FGUIProject/settings/i18n.json
new file mode 100644
index 000000000..53e034f5d
--- /dev/null
+++ b/FGUIProject/settings/i18n.json
@@ -0,0 +1,3 @@
+{
+  "langFiles": []
+}
\ No newline at end of file