From 7f599ba51de84e599c26b37e967d2868ff99f055 Mon Sep 17 00:00:00 2001 From: "Bob.Song" <605277374@qq.com> Date: Tue, 14 Oct 2025 17:58:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AB=AF=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Resources/Fgui/Main/Main_fui.bytes | Bin 14760 -> 15525 bytes Assets/Scripts/Common/Enum.meta | 3 + Assets/Scripts/Common/Enum/ItemType.cs | 27 ++++++ Assets/Scripts/Common/Enum/ItemType.cs.meta | 3 + Assets/Scripts/Common/Utils.meta | 3 + Assets/Scripts/Common/Utils/ItemHelper.cs | 10 +++ .../Scripts/Common/Utils/ItemHelper.cs.meta | 3 + Assets/Scripts/Fishing2/Role/RoleBag.cs | 18 ++++ .../NetworkProtocol/CommonProtoData.cs | 6 +- .../Generate/NetworkProtocol/GameMessage.cs | 58 +++++++++++++ .../Generate/NetworkProtocol/OuterOpcode.cs | 78 +++++++++--------- Assets/Scripts/UI/Bag/BagItem.Designer.cs | 27 ++++++ .../Scripts/UI/Bag/BagItem.Designer.cs.meta | 2 + Assets/Scripts/UI/Bag/BagItem.cs | 15 ++++ Assets/Scripts/UI/Bag/BagItem.cs.meta | 2 + Assets/Scripts/UI/Bag/BagPanel.cs | 20 +++++ Assets/Scripts/UI/Binders/MainBinder.cs | 1 + .../Extensions/TabItemDataExtensions.cs | 13 +++ Assets/Scripts/UI/Common/List/ClassifyList.cs | 10 ++- .../Scripts/UI/Common/List/CommonItemList.cs | 17 ++++ Assets/Scripts/UI/Login/LoginPanel.cs | 2 +- Config/Item.xlsx | Bin 11766 -> 10111 bytes Config/~$Gear.xlsx | 0 Config/~$Item.xlsx | 0 FGUIProject/assets/Main/Com/Items/BagItem.xml | 17 ++++ FGUIProject/assets/Main/package.xml | 1 + .../settings/whoot/hxr7rc7puq3a1h.json | 1 + 27 files changed, 294 insertions(+), 43 deletions(-) create mode 100644 Assets/Scripts/Common/Enum.meta create mode 100644 Assets/Scripts/Common/Enum/ItemType.cs create mode 100644 Assets/Scripts/Common/Enum/ItemType.cs.meta create mode 100644 Assets/Scripts/Common/Utils.meta create mode 100644 Assets/Scripts/Common/Utils/ItemHelper.cs create mode 100644 Assets/Scripts/Common/Utils/ItemHelper.cs.meta create mode 100644 Assets/Scripts/UI/Bag/BagItem.Designer.cs create mode 100644 Assets/Scripts/UI/Bag/BagItem.Designer.cs.meta create mode 100644 Assets/Scripts/UI/Bag/BagItem.cs create mode 100644 Assets/Scripts/UI/Bag/BagItem.cs.meta create mode 100644 Config/~$Gear.xlsx create mode 100644 Config/~$Item.xlsx create mode 100644 FGUIProject/assets/Main/Com/Items/BagItem.xml create mode 100644 FGUIProject/settings/whoot/hxr7rc7puq3a1h.json diff --git a/Assets/Resources/Fgui/Main/Main_fui.bytes b/Assets/Resources/Fgui/Main/Main_fui.bytes index 260c4c41bdb775af49e199d8e227a7bb2b74c6fd..0f17a0635906e960afcdeedf2a366a4fb12270b1 100644 GIT binary patch delta 734 zcmY*WO=}ZT6g_t`PNp$5sWmkpRbz|Qg^7~}3@&Vm?M75gVg#XLnKok$OcQISg1CtL zx)9z%bRpdc*%tSrZdDN6b>&Y`1Q#wkz3*kF>I~<;^Ugi@zB}^<`#_6bZ>)4GFlDLHFDn7CB4ZA>$8>aAN*p7MFU;G?N_cc@_ zs?wOd_W4WTG3PQbUj@AO4{!YCG#@{(V?k##Pj<)K@|pQCw|@CURy$ygkkMFo@LpwU z{CY@vDBssckpKl<8o{SjvA{jA^0(3iyN*#hm`wfck1Wa4G0!6lDx}N=Z^(Bcwr8>_ z%3zxJQsZ`@9Fx3w9m$CAd0qTS8bqRgE?3B+`QLGiX!6bR-Q{qKOJ*4ruE!t7JFyeX z#yLk)kq{q73nwRZnp7pnSd2wJ=gA8hz-}`gU;GM@raQh delta 113 zcmZ2lxuST2rG)Nf1~AY&3Z@u=BnZoI44kg3z#zuL$p8P}|9^}EKrtq;-2Z<-ij6^y op^TA#@(crYAb9{xz5tT~h9D6OFqvSe$|$(G&2RzN diff --git a/Assets/Scripts/Common/Enum.meta b/Assets/Scripts/Common/Enum.meta new file mode 100644 index 000000000..9aec07d68 --- /dev/null +++ b/Assets/Scripts/Common/Enum.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 1a0c4fc0d6264961aeae4fd1036c8e26 +timeCreated: 1760429230 \ No newline at end of file diff --git a/Assets/Scripts/Common/Enum/ItemType.cs b/Assets/Scripts/Common/Enum/ItemType.cs new file mode 100644 index 000000000..2de1f2b00 --- /dev/null +++ b/Assets/Scripts/Common/Enum/ItemType.cs @@ -0,0 +1,27 @@ +namespace NBF +{ + public enum ItemType + { + None, + Currency, + Item, + Rod, + Reel, + Bobber, + Line, + Bait, + Lure, + Hook, + Weight, + Feeder, + Ring + } + + public enum ItemBasicType + { + None, + Currency = 1, + Item = 2, + Fish = 3, + } +} \ No newline at end of file diff --git a/Assets/Scripts/Common/Enum/ItemType.cs.meta b/Assets/Scripts/Common/Enum/ItemType.cs.meta new file mode 100644 index 000000000..c88961b3c --- /dev/null +++ b/Assets/Scripts/Common/Enum/ItemType.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 96a7ec99208a4455ae850366a01e9bea +timeCreated: 1760429237 \ No newline at end of file diff --git a/Assets/Scripts/Common/Utils.meta b/Assets/Scripts/Common/Utils.meta new file mode 100644 index 000000000..b94788dd8 --- /dev/null +++ b/Assets/Scripts/Common/Utils.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: da865ce8b3954697b7c79adc6c3de5ec +timeCreated: 1760429508 \ No newline at end of file diff --git a/Assets/Scripts/Common/Utils/ItemHelper.cs b/Assets/Scripts/Common/Utils/ItemHelper.cs new file mode 100644 index 000000000..0cb9d93d8 --- /dev/null +++ b/Assets/Scripts/Common/Utils/ItemHelper.cs @@ -0,0 +1,10 @@ +namespace NBF.Utils +{ + public static class ItemHelper + { + public static ItemType GetItemType(this uint id) + { + return (ItemType)(id / 10000); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Common/Utils/ItemHelper.cs.meta b/Assets/Scripts/Common/Utils/ItemHelper.cs.meta new file mode 100644 index 000000000..4ca77f9c9 --- /dev/null +++ b/Assets/Scripts/Common/Utils/ItemHelper.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: bbfb10d099a14e8b9b8aea80b789bdf3 +timeCreated: 1760429516 \ No newline at end of file diff --git a/Assets/Scripts/Fishing2/Role/RoleBag.cs b/Assets/Scripts/Fishing2/Role/RoleBag.cs index f67fa96a0..6ab45dc66 100644 --- a/Assets/Scripts/Fishing2/Role/RoleBag.cs +++ b/Assets/Scripts/Fishing2/Role/RoleBag.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using NBC; using NBC.Entitas; +using NBF.Utils; using Newtonsoft.Json; namespace NBF.Fishing2 @@ -23,5 +24,22 @@ namespace NBF.Fishing2 $"获取背包数据成功！Items={JsonConvert.SerializeObject(Items)} Rigs={JsonConvert.SerializeObject(Rigs)}"); } } + + public Dictionary> GetItemsByType() + { + var dic = new Dictionary>(); + foreach (var item in Items) + { + var type = item.ConfigId.GetItemType(); + if (!dic.ContainsKey(type)) + { + dic.Add(type, new List()); + } + + dic[type].Add(item); + } + + return dic; + } } } \ No newline at end of file diff --git a/Assets/Scripts/Generate/NetworkProtocol/CommonProtoData.cs b/Assets/Scripts/Generate/NetworkProtocol/CommonProtoData.cs index 8d46b5c99..1c4432721 100644 --- a/Assets/Scripts/Generate/NetworkProtocol/CommonProtoData.cs +++ b/Assets/Scripts/Generate/NetworkProtocol/CommonProtoData.cs @@ -244,7 +244,7 @@ namespace NBC #endif } [ProtoMember(1)] - public int ConfigId { get; set; } + public uint ConfigId { get; set; } [ProtoMember(2)] public long Id { get; set; } [ProtoMember(3)] @@ -278,7 +278,7 @@ namespace NBC #endif } [ProtoMember(1)] - public int ConfigId { get; set; } + public uint ConfigId { get; set; } [ProtoMember(2)] public long Id { get; set; } [ProtoMember(3)] @@ -334,7 +334,7 @@ namespace NBC #endif } [ProtoMember(1)] - public int ConfigId { get; set; } + public uint ConfigId { get; set; } [ProtoMember(2)] public int Level { get; set; } [ProtoMember(3)] diff --git a/Assets/Scripts/Generate/NetworkProtocol/GameMessage.cs b/Assets/Scripts/Generate/NetworkProtocol/GameMessage.cs index d1129c55b..e8f7641b9 100644 --- a/Assets/Scripts/Generate/NetworkProtocol/GameMessage.cs +++ b/Assets/Scripts/Generate/NetworkProtocol/GameMessage.cs @@ -134,6 +134,64 @@ namespace NBC public List Removes = new List(); } /// + /// /////////// ******** 钓组 *******///////////// + /// + /// + /// 请求安装或取下配件 + /// + [ProtoContract] + public partial class C2Game_RigChangeRequest : AMessage, ICustomRouteRequest, IProto + { + public static C2Game_RigChangeRequest Create(Scene scene) + { + return scene.MessagePoolComponent.Rent(); + } + public override void Dispose() + { + RodId = default; + RigId = default; + IsAdd = default; +#if FANTASY_NET || FANTASY_UNITY + GetScene().MessagePoolComponent.Return(this); +#endif + } + [ProtoIgnore] + public Game2C_RigChangeResponse ResponseType { get; set; } + public uint OpCode() { return OuterOpcode.C2Game_RigChangeRequest; } + [ProtoIgnore] + public int RouteType => Fantasy.RouteType.GameRoute; + [ProtoMember(1)] + public long RodId { get; set; } + [ProtoMember(2)] + public long RigId { get; set; } + [ProtoMember(3)] + public bool IsAdd { get; set; } + } + /// + /// 请求安装配件响应 + /// + [ProtoContract] + public partial class Game2C_RigChangeResponse : AMessage, ICustomRouteResponse, IProto + { + public static Game2C_RigChangeResponse Create(Scene scene) + { + return scene.MessagePoolComponent.Rent(); + } + public override void Dispose() + { + ErrorCode = default; + Rigs = default; +#if FANTASY_NET || FANTASY_UNITY + GetScene().MessagePoolComponent.Return(this); +#endif + } + public uint OpCode() { return OuterOpcode.Game2C_RigChangeResponse; } + [ProtoMember(1)] + public ItemBindInfo Rigs { get; set; } + [ProtoMember(2)] + public uint ErrorCode { get; set; } + } + /// /// /////////// ******** 鱼护 *******///////////// /// /// diff --git a/Assets/Scripts/Generate/NetworkProtocol/OuterOpcode.cs b/Assets/Scripts/Generate/NetworkProtocol/OuterOpcode.cs index 5d4482248..8c9171724 100644 --- a/Assets/Scripts/Generate/NetworkProtocol/OuterOpcode.cs +++ b/Assets/Scripts/Generate/NetworkProtocol/OuterOpcode.cs @@ -7,15 +7,17 @@ namespace Fantasy public const uint C2Game_UseItemRequest = 2281711378; public const uint Game2C_UseItemResponse = 2415929106; public const uint Game2C_ItemChange = 2147493649; - public const uint C2Game_GetFishsRequest = 2281711379; - public const uint Game2C_GetFishsResponse = 2415929107; + public const uint C2Game_RigChangeRequest = 2281711379; + public const uint Game2C_RigChangeResponse = 2415929107; + public const uint C2Game_GetFishsRequest = 2281711380; + public const uint Game2C_GetFishsResponse = 2415929108; public const uint Game2C_FishChange = 2147493650; - public const uint C2Game_SellFishRequest = 2281711380; - public const uint Game2C_SellFishResponse = 2415929108; - public const uint C2Game_BuyRequest = 2281711381; - public const uint Game2C_BuyResponse = 2415929109; - public const uint C2Map_CreateRoomRequest = 2281711382; - public const uint Map2C_CreateRoomResponse = 2415929110; + public const uint C2Game_SellFishRequest = 2281711381; + public const uint Game2C_SellFishResponse = 2415929109; + public const uint C2Game_BuyRequest = 2281711382; + public const uint Game2C_BuyResponse = 2415929110; + public const uint C2Map_CreateRoomRequest = 2281711383; + public const uint Map2C_CreateRoomResponse = 2415929111; public const uint C2G_ExitRoomRequest = 268445457; public const uint G2C_ExitRoomResponse = 402663185; public const uint C2G_EnterMapRequest = 268445458; @@ -26,8 +28,8 @@ namespace Fantasy public const uint C2G_LoginRequest = 268445460; public const uint G2C_LoginResponse = 402663188; public const uint G2C_RepeatLogin = 134227729; - public const uint C2Game_GetRoleInfoRequest = 2281711383; - public const uint Game2C_GetRoleInfoResponse = 2415929111; + public const uint C2Game_GetRoleInfoRequest = 2281711384; + public const uint Game2C_GetRoleInfoResponse = 2415929112; public const uint Map2C_RoleEnterRoomNotify = 2147493652; public const uint Map2C_RoleExitRoomNotify = 2147493653; public const uint C2Map_RolePropertyChange = 2147493654; @@ -38,37 +40,37 @@ namespace Fantasy public const uint C2Map_Look = 2147493659; public const uint Map2C_MoveNotify = 2147493660; public const uint Map2C_LookeNotify = 2147493661; - public const uint C2S_GetConversationsRequest = 2281711384; - public const uint S2C_GetConversationsResponse = 2415929112; - public const uint C2S_SendMailRequest = 2281711385; - public const uint S2C_SendMailResponse = 2415929113; - public const uint C2S_DeleteMailRequest = 2281711386; - public const uint S2C_DeleteMailResponse = 2415929114; + public const uint C2S_GetConversationsRequest = 2281711385; + public const uint S2C_GetConversationsResponse = 2415929113; + public const uint C2S_SendMailRequest = 2281711386; + public const uint S2C_SendMailResponse = 2415929114; + public const uint C2S_DeleteMailRequest = 2281711387; + public const uint S2C_DeleteMailResponse = 2415929115; public const uint S2C_HaveMail = 2147493662; public const uint S2C_MailState = 2147493663; - public const uint C2S_CreateChannelRequest = 2281711387; - public const uint S2C_CreateChannelResponse = 2415929115; - public const uint C2S_JoinChannelRequest = 2281711388; - public const uint S2C_JoinChannelResponse = 2415929116; - public const uint C2S_SendMessageRequest = 2281711389; - public const uint S2C_SendMessageResponse = 2415929117; + public const uint C2S_CreateChannelRequest = 2281711388; + public const uint S2C_CreateChannelResponse = 2415929116; + public const uint C2S_JoinChannelRequest = 2281711389; + public const uint S2C_JoinChannelResponse = 2415929117; + public const uint C2S_SendMessageRequest = 2281711390; + public const uint S2C_SendMessageResponse = 2415929118; public const uint S2C_Message = 2147493664; - public const uint C2S_CreateClubRequest = 2281711390; - public const uint S2C_CreateClubResponse = 2415929118; - public const uint C2S_GetClubInfoRequest = 2281711391; - public const uint S2C_GetClubInfoResponse = 2415929119; - public const uint C2S_GetMemberListRequest = 2281711392; - public const uint S2C_GetMemberListResponse = 2415929120; - public const uint C2S_GetClubListRequest = 2281711393; - public const uint S2C_GetClubListResponse = 2415929121; - public const uint C2S_JoinClubRequest = 2281711394; - public const uint S2C_JoinClubResponse = 2415929122; - public const uint C2S_LeaveClubRequest = 2281711395; - public const uint S2C_LeaveClubResponse = 2415929123; - public const uint C2S_DissolveClubRequest = 2281711396; - public const uint S2C_DissolveClubResponse = 2415929124; - public const uint C2S_DisposeJoinRequest = 2281711397; - public const uint S2C_DisposeJoinResponse = 2415929125; + public const uint C2S_CreateClubRequest = 2281711391; + public const uint S2C_CreateClubResponse = 2415929119; + public const uint C2S_GetClubInfoRequest = 2281711392; + public const uint S2C_GetClubInfoResponse = 2415929120; + public const uint C2S_GetMemberListRequest = 2281711393; + public const uint S2C_GetMemberListResponse = 2415929121; + public const uint C2S_GetClubListRequest = 2281711394; + public const uint S2C_GetClubListResponse = 2415929122; + public const uint C2S_JoinClubRequest = 2281711395; + public const uint S2C_JoinClubResponse = 2415929123; + public const uint C2S_LeaveClubRequest = 2281711396; + public const uint S2C_LeaveClubResponse = 2415929124; + public const uint C2S_DissolveClubRequest = 2281711397; + public const uint S2C_DissolveClubResponse = 2415929125; + public const uint C2S_DisposeJoinRequest = 2281711398; + public const uint S2C_DisposeJoinResponse = 2415929126; public const uint S2C_ClubChange = 2147493665; } } diff --git a/Assets/Scripts/UI/Bag/BagItem.Designer.cs b/Assets/Scripts/UI/Bag/BagItem.Designer.cs new file mode 100644 index 000000000..03aa72b63 --- /dev/null +++ b/Assets/Scripts/UI/Bag/BagItem.Designer.cs @@ -0,0 +1,27 @@ +/**本脚本为自动生成，每次生成会覆盖！请勿手动修改，生成插件文档及项目地址：https://git.whoot.com/whoot-games/whoot.fguieditorplugin**/ + + +using FairyGUI; +using FairyGUI.Utils; +using NBC; + +namespace NBF +{ + public partial class BagItem + { + public const string URL = "ui://hxr7rc7puq3a1h"; + + public GImage back; + public GImage ba; + + public override void ConstructFromXML(XML xml) + { + base.ConstructFromXML(xml); + + back = (GImage)GetChild("back"); + ba = (GImage)GetChild("ba"); + OnInited(); + UILanguage.TrySetComponentLanguage(this); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/UI/Bag/BagItem.Designer.cs.meta b/Assets/Scripts/UI/Bag/BagItem.Designer.cs.meta new file mode 100644 index 000000000..a6d6f15c5 --- /dev/null +++ b/Assets/Scripts/UI/Bag/BagItem.Designer.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 3fa85a75ea9865f438ee246e23aefc66 \ No newline at end of file diff --git a/Assets/Scripts/UI/Bag/BagItem.cs b/Assets/Scripts/UI/Bag/BagItem.cs new file mode 100644 index 000000000..367ff11c5 --- /dev/null +++ b/Assets/Scripts/UI/Bag/BagItem.cs @@ -0,0 +1,15 @@ +// 本脚本只在不存在时会生成一次。组件逻辑写在当前脚本内。已存在不会再次生成覆盖 + +using UnityEngine; +using FairyGUI; +using NBC; + +namespace NBF +{ + public partial class BagItem : GButton + { + private void OnInited() + { + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/UI/Bag/BagItem.cs.meta b/Assets/Scripts/UI/Bag/BagItem.cs.meta new file mode 100644 index 000000000..6de8410f5 --- /dev/null +++ b/Assets/Scripts/UI/Bag/BagItem.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 23a4348047aba5743b09c9d65e404a93 \ No newline at end of file diff --git a/Assets/Scripts/UI/Bag/BagPanel.cs b/Assets/Scripts/UI/Bag/BagPanel.cs index 8e55011ec..701214839 100644 --- a/Assets/Scripts/UI/Bag/BagPanel.cs +++ b/Assets/Scripts/UI/Bag/BagPanel.cs @@ -1,7 +1,9 @@ // 本脚本只在不存在时会生成一次。已存在不会再次生成覆盖 +using System.Collections.Generic; using UnityEngine; using NBC; +using NBF.Fishing2; namespace NBF { @@ -16,6 +18,24 @@ namespace NBF { Game.Input.OnUICanceled += OnUICanceled; UseBottomMenu(); + + List tabItemList = new List(); + var role = App.Main.GetComponent(); + var roleBag = role.GetComponent(); + + var dic = roleBag.GetItemsByType(); + foreach (var (type, list) in dic) + { + TabItemData tabItem = new TabItemData + { + Key = type.ToString() + }; + tabItem.Items.AddRange(list); + tabItemList.Add(tabItem); + } + + ItemList.SetPanel(this); + ItemList.SetData(tabItemList, true, true); } private void OnUICanceled(string action) diff --git a/Assets/Scripts/UI/Binders/MainBinder.cs b/Assets/Scripts/UI/Binders/MainBinder.cs index 8fbfb8a52..059a304c5 100644 --- a/Assets/Scripts/UI/Binders/MainBinder.cs +++ b/Assets/Scripts/UI/Binders/MainBinder.cs @@ -19,6 +19,7 @@ namespace NBF UIObjectFactory.SetPackageItemExtension(HomeStatisticsPage.URL, typeof(HomeStatisticsPage)); UIObjectFactory.SetPackageItemExtension(HomeButtonGroups.URL, typeof(HomeButtonGroups)); UIObjectFactory.SetPackageItemExtension(ChatItem.URL, typeof(ChatItem)); + UIObjectFactory.SetPackageItemExtension(BagItem.URL, typeof(BagItem)); } } } \ No newline at end of file diff --git a/Assets/Scripts/UI/Common/Extensions/TabItemDataExtensions.cs b/Assets/Scripts/UI/Common/Extensions/TabItemDataExtensions.cs index 4717cfb7e..444b9a0ac 100644 --- a/Assets/Scripts/UI/Common/Extensions/TabItemDataExtensions.cs +++ b/Assets/Scripts/UI/Common/Extensions/TabItemDataExtensions.cs @@ -69,5 +69,18 @@ namespace NBF // 去重处理（基于引用相等，如果需要基于内容去重需要重写Equals方法） return allItems.Distinct().ToList(); } + + public static void TabItemDataAddListTitle(this TabItemData tabItem) + { + if (tabItem.Items == null || tabItem.Items.Count < 1) return; + var hasListTitle = tabItem.Items.OfType().Any(); + if (!hasListTitle) + { + tabItem.Items.Insert(0, new ClassifyListTitleData() + { + Title = tabItem.Key + }); + } + } } } \ No newline at end of file diff --git a/Assets/Scripts/UI/Common/List/ClassifyList.cs b/Assets/Scripts/UI/Common/List/ClassifyList.cs index 391328fc7..2c41532bf 100644 --- a/Assets/Scripts/UI/Common/List/ClassifyList.cs +++ b/Assets/Scripts/UI/Common/List/ClassifyList.cs @@ -100,7 +100,11 @@ namespace NBF if (obj is ListItemBase item) { item.SetData(itemData); - obj.SetSize(350, 300); + // obj.SetSize(350, 300); + } + else if (obj is BagItem bagItem) + { + // obj.SetSize(350, 300); } else if (obj is ListTitleItem titleItem) { @@ -120,6 +124,10 @@ namespace NBF return ShopGearItem.URL; } + if (itemData is ItemInfo itemInfo) + { + return BagItem.URL; + } if (itemData is ClassifyListTitleData titleData) { return ListTitleItem.URL; diff --git a/Assets/Scripts/UI/Common/List/CommonItemList.cs b/Assets/Scripts/UI/Common/List/CommonItemList.cs index 01c5fe543..2a41d1667 100644 --- a/Assets/Scripts/UI/Common/List/CommonItemList.cs +++ b/Assets/Scripts/UI/Common/List/CommonItemList.cs @@ -51,7 +51,24 @@ namespace NBF style.selectedIndex = 1; //有二级菜单 } + _tabList.AddRange(tabItemList); + + if (showListTitle) + { + foreach (var tabItemData in _tabList) + { + tabItemData.TabItemDataAddListTitle(); + if (tabItemData.Children.Count > 0) + { + foreach (var itemData in tabItemData.Children) + { + itemData.TabItemDataAddListTitle(); + } + } + } + } + if (showAll) { _tabList.AddAllTabItem(showListTitle); diff --git a/Assets/Scripts/UI/Login/LoginPanel.cs b/Assets/Scripts/UI/Login/LoginPanel.cs index 65156698a..4b084833b 100644 --- a/Assets/Scripts/UI/Login/LoginPanel.cs +++ b/Assets/Scripts/UI/Login/LoginPanel.cs @@ -78,7 +78,7 @@ namespace NBF await LoginHelper.Login(InputAccount.text); BagPanel.Show(); - FishingShopPanel.Show(); + // FishingShopPanel.Show(); // var mapId = role.Info.MapId; // if (mapId == 0) diff --git a/Config/Item.xlsx b/Config/Item.xlsx index 64f00f7dbccf6ce3fd9e0275268f6e2abb3a5898..e01c995cbfe4c4e6965a3c5878f67d49d9ceeaf9 100644 GIT binary patch delta 5617 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

