diff --git a/Assets/Resources/Fgui/Main/Main_fui.bytes b/Assets/Resources/Fgui/Main/Main_fui.bytes
index 0b9be9d58..61aa9779a 100644
Binary files a/Assets/Resources/Fgui/Main/Main_fui.bytes and b/Assets/Resources/Fgui/Main/Main_fui.bytes differ
diff --git a/Assets/Scripts/Common/Data/ItemInfo.cs b/Assets/Scripts/Common/Data/ItemInfo.cs
index fa14f4a3c..94474e3a5 100644
--- a/Assets/Scripts/Common/Data/ItemInfo.cs
+++ b/Assets/Scripts/Common/Data/ItemInfo.cs
@@ -1,4 +1,5 @@
 using NBF;
+using NBF.Utils;
 
 namespace NBC
 {
@@ -10,5 +11,9 @@ namespace NBC
         {
             get { return _config ??= ItemConfig.Get(ConfigId); }
         }
+
+        public ItemType ItemType => ConfigId.GetItemType();
+        
+        public uint ItemSubType => ConfigId.GetItemSubType();
     }
 }
\ No newline at end of file
diff --git a/Assets/Scripts/Common/Enum/ItemType.cs b/Assets/Scripts/Common/Enum/ItemType.cs
index 2de1f2b00..a776a6867 100644
--- a/Assets/Scripts/Common/Enum/ItemType.cs
+++ b/Assets/Scripts/Common/Enum/ItemType.cs
@@ -24,4 +24,12 @@
         Item = 2,
         Fish = 3,
     }
+
+    public enum RodType
+    {
+        None,
+        Tele = 1,
+        Spine = 2,
+        Bolo = 3,
+    }
 }
\ No newline at end of file
diff --git a/Assets/Scripts/Common/Utils/ItemHelper.cs b/Assets/Scripts/Common/Utils/ItemHelper.cs
index 93c5ba9b8..103222695 100644
--- a/Assets/Scripts/Common/Utils/ItemHelper.cs
+++ b/Assets/Scripts/Common/Utils/ItemHelper.cs
@@ -11,6 +11,16 @@ namespace NBF.Utils
             return (ItemType)(id / 10000);
         }
 
