diff --git a/Assets/Resources/Fgui/CommonFlag.meta b/Assets/Resources/Fgui/CommonFlag.meta new file mode 100644 index 000000000..5a512efa8 --- /dev/null +++ b/Assets/Resources/Fgui/CommonFlag.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6f381ed33689da346a208ae0a6a0225b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Fgui/CommonFlag/CommonFlag_atlas0.png b/Assets/Resources/Fgui/CommonFlag/CommonFlag_atlas0.png new file mode 100644 index 000000000..528a95a0b Binary files /dev/null and b/Assets/Resources/Fgui/CommonFlag/CommonFlag_atlas0.png differ diff --git a/Assets/Resources/Fgui/CommonFlag/CommonFlag_atlas0.png.meta b/Assets/Resources/Fgui/CommonFlag/CommonFlag_atlas0.png.meta new file mode 100644 index 000000000..94a739f2a --- /dev/null +++ b/Assets/Resources/Fgui/CommonFlag/CommonFlag_atlas0.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: 19bf979e7f610ae43afaa1a34d7dcca2 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Fgui/CommonFlag/CommonFlag_fui.bytes b/Assets/Resources/Fgui/CommonFlag/CommonFlag_fui.bytes new file mode 100644 index 000000000..e0ba815ba Binary files /dev/null and b/Assets/Resources/Fgui/CommonFlag/CommonFlag_fui.bytes differ diff --git a/Assets/Resources/Fgui/CommonFlag/CommonFlag_fui.bytes.meta b/Assets/Resources/Fgui/CommonFlag/CommonFlag_fui.bytes.meta new file mode 100644 index 000000000..867f3d2d2 --- /dev/null +++ b/Assets/Resources/Fgui/CommonFlag/CommonFlag_fui.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3486dfd1638410e42a054756a7e00d72 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Fgui/CommonIcon.meta b/Assets/Resources/Fgui/CommonIcon.meta new file mode 100644 index 000000000..3d161c5f7 --- /dev/null +++ b/Assets/Resources/Fgui/CommonIcon.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d30a0b3f24947fc4a8d9c2255bb3d7ac +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Fgui/CommonIcon/CommonIcon_atlas0.png b/Assets/Resources/Fgui/CommonIcon/CommonIcon_atlas0.png new file mode 100644 index 000000000..52afc58ab Binary files /dev/null and b/Assets/Resources/Fgui/CommonIcon/CommonIcon_atlas0.png differ diff --git a/Assets/Resources/Fgui/CommonIcon/CommonIcon_atlas0.png.meta b/Assets/Resources/Fgui/CommonIcon/CommonIcon_atlas0.png.meta new file mode 100644 index 000000000..6c0a8e055 --- /dev/null +++ b/Assets/Resources/Fgui/CommonIcon/CommonIcon_atlas0.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: b283ea7cefc1d804ea3ce6d18b7d1191 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Fgui/CommonIcon/CommonIcon_fui.bytes b/Assets/Resources/Fgui/CommonIcon/CommonIcon_fui.bytes new file mode 100644 index 000000000..deccf6f1e Binary files /dev/null and b/Assets/Resources/Fgui/CommonIcon/CommonIcon_fui.bytes differ diff --git a/Assets/Resources/Fgui/CommonIcon/CommonIcon_fui.bytes.meta b/Assets/Resources/Fgui/CommonIcon/CommonIcon_fui.bytes.meta new file mode 100644 index 000000000..a1dff275b --- /dev/null +++ b/Assets/Resources/Fgui/CommonIcon/CommonIcon_fui.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: cc494ea340a433c4996599314577ea55 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Fgui/Main/Main_fui.bytes b/Assets/Resources/Fgui/Main/Main_fui.bytes index fc4cb8843..597683676 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/Def/UIDef.cs b/Assets/Scripts/Common/Def/UIDef.cs index db009bd0d..d1b63d195 100644 --- a/Assets/Scripts/Common/Def/UIDef.cs +++ b/Assets/Scripts/Common/Def/UIDef.cs @@ -15,6 +15,8 @@ namespace NBF public class Pack { public const string Common = "Common"; + public const string CommonIcon = "CommonIcon"; + public const string CommonFlag = "CommonFlag"; public const string Main = "Main"; } diff --git a/Assets/Scripts/Common/Utils/ItemHelper.cs b/Assets/Scripts/Common/Utils/ItemHelper.cs index d214650c5..6420bf908 100644 --- a/Assets/Scripts/Common/Utils/ItemHelper.cs +++ b/Assets/Scripts/Common/Utils/ItemHelper.cs @@ -40,7 +40,8 @@ namespace NBF.Utils public static string GetIcon(this uint id) { //Assets/Resources/Icons/baitfrog.png - return $"Icons/{id}"; + ////$"Icons/{id}"; + return UIPackage.GetItemURL(UIDef.Pack.CommonIcon, id.ToString()); } public static void SetIcon(this GLoader loader, uint id) diff --git a/Assets/Scripts/Fishing2/Role/RoleBag.cs b/Assets/Scripts/Fishing2/Role/RoleBag.cs index 226c169a6..f3d553503 100644 --- a/Assets/Scripts/Fishing2/Role/RoleBag.cs +++ b/Assets/Scripts/Fishing2/Role/RoleBag.cs @@ -14,16 +14,19 @@ namespace NBF.Fishing2 public readonly List Items = new List(); public readonly List Rigs = new List(); public readonly HashSet BindId = new HashSet(); + public readonly List Slots = new List(); public async FTask GetBagInfo() { Items.Clear(); Rigs.Clear(); + Slots.Clear(); var response = (Game2C_GetItemsResponse)await Net.Call(new C2Game_GetItemsRequest()); if (response.ErrorCode == ErrorCode.Success) { Items.AddRange(response.Items); Rigs.AddRange(response.Rigs); + Slots.AddRange(response.Slots); UpdateBindData(); Log.Debug( @@ -146,6 +149,45 @@ namespace NBF.Fishing2 #endregion + #region 插槽 + + public ItemInfo GetSlotItem(int index) + { + if (index < Slots.Count && index >= 0) + { + var itemId = Slots[index]; + if (itemId > 0) + { + return Items.Find(t => t.Id == itemId); + } + } + + return null; + } + + public async FTask SetSlot(int index, long id) + { + var response = (Game2C_SetSlotResponse)await Net.Call(new C2Game_SetSlotRequest() + { + Index = index, + Id = id + }); + Log.Info($"设置插槽结果={response.ErrorCode},参数 index={index} id={id}"); + if (response.ErrorCode == ErrorCode.Success) + { + Slots.Clear(); + Slots.AddRange(response.Slots); + // SetBindItemData(id, response.Rigs); + Notices.Show("插槽设置成功"); + } + else + { + Notices.Error("插槽设置失败"); + } + } + + #endregion + #endregion } } \ No newline at end of file diff --git a/Assets/Scripts/Generate/NetworkProtocol/GameMessage.cs b/Assets/Scripts/Generate/NetworkProtocol/GameMessage.cs index c49f0e564..73c75a3bb 100644 --- a/Assets/Scripts/Generate/NetworkProtocol/GameMessage.cs +++ b/Assets/Scripts/Generate/NetworkProtocol/GameMessage.cs @@ -49,6 +49,7 @@ namespace Fantasy ErrorCode = default; Items.Clear(); Rigs.Clear(); + Slots.Clear(); #if FANTASY_NET || FANTASY_UNITY GetScene().MessagePoolComponent.Return(this); #endif @@ -59,6 +60,8 @@ namespace Fantasy [ProtoMember(2)] public List Rigs = new List(); [ProtoMember(3)] + public List Slots = new List(); + [ProtoMember(4)] public uint ErrorCode { get; set; } } /// @@ -195,6 +198,61 @@ namespace Fantasy public uint ErrorCode { get; set; } } /// + /// /////////// ******** 快速使用插槽 *******///////////// + /// + /// + /// 请求设置快速使用 + /// + [ProtoContract] + public partial class C2Game_SetSlotRequest : AMessage, ICustomRouteRequest + { + public static C2Game_SetSlotRequest Create(Scene scene) + { + return scene.MessagePoolComponent.Rent(); + } + public override void Dispose() + { + Index = default; + Id = default; +#if FANTASY_NET || FANTASY_UNITY + GetScene().MessagePoolComponent.Return(this); +#endif + } + [ProtoIgnore] + public Game2C_SetSlotResponse ResponseType { get; set; } + public uint OpCode() { return OuterOpcode.C2Game_SetSlotRequest; } + [ProtoIgnore] + public int RouteType => Fantasy.RouteType.GameRoute; + [ProtoMember(1)] + public int Index { get; set; } + [ProtoMember(2)] + public long Id { get; set; } + } + /// + /// 请求设置快速使用响应 + /// + [ProtoContract] + public partial class Game2C_SetSlotResponse : AMessage, ICustomRouteResponse + { + public static Game2C_SetSlotResponse Create(Scene scene) + { + return scene.MessagePoolComponent.Rent(); + } + public override void Dispose() + { + ErrorCode = default; + Slots.Clear(); +#if FANTASY_NET || FANTASY_UNITY + GetScene().MessagePoolComponent.Return(this); +#endif + } + public uint OpCode() { return OuterOpcode.Game2C_SetSlotResponse; } + [ProtoMember(1)] + public List Slots = new List(); + [ProtoMember(2)] + public uint ErrorCode { get; set; } + } + /// /// /////////// ******** 鱼护 *******///////////// /// /// diff --git a/Assets/Scripts/Generate/NetworkProtocol/NetworkProtocolHelper.cs b/Assets/Scripts/Generate/NetworkProtocol/NetworkProtocolHelper.cs index 6db948e11..2c6701737 100644 --- a/Assets/Scripts/Generate/NetworkProtocol/NetworkProtocolHelper.cs +++ b/Assets/Scripts/Generate/NetworkProtocol/NetworkProtocolHelper.cs @@ -68,6 +68,21 @@ namespace Fantasy return (Game2C_RigChangeResponse)await session.Call(request); } + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static async FTask C2Game_SetSlotRequest(this Session session, C2Game_SetSlotRequest request) + { + return (Game2C_SetSlotResponse)await session.Call(request); + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static async FTask C2Game_SetSlotRequest(this Session session, int index, long id) + { + using var request = Fantasy.C2Game_SetSlotRequest.Create(session.Scene); + request.Index = index; + request.Id = id; + return (Game2C_SetSlotResponse)await session.Call(request); + } + [MethodImpl(MethodImplOptions.AggressiveInlining)] public static async FTask C2Game_GetFishsRequest(this Session session, C2Game_GetFishsRequest request) { diff --git a/Assets/Scripts/Generate/NetworkProtocol/OuterOpcode.cs b/Assets/Scripts/Generate/NetworkProtocol/OuterOpcode.cs index 8c9171724..b33d902dd 100644 --- a/Assets/Scripts/Generate/NetworkProtocol/OuterOpcode.cs +++ b/Assets/Scripts/Generate/NetworkProtocol/OuterOpcode.cs @@ -9,15 +9,17 @@ namespace Fantasy public const uint Game2C_ItemChange = 2147493649; 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 C2Game_SetSlotRequest = 2281711380; + public const uint Game2C_SetSlotResponse = 2415929108; + public const uint C2Game_GetFishsRequest = 2281711381; + public const uint Game2C_GetFishsResponse = 2415929109; public const uint Game2C_FishChange = 2147493650; - 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 C2Game_SellFishRequest = 2281711382; + public const uint Game2C_SellFishResponse = 2415929110; + public const uint C2Game_BuyRequest = 2281711383; + public const uint Game2C_BuyResponse = 2415929111; + public const uint C2Map_CreateRoomRequest = 2281711384; + public const uint Map2C_CreateRoomResponse = 2415929112; public const uint C2G_ExitRoomRequest = 268445457; public const uint G2C_ExitRoomResponse = 402663185; public const uint C2G_EnterMapRequest = 268445458; @@ -28,8 +30,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 = 2281711384; - public const uint Game2C_GetRoleInfoResponse = 2415929112; + public const uint C2Game_GetRoleInfoRequest = 2281711385; + public const uint Game2C_GetRoleInfoResponse = 2415929113; public const uint Map2C_RoleEnterRoomNotify = 2147493652; public const uint Map2C_RoleExitRoomNotify = 2147493653; public const uint C2Map_RolePropertyChange = 2147493654; @@ -40,37 +42,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 = 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 C2S_GetConversationsRequest = 2281711386; + public const uint S2C_GetConversationsResponse = 2415929114; + public const uint C2S_SendMailRequest = 2281711387; + public const uint S2C_SendMailResponse = 2415929115; + public const uint C2S_DeleteMailRequest = 2281711388; + public const uint S2C_DeleteMailResponse = 2415929116; public const uint S2C_HaveMail = 2147493662; public const uint S2C_MailState = 2147493663; - 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 C2S_CreateChannelRequest = 2281711389; + public const uint S2C_CreateChannelResponse = 2415929117; + public const uint C2S_JoinChannelRequest = 2281711390; + public const uint S2C_JoinChannelResponse = 2415929118; + public const uint C2S_SendMessageRequest = 2281711391; + public const uint S2C_SendMessageResponse = 2415929119; public const uint S2C_Message = 2147493664; - 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 C2S_CreateClubRequest = 2281711392; + public const uint S2C_CreateClubResponse = 2415929120; + public const uint C2S_GetClubInfoRequest = 2281711393; + public const uint S2C_GetClubInfoResponse = 2415929121; + public const uint C2S_GetMemberListRequest = 2281711394; + public const uint S2C_GetMemberListResponse = 2415929122; + public const uint C2S_GetClubListRequest = 2281711395; + public const uint S2C_GetClubListResponse = 2415929123; + public const uint C2S_JoinClubRequest = 2281711396; + public const uint S2C_JoinClubResponse = 2415929124; + public const uint C2S_LeaveClubRequest = 2281711397; + public const uint S2C_LeaveClubResponse = 2415929125; + public const uint C2S_DissolveClubRequest = 2281711398; + public const uint S2C_DissolveClubResponse = 2415929126; + public const uint C2S_DisposeJoinRequest = 2281711399; + public const uint S2C_DisposeJoinResponse = 2415929127; public const uint S2C_ClubChange = 2147493665; } } diff --git a/Assets/Scripts/Init.cs b/Assets/Scripts/Init.cs index 3659baea5..ef8fcb9fb 100644 --- a/Assets/Scripts/Init.cs +++ b/Assets/Scripts/Init.cs @@ -96,6 +96,8 @@ namespace NBF private void AddUIPackages() { App.UI.AddPackage("Common/Common"); + App.UI.AddPackage("CommonFlag/CommonFlag"); + App.UI.AddPackage("CommonIcon/CommonIcon"); } #endregion diff --git a/Assets/Scripts/NBC.Fantasy/Runtime/Plugins/FairyGUI/Scripts/UI/GLoader.cs b/Assets/Scripts/NBC.Fantasy/Runtime/Plugins/FairyGUI/Scripts/UI/GLoader.cs index 8adf74d76..764cf7005 100644 --- a/Assets/Scripts/NBC.Fantasy/Runtime/Plugins/FairyGUI/Scripts/UI/GLoader.cs +++ b/Assets/Scripts/NBC.Fantasy/Runtime/Plugins/FairyGUI/Scripts/UI/GLoader.cs @@ -91,7 +91,6 @@ namespace FairyGUI { if (_url == value) return; - ClearContent(); _url = value; LoadContent(); diff --git a/Assets/Scripts/UI/Bag/BagItem.cs b/Assets/Scripts/UI/Bag/BagItem.cs index 644b5bb47..9895101d5 100644 --- a/Assets/Scripts/UI/Bag/BagItem.cs +++ b/Assets/Scripts/UI/Bag/BagItem.cs @@ -3,8 +3,10 @@ using UnityEngine; using FairyGUI; using Fantasy; +using Fantasy.Async; using NBC; using NBF.Utils; +using Log = NBC.Log; namespace NBF { @@ -12,23 +14,35 @@ namespace NBF { public ItemInfo ItemInfo; + // private string iconStr; + private void OnInited() { - draggable = true; - onDragStart.Add(context => - { - context.PreventDefault(); - DragDropManager.inst.StartDrag(this, this.icon, this.icon, (int)context.data); - }); + onDragStart.Add(DragStart); + } + + + private void DragStart(EventContext context) + { + context.PreventDefault(); + DragDropManager.inst.StartDrag(this, this.icon, this.icon, (int)context.data); + // icon = string.Empty; } public virtual void SetData(ItemInfo itemInfo) { + draggable = false; ItemInfo = itemInfo; title = itemInfo.ConfigId.GetName(); this.SetIcon(itemInfo.ConfigId); Quality.SetQuality(ItemInfo.Config.Quality); this.SetTitleQuality(ItemInfo.Config.Quality); + // iconStr = icon; + } + + public void UpdateIcon() + { + this.SetIcon(ItemInfo.ConfigId); } } } \ No newline at end of file diff --git a/Assets/Scripts/UI/Bag/BagSlotItem.Designer.cs b/Assets/Scripts/UI/Bag/BagSlotItem.Designer.cs index d2709da71..5b2729c4d 100644 --- a/Assets/Scripts/UI/Bag/BagSlotItem.Designer.cs +++ b/Assets/Scripts/UI/Bag/BagSlotItem.Designer.cs @@ -11,19 +11,25 @@ namespace NBF { public const string URL = "ui://hxr7rc7puiwj1t"; + public Controller showType; public GImage back; public GTextField TextIndex; public GTextField TextCount; public GImage Quality; + public GButton BtnRemove; + public GImage Add; public override void ConstructFromXML(XML xml) { base.ConstructFromXML(xml); + showType = GetController("showType"); back = (GImage)GetChild("back"); TextIndex = (GTextField)GetChild("TextIndex"); TextCount = (GTextField)GetChild("TextCount"); Quality = (GImage)GetChild("Quality"); + BtnRemove = (GButton)GetChild("BtnRemove"); + Add = (GImage)GetChild("Add"); OnInited(); UILanguage.TrySetComponentLanguage(this); } diff --git a/Assets/Scripts/UI/Bag/BagSlotItem.cs b/Assets/Scripts/UI/Bag/BagSlotItem.cs index cbd01001f..834fdd701 100644 --- a/Assets/Scripts/UI/Bag/BagSlotItem.cs +++ b/Assets/Scripts/UI/Bag/BagSlotItem.cs @@ -1,16 +1,78 @@ // 本脚本只在不存在时会生成一次。组件逻辑写在当前脚本内。已存在不会再次生成覆盖 +using System; using UnityEngine; using FairyGUI; +using Fantasy; using NBC; +using NBF.Fishing2; +using NBF.Utils; +using Log = NBC.Log; namespace NBF { public partial class BagSlotItem : GButton { + public int Index { get; private set; } + + public Action OnChangeSlot; + private void OnInited() { - onDrop.Add(context => { this.icon = (string)context.data; }); + onDrop.Add(OnDrop); + BtnRemove.onClick.Set(OnRemove); + onClick.Add(OnClick); + } + + private void OnClick() + { + if (showType.selectedIndex == 0) + { + // Notices.Info("拖拽放入"); + } + } + + private void OnRemove(EventContext context) + { + context.PreventDefault(); + OnChangeSlot?.Invoke(Index, 0); + } + + private void OnDrop(EventContext context) + { + var obj = context.initiator; + if (obj is BagItem bagItem) + { + Log.Info($"放下了：{bagItem.ItemInfo.Id}"); + OnChangeSlot?.Invoke(Index, bagItem.ItemInfo.Id); + } + } + + public void SetData(int index, ItemInfo itemInfo = null) + { + Index = index; + TextIndex.text = (index + 1).ToString(); + if (itemInfo != null) + { + showType.selectedIndex = 1; + icon = itemInfo.ConfigId.GetIcon(); + if (itemInfo.Count > 1) + { + TextCount.text = itemInfo.Count.ToString(); + } + else + { + TextCount.text = string.Empty; + } + + Quality.SetQuality(itemInfo.Config.Quality); + } + else + { + showType.selectedIndex = 0; + TextCount.text = string.Empty; + icon = string.Empty; + } } } } \ No newline at end of file diff --git a/Assets/Scripts/UI/Bag/BagSlotPanel.Designer.cs b/Assets/Scripts/UI/Bag/BagSlotPanel.Designer.cs index a01dcb6bf..978f58dc9 100644 --- a/Assets/Scripts/UI/Bag/BagSlotPanel.Designer.cs +++ b/Assets/Scripts/UI/Bag/BagSlotPanel.Designer.cs @@ -24,6 +24,8 @@ namespace NBF public GList SlotList; [AutoFind(Name = "SlotSeparator")] public GImage SlotSeparator; + [AutoFind(Name = "Test")] + public GLoader Test; public override string[] GetDependPackages(){ return new string[] {"Common"}; } public static void Show(object param = null){ App.UI.OpenUI(param); } diff --git a/Assets/Scripts/UI/Bag/BagSlotPanel.cs b/Assets/Scripts/UI/Bag/BagSlotPanel.cs index 1ae35bf40..a1088dfb9 100644 --- a/Assets/Scripts/UI/Bag/BagSlotPanel.cs +++ b/Assets/Scripts/UI/Bag/BagSlotPanel.cs @@ -14,24 +14,26 @@ namespace NBF { private List _items = new List(); + private RoleBag _roleBag; + protected override void OnInit() { - // List.SetVirtual(); } protected override void OnShow() { + var role = App.Main.GetComponent(); + _roleBag = role.GetComponent(); SetList(); + SetSlotList(); } + #region 物品列表 + private void SetList() { - - - var role = App.Main.GetComponent(); - var roleBag = role.GetComponent(); _items.Clear(); - foreach (var roleBagItem in roleBag.Items) + foreach (var roleBagItem in _roleBag.Items) { if (CanShow(roleBagItem)) { @@ -51,9 +53,41 @@ namespace NBF if (obj is BagItem bagItem) { bagItem.SetData(itemData); + bagItem.draggable = true; } } + #endregion + + #region 快速选择列表 + + private void SetSlotList() + { + SlotList.RemoveChildrenToPool(); + for (int index = 0; index < 7; index++) + { + if (SlotList.AddItemFromPool() is BagSlotItem slotItem) + { + slotItem.SetData(index, _roleBag.GetSlotItem(index)); + slotItem.OnChangeSlot = OnChangeSlotItem; + } + } + } + + + private void OnChangeSlotItem(int index, long id) + { + _roleBag.SetSlot(index, id).OnCompleted(OnChangeSlotItemDone); + } + + private void OnChangeSlotItemDone() + { + SetSlotList(); + // SlotList.RefreshVirtualList(); + } + + #endregion + private bool CanShow(ItemInfo itemInfo) { if (itemInfo.ItemType == ItemType.Rod) diff --git a/Assets/Scripts/UI/Ex/XGLoader.cs b/Assets/Scripts/UI/Ex/XGLoader.cs index aa78f12ad..27c3eb792 100644 --- a/Assets/Scripts/UI/Ex/XGLoader.cs +++ b/Assets/Scripts/UI/Ex/XGLoader.cs @@ -25,6 +25,7 @@ namespace NBF } else { + Log.Info($"LoadExternal={url}"); _texture = Resources.Load(url); if (_texture != null) onExternalLoadSuccess(new NTexture(_texture)); diff --git a/Assets/Scripts/UI/Login/LoginPanel.cs b/Assets/Scripts/UI/Login/LoginPanel.cs index ba2eb4cb8..245de4389 100644 --- a/Assets/Scripts/UI/Login/LoginPanel.cs +++ b/Assets/Scripts/UI/Login/LoginPanel.cs @@ -31,6 +31,7 @@ namespace NBF await LoginHelper.Login(InputAccount.text); BagPanel.Show(); + // BagSlotPanel.Show(); // FishingShopPanel.Show(); Del(); diff --git a/FGUIProject/assets/CommonFlag/package.xml b/FGUIProject/assets/CommonFlag/package.xml index 881b1b51a..3492e550f 100644 --- a/FGUIProject/assets/CommonFlag/package.xml +++ b/FGUIProject/assets/CommonFlag/package.xml @@ -256,5 +256,5 @@ - + \ No newline at end of file diff --git a/FGUIProject/assets/CommonIcon/100001.png b/FGUIProject/assets/CommonIcon/100001.png new file mode 100644 index 000000000..d1647f046 Binary files /dev/null and b/FGUIProject/assets/CommonIcon/100001.png differ diff --git a/FGUIProject/assets/CommonIcon/100002.png b/FGUIProject/assets/CommonIcon/100002.png new file mode 100644 index 000000000..4a3a2c2ab Binary files /dev/null and b/FGUIProject/assets/CommonIcon/100002.png differ diff --git a/FGUIProject/assets/CommonIcon/100003.png b/FGUIProject/assets/CommonIcon/100003.png new file mode 100644 index 000000000..3e2d3c8f3 Binary files /dev/null and b/FGUIProject/assets/CommonIcon/100003.png differ diff --git a/FGUIProject/assets/CommonIcon/100004.png b/FGUIProject/assets/CommonIcon/100004.png new file mode 100644 index 000000000..f40bfd242 Binary files /dev/null and b/FGUIProject/assets/CommonIcon/100004.png differ diff --git a/FGUIProject/assets/CommonIcon/100005.png b/FGUIProject/assets/CommonIcon/100005.png new file mode 100644 index 000000000..fa23ba8f5 Binary files /dev/null and b/FGUIProject/assets/CommonIcon/100005.png differ diff --git a/FGUIProject/assets/CommonIcon/100006.png b/FGUIProject/assets/CommonIcon/100006.png new file mode 100644 index 000000000..8b002ff08 Binary files /dev/null and b/FGUIProject/assets/CommonIcon/100006.png differ diff --git a/FGUIProject/assets/CommonIcon/100007.png b/FGUIProject/assets/CommonIcon/100007.png new file mode 100644 index 000000000..8c263c9a8 Binary files /dev/null and b/FGUIProject/assets/CommonIcon/100007.png differ diff --git a/FGUIProject/assets/CommonIcon/100008.png b/FGUIProject/assets/CommonIcon/100008.png new file mode 100644 index 000000000..4d75d2b3d Binary files /dev/null and b/FGUIProject/assets/CommonIcon/100008.png differ diff --git a/FGUIProject/assets/CommonIcon/100009.png b/FGUIProject/assets/CommonIcon/100009.png new file mode 100644 index 000000000..a641a3a1d Binary files /dev/null and b/FGUIProject/assets/CommonIcon/100009.png differ diff --git a/FGUIProject/assets/CommonIcon/100010.png b/FGUIProject/assets/CommonIcon/100010.png new file mode 100644 index 000000000..6a0fdf92e Binary files /dev/null and b/FGUIProject/assets/CommonIcon/100010.png differ diff --git a/FGUIProject/assets/CommonIcon/110001.png b/FGUIProject/assets/CommonIcon/110001.png new file mode 100644 index 000000000..d5ea2b66e Binary files /dev/null and b/FGUIProject/assets/CommonIcon/110001.png differ diff --git a/FGUIProject/assets/CommonIcon/30001.png b/FGUIProject/assets/CommonIcon/30001.png new file mode 100644 index 000000000..0c25a328d Binary files /dev/null and b/FGUIProject/assets/CommonIcon/30001.png differ diff --git a/FGUIProject/assets/CommonIcon/30002.png b/FGUIProject/assets/CommonIcon/30002.png new file mode 100644 index 000000000..9372d7449 Binary files /dev/null and b/FGUIProject/assets/CommonIcon/30002.png differ diff --git a/FGUIProject/assets/CommonIcon/30003.png b/FGUIProject/assets/CommonIcon/30003.png new file mode 100644 index 000000000..2aa7aac24 Binary files /dev/null and b/FGUIProject/assets/CommonIcon/30003.png differ diff --git a/FGUIProject/assets/CommonIcon/30004.png b/FGUIProject/assets/CommonIcon/30004.png new file mode 100644 index 000000000..d668952a4 Binary files /dev/null and b/FGUIProject/assets/CommonIcon/30004.png differ diff --git a/FGUIProject/assets/CommonIcon/30005.png b/FGUIProject/assets/CommonIcon/30005.png new file mode 100644 index 000000000..218ad299a Binary files /dev/null and b/FGUIProject/assets/CommonIcon/30005.png differ diff --git a/FGUIProject/assets/CommonIcon/30006.png b/FGUIProject/assets/CommonIcon/30006.png new file mode 100644 index 000000000..3bc265b55 Binary files /dev/null and b/FGUIProject/assets/CommonIcon/30006.png differ diff --git a/FGUIProject/assets/CommonIcon/30007.png b/FGUIProject/assets/CommonIcon/30007.png new file mode 100644 index 000000000..71478a90e Binary files /dev/null and b/FGUIProject/assets/CommonIcon/30007.png differ diff --git a/FGUIProject/assets/CommonIcon/30008.png b/FGUIProject/assets/CommonIcon/30008.png new file mode 100644 index 000000000..d26ba21b9 Binary files /dev/null and b/FGUIProject/assets/CommonIcon/30008.png differ diff --git a/FGUIProject/assets/CommonIcon/30009.png b/FGUIProject/assets/CommonIcon/30009.png new file mode 100644 index 000000000..1b99ae81a Binary files /dev/null and b/FGUIProject/assets/CommonIcon/30009.png differ diff --git a/FGUIProject/assets/CommonIcon/30010.png b/FGUIProject/assets/CommonIcon/30010.png new file mode 100644 index 000000000..0f570b968 Binary files /dev/null and b/FGUIProject/assets/CommonIcon/30010.png differ diff --git a/FGUIProject/assets/CommonIcon/30011.png b/FGUIProject/assets/CommonIcon/30011.png new file mode 100644 index 000000000..f7b1aafdb Binary files /dev/null and b/FGUIProject/assets/CommonIcon/30011.png differ diff --git a/FGUIProject/assets/CommonIcon/31001.png b/FGUIProject/assets/CommonIcon/31001.png new file mode 100644 index 000000000..0c25a328d Binary files /dev/null and b/FGUIProject/assets/CommonIcon/31001.png differ diff --git a/FGUIProject/assets/CommonIcon/32003.png b/FGUIProject/assets/CommonIcon/32003.png new file mode 100644 index 000000000..2aa7aac24 Binary files /dev/null and b/FGUIProject/assets/CommonIcon/32003.png differ diff --git a/FGUIProject/assets/CommonIcon/32004.png b/FGUIProject/assets/CommonIcon/32004.png new file mode 100644 index 000000000..2aa7aac24 Binary files /dev/null and b/FGUIProject/assets/CommonIcon/32004.png differ diff --git a/FGUIProject/assets/CommonIcon/32005.png b/FGUIProject/assets/CommonIcon/32005.png new file mode 100644 index 000000000..2aa7aac24 Binary files /dev/null and b/FGUIProject/assets/CommonIcon/32005.png differ diff --git a/FGUIProject/assets/CommonIcon/32006.png b/FGUIProject/assets/CommonIcon/32006.png new file mode 100644 index 000000000..2aa7aac24 Binary files /dev/null and b/FGUIProject/assets/CommonIcon/32006.png differ diff --git a/FGUIProject/assets/CommonIcon/32007.png b/FGUIProject/assets/CommonIcon/32007.png new file mode 100644 index 000000000..2aa7aac24 Binary files /dev/null and b/FGUIProject/assets/CommonIcon/32007.png differ diff --git a/FGUIProject/assets/CommonIcon/33002.png b/FGUIProject/assets/CommonIcon/33002.png new file mode 100644 index 000000000..9372d7449 Binary files /dev/null and b/FGUIProject/assets/CommonIcon/33002.png differ diff --git a/FGUIProject/assets/CommonIcon/40001.png b/FGUIProject/assets/CommonIcon/40001.png new file mode 100644 index 000000000..2aa023954 Binary files /dev/null and b/FGUIProject/assets/CommonIcon/40001.png differ diff --git a/FGUIProject/assets/CommonIcon/40002.png b/FGUIProject/assets/CommonIcon/40002.png new file mode 100644 index 000000000..7e115b1d3 Binary files /dev/null and b/FGUIProject/assets/CommonIcon/40002.png differ diff --git a/FGUIProject/assets/CommonIcon/40003.png b/FGUIProject/assets/CommonIcon/40003.png new file mode 100644 index 000000000..4a57962f3 Binary files /dev/null and b/FGUIProject/assets/CommonIcon/40003.png differ diff --git a/FGUIProject/assets/CommonIcon/40004.png b/FGUIProject/assets/CommonIcon/40004.png new file mode 100644 index 000000000..978486e33 Binary files /dev/null and b/FGUIProject/assets/CommonIcon/40004.png differ diff --git a/FGUIProject/assets/CommonIcon/40005.png b/FGUIProject/assets/CommonIcon/40005.png new file mode 100644 index 000000000..ad368fea3 Binary files /dev/null and b/FGUIProject/assets/CommonIcon/40005.png differ diff --git a/FGUIProject/assets/CommonIcon/40006.png b/FGUIProject/assets/CommonIcon/40006.png new file mode 100644 index 000000000..a060ac02b Binary files /dev/null and b/FGUIProject/assets/CommonIcon/40006.png differ diff --git a/FGUIProject/assets/CommonIcon/40007.png b/FGUIProject/assets/CommonIcon/40007.png new file mode 100644 index 000000000..3eac0f281 Binary files /dev/null and b/FGUIProject/assets/CommonIcon/40007.png differ diff --git a/FGUIProject/assets/CommonIcon/40008.png b/FGUIProject/assets/CommonIcon/40008.png new file mode 100644 index 000000000..f43c99d5d Binary files /dev/null and b/FGUIProject/assets/CommonIcon/40008.png differ diff --git a/FGUIProject/assets/CommonIcon/40009.png b/FGUIProject/assets/CommonIcon/40009.png new file mode 100644 index 000000000..9d8585b1c Binary files /dev/null and b/FGUIProject/assets/CommonIcon/40009.png differ diff --git a/FGUIProject/assets/CommonIcon/40010.png b/FGUIProject/assets/CommonIcon/40010.png new file mode 100644 index 000000000..041c16440 Binary files /dev/null and b/FGUIProject/assets/CommonIcon/40010.png differ diff --git a/FGUIProject/assets/CommonIcon/50001.png b/FGUIProject/assets/CommonIcon/50001.png new file mode 100644 index 000000000..75ff35872 Binary files /dev/null and b/FGUIProject/assets/CommonIcon/50001.png differ diff --git a/FGUIProject/assets/CommonIcon/50002.png b/FGUIProject/assets/CommonIcon/50002.png new file mode 100644 index 000000000..c7c2e16b7 Binary files /dev/null and b/FGUIProject/assets/CommonIcon/50002.png differ diff --git a/FGUIProject/assets/CommonIcon/50003.png b/FGUIProject/assets/CommonIcon/50003.png new file mode 100644 index 000000000..06327b4a8 Binary files /dev/null and b/FGUIProject/assets/CommonIcon/50003.png differ diff --git a/FGUIProject/assets/CommonIcon/50004.png b/FGUIProject/assets/CommonIcon/50004.png new file mode 100644 index 000000000..b8f8d0f89 Binary files /dev/null and b/FGUIProject/assets/CommonIcon/50004.png differ diff --git a/FGUIProject/assets/CommonIcon/50005.png b/FGUIProject/assets/CommonIcon/50005.png new file mode 100644 index 000000000..19e4c44c3 Binary files /dev/null and b/FGUIProject/assets/CommonIcon/50005.png differ diff --git a/FGUIProject/assets/CommonIcon/50006.png b/FGUIProject/assets/CommonIcon/50006.png new file mode 100644 index 000000000..22d2b48e4 Binary files /dev/null and b/FGUIProject/assets/CommonIcon/50006.png differ diff --git a/FGUIProject/assets/CommonIcon/50007.png b/FGUIProject/assets/CommonIcon/50007.png new file mode 100644 index 000000000..863917e7b Binary files /dev/null and b/FGUIProject/assets/CommonIcon/50007.png differ diff --git a/FGUIProject/assets/CommonIcon/50008.png b/FGUIProject/assets/CommonIcon/50008.png new file mode 100644 index 000000000..dbe837c1f Binary files /dev/null and b/FGUIProject/assets/CommonIcon/50008.png differ diff --git a/FGUIProject/assets/CommonIcon/50009.png b/FGUIProject/assets/CommonIcon/50009.png new file mode 100644 index 000000000..707dffb9c Binary files /dev/null and b/FGUIProject/assets/CommonIcon/50009.png differ diff --git a/FGUIProject/assets/CommonIcon/50010.png b/FGUIProject/assets/CommonIcon/50010.png new file mode 100644 index 000000000..152223185 Binary files /dev/null and b/FGUIProject/assets/CommonIcon/50010.png differ diff --git a/FGUIProject/assets/CommonIcon/50011.png b/FGUIProject/assets/CommonIcon/50011.png new file mode 100644 index 000000000..004262c5d Binary files /dev/null and b/FGUIProject/assets/CommonIcon/50011.png differ diff --git a/FGUIProject/assets/CommonIcon/50012.png b/FGUIProject/assets/CommonIcon/50012.png new file mode 100644 index 000000000..4e17a0579 Binary files /dev/null and b/FGUIProject/assets/CommonIcon/50012.png differ diff --git a/FGUIProject/assets/CommonIcon/50013.png b/FGUIProject/assets/CommonIcon/50013.png new file mode 100644 index 000000000..707d87644 Binary files /dev/null and b/FGUIProject/assets/CommonIcon/50013.png differ diff --git a/FGUIProject/assets/CommonIcon/50014.png b/FGUIProject/assets/CommonIcon/50014.png new file mode 100644 index 000000000..b48dc0de3 Binary files /dev/null and b/FGUIProject/assets/CommonIcon/50014.png differ diff --git a/FGUIProject/assets/CommonIcon/60001.png b/FGUIProject/assets/CommonIcon/60001.png new file mode 100644 index 000000000..5d08959fb Binary files /dev/null and b/FGUIProject/assets/CommonIcon/60001.png differ diff --git a/FGUIProject/assets/CommonIcon/60002.png b/FGUIProject/assets/CommonIcon/60002.png new file mode 100644 index 000000000..6e304b71f Binary files /dev/null and b/FGUIProject/assets/CommonIcon/60002.png differ diff --git a/FGUIProject/assets/CommonIcon/60003.png b/FGUIProject/assets/CommonIcon/60003.png new file mode 100644 index 000000000..b0f4d2453 Binary files /dev/null and b/FGUIProject/assets/CommonIcon/60003.png differ diff --git a/FGUIProject/assets/CommonIcon/60004.png b/FGUIProject/assets/CommonIcon/60004.png new file mode 100644 index 000000000..296f22b17 Binary files /dev/null and b/FGUIProject/assets/CommonIcon/60004.png differ diff --git a/FGUIProject/assets/CommonIcon/60005.png b/FGUIProject/assets/CommonIcon/60005.png new file mode 100644 index 000000000..f19e03e04 Binary files /dev/null and b/FGUIProject/assets/CommonIcon/60005.png differ diff --git a/FGUIProject/assets/CommonIcon/60006.png b/FGUIProject/assets/CommonIcon/60006.png new file mode 100644 index 000000000..faa1cd8ce Binary files /dev/null and b/FGUIProject/assets/CommonIcon/60006.png differ diff --git a/FGUIProject/assets/CommonIcon/60007.png b/FGUIProject/assets/CommonIcon/60007.png new file mode 100644 index 000000000..94e7ac98c Binary files /dev/null and b/FGUIProject/assets/CommonIcon/60007.png differ diff --git a/FGUIProject/assets/CommonIcon/60008.png b/FGUIProject/assets/CommonIcon/60008.png new file mode 100644 index 000000000..04fdf8b68 Binary files /dev/null and b/FGUIProject/assets/CommonIcon/60008.png differ diff --git a/FGUIProject/assets/CommonIcon/60009.png b/FGUIProject/assets/CommonIcon/60009.png new file mode 100644 index 000000000..9582978d9 Binary files /dev/null and b/FGUIProject/assets/CommonIcon/60009.png differ diff --git a/FGUIProject/assets/CommonIcon/60010.png b/FGUIProject/assets/CommonIcon/60010.png new file mode 100644 index 000000000..071f4f590 Binary files /dev/null and b/FGUIProject/assets/CommonIcon/60010.png differ diff --git a/FGUIProject/assets/CommonIcon/70001.png b/FGUIProject/assets/CommonIcon/70001.png new file mode 100644 index 000000000..841b2ac97 Binary files /dev/null and b/FGUIProject/assets/CommonIcon/70001.png differ diff --git a/FGUIProject/assets/CommonIcon/70002.png b/FGUIProject/assets/CommonIcon/70002.png new file mode 100644 index 000000000..4e791693d Binary files /dev/null and b/FGUIProject/assets/CommonIcon/70002.png differ diff --git a/FGUIProject/assets/CommonIcon/70003.png b/FGUIProject/assets/CommonIcon/70003.png new file mode 100644 index 000000000..6a1fec2d5 Binary files /dev/null and b/FGUIProject/assets/CommonIcon/70003.png differ diff --git a/FGUIProject/assets/CommonIcon/70004.png b/FGUIProject/assets/CommonIcon/70004.png new file mode 100644 index 000000000..97ede859f Binary files /dev/null and b/FGUIProject/assets/CommonIcon/70004.png differ diff --git a/FGUIProject/assets/CommonIcon/80001.png b/FGUIProject/assets/CommonIcon/80001.png new file mode 100644 index 000000000..0a471b612 Binary files /dev/null and b/FGUIProject/assets/CommonIcon/80001.png differ diff --git a/FGUIProject/assets/CommonIcon/80002.png b/FGUIProject/assets/CommonIcon/80002.png new file mode 100644 index 000000000..36f9868aa Binary files /dev/null and b/FGUIProject/assets/CommonIcon/80002.png differ diff --git a/FGUIProject/assets/CommonIcon/80003.png b/FGUIProject/assets/CommonIcon/80003.png new file mode 100644 index 000000000..0b6920be7 Binary files /dev/null and b/FGUIProject/assets/CommonIcon/80003.png differ diff --git a/FGUIProject/assets/CommonIcon/80004.png b/FGUIProject/assets/CommonIcon/80004.png new file mode 100644 index 000000000..c5b42b2c9 Binary files /dev/null and b/FGUIProject/assets/CommonIcon/80004.png differ diff --git a/FGUIProject/assets/CommonIcon/80005.png b/FGUIProject/assets/CommonIcon/80005.png new file mode 100644 index 000000000..bb312cfa9 Binary files /dev/null and b/FGUIProject/assets/CommonIcon/80005.png differ diff --git a/FGUIProject/assets/CommonIcon/80006.png b/FGUIProject/assets/CommonIcon/80006.png new file mode 100644 index 000000000..26e68d146 Binary files /dev/null and b/FGUIProject/assets/CommonIcon/80006.png differ diff --git a/FGUIProject/assets/CommonIcon/80007.png b/FGUIProject/assets/CommonIcon/80007.png new file mode 100644 index 000000000..c9f903183 Binary files /dev/null and b/FGUIProject/assets/CommonIcon/80007.png differ diff --git a/FGUIProject/assets/CommonIcon/80008.png b/FGUIProject/assets/CommonIcon/80008.png new file mode 100644 index 000000000..c28ff5986 Binary files /dev/null and b/FGUIProject/assets/CommonIcon/80008.png differ diff --git a/FGUIProject/assets/CommonIcon/80009.png b/FGUIProject/assets/CommonIcon/80009.png new file mode 100644 index 000000000..2dfb06f8d Binary files /dev/null and b/FGUIProject/assets/CommonIcon/80009.png differ diff --git a/FGUIProject/assets/CommonIcon/80010.png b/FGUIProject/assets/CommonIcon/80010.png new file mode 100644 index 000000000..381129766 Binary files /dev/null and b/FGUIProject/assets/CommonIcon/80010.png differ diff --git a/FGUIProject/assets/CommonIcon/80011.png b/FGUIProject/assets/CommonIcon/80011.png new file mode 100644 index 000000000..f0c17a7d3 Binary files /dev/null and b/FGUIProject/assets/CommonIcon/80011.png differ diff --git a/FGUIProject/assets/CommonIcon/80012.png b/FGUIProject/assets/CommonIcon/80012.png new file mode 100644 index 000000000..4b068c843 Binary files /dev/null and b/FGUIProject/assets/CommonIcon/80012.png differ diff --git a/FGUIProject/assets/CommonIcon/80013.png b/FGUIProject/assets/CommonIcon/80013.png new file mode 100644 index 000000000..5501c982e Binary files /dev/null and b/FGUIProject/assets/CommonIcon/80013.png differ diff --git a/FGUIProject/assets/CommonIcon/90001.png b/FGUIProject/assets/CommonIcon/90001.png new file mode 100644 index 000000000..b2f3f64c4 Binary files /dev/null and b/FGUIProject/assets/CommonIcon/90001.png differ diff --git a/FGUIProject/assets/CommonIcon/90002.png b/FGUIProject/assets/CommonIcon/90002.png new file mode 100644 index 000000000..0202c13c7 Binary files /dev/null and b/FGUIProject/assets/CommonIcon/90002.png differ diff --git a/FGUIProject/assets/CommonIcon/90003.png b/FGUIProject/assets/CommonIcon/90003.png new file mode 100644 index 000000000..2b4142b0d Binary files /dev/null and b/FGUIProject/assets/CommonIcon/90003.png differ diff --git a/FGUIProject/assets/CommonIcon/90004.png b/FGUIProject/assets/CommonIcon/90004.png new file mode 100644 index 000000000..3061607e2 Binary files /dev/null and b/FGUIProject/assets/CommonIcon/90004.png differ diff --git a/FGUIProject/assets/CommonIcon/90005.png b/FGUIProject/assets/CommonIcon/90005.png new file mode 100644 index 000000000..47498c091 Binary files /dev/null and b/FGUIProject/assets/CommonIcon/90005.png differ diff --git a/FGUIProject/assets/CommonIcon/90006.png b/FGUIProject/assets/CommonIcon/90006.png new file mode 100644 index 000000000..0b40b6c91 Binary files /dev/null and b/FGUIProject/assets/CommonIcon/90006.png differ diff --git a/FGUIProject/assets/CommonIcon/90007.png b/FGUIProject/assets/CommonIcon/90007.png new file mode 100644 index 000000000..3bc0d58e0 Binary files /dev/null and b/FGUIProject/assets/CommonIcon/90007.png differ diff --git a/FGUIProject/assets/CommonIcon/90008.png b/FGUIProject/assets/CommonIcon/90008.png new file mode 100644 index 000000000..4e9a5e99c Binary files /dev/null and b/FGUIProject/assets/CommonIcon/90008.png differ diff --git a/FGUIProject/assets/CommonIcon/90009.png b/FGUIProject/assets/CommonIcon/90009.png new file mode 100644 index 000000000..b038156f4 Binary files /dev/null and b/FGUIProject/assets/CommonIcon/90009.png differ diff --git a/FGUIProject/assets/CommonIcon/90010.png b/FGUIProject/assets/CommonIcon/90010.png new file mode 100644 index 000000000..7e3fd3754 Binary files /dev/null and b/FGUIProject/assets/CommonIcon/90010.png differ diff --git a/FGUIProject/assets/CommonIcon/90011.png b/FGUIProject/assets/CommonIcon/90011.png new file mode 100644 index 000000000..8c7dc0319 Binary files /dev/null and b/FGUIProject/assets/CommonIcon/90011.png differ diff --git a/FGUIProject/assets/CommonIcon/90012.png b/FGUIProject/assets/CommonIcon/90012.png new file mode 100644 index 000000000..6df9de595 Binary files /dev/null and b/FGUIProject/assets/CommonIcon/90012.png differ diff --git a/FGUIProject/assets/CommonIcon/90013.png b/FGUIProject/assets/CommonIcon/90013.png new file mode 100644 index 000000000..7518525c7 Binary files /dev/null and b/FGUIProject/assets/CommonIcon/90013.png differ diff --git a/FGUIProject/assets/CommonIcon/90014.png b/FGUIProject/assets/CommonIcon/90014.png new file mode 100644 index 000000000..d9a17487e Binary files /dev/null and b/FGUIProject/assets/CommonIcon/90014.png differ diff --git a/FGUIProject/assets/CommonIcon/90015.png b/FGUIProject/assets/CommonIcon/90015.png new file mode 100644 index 000000000..72700dd51 Binary files /dev/null and b/FGUIProject/assets/CommonIcon/90015.png differ diff --git a/FGUIProject/assets/CommonIcon/90016.png b/FGUIProject/assets/CommonIcon/90016.png new file mode 100644 index 000000000..fd05e4281 Binary files /dev/null and b/FGUIProject/assets/CommonIcon/90016.png differ diff --git a/FGUIProject/assets/CommonIcon/90017.png b/FGUIProject/assets/CommonIcon/90017.png new file mode 100644 index 000000000..007b0bfb6 Binary files /dev/null and b/FGUIProject/assets/CommonIcon/90017.png differ diff --git a/FGUIProject/assets/CommonIcon/90018.png b/FGUIProject/assets/CommonIcon/90018.png new file mode 100644 index 000000000..5e333f72f Binary files /dev/null and b/FGUIProject/assets/CommonIcon/90018.png differ diff --git a/FGUIProject/assets/CommonIcon/90019.png b/FGUIProject/assets/CommonIcon/90019.png new file mode 100644 index 000000000..208ddf3d3 Binary files /dev/null and b/FGUIProject/assets/CommonIcon/90019.png differ diff --git a/FGUIProject/assets/CommonIcon/90020.png b/FGUIProject/assets/CommonIcon/90020.png new file mode 100644 index 000000000..f2ac61848 Binary files /dev/null and b/FGUIProject/assets/CommonIcon/90020.png differ diff --git a/FGUIProject/assets/CommonIcon/package.xml b/FGUIProject/assets/CommonIcon/package.xml new file mode 100644 index 000000000..b5ddd018e --- /dev/null +++ b/FGUIProject/assets/CommonIcon/package.xml @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/FGUIProject/assets/Main/Bag/BagSlotItem.xml b/FGUIProject/assets/Main/Bag/BagSlotItem.xml index 59bc87c6d..57a76ae9b 100644 --- a/FGUIProject/assets/Main/Bag/BagSlotItem.xml +++ b/FGUIProject/assets/Main/Bag/BagSlotItem.xml @@ -1,13 +1,30 @@ + + + + + - - + + + + + + + + + + + + + +