dY~ z!@iu&rfI0Kck&Eg{Sq_y&x#fZYUE*dp$AvWiUw{24E@HrH`Vm?OF7q99s6dNz)P>+ z2qdefiturn{{XpQV)}=gZ(s)*brqyzF8dTgJ@Hk1{+tGc;pm9-w-l;)i#4_xhDI}* zmC|8m?{~3joJP@J>GFPa8&a8F@CGTqFKhl{)|}%JI#pB6(zKn|l)bpPI4eb|Wjd#V z#G*^A6_U*^{RWDJA$_DTJ&`Z1%)(*dnK%v8%Rx)jw!&;fdXl&L&kAUvJcxVL=qa_4G4*vya&r9cTEVwW z@c9>3_9#6+YVTLRkR!fYWKs_F?)F*d^+h`cM8qS3U-R?gRF%WA6`n!pUkgp|G&ofpN=t<|KMq}qYH@^26P*uzx~Vkzxk!dTJ6L=kw%gZ|M!t zs0n%k&~j7xzjn&m6WfnbUx=?3RGIFn83a^3+wkf12Rv9O+#4Ay+H|C9? z3cd^%=0H#y-;xU>AcQ9RI|{|L3z^{&W9WocN$dy#fM8Dv%!nvE#!!d~9|6W7h2`+e zz?e2+QTG2DN5J1T|1)=|!ALPMVdh0>*#GNsZeE2yiktDz6>u|PNJQ`8D*!R-qH_55 zKun0J3O;}i(<-W{9Pv-#ARj*uf4Hk_fWO55e{26mg#ZBPAKQO@D+w{;WUQDaF;Xhp Pn?RT3#>$!ZkK%s-3j0-B delta 7125 zcmZX3by!qg_x3P!*HA;lfW*)#Arb=8-6A2K(mm9G(#+5x2uLF#CEcCUAV`WdNGTxj z!^iLWp7(v;^T)ogc0PT9*Lg zar(7}nQnIxdxKIheHx8y9JNN2Eqml=txL~BA07KSeZD=tps78Q9*Z2Fqntw}^0_Bb zFlD+~tE1Npz?_JSh4>){H+N&GCLJ;@9DPJ&8R-hb>al?Ms=9nEq)CKY5)oh1ONcA0Fi3zkH3o(JQTer8+=bT(Y@8jk;l@- z$;ryu!<~=Y$H}oEaYgB#`Mx9c6-K#ZrBpBKyqX;i1M^k5?GHe;q%rQLw%dAITWD%q zq|55(ZGWGp`mkrXjGNbAH-`sPU$hBiICWYcly81#TgP);8(MURJpZ}?`zmBZnZ%Xs zMGk?XZl0c()wZ>sw>y3Y z*vuD)P8Ng{{UZ1A3nEu&;52S{o-c@mHqGbL2qr{{pD#_%PU>4NmOS|4<*&Za$H9PdgMH0HFRC(#y$F z?vEEA_x*jW&WcMWFHul@?Hx*EC4{lo&Iq%((AoDhtJ9kcgNLhV4SkXOxQsV@{uo+h zc9~Hix5iWNc39i^)5Aq2%-CABkf#e4q{`xs^ZVr0iAmTgJ!4Nw@!Q*Y^t`GePh-+dBD8|Ka#W#lsC(K>QAKNOFIxe>zUm1Y(@1-oD$!)$l!tw znZ1s6^Y|3n1<@|m}zW#el@d4L06)CzXJr7KHLaw zDw(jiSI2%O{XDFPA2f(aS#jX`z|*!u|M@}b`NY#bafZR<^_91YFi^@5EeD0|l)JoP z-irX?hn~o1@CI|5FX6+kp46t1(YpLDmqg4<>Y~=EU%ui$PY>5k-ydqmXckxj?;0I! zs*~SLSyd*0k!ffQ1Y(NP2^nYrKc5X3yu4NP#A@338 zwTzpo&Yn$6hmy^!kmBHn8^Q;-=i>Eze6mUMqq6up?Nru}#wnKu=Ncs3P1!58^i-BR z_8JMeEK=U}n(yBJ6uIK}dZU!U#7M=tJsnt-eC>JhjUGw5F+P*1wH6$im(iraIHa&r zxy}q5efqT;LC#xaBk=&}eA!v4r1mr~=49mPho7v}1G_bQ!uVh0^p5T7mf#ORS&HBj zYNDgBf`67-8tL_YHg-d{ha*Wh?boYi@Xl2>cs}m+q!#hnkbTDGv2LuC-Lt-2m8v}% z*@(->wfGt?)t>ac<0bZ>WPu^a7u_aS29B{Hm|79in}d^wdzTFw5}K&q`>TKiO8A=L z&@oSM)#b2*f9ePlsk=M~$1{NmKh>JhB@gS~3EB<9rE4H0(HEA|_A4!SP)I1E9kqqp z0(&>a+9`*<`35_zc!Ra<58H?N2kdoH#z-y4Czru^{`{<8=$V%M8mPnc&@T8~J?6(UN_m^C+g7@jYj6R*Yf{4c6%(bVQTBd~H z{@mMSKa*bZbUP{R)3!8y?VWDWzU8p>*1F3;pnsC(Ohwhpf+dg^KKapif|>t{T=RQX7;{O^ffKzzbG@$yRzx(FwLw({`fj%H11KT|CM_RikVUl(BV2 znV+YFdv#}dv)}vc5mZTt407zL`XVT7^hGLd0eeLUYhCm4t<9?~{PfV6N@Y#m#{Id4 z@ERnle|mWgV&F~vooHy>YnGp?d8KN(8Jv%w+qAyE!+B3U7t?4R48Ui$73hLh#0OB~M(W$(sL_cw(UcP$t0$Ryu^m-^yXRovY ztJRzR@qsFHYhs#E1GI=FO^6EFo0k{s=yM0rF>kA4gv`#Y75QE?A)z z$LdE|fJ`mT!b0Ao*Pjq)=sXs0|V6<*Y-6I%gIB{y4+{xC&@q_spnO%Zt`0CNHJ&5a z+vMheg22+ZwQGujnu9%C;NbY+!e!vJOKxFD=Bzw5{!{&$1CTn z>g<>W8YxN7=V&WY8!5r;0NGPXO7zLH#q7sFRHPfZ@xCIoF0%A+B+cw7W3?y^?w5`t z8uIkX^g|WS0z&Dl(<%t&6~$U)ZE;r2A!B?t=97VQY=vjIdK{pOiU+K#47P`Hu5?8c z-jal-ZT@}XjUl!LE3{-h1=-nGpZolo)1QH7!PQ1M%o2ijSk) zAw5Uu?2BvhcKn`~Vw(LA+Aohf_eB!uYIJd!F$kzjaDCkG_d+-KKV=XAxyC{cb3%+O zbw4KRI|@A_x^VVJCUGF%*-C@Xrv13>YU*(ZokyJCwVuC_?llGRFmZvP*&ss6pGQ_p zwQcZ{C-x#=tb_v(g%}8#_x)O4S7Qa(GUx<{ zD6>uMLJPYv3Q=m)5F3=KTOGV1mM_;0y4a01M9H&++=)mzbo!nonU+r?a1eV63%`*-hD@cFuVxNP+IGGgw5_PXnh8%F&n_?c z8o?z|{NJmF2+|@0$@CV@^|tGE7WAO=jN@!yt1=~QQueSIpQ*k|>t}SCbCok;tBNlx z88Nxj)`L5jRv0Gbb`=zZPZyv=6Ki?phc4fUwE}CZMj{G$=}4~J^&j0duY54#e!KjH zTxDhM662q3QVk9X3lL{HqdoKj=l+kPk9-J%P{jAUzZ6DJs#w?+pueAHVniv;qEfe5 zLwbM&VJmIdM*%C13z>8A7;zr`Cz18v>c8$bF)62fKKH9{UP)>9A2x6poaE(Q&ff8< zm`RC$pBoUkSN42?2BSaD^R(jw5ZmBmcYOd6S|oMyP?f(K{>WOBw{4?q(a|NUK(IEf zonPXNt40JOhgy`!p_I?h>!eTc&=If6Hw{na4yKUbT~{F@Dv0Vo?zO*~c7iC7_TD%T zoI4$r#MF^IIZqRy8LOh3f3`yHcVk9tpxY9(a%dy~)}tm{X|g0e+CG^r6bDm=nX!4c zCQ{d0aWz8V-lj*Ly`@mNymt#-@k`^Y2#64`#uPHTvf?ltk=v1DPNeYBkWX(wdx3b2 zXdW2CHDs>|{ANJ0*r2#~Q6+91ESgY1WXO= zxy=7&@Tu%r49Rk+tO#bZP`Rxl0a22NlsctYAJ?4y5u=LcTU*ET!aa823j`Jn=LKC7=#Xp1>5Qg0k<`9yL=e*Dq&#zUcHRk>=4)SoGCZNyd`r z)>O%AVNCTB>&Y!knAzC|K{*o&z{ke1&qQ`N8^DHd`YJvxJd1@smUs93;00?qx7y%U zDk$a?@qFf@OZ{F?dCq<&S?Bac@PHm#8on`?OOz|dw`*|4koY^HSBIWzGW zS-PRk!{!8D=1X`u)gTXKq_(-CM}d>Z^b@;Q=$&U+N|}s@DIs3kJTy??VdYqmh!AFCOcyS z0<%PcY@moj2*rB}-2qwRA0sv;1Um2$1?f?P;Sn2IOKv-5m>}qj-e9~=jY_mNJO6$L z%fJWc6sF2pvtYK#YC=rCaXNg&V^+&h-d|{>3(hU?UcDQ2crjlfBveo`Gb6u!+OpN_ z@yrKd#NpL96k)DP>~` z!m{Ci^Nz;u#mb;2y%Smpm)Hv=V8KC#z?@%13{P3z=R=*H*hQOomC3xH*=5Kw3pGWP zt3A9KKkiD~QK+eoc~jZT{MDt>)>^K+V{ib6q(qp)0&GE;t7!k1d^u+GS>X}7p2%C{ zIK{fws#1^Cfn*J`CeD{tLx(y|E;~x1y7|Vr72&1D)m`P2OY-M$KADZ5;5R*wt0S|V ziN&?UBZcUzSWfq?Ca}l>@Kkl#A8k!8kdTm{u#d=_@a1%MTt(TbAP!qjl0!p*#$Y_L zUJhB!Y#64A+SjkZ2BqDwfif1Y#A)=zs07@h^Sk9$VkFVMM3mi?4s;r+ICh%QKK{kF}hpLwN02a1yGJW z8O+5G6JzSEpNHvlbI)=S8*G8WZ7jMZWFlJ8Fy&Gf4!VRS_$K9y*#I6qN64>(*>JlPngorY|Re6`vaPf9F z|Gr&))&24*bKE`Ppp%&AzA^gCnA&h*#x-p0@7i2G(O9yFM75jg1%H2SV-DNX9O8A7+~e=)gi2+SdeMUTp+t?b*^7z}+VuNhJcfk?>wwl`AQ)yKu7rlYyY z!JD`#{NkKrDhf>q%ZX}3B!-1dnQ2AMc6h^Pd@Q>qc5?8`fR`D)uR*98av85P%>O>g zQ{J6Wd^@@kW(^}^{BSG_`W{!OIJVH96O(fTWo7toDw1zlGph zziQzU@9i0~W{PK={!N?T(Ls%!AHTKv*;!qPT{;qWbMR~PjR6DIBVORP3)Z^l#aZQs z_e%P&+ZQLdE0$uDxiAHfwI2@(1>Xd?y4|kPTi`UEg(!v}O8K7 z_9|W@D@h0YCxWCXpVyw4SOTmkD@Hm7(S@5wzXGTc6BEXl@;d*v6Mz4S_53u8V0Ixo za^o6XtW-k6tU?9E#qjVFn%Kn*WUY{c6v2EwuhPHurVY~;MON>%;Vm%s7a7aBL#%}Byn*cYGkVEi;8c-#eBg&O9U zAu(=)r~4}6v{?#vxo;=aWhqT&Vg9Sv#^&xLCMCU8pvUdnwN3j~cqe&Vbg+3D4s~^D zfT|I4>%$tX8fa-8Qeq@bO((_s6I5mQqGpXxm()VZOl^|86Mvplh_Onm6;YKd8-S5^ z%&ajL%RR#xGpf@_vi|!9pC%V-MB4q5ob%~Aiij&-_)nE{9LsLYde$DtQhiElx<(;J zH|^H0`Qw3^@BuP2mceo%x|-upawyh+S<_(f*iN8uiK)4x&t{jN4@#y^CB(4eNuF6TJz1FX^z3I)*PCEYP8$)! z`9j%69drB~eCcI;J9y}&y|N%QU6=A<*=WjMFHp78<*0n7ZtP+#E|;@(@{%1bC4k>+ zqqy`L&tXk@l%S{aJRLx@^I%tYSM#XcJxns$M3s7-k(dD{|EBi&C1c8 z=P&$UYAyHg=l2PN_NaV#kB{KDVV@*tRS0sEeB7|%CbCy3U9(V+7PCgXlOLXJa6B}> z9nH^E$ol5!oSF0*6+TK^Pt>TeSZAEDkRMZ@chQqTIIy@a%K46Dbg$*psfz)DWHHD_ zlANv*5vnEo4w>fuK(<_ePp;lonq)F~3x#xn5KK9zTGJUY9_-wygK5J+zXYD%$=Ka$ zU#LEMFnnz*B^h~QhMs-XGJd8TU#2sJN`Y#We?2((taYZ2;<#G-I!8_TDzgF_6NG$U zao23OO1-|aEb`BJ;J0Gk5`+;4yJzD7xyDEfbME3Ldh#RriZHQ3*J3-blmi$&$!+{@ zlF;=4`}MIh-Rae}8c+wQDT9`&_*&q{lDNQ$S*@^`p-jinLe_Z=opOg#5r_Ej!jCh_ zKx=Gy^W=#!nK9vDN5PhMY84SW-dy|Whn$vYJX!hBPOOnEOyvh~TzNS^e1SuFRy5Ty ztl#wLwXzNKd|IDT7(S*YTaQftrju$;gIbDw&8Fw|^Vp&EV^e)CIsTzkJz8lkeNZym z*Uhd35Bc*A20c*NcVsXC+)V66%wOtgVrJ+Y@HXp?Xcu|MyubUX-%Zd%@yf|BSjGOOj|;LPj6FEFFo_&1Ws0}r0W0}UO#&}NKBXUyuT_IkruFe^OMNVHF&CX4t;=_h;tS?+Z7QZ> z9B=vF;DOW0SBK!2@$RRY-kBIVRGJI8KSxs-RCDYr)B`{IdbY{?9EFLbo*z?aa4Mq! zLHCE{zsm{#|K;3k+NAf^-xmsi;l7<=MaD5p0e>+e$C>$o49rMW2m<}DQV%i%qJx5s zJc2w%F+=jQ@M0=L{`wSKm Vd%>59fE+*$FurFS&i1?W{{Yg%>DvGR diff --git a/Config/~$Gear.xlsx b/Config/~$Gear.xlsx new file mode 100644 index 000000000..e69de29bb diff --git a/Config/~$Item.xlsx b/Config/~$Item.xlsx new file mode 100644 index 000000000..e69de29bb diff --git a/FGUIProject/assets/Main/Com/Items/BagItem.xml b/FGUIProject/assets/Main/Com/Items/BagItem.xml new file mode 100644 index 000000000..2da4a75d3 --- /dev/null +++ b/FGUIProject/assets/Main/Com/Items/BagItem.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + +