From b2cf8cdb88da3fe3869622595609dbbf174cca27 Mon Sep 17 00:00:00 2001 From: "Bob.Song" Date: Fri, 31 Oct 2025 18:03:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E4=BB=B6item?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Resources/Fgui/Main/Main_fui.bytes | Bin 20145 -> 21645 bytes Assets/Scripts/Common/Data/ItemInfo.cs | 5 + Assets/Scripts/Common/Enum/ItemType.cs | 8 ++ Assets/Scripts/Common/Utils/ItemHelper.cs | 10 ++ ...em.Designer.cs => BagGearItem.Designer.cs} | 2 +- ...r.cs.meta => BagGearItem.Designer.cs.meta} | 0 Assets/Scripts/UI/Bag/BagGearItem.cs | 24 ++++ .../{GearItem.cs.meta => BagGearItem.cs.meta} | 0 Assets/Scripts/UI/Bag/GearItem.cs | 15 --- Assets/Scripts/UI/Bag/ItemDetailsPanel.cs | 8 +- Assets/Scripts/UI/Bag/ItemGearInfoTag.cs | 60 ++++++++++ Assets/Scripts/UI/Binders/MainBinder.cs | 3 +- .../UI/Common/Extensions/GListExtensions.cs | 20 ++++ .../Common/Extensions/GListExtensions.cs.meta | 3 + .../UI/Shops/FishingShopPanel.Designer.cs | 2 +- .../Scripts/UI/Shops/ShopGearItem.Designer.cs | 2 +- Config/Item.xlsx | Bin 15933 -> 15944 bytes .../assets/Common/Com/ClassifyList.xml | 2 +- .../assets/Common/Com/List/CommonItemList.xml | 2 +- .../assets/Main/{ => Assets}/Images/Bag.png | Bin .../assets/Main/{ => Assets}/Images/Bell.png | Bin .../assets/Main/{ => Assets}/Images/Cup.png | Bin .../assets/Main/{ => Assets}/Images/Fire.png | Bin .../assets/Main/{ => Assets}/Images/OnOff.png | Bin .../Main/{ => Assets}/Images/Settings.png | Bin .../assets/Main/{ => Assets}/Images/back1.png | Bin ...ys-Rainbow-Six-Siege07172020-095450-32422.jpg | Bin .../效果图/主页参考/20250602193216_1.jpg | Bin .../Battlefield-103092021-020927-34337.jpg | Bin .../主页参考/Brawlout06232020-111349-88282.jpg | Bin .../Forza-Horizon-407142020-072335-48421.jpg | Bin .../主页参考/Overwatch01202022-121231-39980.jpg | Bin .../主页参考/PixPin_2025-06-02_14-52-32.png | Bin .../主页参考/PixPin_2025-06-02_19-45-29.png | Bin .../Star-Wars-Battlefront09132020-012635-4501.jpg | Bin ...The-King-of-Fighters-XIV06112021-075157-84128.jpg | Bin ...lancys-Rainbow-Six-Siege07172020-095237-84280.jpg | Bin .../Trials-Rising06092021-103622-69962.jpg | Bin .../assets/Main/{ => Assets}/效果图/商店.png | Bin .../Main/{ => Assets}/效果图/快速选择.png | Bin .../Main/{ => Assets}/效果图/成就页.png | Bin .../assets/Main/{ => Assets}/效果图/捏脸.png | Bin .../效果图/背包参考/20251010210536_1.jpg | Bin .../效果图/背包参考/20251014232129_1.jpg | Bin .../效果图/背包参考/20251014232148_1.jpg | Bin .../效果图/背包参考/20251018230825_1.jpg | Bin .../效果图/背包参考/20251018230927_1.jpg | Bin .../Main/{ => Assets}/效果图/设置页.png | Bin .../{Com/GearItem.xml => Bag/BagGearItem.xml} | 0 .../assets/Main/{ => Bag}/BagPanel.xml | 0 .../Main/{Com/Items => Bag/Item}/BagItem.xml | 0 .../{Com => Bag/Item}/ItemBasicInfoTag.xml | 0 .../Main/Bag/Item/ItemDetailsContent.xml | 7 ++ .../{Com => Bag/Item}/ItemGearInfoTag.xml | 7 +- .../Main/{Com => Bag/Item}/ItemPopUp.xml | 0 .../Main/{ => Bag}/ItemDetailsPanel.xml | 2 +- .../assets/Main/{ => Chat}/ChatTestPanel.xml | 0 .../assets/Main/Com/ItemDetailsContent.xml | 9 -- .../assets/Main/{ => Home}/HomePanel.xml | 0 .../assets/Main/{ => Login}/LoginPanel.xml | 0 .../assets/Main/{ => Make}/MakePanel.xml | 0 .../assets/Main/{ => Map}/MapPanel.xml | 0 .../Main/{ => Settings}/SettingPanel.xml | 0 .../{ => Main}/Shop/Com/SelectTextItem.xml | 0 .../{ => Main}/Shop/Com/ShopGearItem.xml | 0 .../{ => Main}/Shop/FishingShopPanel.xml | 2 +- .../Shop/x效果图/20250521000344_1.jpg | Bin .../Shop/x效果图/20250521221501_1.jpg | Bin .../Shop/x效果图/20250521221613_1.jpg | Bin .../Shop/x效果图/20250521221623_1.jpg | Bin .../Shop/x效果图/20250521221650_1.jpg | Bin .../Shop/x效果图/20250521221757_1.jpg | Bin .../Shop/x效果图/20250521221819_1.jpg | Bin .../Shop/x效果图/20250521221928_1.jpg | Bin .../Shop/x效果图/20250521221948_1.jpg | Bin .../Shop/x效果图/20250521222125_1.jpg | Bin .../Shop/x效果图/20250521222215_1.jpg | Bin .../Shop/x效果图/20250521222223_1.jpg | Bin .../Shop/x效果图/20250521222232_1.jpg | Bin .../Shop/x效果图/20250521222522_1.jpg | Bin .../Shop/x效果图/20250521222909_1.jpg | Bin .../assets/{ => Main}/Shop/x效果图/咖啡店.jpg | Bin .../assets/{ => Main}/Shop/x效果图/市场.jpg | Bin .../assets/{ => Main}/Shop/x效果图/码头.jpg | Bin .../{ => Main}/Shop/x效果图/自动贩卖机.jpg | Bin .../assets/{ => Main}/Shop/x效果图/食品店.jpg | Bin .../assets/{ => Main}/Shop/x效果图/鱼市.jpg | Bin .../assets/{ => Main}/Shop/x效果图/鱼护.jpg | Bin FGUIProject/assets/Main/package.xml | 111 +++++++++++------- FGUIProject/assets/Shop/package.xml | 31 ----- FGUIProject/settings/whoot/hxr7rc7pfcfg8.json | 1 + FGUIProject/settings/whoot/hxr7rc7poome9.json | 1 + 92 files changed, 225 insertions(+), 112 deletions(-) rename Assets/Scripts/UI/Bag/{GearItem.Designer.cs => BagGearItem.Designer.cs} (96%) rename Assets/Scripts/UI/Bag/{GearItem.Designer.cs.meta => BagGearItem.Designer.cs.meta} (100%) create mode 100644 Assets/Scripts/UI/Bag/BagGearItem.cs rename Assets/Scripts/UI/Bag/{GearItem.cs.meta => BagGearItem.cs.meta} (100%) delete mode 100644 Assets/Scripts/UI/Bag/GearItem.cs create mode 100644 Assets/Scripts/UI/Common/Extensions/GListExtensions.cs create mode 100644 Assets/Scripts/UI/Common/Extensions/GListExtensions.cs.meta rename FGUIProject/assets/Main/{ => Assets}/Images/Bag.png (100%) rename FGUIProject/assets/Main/{ => Assets}/Images/Bell.png (100%) rename FGUIProject/assets/Main/{ => Assets}/Images/Cup.png (100%) rename FGUIProject/assets/Main/{ => Assets}/Images/Fire.png (100%) rename FGUIProject/assets/Main/{ => Assets}/Images/OnOff.png (100%) rename FGUIProject/assets/Main/{ => Assets}/Images/Settings.png (100%) rename FGUIProject/assets/Main/{ => Assets}/Images/back1.png (100%) rename FGUIProject/assets/Main/{ => Assets}/效果图/Tom-Clancys-Rainbow-Six-Siege07172020-095450-32422.jpg (100%) rename FGUIProject/assets/Main/{ => Assets}/效果图/主页参考/20250602193216_1.jpg (100%) rename FGUIProject/assets/Main/{ => Assets}/效果图/主页参考/Battlefield-103092021-020927-34337.jpg (100%) rename FGUIProject/assets/Main/{ => Assets}/效果图/主页参考/Brawlout06232020-111349-88282.jpg (100%) rename FGUIProject/assets/Main/{ => Assets}/效果图/主页参考/Forza-Horizon-407142020-072335-48421.jpg (100%) rename FGUIProject/assets/Main/{ => Assets}/效果图/主页参考/Overwatch01202022-121231-39980.jpg (100%) rename FGUIProject/assets/Main/{ => Assets}/效果图/主页参考/PixPin_2025-06-02_14-52-32.png (100%) rename FGUIProject/assets/Main/{ => Assets}/效果图/主页参考/PixPin_2025-06-02_19-45-29.png (100%) rename FGUIProject/assets/Main/{ => Assets}/效果图/主页参考/Star-Wars-Battlefront09132020-012635-4501.jpg (100%) rename FGUIProject/assets/Main/{ => Assets}/效果图/主页参考/The-King-of-Fighters-XIV06112021-075157-84128.jpg (100%) rename FGUIProject/assets/Main/{ => Assets}/效果图/主页参考/Tom-Clancys-Rainbow-Six-Siege07172020-095237-84280.jpg (100%) rename FGUIProject/assets/Main/{ => Assets}/效果图/主页参考/Trials-Rising06092021-103622-69962.jpg (100%) rename FGUIProject/assets/Main/{ => Assets}/效果图/商店.png (100%) rename FGUIProject/assets/Main/{ => Assets}/效果图/快速选择.png (100%) rename FGUIProject/assets/Main/{ => Assets}/效果图/成就页.png (100%) rename FGUIProject/assets/Main/{ => Assets}/效果图/捏脸.png (100%) rename FGUIProject/assets/Main/{ => Assets}/效果图/背包参考/20251010210536_1.jpg (100%) rename FGUIProject/assets/Main/{ => Assets}/效果图/背包参考/20251014232129_1.jpg (100%) rename FGUIProject/assets/Main/{ => Assets}/效果图/背包参考/20251014232148_1.jpg (100%) rename FGUIProject/assets/Main/{ => Assets}/效果图/背包参考/20251018230825_1.jpg (100%) rename FGUIProject/assets/Main/{ => Assets}/效果图/背包参考/20251018230927_1.jpg (100%) rename FGUIProject/assets/Main/{ => Assets}/效果图/设置页.png (100%) rename FGUIProject/assets/Main/{Com/GearItem.xml => Bag/BagGearItem.xml} (100%) rename FGUIProject/assets/Main/{ => Bag}/BagPanel.xml (100%) rename FGUIProject/assets/Main/{Com/Items => Bag/Item}/BagItem.xml (100%) rename FGUIProject/assets/Main/{Com => Bag/Item}/ItemBasicInfoTag.xml (100%) create mode 100644 FGUIProject/assets/Main/Bag/Item/ItemDetailsContent.xml rename FGUIProject/assets/Main/{Com => Bag/Item}/ItemGearInfoTag.xml (76%) rename FGUIProject/assets/Main/{Com => Bag/Item}/ItemPopUp.xml (100%) rename FGUIProject/assets/Main/{ => Bag}/ItemDetailsPanel.xml (98%) rename FGUIProject/assets/Main/{ => Chat}/ChatTestPanel.xml (100%) delete mode 100644 FGUIProject/assets/Main/Com/ItemDetailsContent.xml rename FGUIProject/assets/Main/{ => Home}/HomePanel.xml (100%) rename FGUIProject/assets/Main/{ => Login}/LoginPanel.xml (100%) rename FGUIProject/assets/Main/{ => Make}/MakePanel.xml (100%) rename FGUIProject/assets/Main/{ => Map}/MapPanel.xml (100%) rename FGUIProject/assets/Main/{ => Settings}/SettingPanel.xml (100%) rename FGUIProject/assets/{ => Main}/Shop/Com/SelectTextItem.xml (100%) rename FGUIProject/assets/{ => Main}/Shop/Com/ShopGearItem.xml (100%) rename FGUIProject/assets/{ => Main}/Shop/FishingShopPanel.xml (93%) rename FGUIProject/assets/{ => Main}/Shop/x效果图/20250521000344_1.jpg (100%) rename FGUIProject/assets/{ => Main}/Shop/x效果图/20250521221501_1.jpg (100%) rename FGUIProject/assets/{ => Main}/Shop/x效果图/20250521221613_1.jpg (100%) rename FGUIProject/assets/{ => Main}/Shop/x效果图/20250521221623_1.jpg (100%) rename FGUIProject/assets/{ => Main}/Shop/x效果图/20250521221650_1.jpg (100%) rename FGUIProject/assets/{ => Main}/Shop/x效果图/20250521221757_1.jpg (100%) rename FGUIProject/assets/{ => Main}/Shop/x效果图/20250521221819_1.jpg (100%) rename FGUIProject/assets/{ => Main}/Shop/x效果图/20250521221928_1.jpg (100%) rename FGUIProject/assets/{ => Main}/Shop/x效果图/20250521221948_1.jpg (100%) rename FGUIProject/assets/{ => Main}/Shop/x效果图/20250521222125_1.jpg (100%) rename FGUIProject/assets/{ => Main}/Shop/x效果图/20250521222215_1.jpg (100%) rename FGUIProject/assets/{ => Main}/Shop/x效果图/20250521222223_1.jpg (100%) rename FGUIProject/assets/{ => Main}/Shop/x效果图/20250521222232_1.jpg (100%) rename FGUIProject/assets/{ => Main}/Shop/x效果图/20250521222522_1.jpg (100%) rename FGUIProject/assets/{ => Main}/Shop/x效果图/20250521222909_1.jpg (100%) rename FGUIProject/assets/{ => Main}/Shop/x效果图/咖啡店.jpg (100%) rename FGUIProject/assets/{ => Main}/Shop/x效果图/市场.jpg (100%) rename FGUIProject/assets/{ => Main}/Shop/x效果图/码头.jpg (100%) rename FGUIProject/assets/{ => Main}/Shop/x效果图/自动贩卖机.jpg (100%) rename FGUIProject/assets/{ => Main}/Shop/x效果图/食品店.jpg (100%) rename FGUIProject/assets/{ => Main}/Shop/x效果图/鱼市.jpg (100%) rename FGUIProject/assets/{ => Main}/Shop/x效果图/鱼护.jpg (100%) delete mode 100644 FGUIProject/assets/Shop/package.xml create mode 100644 FGUIProject/settings/whoot/hxr7rc7pfcfg8.json create mode 100644 FGUIProject/settings/whoot/hxr7rc7poome9.json diff --git a/Assets/Resources/Fgui/Main/Main_fui.bytes b/Assets/Resources/Fgui/Main/Main_fui.bytes index 0b9be9d58a9ff3067e8be6804b5cf939ddefd40c..61aa9779a9d5acbcfce3aba12f3312bb54e8882d 100644 GIT binary patch delta 3521 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 V`;_X+T&BBM9?%c<(au+^)8bgI zr;pWF%UWk`?U1syTb+;D&Br=7UAwN^=%#C(kG8XJv+FhsJNJen?S8%ao%@}fd(Qd( z_k90z?!W;Y-h6I8LpcUG{I6lTU@dkiKehAmK^4-dk z$>L=B1vTA_mjsI6~Ms&IznrVMcJJ_R*aANf2@NlL_js9j>y|gwrO$96Ix!hD0 ztRhFWN%X;Lx{+(gH58j?je+~XEg^)!94LV@PE!GHfIwEh0c)u#uUZZ3U_A}x<#52I zJgWp75Cj^jyEvxw9RXdi@zc5tG1NL4$m!45MfCz(M_5kstpz%aA_^PQXocF~}q~!#Bwul7%&NcSw|B3v8XpJ72Ea^9&`3 z2JIFa3NeZYVH$;ouHO;b%ID_CZq|VbpdYrux9D7`Q8NJFp3okG?GxI=uwz0acw|C* z6dq%(ILs&>hwo5B*n05FQ5=Kg6dPHGKjo-!IvY8S#?mC(6KRn4a_vvRs}uGD@iX{2 z1w~Z{^D(O66r6@L3gc-|mq6R1B9&U~kNUJ0uhDL%+b`iPy&PR2odO&mM-{cIlJHj) zZ#GE3W*q0>JQbJ=@C>aoXGp(c%Pa6Y9W>{OQ*eeZn-ha%+Y#WN6D~Sr&Q|PIF)8A= z@Fw-exH$6pm<;pppmCBqRZs_w(5QpAIP?Vko^HmtG`u}G-zOFeRmFx$a8AG<;Exm# z-^2&EG=3qD`VXZ_z}wutf2PrRuXKUqFT!7Fmc=dJfp=-ZQmz#55*Kfq)k!*QoaV1^ znZ47k-YHM!i7RlG-n6>$nm=o_fcN12FYvpW;KmOo{r(2mzrfF6bK{4yAAOjt7B}GU zwAI$cxOOtRA}BaHk*rC21;rKRa2quLfPXSgb|p1V@yb;wa%qwxmMIZl?KA;5;Uf;} zw@nTDd}^<@QNX|8V|EOj;g$Z)b-Im%@x@BiS9lxC;<$7=RydtLnxU8e!@mE8TNIL7 ztN8@RIK#5kMln9+Eu7I2Y6L`zPID)!phh{@9LR?Pm<^>+szbrUSq(f>Ae3bRollIC zN2mxw4UME(B_5S1p_WF|(#U5IC$n82EZYL%5c{8IshWtBe{(R2$W3K`T9z>BR)Pm1z=*+{{KteTWT{80Re(N+BvJX){0-00%b z&wFL@AYGK@pZy8uZ17DsO%1n<4}3bz;T>mUE}h7_8}le3+au*Oh%Gpa?#tdJ6|lY; zXH!7VotinUcatZlUOa$>bTDTrvjU5-SYbsuoebCC9&5A9r4mkD%H8N^tDhxH=O`l! z%b1Vr=H!cVZh9_PmTE}gT)Y$ZkB{-&OB=WXdAytIk^lR$tYhnXmL0U#V4{S=aG8yG z*Cd}l!$zFPo#AJrMXF%G`H;ZFEro)M;>7~2Bv+9~y1@1-?)v_se1*lW^2Zvh>FuKQ z0H%lpeELOk;!9kG?BXVk8$F<=$BJ*C!dP(}?xfg~Jwd6R&mJFV+~a7clO<06R()JD zQ~n$~O4G2G7MGf^j(SV$rA54_7whSb()r@coY+$K6?239>BC0(wOJ4t20#EL!K2tf zyUJ|hVP0S5b%59Rc0HaVk=tdo`nZef-8EO+wW@jEwAWk>8$nL3wK=IL6;A2 zy1IGb-NP@*Idc3tN-FwMJMwyk3b|`X=dT!PT+oao8C5A**0!>{%{ddaRlY8_ucNsQ zG_qw4XiI(f`V9enOI 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); } + /// + /// 获取物品子类型 + /// + /// + /// + 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() + { + } + + /// + /// 设置数据 + /// + /// 主物体 + /// 可以装配的配件 + 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 GetItemGearTypes() + { + List types = new List(); + + 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 4fbbf94697dc3608a06fbb36d38d7a8fcf53b750..a2973d879b5259029c08880f2d7aff6ad7ccb45b 100644 GIT binary patch delta 6940 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 - + \ 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 @@ - + 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 @@ + + + + + + + \ 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 @@ - + - - - + @@ -20,5 +18,4 @@ - \ 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 @@ - + 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 @@ - - - - - - - - - \ 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 @@ - + 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 @@ - - - - - - - + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - + + + + + + + - - + + - + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ 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