+        /// <summary>
+        /// 获取物品子类型
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public static uint GetItemSubType(this uint id)
+        {
+            return (id / 1000) % 10;
+        }
+
         public static string GetName(this uint id)
         {
             return Lan.Get($"Name_{id}");
diff --git a/Assets/Scripts/UI/Bag/GearItem.Designer.cs b/Assets/Scripts/UI/Bag/BagGearItem.Designer.cs
similarity index 96%
rename from Assets/Scripts/UI/Bag/GearItem.Designer.cs
rename to Assets/Scripts/UI/Bag/BagGearItem.Designer.cs
index 1dcaa225f..dfacdc43f 100644
--- a/Assets/Scripts/UI/Bag/GearItem.Designer.cs
+++ b/Assets/Scripts/UI/Bag/BagGearItem.Designer.cs
@@ -7,7 +7,7 @@ using NBC;
 
 namespace NBF
 {
-    public partial class GearItem
+    public partial class BagGearItem
     {
         public const string URL = "ui://hxr7rc7pnzfp1n";
 
diff --git a/Assets/Scripts/UI/Bag/GearItem.Designer.cs.meta b/Assets/Scripts/UI/Bag/BagGearItem.Designer.cs.meta
similarity index 100%
rename from Assets/Scripts/UI/Bag/GearItem.Designer.cs.meta
rename to Assets/Scripts/UI/Bag/BagGearItem.Designer.cs.meta
diff --git a/Assets/Scripts/UI/Bag/BagGearItem.cs b/Assets/Scripts/UI/Bag/BagGearItem.cs
new file mode 100644
index 000000000..f4569624b
--- /dev/null
+++ b/Assets/Scripts/UI/Bag/BagGearItem.cs
@@ -0,0 +1,24 @@
+// 本脚本只在不存在时会生成一次。组件逻辑写在当前脚本内。已存在不会再次生成覆盖 
+
+using UnityEngine;
+using FairyGUI;
+using NBC;
+
+namespace NBF
+{
+    public partial class BagGearItem : GButton
+    {
+        private void OnInited()
+        {
+        }
+
+        /// <summary>
+        /// 设置数据
+        /// </summary>
+        /// <param name="item">主物体</param>
+        /// <param name="gearItemType">可以装配的配件</param>
+        public void SetData(ItemInfo item, ItemType gearItemType)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/Assets/Scripts/UI/Bag/GearItem.cs.meta b/Assets/Scripts/UI/Bag/BagGearItem.cs.meta
similarity index 100%
rename from Assets/Scripts/UI/Bag/GearItem.cs.meta
rename to Assets/Scripts/UI/Bag/BagGearItem.cs.meta
diff --git a/Assets/Scripts/UI/Bag/GearItem.cs b/Assets/Scripts/UI/Bag/GearItem.cs
deleted file mode 100644
index ccd0ec52f..000000000
--- a/Assets/Scripts/UI/Bag/GearItem.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-// 本脚本只在不存在时会生成一次。组件逻辑写在当前脚本内。已存在不会再次生成覆盖 
-
-using UnityEngine;
-using FairyGUI;
-using NBC;
-
-namespace NBF
-{
-    public partial class GearItem : GButton
-    {
-        private void OnInited()
-        {
-        }
-    }
-}
\ No newline at end of file
diff --git a/Assets/Scripts/UI/Bag/ItemDetailsPanel.cs b/Assets/Scripts/UI/Bag/ItemDetailsPanel.cs
index a45cdc7e5..5baa9acc4 100644
--- a/Assets/Scripts/UI/Bag/ItemDetailsPanel.cs
+++ b/Assets/Scripts/UI/Bag/ItemDetailsPanel.cs
@@ -19,11 +19,17 @@ namespace NBF
         protected override void OnShow()
         {
             ItemInfo = GetData() as ItemInfo;
+            if (ItemInfo == null || ItemInfo.Config == null)
+            {
+                Hide();
+                return;
+            }
 
             Quality.SetQuality(ItemInfo.Config.Quality);
 
+            Content.Gear.visible = false;
             Content.Basic.SetInfo(ItemInfo);
-            Content.Basic.SetInfo(ItemInfo);
+            Content.Gear.SetInfo(ItemInfo);
 
             // var model = PrefabsHelper.CreatePrefab(ItemInfo.Config.Model);
             Model.SetData(ItemInfo.Config);
diff --git a/Assets/Scripts/UI/Bag/ItemGearInfoTag.cs b/Assets/Scripts/UI/Bag/ItemGearInfoTag.cs
index 108bcc7df..fdb09fad0 100644
--- a/Assets/Scripts/UI/Bag/ItemGearInfoTag.cs
+++ b/Assets/Scripts/UI/Bag/ItemGearInfoTag.cs
@@ -1,19 +1,79 @@
 // 本脚本只在不存在时会生成一次。组件逻辑写在当前脚本内。已存在不会再次生成覆盖 
 
+using System.Collections.Generic;
 using UnityEngine;
 using FairyGUI;
 using NBC;
+using NBF.Utils;
 
 namespace NBF
 {
     public partial class ItemGearInfoTag : GComponent
     {
+        public ItemInfo Info { get; private set; }
+
         private void OnInited()
         {
         }
 
         public void SetInfo(ItemInfo itemInfo)
         {
+            Info = itemInfo;
+            var types = GetItemGearTypes();
+            List.RemoveChildrenToPool();
+            foreach (var itemType in types)
+            {
+                var item = List.AddItemFromPool() as BagGearItem;
+                item?.SetData(itemInfo, itemType);
+            }
+
+            List.AutoHeight();
+            this.height = List.height + List.y + 10;
+            parent.scrollPane.touchEffect = height + y > parent.height;
+            parent.scrollPane.ScrollTop();
+            if (types.Count < 1)
+            {
+                visible = false;
+            }
+        }
+
+
+        private List<ItemType> GetItemGearTypes()
+        {
+            List<ItemType> types = new List<ItemType>();
+
+            var itemType = Info.ItemType;
+            if (itemType == ItemType.Rod)
+            {
+                var subType = (RodType)Info.ItemSubType;
+                if (subType == RodType.Tele)
+                {
+                    types.Add(ItemType.Line);
+                    types.Add(ItemType.Bobber);
+                    types.Add(ItemType.Weight);
+                    types.Add(ItemType.Hook);
+                }
+                else if (subType == RodType.Spine)
+                {
+                    types.Add(ItemType.Line);
+                    types.Add(ItemType.Weight);
+                    types.Add(ItemType.Lure);
+                }
+                else if (subType == RodType.Bolo)
+                {
+                    types.Add(ItemType.Line);
+                    types.Add(ItemType.Weight);
+                    types.Add(ItemType.Lure);
+                }
+            }
+            else if (itemType == ItemType.Lure)
+            {
+                types.Add(ItemType.Hook);
+                types.Add(ItemType.Hook);
+            }
+
+            // Info.Config;
+            return types;
         }
     }
 }
\ No newline at end of file
diff --git a/Assets/Scripts/UI/Binders/MainBinder.cs b/Assets/Scripts/UI/Binders/MainBinder.cs
index f657945a1..c83a8b446 100644
--- a/Assets/Scripts/UI/Binders/MainBinder.cs
+++ b/Assets/Scripts/UI/Binders/MainBinder.cs
@@ -19,10 +19,11 @@ namespace NBF
             UIObjectFactory.SetPackageItemExtension(HomeStatisticsPage.URL, typeof(HomeStatisticsPage));
             UIObjectFactory.SetPackageItemExtension(HomeButtonGroups.URL, typeof(HomeButtonGroups));
             UIObjectFactory.SetPackageItemExtension(ChatItem.URL, typeof(ChatItem));
-            UIObjectFactory.SetPackageItemExtension(GearItem.URL, typeof(GearItem));
+            UIObjectFactory.SetPackageItemExtension(BagGearItem.URL, typeof(BagGearItem));
             UIObjectFactory.SetPackageItemExtension(ItemDetailsContent.URL, typeof(ItemDetailsContent));
             UIObjectFactory.SetPackageItemExtension(ItemBasicInfoTag.URL, typeof(ItemBasicInfoTag));
             UIObjectFactory.SetPackageItemExtension(ItemGearInfoTag.URL, typeof(ItemGearInfoTag));
+            UIObjectFactory.SetPackageItemExtension(ShopGearItem.URL, typeof(ShopGearItem));
             UIObjectFactory.SetPackageItemExtension(BagItem.URL, typeof(BagItem));
         }
     }
diff --git a/Assets/Scripts/UI/Common/Extensions/GListExtensions.cs b/Assets/Scripts/UI/Common/Extensions/GListExtensions.cs
new file mode 100644
index 000000000..9442931b5
--- /dev/null
+++ b/Assets/Scripts/UI/Common/Extensions/GListExtensions.cs
@@ -0,0 +1,20 @@
+using FairyGUI;
+
+namespace NBF
+{
+    public static class GListExtensions
+    {
+        public static void AutoHeight(this GList list)
+        {
+            if (list.numItems < 1)
+            {
+                list.height = 100;
+                return;
+            }
+
+            var item = list.GetChildAt(0);
+            var listHeight = list.numItems * item.height + list.lineGap * list.numItems;
+            list.height = listHeight;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Assets/Scripts/UI/Common/Extensions/GListExtensions.cs.meta b/Assets/Scripts/UI/Common/Extensions/GListExtensions.cs.meta
new file mode 100644
index 000000000..e232e03f3
--- /dev/null
+++ b/Assets/Scripts/UI/Common/Extensions/GListExtensions.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 5bb71cdaee584b00a50ea53c6023ea79
+timeCreated: 1761876194
\ No newline at end of file
diff --git a/Assets/Scripts/UI/Shops/FishingShopPanel.Designer.cs b/Assets/Scripts/UI/Shops/FishingShopPanel.Designer.cs
index e7df34af1..23b465198 100644
--- a/Assets/Scripts/UI/Shops/FishingShopPanel.Designer.cs
+++ b/Assets/Scripts/UI/Shops/FishingShopPanel.Designer.cs
@@ -11,7 +11,7 @@ namespace NBF
     public partial class FishingShopPanel
     {
         public GObject this[string aKey] => ContentPane.GetChild(aKey);
-        public override string UIPackName => "Shop";
+        public override string UIPackName => "Main";
         public override string UIResName => "FishingShopPanel";
 
         [AutoFind(Name = "Currencys")]
diff --git a/Assets/Scripts/UI/Shops/ShopGearItem.Designer.cs b/Assets/Scripts/UI/Shops/ShopGearItem.Designer.cs
index cc2fc04ef..a75c3d8b0 100644
--- a/Assets/Scripts/UI/Shops/ShopGearItem.Designer.cs
+++ b/Assets/Scripts/UI/Shops/ShopGearItem.Designer.cs
@@ -9,7 +9,7 @@ namespace NBF
 {
     public partial class ShopGearItem
     {
-        public const string URL = "ui://146ra2lqoome9";
+        public const string URL = "ui://hxr7rc7poome9";
 
         public GImage back;
         public GImage ba;
diff --git a/Config/Item.xlsx b/Config/Item.xlsx
index 4fbbf9469..a2973d879 100644
Binary files a/Config/Item.xlsx and b/Config/Item.xlsx differ
diff --git a/FGUIProject/assets/Common/Com/ClassifyList.xml b/FGUIProject/assets/Common/Com/ClassifyList.xml
index 3b262388e..95ee67bc2 100644
--- a/FGUIProject/assets/Common/Com/ClassifyList.xml
+++ b/FGUIProject/assets/Common/Com/ClassifyList.xml
@@ -3,7 +3,7 @@
   <displayList>
     <list id="n5_oome" name="List" xy="0,1" size="1846,806" layout="flow_hz" selectionMode="multiple" overflow="scroll" scrollBarFlags="4" scrollBarRes="ui://6hgkvlauoomej," clipSoftness="10,10" lineGap="20" colGap="20" autoClearItems="true" foldInvisibleItems="true">
       <relation target="" sidePair="width-width,height-height"/>
-      <item url="ui://146ra2lqoome9"/>
+      <item url="ui://hxr7rc7poome9"/>
     </list>
   </displayList>
 </component>
\ No newline at end of file
diff --git a/FGUIProject/assets/Common/Com/List/CommonItemList.xml b/FGUIProject/assets/Common/Com/List/CommonItemList.xml
index 62c3641ac..5a835daa1 100644
--- a/FGUIProject/assets/Common/Com/List/CommonItemList.xml
+++ b/FGUIProject/assets/Common/Com/List/CommonItemList.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1920,1007" designImage="ui://146ra2lqr03ue" designImageAlpha="0">
+<component size="1920,1007" designImage="ui://hxr7rc7pr03ue" designImageAlpha="0">
   <controller name="style" pages="1,oneMenu,2,twoMenu" selected="0">
     <remark page="0" value="一级菜单"/>
     <remark page="1" value="二级菜单"/>
diff --git a/FGUIProject/assets/Main/Images/Bag.png b/FGUIProject/assets/Main/Assets/Images/Bag.png
similarity index 100%
rename from FGUIProject/assets/Main/Images/Bag.png
rename to FGUIProject/assets/Main/Assets/Images/Bag.png
diff --git a/FGUIProject/assets/Main/Images/Bell.png b/FGUIProject/assets/Main/Assets/Images/Bell.png
similarity index 100%
rename from FGUIProject/assets/Main/Images/Bell.png
rename to FGUIProject/assets/Main/Assets/Images/Bell.png
diff --git a/FGUIProject/assets/Main/Images/Cup.png b/FGUIProject/assets/Main/Assets/Images/Cup.png
similarity index 100%
rename from FGUIProject/assets/Main/Images/Cup.png
rename to FGUIProject/assets/Main/Assets/Images/Cup.png
diff --git a/FGUIProject/assets/Main/Images/Fire.png b/FGUIProject/assets/Main/Assets/Images/Fire.png
similarity index 100%
rename from FGUIProject/assets/Main/Images/Fire.png
rename to FGUIProject/assets/Main/Assets/Images/Fire.png
diff --git a/FGUIProject/assets/Main/Images/OnOff.png b/FGUIProject/assets/Main/Assets/Images/OnOff.png
similarity index 100%
rename from FGUIProject/assets/Main/Images/OnOff.png
rename to FGUIProject/assets/Main/Assets/Images/OnOff.png
diff --git a/FGUIProject/assets/Main/Images/Settings.png b/FGUIProject/assets/Main/Assets/Images/Settings.png
similarity index 100%
rename from FGUIProject/assets/Main/Images/Settings.png
rename to FGUIProject/assets/Main/Assets/Images/Settings.png
diff --git a/FGUIProject/assets/Main/Images/back1.png b/FGUIProject/assets/Main/Assets/Images/back1.png
similarity index 100%
rename from FGUIProject/assets/Main/Images/back1.png
rename to FGUIProject/assets/Main/Assets/Images/back1.png
diff --git a/FGUIProject/assets/Main/效果图/Tom-Clancys-Rainbow-Six-Siege07172020-095450-32422.jpg b/FGUIProject/assets/Main/Assets/效果图/Tom-Clancys-Rainbow-Six-Siege07172020-095450-32422.jpg
similarity index 100%
rename from FGUIProject/assets/Main/效果图/Tom-Clancys-Rainbow-Six-Siege07172020-095450-32422.jpg
rename to FGUIProject/assets/Main/Assets/效果图/Tom-Clancys-Rainbow-Six-Siege07172020-095450-32422.jpg
diff --git a/FGUIProject/assets/Main/效果图/主页参考/20250602193216_1.jpg b/FGUIProject/assets/Main/Assets/效果图/主页参考/20250602193216_1.jpg
similarity index 100%
rename from FGUIProject/assets/Main/效果图/主页参考/20250602193216_1.jpg
rename to FGUIProject/assets/Main/Assets/效果图/主页参考/20250602193216_1.jpg
diff --git a/FGUIProject/assets/Main/效果图/主页参考/Battlefield-103092021-020927-34337.jpg b/FGUIProject/assets/Main/Assets/效果图/主页参考/Battlefield-103092021-020927-34337.jpg
similarity index 100%
rename from FGUIProject/assets/Main/效果图/主页参考/Battlefield-103092021-020927-34337.jpg
rename to FGUIProject/assets/Main/Assets/效果图/主页参考/Battlefield-103092021-020927-34337.jpg
diff --git a/FGUIProject/assets/Main/效果图/主页参考/Brawlout06232020-111349-88282.jpg b/FGUIProject/assets/Main/Assets/效果图/主页参考/Brawlout06232020-111349-88282.jpg
similarity index 100%
rename from FGUIProject/assets/Main/效果图/主页参考/Brawlout06232020-111349-88282.jpg
rename to FGUIProject/assets/Main/Assets/效果图/主页参考/Brawlout06232020-111349-88282.jpg
diff --git a/FGUIProject/assets/Main/效果图/主页参考/Forza-Horizon-407142020-072335-48421.jpg b/FGUIProject/assets/Main/Assets/效果图/主页参考/Forza-Horizon-407142020-072335-48421.jpg
similarity index 100%
rename from FGUIProject/assets/Main/效果图/主页参考/Forza-Horizon-407142020-072335-48421.jpg
rename to FGUIProject/assets/Main/Assets/效果图/主页参考/Forza-Horizon-407142020-072335-48421.jpg
diff --git a/FGUIProject/assets/Main/效果图/主页参考/Overwatch01202022-121231-39980.jpg b/FGUIProject/assets/Main/Assets/效果图/主页参考/Overwatch01202022-121231-39980.jpg
similarity index 100%
rename from FGUIProject/assets/Main/效果图/主页参考/Overwatch01202022-121231-39980.jpg
rename to FGUIProject/assets/Main/Assets/效果图/主页参考/Overwatch01202022-121231-39980.jpg
diff --git a/FGUIProject/assets/Main/效果图/主页参考/PixPin_2025-06-02_14-52-32.png b/FGUIProject/assets/Main/Assets/效果图/主页参考/PixPin_2025-06-02_14-52-32.png
similarity index 100%
rename from FGUIProject/assets/Main/效果图/主页参考/PixPin_2025-06-02_14-52-32.png
rename to FGUIProject/assets/Main/Assets/效果图/主页参考/PixPin_2025-06-02_14-52-32.png
diff --git a/FGUIProject/assets/Main/效果图/主页参考/PixPin_2025-06-02_19-45-29.png b/FGUIProject/assets/Main/Assets/效果图/主页参考/PixPin_2025-06-02_19-45-29.png
similarity index 100%
rename from FGUIProject/assets/Main/效果图/主页参考/PixPin_2025-06-02_19-45-29.png
rename to FGUIProject/assets/Main/Assets/效果图/主页参考/PixPin_2025-06-02_19-45-29.png
diff --git a/FGUIProject/assets/Main/效果图/主页参考/Star-Wars-Battlefront09132020-012635-4501.jpg b/FGUIProject/assets/Main/Assets/效果图/主页参考/Star-Wars-Battlefront09132020-012635-4501.jpg
similarity index 100%
rename from FGUIProject/assets/Main/效果图/主页参考/Star-Wars-Battlefront09132020-012635-4501.jpg
rename to FGUIProject/assets/Main/Assets/效果图/主页参考/Star-Wars-Battlefront09132020-012635-4501.jpg
diff --git a/FGUIProject/assets/Main/效果图/主页参考/The-King-of-Fighters-XIV06112021-075157-84128.jpg b/FGUIProject/assets/Main/Assets/效果图/主页参考/The-King-of-Fighters-XIV06112021-075157-84128.jpg
similarity index 100%
rename from FGUIProject/assets/Main/效果图/主页参考/The-King-of-Fighters-XIV06112021-075157-84128.jpg
rename to FGUIProject/assets/Main/Assets/效果图/主页参考/The-King-of-Fighters-XIV06112021-075157-84128.jpg
diff --git a/FGUIProject/assets/Main/效果图/主页参考/Tom-Clancys-Rainbow-Six-Siege07172020-095237-84280.jpg b/FGUIProject/assets/Main/Assets/效果图/主页参考/Tom-Clancys-Rainbow-Six-Siege07172020-095237-84280.jpg
similarity index 100%
rename from FGUIProject/assets/Main/效果图/主页参考/Tom-Clancys-Rainbow-Six-Siege07172020-095237-84280.jpg
rename to FGUIProject/assets/Main/Assets/效果图/主页参考/Tom-Clancys-Rainbow-Six-Siege07172020-095237-84280.jpg
diff --git a/FGUIProject/assets/Main/效果图/主页参考/Trials-Rising06092021-103622-69962.jpg b/FGUIProject/assets/Main/Assets/效果图/主页参考/Trials-Rising06092021-103622-69962.jpg
similarity index 100%
rename from FGUIProject/assets/Main/效果图/主页参考/Trials-Rising06092021-103622-69962.jpg
rename to FGUIProject/assets/Main/Assets/效果图/主页参考/Trials-Rising06092021-103622-69962.jpg
diff --git a/FGUIProject/assets/Main/效果图/商店.png b/FGUIProject/assets/Main/Assets/效果图/商店.png
similarity index 100%
rename from FGUIProject/assets/Main/效果图/商店.png
rename to FGUIProject/assets/Main/Assets/效果图/商店.png
diff --git a/FGUIProject/assets/Main/效果图/快速选择.png b/FGUIProject/assets/Main/Assets/效果图/快速选择.png
similarity index 100%
rename from FGUIProject/assets/Main/效果图/快速选择.png
rename to FGUIProject/assets/Main/Assets/效果图/快速选择.png
diff --git a/FGUIProject/assets/Main/效果图/成就页.png b/FGUIProject/assets/Main/Assets/效果图/成就页.png
similarity index 100%
rename from FGUIProject/assets/Main/效果图/成就页.png
rename to FGUIProject/assets/Main/Assets/效果图/成就页.png
diff --git a/FGUIProject/assets/Main/效果图/捏脸.png b/FGUIProject/assets/Main/Assets/效果图/捏脸.png
similarity index 100%
rename from FGUIProject/assets/Main/效果图/捏脸.png
rename to FGUIProject/assets/Main/Assets/效果图/捏脸.png
diff --git a/FGUIProject/assets/Main/效果图/背包参考/20251010210536_1.jpg b/FGUIProject/assets/Main/Assets/效果图/背包参考/20251010210536_1.jpg
similarity index 100%
rename from FGUIProject/assets/Main/效果图/背包参考/20251010210536_1.jpg
rename to FGUIProject/assets/Main/Assets/效果图/背包参考/20251010210536_1.jpg
diff --git a/FGUIProject/assets/Main/效果图/背包参考/20251014232129_1.jpg b/FGUIProject/assets/Main/Assets/效果图/背包参考/20251014232129_1.jpg
similarity index 100%
rename from FGUIProject/assets/Main/效果图/背包参考/20251014232129_1.jpg
rename to FGUIProject/assets/Main/Assets/效果图/背包参考/20251014232129_1.jpg
diff --git a/FGUIProject/assets/Main/效果图/背包参考/20251014232148_1.jpg b/FGUIProject/assets/Main/Assets/效果图/背包参考/20251014232148_1.jpg
similarity index 100%
rename from FGUIProject/assets/Main/效果图/背包参考/20251014232148_1.jpg
rename to FGUIProject/assets/Main/Assets/效果图/背包参考/20251014232148_1.jpg
diff --git a/FGUIProject/assets/Main/效果图/背包参考/20251018230825_1.jpg b/FGUIProject/assets/Main/Assets/效果图/背包参考/20251018230825_1.jpg
similarity index 100%
rename from FGUIProject/assets/Main/效果图/背包参考/20251018230825_1.jpg
rename to FGUIProject/assets/Main/Assets/效果图/背包参考/20251018230825_1.jpg
diff --git a/FGUIProject/assets/Main/效果图/背包参考/20251018230927_1.jpg b/FGUIProject/assets/Main/Assets/效果图/背包参考/20251018230927_1.jpg
similarity index 100%
rename from FGUIProject/assets/Main/效果图/背包参考/20251018230927_1.jpg
rename to FGUIProject/assets/Main/Assets/效果图/背包参考/20251018230927_1.jpg
diff --git a/FGUIProject/assets/Main/效果图/设置页.png b/FGUIProject/assets/Main/Assets/效果图/设置页.png
similarity index 100%
rename from FGUIProject/assets/Main/效果图/设置页.png
rename to FGUIProject/assets/Main/Assets/效果图/设置页.png
diff --git a/FGUIProject/assets/Main/Com/GearItem.xml b/FGUIProject/assets/Main/Bag/BagGearItem.xml
similarity index 100%
rename from FGUIProject/assets/Main/Com/GearItem.xml
rename to FGUIProject/assets/Main/Bag/BagGearItem.xml
diff --git a/FGUIProject/assets/Main/BagPanel.xml b/FGUIProject/assets/Main/Bag/BagPanel.xml
similarity index 100%
rename from FGUIProject/assets/Main/BagPanel.xml
rename to FGUIProject/assets/Main/Bag/BagPanel.xml
diff --git a/FGUIProject/assets/Main/Com/Items/BagItem.xml b/FGUIProject/assets/Main/Bag/Item/BagItem.xml
similarity index 100%
rename from FGUIProject/assets/Main/Com/Items/BagItem.xml
rename to FGUIProject/assets/Main/Bag/Item/BagItem.xml
diff --git a/FGUIProject/assets/Main/Com/ItemBasicInfoTag.xml b/FGUIProject/assets/Main/Bag/Item/ItemBasicInfoTag.xml
similarity index 100%
rename from FGUIProject/assets/Main/Com/ItemBasicInfoTag.xml
rename to FGUIProject/assets/Main/Bag/Item/ItemBasicInfoTag.xml
diff --git a/FGUIProject/assets/Main/Bag/Item/ItemDetailsContent.xml b/FGUIProject/assets/Main/Bag/Item/ItemDetailsContent.xml
new file mode 100644
index 000000000..2b1af4e52
--- /dev/null
+++ b/FGUIProject/assets/Main/Bag/Item/ItemDetailsContent.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="980,608" overflow="scroll" scrollBarFlags="4" scrollBarRes="ui://6hgkvlauoomej,">
+  <displayList>
+    <component id="n8_nzfp" name="Basic" src="nzfp1p" fileName="Com/ItemBasicInfoTag.xml" xy="37,0"/>
+    <component id="n25_lbqg" name="Gear" src="nzfp1q" fileName="Com/ItemGearInfoTag.xml" xy="37,127" size="943,956"/>
+  </displayList>
+</component>
\ No newline at end of file
diff --git a/FGUIProject/assets/Main/Com/ItemGearInfoTag.xml b/FGUIProject/assets/Main/Bag/Item/ItemGearInfoTag.xml
similarity index 76%
rename from FGUIProject/assets/Main/Com/ItemGearInfoTag.xml
rename to FGUIProject/assets/Main/Bag/Item/ItemGearInfoTag.xml
index 426fc334a..6db1186e5 100644
--- a/FGUIProject/assets/Main/Com/ItemGearInfoTag.xml
+++ b/FGUIProject/assets/Main/Bag/Item/ItemGearInfoTag.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="943,1109">
+<component size="943,957">
   <displayList>
     <text id="n24_nzfp" name="TextTitle" xy="0,0" size="94,33" fontSize="23" color="#d8fbff" text="钓组配件"/>
     <richtext id="n25_nzfp" name="TextDesc" xy="0,36" size="381,24" font="ui://6hgkvlaugkm7x" fontSize="16" color="#d0d0d0" ubb="true" vars="true" autoSize="none" text="结构：中型的 适配中：2-10克 长度：1.8米 损耗：0%"/>
     <image id="n23_nzfp" name="n23" src="kryob" fileName="Images/Square.png" pkg="6hgkvlau" xy="0,64" size="943,1" alpha="0.5" color="#5c748b"/>
-    <list id="n22_nzfp" name="List" xy="0,74" size="939,1035" lineGap="14" defaultItem="ui://hxr7rc7pnzfp1n">
-      <item/>
-      <item/>
+    <list id="n22_nzfp" name="List" xy="0,74" size="939,875" lineGap="14" defaultItem="ui://hxr7rc7pnzfp1n">
       <item/>
       <item/>
       <item/>
@@ -20,5 +18,4 @@
       <item/>
     </list>
   </displayList>
-  <relation target="n22_nzfp" sidePair="bottomext-bottom"/>
 </component>
\ No newline at end of file
diff --git a/FGUIProject/assets/Main/Com/ItemPopUp.xml b/FGUIProject/assets/Main/Bag/Item/ItemPopUp.xml
similarity index 100%
rename from FGUIProject/assets/Main/Com/ItemPopUp.xml
rename to FGUIProject/assets/Main/Bag/Item/ItemPopUp.xml
diff --git a/FGUIProject/assets/Main/ItemDetailsPanel.xml b/FGUIProject/assets/Main/Bag/ItemDetailsPanel.xml
similarity index 98%
rename from FGUIProject/assets/Main/ItemDetailsPanel.xml
rename to FGUIProject/assets/Main/Bag/ItemDetailsPanel.xml
index c8e2c1fe2..e540060d1 100644
--- a/FGUIProject/assets/Main/ItemDetailsPanel.xml
+++ b/FGUIProject/assets/Main/Bag/ItemDetailsPanel.xml
@@ -17,7 +17,7 @@
       <relation target="" sidePair="left-left,top-top"/>
     </component>
     <component id="n8_nzfp" name="Content" src="nzfp1o" fileName="Com/ItemDetailsContent.xml" xy="883,144" size="1000,820">
-      <relation target="" sidePair="left-left,top-top,rightext-right"/>
+      <relation target="" sidePair="left-left,top-top,rightext-right,bottomext-bottom"/>
     </component>
     <image id="n12_xd2f" name="Quality" src="kryob" fileName="Images/Square.png" pkg="6hgkvlau" xy="62,955" size="820,8" alpha="0.6" color="#ff6c00">
       <relation target="n6_r6au" sidePair="width-width,height-height,center-center,middle-middle"/>
diff --git a/FGUIProject/assets/Main/ChatTestPanel.xml b/FGUIProject/assets/Main/Chat/ChatTestPanel.xml
similarity index 100%
rename from FGUIProject/assets/Main/ChatTestPanel.xml
rename to FGUIProject/assets/Main/Chat/ChatTestPanel.xml
diff --git a/FGUIProject/assets/Main/Com/ItemDetailsContent.xml b/FGUIProject/assets/Main/Com/ItemDetailsContent.xml
deleted file mode 100644
index 70766ebeb..000000000
--- a/FGUIProject/assets/Main/Com/ItemDetailsContent.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="980,1281" overflow="scroll" scrollBarRes="ui://6hgkvlauoomej,">
-  <displayList>
-    <component id="n8_nzfp" name="Basic" src="nzfp1p" fileName="Com/ItemBasicInfoTag.xml" xy="37,0"/>
-    <component id="n24_nzfp" name="Gear" src="nzfp1q" fileName="Com/ItemGearInfoTag.xml" xy="40,117" size="940,1162">
-      <relation target="n8_nzfp" sidePair="left-left,top-bottom"/>
-    </component>
-  </displayList>
-</component>
\ No newline at end of file
diff --git a/FGUIProject/assets/Main/HomePanel.xml b/FGUIProject/assets/Main/Home/HomePanel.xml
similarity index 100%
rename from FGUIProject/assets/Main/HomePanel.xml
rename to FGUIProject/assets/Main/Home/HomePanel.xml
diff --git a/FGUIProject/assets/Main/LoginPanel.xml b/FGUIProject/assets/Main/Login/LoginPanel.xml
similarity index 100%
rename from FGUIProject/assets/Main/LoginPanel.xml
rename to FGUIProject/assets/Main/Login/LoginPanel.xml
diff --git a/FGUIProject/assets/Main/MakePanel.xml b/FGUIProject/assets/Main/Make/MakePanel.xml
similarity index 100%
rename from FGUIProject/assets/Main/MakePanel.xml
rename to FGUIProject/assets/Main/Make/MakePanel.xml
diff --git a/FGUIProject/assets/Main/MapPanel.xml b/FGUIProject/assets/Main/Map/MapPanel.xml
similarity index 100%
rename from FGUIProject/assets/Main/MapPanel.xml
rename to FGUIProject/assets/Main/Map/MapPanel.xml
diff --git a/FGUIProject/assets/Main/SettingPanel.xml b/FGUIProject/assets/Main/Settings/SettingPanel.xml
similarity index 100%
rename from FGUIProject/assets/Main/SettingPanel.xml
rename to FGUIProject/assets/Main/Settings/SettingPanel.xml
diff --git a/FGUIProject/assets/Shop/Com/SelectTextItem.xml b/FGUIProject/assets/Main/Shop/Com/SelectTextItem.xml
similarity index 100%
rename from FGUIProject/assets/Shop/Com/SelectTextItem.xml
rename to FGUIProject/assets/Main/Shop/Com/SelectTextItem.xml
diff --git a/FGUIProject/assets/Shop/Com/ShopGearItem.xml b/FGUIProject/assets/Main/Shop/Com/ShopGearItem.xml
similarity index 100%
rename from FGUIProject/assets/Shop/Com/ShopGearItem.xml
rename to FGUIProject/assets/Main/Shop/Com/ShopGearItem.xml
diff --git a/FGUIProject/assets/Shop/FishingShopPanel.xml b/FGUIProject/assets/Main/Shop/FishingShopPanel.xml
similarity index 93%
rename from FGUIProject/assets/Shop/FishingShopPanel.xml
rename to FGUIProject/assets/Main/Shop/FishingShopPanel.xml
index cdc076823..66cf48c3d 100644
--- a/FGUIProject/assets/Shop/FishingShopPanel.xml
+++ b/FGUIProject/assets/Main/Shop/FishingShopPanel.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1920,1080" designImage="ui://146ra2lqr03ue" designImageAlpha="0">
+<component size="1920,1080" designImage="ui://hxr7rc7pr03ue" designImageAlpha="0">
   <displayList>
     <component id="n36_gii7" name="n36" src="8hy8la" fileName="Com/Back/Back1.xml" pkg="6hgkvlau" xy="0,0">
       <relation target="" sidePair="width-width,height-height"/>
diff --git a/FGUIProject/assets/Shop/x效果图/20250521000344_1.jpg b/FGUIProject/assets/Main/Shop/x效果图/20250521000344_1.jpg
similarity index 100%
rename from FGUIProject/assets/Shop/x效果图/20250521000344_1.jpg
rename to FGUIProject/assets/Main/Shop/x效果图/20250521000344_1.jpg
diff --git a/FGUIProject/assets/Shop/x效果图/20250521221501_1.jpg b/FGUIProject/assets/Main/Shop/x效果图/20250521221501_1.jpg
similarity index 100%
rename from FGUIProject/assets/Shop/x效果图/20250521221501_1.jpg
rename to FGUIProject/assets/Main/Shop/x效果图/20250521221501_1.jpg
diff --git a/FGUIProject/assets/Shop/x效果图/20250521221613_1.jpg b/FGUIProject/assets/Main/Shop/x效果图/20250521221613_1.jpg
similarity index 100%
rename from FGUIProject/assets/Shop/x效果图/20250521221613_1.jpg
rename to FGUIProject/assets/Main/Shop/x效果图/20250521221613_1.jpg
diff --git a/FGUIProject/assets/Shop/x效果图/20250521221623_1.jpg b/FGUIProject/assets/Main/Shop/x效果图/20250521221623_1.jpg
similarity index 100%
rename from FGUIProject/assets/Shop/x效果图/20250521221623_1.jpg
rename to FGUIProject/assets/Main/Shop/x效果图/20250521221623_1.jpg
diff --git a/FGUIProject/assets/Shop/x效果图/20250521221650_1.jpg b/FGUIProject/assets/Main/Shop/x效果图/20250521221650_1.jpg
similarity index 100%
rename from FGUIProject/assets/Shop/x效果图/20250521221650_1.jpg
rename to FGUIProject/assets/Main/Shop/x效果图/20250521221650_1.jpg
diff --git a/FGUIProject/assets/Shop/x效果图/20250521221757_1.jpg b/FGUIProject/assets/Main/Shop/x效果图/20250521221757_1.jpg
similarity index 100%
rename from FGUIProject/assets/Shop/x效果图/20250521221757_1.jpg
rename to FGUIProject/assets/Main/Shop/x效果图/20250521221757_1.jpg
diff --git a/FGUIProject/assets/Shop/x效果图/20250521221819_1.jpg b/FGUIProject/assets/Main/Shop/x效果图/20250521221819_1.jpg
similarity index 100%
rename from FGUIProject/assets/Shop/x效果图/20250521221819_1.jpg
rename to FGUIProject/assets/Main/Shop/x效果图/20250521221819_1.jpg
diff --git a/FGUIProject/assets/Shop/x效果图/20250521221928_1.jpg b/FGUIProject/assets/Main/Shop/x效果图/20250521221928_1.jpg
similarity index 100%
rename from FGUIProject/assets/Shop/x效果图/20250521221928_1.jpg
rename to FGUIProject/assets/Main/Shop/x效果图/20250521221928_1.jpg
diff --git a/FGUIProject/assets/Shop/x效果图/20250521221948_1.jpg b/FGUIProject/assets/Main/Shop/x效果图/20250521221948_1.jpg
similarity index 100%
rename from FGUIProject/assets/Shop/x效果图/20250521221948_1.jpg
rename to FGUIProject/assets/Main/Shop/x效果图/20250521221948_1.jpg
diff --git a/FGUIProject/assets/Shop/x效果图/20250521222125_1.jpg b/FGUIProject/assets/Main/Shop/x效果图/20250521222125_1.jpg
similarity index 100%
rename from FGUIProject/assets/Shop/x效果图/20250521222125_1.jpg
rename to FGUIProject/assets/Main/Shop/x效果图/20250521222125_1.jpg
diff --git a/FGUIProject/assets/Shop/x效果图/20250521222215_1.jpg b/FGUIProject/assets/Main/Shop/x效果图/20250521222215_1.jpg
similarity index 100%
rename from FGUIProject/assets/Shop/x效果图/20250521222215_1.jpg
rename to FGUIProject/assets/Main/Shop/x效果图/20250521222215_1.jpg
diff --git a/FGUIProject/assets/Shop/x效果图/20250521222223_1.jpg b/FGUIProject/assets/Main/Shop/x效果图/20250521222223_1.jpg
similarity index 100%
rename from FGUIProject/assets/Shop/x效果图/20250521222223_1.jpg
rename to FGUIProject/assets/Main/Shop/x效果图/20250521222223_1.jpg
diff --git a/FGUIProject/assets/Shop/x效果图/20250521222232_1.jpg b/FGUIProject/assets/Main/Shop/x效果图/20250521222232_1.jpg
similarity index 100%
rename from FGUIProject/assets/Shop/x效果图/20250521222232_1.jpg
rename to FGUIProject/assets/Main/Shop/x效果图/20250521222232_1.jpg
diff --git a/FGUIProject/assets/Shop/x效果图/20250521222522_1.jpg b/FGUIProject/assets/Main/Shop/x效果图/20250521222522_1.jpg
similarity index 100%
rename from FGUIProject/assets/Shop/x效果图/20250521222522_1.jpg
rename to FGUIProject/assets/Main/Shop/x效果图/20250521222522_1.jpg
diff --git a/FGUIProject/assets/Shop/x效果图/20250521222909_1.jpg b/FGUIProject/assets/Main/Shop/x效果图/20250521222909_1.jpg
similarity index 100%
rename from FGUIProject/assets/Shop/x效果图/20250521222909_1.jpg
rename to FGUIProject/assets/Main/Shop/x效果图/20250521222909_1.jpg
diff --git a/FGUIProject/assets/Shop/x效果图/咖啡店.jpg b/FGUIProject/assets/Main/Shop/x效果图/咖啡店.jpg
similarity index 100%
rename from FGUIProject/assets/Shop/x效果图/咖啡店.jpg
rename to FGUIProject/assets/Main/Shop/x效果图/咖啡店.jpg
diff --git a/FGUIProject/assets/Shop/x效果图/市场.jpg b/FGUIProject/assets/Main/Shop/x效果图/市场.jpg
similarity index 100%
rename from FGUIProject/assets/Shop/x效果图/市场.jpg
rename to FGUIProject/assets/Main/Shop/x效果图/市场.jpg
diff --git a/FGUIProject/assets/Shop/x效果图/码头.jpg b/FGUIProject/assets/Main/Shop/x效果图/码头.jpg
similarity index 100%
rename from FGUIProject/assets/Shop/x效果图/码头.jpg
rename to FGUIProject/assets/Main/Shop/x效果图/码头.jpg
diff --git a/FGUIProject/assets/Shop/x效果图/自动贩卖机.jpg b/FGUIProject/assets/Main/Shop/x效果图/自动贩卖机.jpg
similarity index 100%
rename from FGUIProject/assets/Shop/x效果图/自动贩卖机.jpg
rename to FGUIProject/assets/Main/Shop/x效果图/自动贩卖机.jpg
diff --git a/FGUIProject/assets/Shop/x效果图/食品店.jpg b/FGUIProject/assets/Main/Shop/x效果图/食品店.jpg
similarity index 100%
rename from FGUIProject/assets/Shop/x效果图/食品店.jpg
rename to FGUIProject/assets/Main/Shop/x效果图/食品店.jpg
diff --git a/FGUIProject/assets/Shop/x效果图/鱼市.jpg b/FGUIProject/assets/Main/Shop/x效果图/鱼市.jpg
similarity index 100%
rename from FGUIProject/assets/Shop/x效果图/鱼市.jpg
rename to FGUIProject/assets/Main/Shop/x效果图/鱼市.jpg
diff --git a/FGUIProject/assets/Shop/x效果图/鱼护.jpg b/FGUIProject/assets/Main/Shop/x效果图/鱼护.jpg
similarity index 100%
rename from FGUIProject/assets/Shop/x效果图/鱼护.jpg
rename to FGUIProject/assets/Main/Shop/x效果图/鱼护.jpg
diff --git a/FGUIProject/assets/Main/package.xml b/FGUIProject/assets/Main/package.xml
index 5eac4fcc4..d82e4043a 100644
--- a/FGUIProject/assets/Main/package.xml
+++ b/FGUIProject/assets/Main/package.xml
@@ -1,66 +1,91 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packageDescription id="hxr7rc7p">
   <resources>
-    <component id="oy1y0" name="HomePanel.xml" path="/" exported="true"/>
-    <component id="e9z81" name="SettingPanel.xml" path="/" exported="true"/>
-    <image id="e9z82" name="设置页.png" path="/效果图/"/>
-    <image id="e9z84" name="商店.png" path="/效果图/"/>
-    <image id="e9z85" name="捏脸.png" path="/效果图/"/>
-    <image id="e9z86" name="快速选择.png" path="/效果图/"/>
-    <image id="e9z87" name="成就页.png" path="/效果图/"/>
+    <component id="oy1y0" name="HomePanel.xml" path="/Home/" exported="true"/>
+    <component id="e9z81" name="SettingPanel.xml" path="/Settings/" exported="true"/>
+    <image id="e9z82" name="设置页.png" path="/Assets/效果图/"/>
+    <image id="e9z84" name="商店.png" path="/Assets/效果图/"/>
+    <image id="e9z85" name="捏脸.png" path="/Assets/效果图/"/>
+    <image id="e9z86" name="快速选择.png" path="/Assets/效果图/"/>
+    <image id="e9z87" name="成就页.png" path="/Assets/效果图/"/>
     <component id="e9z88" name="SettingItem.xml" path="/Com/Items/" exported="true"/>
     <component id="e9z89" name="IntroduceTag.xml" path="/Com/"/>
-    <image id="nmzba" name="PixPin_2025-06-02_19-45-29.png" path="/效果图/主页参考/"/>
-    <image id="nmzbb" name="PixPin_2025-06-02_14-52-32.png" path="/效果图/主页参考/"/>
-    <image id="nmzbc" name="20250602193216_1.jpg" path="/效果图/主页参考/"/>
-    <image id="nmzbd" name="Trials-Rising06092021-103622-69962.jpg" path="/效果图/主页参考/"/>
-    <image id="nmzbe" name="Battlefield-103092021-020927-34337.jpg" path="/效果图/主页参考/"/>
-    <image id="nmzbf" name="Brawlout06232020-111349-88282.jpg" path="/效果图/主页参考/"/>
-    <image id="nmzbg" name="Forza-Horizon-407142020-072335-48421.jpg" path="/效果图/主页参考/"/>
-    <image id="nmzbh" name="Overwatch01202022-121231-39980.jpg" path="/效果图/主页参考/"/>
-    <image id="nmzbi" name="Star-Wars-Battlefront09132020-012635-4501.jpg" path="/效果图/主页参考/"/>
-    <image id="nmzbj" name="The-King-of-Fighters-XIV06112021-075157-84128.jpg" path="/效果图/主页参考/"/>
-    <image id="nmzbk" name="Tom-Clancys-Rainbow-Six-Siege07172020-095237-84280.jpg" path="/效果图/主页参考/"/>
-    <image id="nmzbl" name="Tom-Clancys-Rainbow-Six-Siege07172020-095450-32422.jpg" path="/效果图/"/>
-    <image id="nmzbm" name="back1.png" path="/Images/"/>
+    <image id="nmzba" name="PixPin_2025-06-02_19-45-29.png" path="/Assets/效果图/主页参考/"/>
+    <image id="nmzbb" name="PixPin_2025-06-02_14-52-32.png" path="/Assets/效果图/主页参考/"/>
+    <image id="nmzbc" name="20250602193216_1.jpg" path="/Assets/效果图/主页参考/"/>
+    <image id="nmzbd" name="Trials-Rising06092021-103622-69962.jpg" path="/Assets/效果图/主页参考/"/>
+    <image id="nmzbe" name="Battlefield-103092021-020927-34337.jpg" path="/Assets/效果图/主页参考/"/>
+    <image id="nmzbf" name="Brawlout06232020-111349-88282.jpg" path="/Assets/效果图/主页参考/"/>
+    <image id="nmzbg" name="Forza-Horizon-407142020-072335-48421.jpg" path="/Assets/效果图/主页参考/"/>
+    <image id="nmzbh" name="Overwatch01202022-121231-39980.jpg" path="/Assets/效果图/主页参考/"/>
+    <image id="nmzbi" name="Star-Wars-Battlefront09132020-012635-4501.jpg" path="/Assets/效果图/主页参考/"/>
+    <image id="nmzbj" name="The-King-of-Fighters-XIV06112021-075157-84128.jpg" path="/Assets/效果图/主页参考/"/>
+    <image id="nmzbk" name="Tom-Clancys-Rainbow-Six-Siege07172020-095237-84280.jpg" path="/Assets/效果图/主页参考/"/>
+    <image id="nmzbl" name="Tom-Clancys-Rainbow-Six-Siege07172020-095450-32422.jpg" path="/Assets/效果图/"/>
+    <image id="nmzbm" name="back1.png" path="/Assets/Images/"/>
     <component id="lvqln" name="HomeButtonGroups.xml" path="/Com/Home/"/>
     <component id="lvqlo" name="BtnHomeSmall.xml" path="/Com/Home/"/>
     <component id="lvqlp" name="BtnHomeMedium.xml" path="/Com/Home/"/>
     <component id="lvqlq" name="BtnHomeMap.xml" path="/Com/Home/"/>
-    <image id="lvqlr" name="Settings.png" path="/Images/"/>
-    <image id="lvqls" name="OnOff.png" path="/Images/"/>
-    <image id="lvqlv" name="Bell.png" path="/Images/"/>
-    <image id="lvqlw" name="Cup.png" path="/Images/"/>
-    <image id="lvqlx" name="Fire.png" path="/Images/"/>
-    <image id="lvqly" name="Bag.png" path="/Images/"/>
-    <component id="lvqlz" name="BagPanel.xml" path="/" exported="true"/>
+    <image id="lvqlr" name="Settings.png" path="/Assets/Images/"/>
+    <image id="lvqls" name="OnOff.png" path="/Assets/Images/"/>
+    <image id="lvqlv" name="Bell.png" path="/Assets/Images/"/>
+    <image id="lvqlw" name="Cup.png" path="/Assets/Images/"/>
+    <image id="lvqlx" name="Fire.png" path="/Assets/Images/"/>
+    <image id="lvqly" name="Bag.png" path="/Assets/Images/"/>
+    <component id="lvqlz" name="BagPanel.xml" path="/Bag/" exported="true"/>
     <component id="lvql10" name="HomeMainPage.xml" path="/Com/Home/Pages/" exported="true"/>
     <component id="lvql11" name="HomeActivityPage.xml" path="/Com/Home/Pages/" exported="true"/>
     <component id="lvql12" name="HomeRankPage.xml" path="/Com/Home/Pages/" exported="true"/>
     <component id="lvql13" name="HomeStatisticsPage.xml" path="/Com/Home/Pages/" exported="true"/>
     <component id="lvql14" name="FishBagPanel.xml" path="/Com/" exported="true"/>
-    <component id="lvql15" name="MakePanel.xml" path="/" exported="true"/>
-    <component id="lvql16" name="MapPanel.xml" path="/" exported="true"/>
+    <component id="lvql15" name="MakePanel.xml" path="/Make/" exported="true"/>
+    <component id="lvql16" name="MapPanel.xml" path="/Map/" exported="true"/>
     <component id="j6rn17" name="SettingSubTitleItem.xml" path="/Com/Items/" exported="true"/>
     <component id="j6rn18" name="SettingMask.xml" path="/Com/"/>
     <component id="5dtx1b" name="KeyboardInput.xml" path="/Com/Items/"/>
     <component id="5dtx1c" name="SettingInputItem.xml" path="/Com/Items/" exported="true"/>
     <component id="5dtx1d" name="InputWaitingCom.xml" path="/Com/" exported="true"/>
-    <component id="n5ne1e" name="ChatTestPanel.xml" path="/" exported="true"/>
+    <component id="n5ne1e" name="ChatTestPanel.xml" path="/Chat/" exported="true"/>
     <component id="n5ne1f" name="ChatItem.xml" path="/Com/" exported="true"/>
-    <component id="9zbo1g" name="LoginPanel.xml" path="/" exported="true"/>
-    <component id="uq3a1h" name="BagItem.xml" path="/Com/Items/" exported="true"/>
-    <component id="r6au1h" name="ItemDetailsPanel.xml" path="/" exported="true"/>
-    <image id="r6au1i" name="20251014232148_1.jpg" path="/效果图/背包参考/"/>
-    <image id="r6au1j" name="20251010210536_1.jpg" path="/效果图/背包参考/"/>
-    <image id="r6au1k" name="20251014232129_1.jpg" path="/效果图/背包参考/"/>
-    <image id="nzfp1l" name="20251018230825_1.jpg" path="/效果图/背包参考/"/>
-    <image id="nzfp1m" name="20251018230927_1.jpg" path="/效果图/背包参考/"/>
-    <component id="nzfp1n" name="GearItem.xml" path="/Com/" exported="true"/>
-    <component id="nzfp1o" name="ItemDetailsContent.xml" path="/Com/" exported="true"/>
-    <component id="nzfp1p" name="ItemBasicInfoTag.xml" path="/Com/" exported="true"/>
-    <component id="nzfp1q" name="ItemGearInfoTag.xml" path="/Com/"/>
-    <component id="xd2f1r" name="ItemPopUp.xml" path="/Com/"/>
+    <component id="9zbo1g" name="LoginPanel.xml" path="/Login/" exported="true"/>
+    <component id="uq3a1h" name="BagItem.xml" path="/Bag/Item/" exported="true"/>
+    <component id="r6au1h" name="ItemDetailsPanel.xml" path="/Bag/" exported="true"/>
+    <image id="r6au1i" name="20251014232148_1.jpg" path="/Assets/效果图/背包参考/"/>
+    <image id="r6au1j" name="20251010210536_1.jpg" path="/Assets/效果图/背包参考/"/>
+    <image id="r6au1k" name="20251014232129_1.jpg" path="/Assets/效果图/背包参考/"/>
+    <image id="nzfp1l" name="20251018230825_1.jpg" path="/Assets/效果图/背包参考/"/>
+    <image id="nzfp1m" name="20251018230927_1.jpg" path="/Assets/效果图/背包参考/"/>
+    <component id="nzfp1n" name="BagGearItem.xml" path="/Bag/" exported="true"/>
+    <component id="nzfp1o" name="ItemDetailsContent.xml" path="/Bag/Item/" exported="true"/>
+    <component id="nzfp1p" name="ItemBasicInfoTag.xml" path="/Bag/Item/" exported="true"/>
+    <component id="nzfp1q" name="ItemGearInfoTag.xml" path="/Bag/Item/"/>
+    <component id="xd2f1r" name="ItemPopUp.xml" path="/Bag/Item/"/>
+    <component id="oome9" name="ShopGearItem.xml" path="/Shop/Com/" exported="true"/>
+    <component id="drkwb" name="SelectTextItem.xml" path="/Shop/Com/"/>
+    <image id="fcfg0" name="市场.jpg" path="/Shop/x效果图/"/>
+    <image id="fcfg1" name="鱼护.jpg" path="/Shop/x效果图/"/>
+    <image id="fcfg2" name="码头.jpg" path="/Shop/x效果图/"/>
+    <image id="fcfg3" name="鱼市.jpg" path="/Shop/x效果图/"/>
+    <image id="fcfg4" name="自动贩卖机.jpg" path="/Shop/x效果图/"/>
+    <image id="fcfg5" name="咖啡店.jpg" path="/Shop/x效果图/"/>
+    <image id="fcfg6" name="食品店.jpg" path="/Shop/x效果图/"/>
+    <image id="r03uc" name="20250521000344_1.jpg" path="/Shop/x效果图/"/>
+    <image id="r03ud" name="20250521221501_1.jpg" path="/Shop/x效果图/"/>
+    <image id="r03ue" name="20250521221613_1.jpg" path="/Shop/x效果图/"/>
+    <image id="r03uf" name="20250521221623_1.jpg" path="/Shop/x效果图/"/>
+    <image id="r03ug" name="20250521221650_1.jpg" path="/Shop/x效果图/"/>
+    <image id="r03uh" name="20250521221757_1.jpg" path="/Shop/x效果图/"/>
+    <image id="r03ui" name="20250521221819_1.jpg" path="/Shop/x效果图/"/>
+    <image id="r03uj" name="20250521221928_1.jpg" path="/Shop/x效果图/"/>
+    <image id="r03uk" name="20250521221948_1.jpg" path="/Shop/x效果图/"/>
+    <image id="r03ul" name="20250521222125_1.jpg" path="/Shop/x效果图/"/>
+    <image id="r03um" name="20250521222215_1.jpg" path="/Shop/x效果图/"/>
+    <image id="r03un" name="20250521222223_1.jpg" path="/Shop/x效果图/"/>
+    <image id="r03uo" name="20250521222232_1.jpg" path="/Shop/x效果图/"/>
+    <image id="r03up" name="20250521222522_1.jpg" path="/Shop/x效果图/"/>
+    <image id="r03uq" name="20250521222909_1.jpg" path="/Shop/x效果图/"/>
+    <component id="fcfg8" name="FishingShopPanel.xml" path="/Shop/" exported="true"/>
   </resources>
   <publish name="" path="../Assets/Resources/Fgui/Main" packageCount="2" genCode="true"/>
 </packageDescription>
\ No newline at end of file
diff --git a/FGUIProject/assets/Shop/package.xml b/FGUIProject/assets/Shop/package.xml
deleted file mode 100644
index 8a1866cd1..000000000
--- a/FGUIProject/assets/Shop/package.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packageDescription id="146ra2lq">
-  <resources>
-    <image id="fcfg0" name="市场.jpg" path="/x效果图/"/>
-    <image id="fcfg1" name="鱼护.jpg" path="/x效果图/"/>
-    <image id="fcfg2" name="码头.jpg" path="/x效果图/"/>
-    <image id="fcfg3" name="鱼市.jpg" path="/x效果图/"/>
-    <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="FishingShopPanel.xml" path="/" exported="true"/>
-    <component id="oome9" name="ShopGearItem.xml" path="/Com/" exported="true"/>
-    <component id="drkwb" name="SelectTextItem.xml" path="/Com/"/>
-    <image id="r03uc" name="20250521000344_1.jpg" path="/x效果图/"/>
-    <image id="r03ud" name="20250521221501_1.jpg" path="/x效果图/"/>
-    <image id="r03ue" name="20250521221613_1.jpg" path="/x效果图/"/>
-    <image id="r03uf" name="20250521221623_1.jpg" path="/x效果图/"/>
-    <image id="r03ug" name="20250521221650_1.jpg" path="/x效果图/"/>
-    <image id="r03uh" name="20250521221757_1.jpg" path="/x效果图/"/>
-    <image id="r03ui" name="20250521221819_1.jpg" path="/x效果图/"/>
-    <image id="r03uj" name="20250521221928_1.jpg" path="/x效果图/"/>
-    <image id="r03uk" name="20250521221948_1.jpg" path="/x效果图/"/>
-    <image id="r03ul" name="20250521222125_1.jpg" path="/x效果图/"/>
-    <image id="r03um" name="20250521222215_1.jpg" path="/x效果图/"/>
-    <image id="r03un" name="20250521222223_1.jpg" path="/x效果图/"/>
-    <image id="r03uo" name="20250521222232_1.jpg" path="/x效果图/"/>
-    <image id="r03up" name="20250521222522_1.jpg" path="/x效果图/"/>
-    <image id="r03uq" name="20250521222909_1.jpg" path="/x效果图/"/>
-  </resources>
-  <publish name="" path="../Assets/Resources/Fgui/Shop" packageCount="2" genCode="true"/>
-</packageDescription>
\ No newline at end of file
diff --git a/FGUIProject/settings/whoot/hxr7rc7pfcfg8.json b/FGUIProject/settings/whoot/hxr7rc7pfcfg8.json
new file mode 100644
index 000000000..7e755c6cb
--- /dev/null
+++ b/FGUIProject/settings/whoot/hxr7rc7pfcfg8.json
@@ -0,0 +1 @@
+{"url":"ui://hxr7rc7pfcfg8","name":"FishingShopPanel","scriptType":"panel","isCustomName":false,"customName":"","annotation":"","member":{}}
\ No newline at end of file
diff --git a/FGUIProject/settings/whoot/hxr7rc7poome9.json b/FGUIProject/settings/whoot/hxr7rc7poome9.json
new file mode 100644
index 000000000..d1cb6d4bd
--- /dev/null
+++ b/FGUIProject/settings/whoot/hxr7rc7poome9.json
@@ -0,0 +1 @@
+{"url":"ui://hxr7rc7poome9","name":"ShopGearItem","scriptType":"component","isCustomName":false,"customName":"","annotation":"","member":{}}
\ No newline at end of file