From 42b67e9e0607e99dc1b7fe94e145ba632236eca7 Mon Sep 17 00:00:00 2001 From: Lncvrt Date: Sat, 24 Jan 2026 16:06:03 -0700 Subject: [PATCH] New custom icon system (not fully done yet) --- Assets/Prefabs/ProfilePrefab.prefab | 39 +- Assets/Resources/Other/Loading.png | Bin 0 -> 5197 bytes Assets/Resources/Other/Loading.png.meta | 195 ++++++++++ Assets/Scenes/IconsMenu.unity | 340 +++++++++--------- Assets/Scenes/LeaderboardMenu.unity | 20 +- Assets/Scripts/BazookaManager.cs | 1 + Assets/Scripts/CustomGamePlayer.cs | 17 +- Assets/Scripts/CustomIconLoader.cs | 48 +++ Assets/Scripts/CustomIconLoader.cs.meta | 2 + Assets/Scripts/GamePlayer.cs | 17 +- .../IconMarketplaceDownloadIcon.cs | 38 +- Assets/Scripts/IconsMenu.cs | 113 ++---- Assets/Scripts/LeaderboardsMenu.cs | 177 +++------ Assets/Scripts/Other/Endpoints.cs | 1 + Assets/Scripts/ProfileMenu.cs | 71 ++-- Assets/Scripts/Tools.cs | 60 ++-- Assets/Scripts/Types/MarketplaceIcon.cs | 14 + ...onType.cs.meta => MarketplaceIcon.cs.meta} | 0 .../Types/MarketplaceIconStorageType.cs | 6 +- ...laceIconType.cs => MarketplaceTempIcon.cs} | 10 +- .../Scripts/Types/MarketplaceTempIcon.cs.meta | 2 + Assets/Scripts/WaitingForCustomIcon.cs | 6 + Assets/Scripts/WaitingForCustomIcon.cs.meta | 2 + 23 files changed, 647 insertions(+), 532 deletions(-) create mode 100644 Assets/Resources/Other/Loading.png create mode 100644 Assets/Resources/Other/Loading.png.meta create mode 100644 Assets/Scripts/CustomIconLoader.cs create mode 100644 Assets/Scripts/CustomIconLoader.cs.meta create mode 100644 Assets/Scripts/Types/MarketplaceIcon.cs rename Assets/Scripts/Types/{MarketplaceIconType.cs.meta => MarketplaceIcon.cs.meta} (100%) rename Assets/Scripts/Types/{MarketplaceIconType.cs => MarketplaceTempIcon.cs} (75%) create mode 100644 Assets/Scripts/Types/MarketplaceTempIcon.cs.meta create mode 100644 Assets/Scripts/WaitingForCustomIcon.cs create mode 100644 Assets/Scripts/WaitingForCustomIcon.cs.meta diff --git a/Assets/Prefabs/ProfilePrefab.prefab b/Assets/Prefabs/ProfilePrefab.prefab index 0f9701e..c2e294c 100644 --- a/Assets/Prefabs/ProfilePrefab.prefab +++ b/Assets/Prefabs/ProfilePrefab.prefab @@ -104,6 +104,7 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 @@ -348,6 +349,7 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 @@ -412,7 +414,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3698174834060150289 RectTransform: m_ObjectHideFlags: 0 @@ -752,6 +754,7 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 @@ -1171,6 +1174,7 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 @@ -1817,6 +1821,7 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 @@ -1955,6 +1960,7 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 @@ -2212,6 +2218,7 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 @@ -2363,6 +2370,7 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 @@ -2478,7 +2486,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: dbf71fe5f2caad1409da64bdbb781eb5, type: 3} + m_Sprite: {fileID: 21300000, guid: 517f61beffc1245a0a3f7907c7c93eb0, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2680,6 +2688,7 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 @@ -2893,6 +2902,7 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 @@ -3263,6 +3273,7 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 @@ -3634,6 +3645,7 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 @@ -3787,6 +3799,7 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 @@ -4018,6 +4031,7 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 @@ -4427,6 +4441,7 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 @@ -4973,6 +4988,7 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 @@ -5110,6 +5126,7 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 @@ -5342,6 +5359,7 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 @@ -5598,6 +5616,7 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 @@ -5909,6 +5928,7 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 @@ -6306,6 +6326,7 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 @@ -6443,6 +6464,7 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 @@ -6594,6 +6616,7 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 @@ -7025,6 +7048,7 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 @@ -7176,6 +7200,7 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 @@ -7329,6 +7354,7 @@ MonoBehaviour: m_VerticalAlignment: 1024 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 @@ -7559,6 +7585,7 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 @@ -7712,6 +7739,7 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 @@ -7917,6 +7945,7 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 @@ -8068,6 +8097,7 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 @@ -8300,6 +8330,7 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 @@ -8452,6 +8483,7 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 @@ -8664,6 +8696,7 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 @@ -8891,6 +8924,7 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 @@ -9107,6 +9141,7 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 diff --git a/Assets/Resources/Other/Loading.png b/Assets/Resources/Other/Loading.png new file mode 100644 index 0000000000000000000000000000000000000000..ca1c60a22d16a17d68e739f9efc49d2516709a5c GIT binary patch literal 5197 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 literal 0 HcmV?d00001 diff --git a/Assets/Resources/Other/Loading.png.meta b/Assets/Resources/Other/Loading.png.meta new file mode 100644 index 0000000..0807444 --- /dev/null +++ b/Assets/Resources/Other/Loading.png.meta @@ -0,0 +1,195 @@ +fileFormatVersion: 2 +guid: 517f61beffc1245a0a3f7907c7c93eb0 +TextureImporter: + internalIDToNameTable: + - first: + 213: -1134032105938053371 + second: Loading_0 + - first: + 213: -5715818429344116891 + second: Loading_1 + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + 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: 2 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + 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: 1 + spriteTessellationDetail: -1 + textureType: 8 + 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 + - serializedVersion: 4 + buildTarget: Android + 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: iOS + 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: + - serializedVersion: 2 + name: Loading_0 + rect: + serializedVersion: 2 + x: 11 + y: 11 + width: 105 + height: 54 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 5079ca9decb1340f0800000000000000 + internalID: -1134032105938053371 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Loading_1 + rect: + serializedVersion: 2 + x: 12 + y: 63 + width: 105 + height: 54 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 56f00561c655da0b0800000000000000 + internalID: -5715818429344116891 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 1537655665 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + Loading_0: -1134032105938053371 + Loading_1: -5715818429344116891 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/IconsMenu.unity b/Assets/Scenes/IconsMenu.unity index 1ec93bf..b0d8638 100644 --- a/Assets/Scenes/IconsMenu.unity +++ b/Assets/Scenes/IconsMenu.unity @@ -1263,7 +1263,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 528764918} + m_Material: {fileID: 1481530722} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -2658,7 +2658,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 1268332476} + m_Material: {fileID: 1079910495} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -4314,7 +4314,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 6534417478244952628, guid: dbf71fe5f2caad1409da64bdbb781eb5, type: 3} + m_Sprite: {fileID: 21300000, guid: 517f61beffc1245a0a3f7907c7c93eb0, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4923,47 +4923,6 @@ MonoBehaviour: invert: 0 addMore: {r: 0.40784314, g: 0.40784314, b: 0.40784314, a: 0} reverseAdd: 0 ---- !u!21 &528764918 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/RoundedCorners - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _OuterUV: {r: 0, g: 0, b: 1, a: 1} - - _WidthHeightRadius: {r: 30, g: 200, b: 10, a: 0} - m_BuildTextureStacks: [] - m_AllowLocking: 1 --- !u!1 &529729328 GameObject: m_ObjectHideFlags: 0 @@ -5992,47 +5951,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727840300} m_CullTransparentMesh: 1 ---- !u!21 &758879354 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/RoundedCorners - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _OuterUV: {r: 0, g: 0, b: 1, a: 1} - - _WidthHeightRadius: {r: 30, g: 200, b: 10, a: 0} - m_BuildTextureStacks: [] - m_AllowLocking: 1 --- !u!1 &773616055 GameObject: m_ObjectHideFlags: 0 @@ -6084,7 +6002,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 1883750993} + m_Material: {fileID: 1525854425} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -6587,7 +6505,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 758879354} + m_Material: {fileID: 1466303730} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -7500,6 +7418,47 @@ MonoBehaviour: invert: 0 addMore: {r: 0, g: 0, b: 0, a: 0} reverseAdd: 0 +--- !u!21 &1079910495 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/RoundedCorners + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _OuterUV: {r: 0, g: 0, b: 1, a: 1} + - _WidthHeightRadius: {r: 200, g: 200, b: 10, a: 0} + m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!1 &1098647304 GameObject: m_ObjectHideFlags: 0 @@ -8529,47 +8488,6 @@ MonoBehaviour: invert: 0 addMore: {r: 0, g: 0, b: 0, a: 0} reverseAdd: 0 ---- !u!21 &1268332476 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/RoundedCorners - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _OuterUV: {r: 0, g: 0, b: 1, a: 1} - - _WidthHeightRadius: {r: 200, g: 200, b: 10, a: 0} - m_BuildTextureStacks: [] - m_AllowLocking: 1 --- !u!1 &1275335463 GameObject: m_ObjectHideFlags: 0 @@ -9795,6 +9713,88 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Assembly-CSharp::WebsocketHandler _Connection: {fileID: 0} +--- !u!21 &1466303730 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/RoundedCorners + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _OuterUV: {r: 0, g: 0, b: 1, a: 1} + - _WidthHeightRadius: {r: 30, g: 200, b: 10, a: 0} + m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!21 &1481530722 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/RoundedCorners + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _OuterUV: {r: 0, g: 0, b: 1, a: 1} + - _WidthHeightRadius: {r: 30, g: 200, b: 10, a: 0} + m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!1 &1482403541 GameObject: m_ObjectHideFlags: 0 @@ -10242,6 +10242,47 @@ MonoBehaviour: invert: 0 addMore: {r: 0.40784314, g: 0.40784314, b: 0.40784314, a: 0} reverseAdd: 0 +--- !u!21 &1525854425 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/RoundedCorners + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _OuterUV: {r: 0, g: 0, b: 1, a: 1} + - _WidthHeightRadius: {r: 200, g: 200, b: 10, a: 0} + m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!1 &1545692392 GameObject: m_ObjectHideFlags: 0 @@ -11444,7 +11485,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: 517f61beffc1245a0a3f7907c7c93eb0, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -12698,47 +12739,6 @@ MonoBehaviour: invert: 0 addMore: {r: 0.40784314, g: 0.40784314, b: 0.40784314, a: 0} reverseAdd: 0 ---- !u!21 &1883750993 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/RoundedCorners - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _OuterUV: {r: 0, g: 0, b: 1, a: 1} - - _WidthHeightRadius: {r: 200, g: 200, b: 10, a: 0} - m_BuildTextureStacks: [] - m_AllowLocking: 1 --- !u!1 &1884762428 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/LeaderboardMenu.unity b/Assets/Scenes/LeaderboardMenu.unity index 11d2b41..7e1534a 100644 --- a/Assets/Scenes/LeaderboardMenu.unity +++ b/Assets/Scenes/LeaderboardMenu.unity @@ -800,7 +800,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &159578938 RectTransform: m_ObjectHideFlags: 0 @@ -917,7 +917,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: 517f61beffc1245a0a3f7907c7c93eb0, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1232,7 +1232,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &256529377 RectTransform: m_ObjectHideFlags: 0 @@ -1487,7 +1487,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: 517f61beffc1245a0a3f7907c7c93eb0, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4018,7 +4018,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1175108947 RectTransform: m_ObjectHideFlags: 0 @@ -4962,7 +4962,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: 517f61beffc1245a0a3f7907c7c93eb0, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5517,7 +5517,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1377826547 RectTransform: m_ObjectHideFlags: 0 @@ -5788,7 +5788,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: 517f61beffc1245a0a3f7907c7c93eb0, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -6355,7 +6355,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1500413898 RectTransform: m_ObjectHideFlags: 0 @@ -8710,7 +8710,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: 517f61beffc1245a0a3f7907c7c93eb0, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/Scripts/BazookaManager.cs b/Assets/Scripts/BazookaManager.cs index 7bffb77..d95aa04 100644 --- a/Assets/Scripts/BazookaManager.cs +++ b/Assets/Scripts/BazookaManager.cs @@ -11,6 +11,7 @@ public class BazookaManager : MonoBehaviour { ["version"] = "0" }; + public List iconCache = new(); void Awake() { diff --git a/Assets/Scripts/CustomGamePlayer.cs b/Assets/Scripts/CustomGamePlayer.cs index ed7bd07..07a6516 100644 --- a/Assets/Scripts/CustomGamePlayer.cs +++ b/Assets/Scripts/CustomGamePlayer.cs @@ -127,19 +127,10 @@ public class CustomGamePlayer : MonoBehaviour BazookaManager.Instance.SetBirdOverlay(1); } } - else - { - if (customIconData.Selected != null) - { - foreach (var icon in customIconData.Data) - { - if (icon.UUID == customIconData.Selected) - { - Tools.RenderFromBase64(icon.Data, component); - } - } - } - } + // else if (customIconData.Selected != null) + // foreach (var icon in customIconData.Purchased) + // if (icon == customIconData.Selected) + // Tools.RenderFromBase64(icon, component); lastMoveTime = Time.time; UnityEngine.InputSystem.EnhancedTouch.EnhancedTouchSupport.Enable(); diff --git a/Assets/Scripts/CustomIconLoader.cs b/Assets/Scripts/CustomIconLoader.cs new file mode 100644 index 0000000..cda778e --- /dev/null +++ b/Assets/Scripts/CustomIconLoader.cs @@ -0,0 +1,48 @@ +using System.Collections.Generic; +using System.Linq; +using Newtonsoft.Json.Linq; +using UnityEngine; +using UnityEngine.Networking; +using UnityEngine.UI; + +public class CustomIconLoader : MonoBehaviour +{ + public static async void Init(WaitingForCustomIcon[] objects) + { + var iconsToDownload = new HashSet(); + foreach (var obj in objects) + if (!BazookaManager.Instance.iconCache.Any(icon => icon.ID == obj.ID)) + iconsToDownload.Add(obj.ID); + + if (iconsToDownload.Count != 0) + { + var ids = string.Join(",", iconsToDownload.Select(id => $"\"{id}\"")); + using UnityWebRequest request = UnityWebRequest.Get(Endpoints.ICON_MARKETPLACE_ICON_ENDPOINT + $"?ids=[{ids}]"); + request.SetRequestHeader("Requester", "BerryDashClient"); + request.SetRequestHeader("ClientVersion", Application.version); + request.SetRequestHeader("ClientPlatform", Application.platform.ToString()); + await request.SendWebRequest(); + if (request.downloadHandler.text == null) + { + return; + } + var jsonResponse = JObject.Parse(request.downloadHandler.text); + if ((bool)jsonResponse["success"]) + { + var icons = jsonResponse["data"].ToObject(); + foreach (var icon in icons) BazookaManager.Instance.iconCache.Add(new MarketplaceIcon { ID = icon.ID, Data = icon.Data }); + } + Debug.Log($"Downloaded {iconsToDownload.Count} custom icons"); + } + + foreach (var obj in objects) + { + var cachedIcon = BazookaManager.Instance.iconCache.FirstOrDefault(icon => icon.ID == obj.ID); + if (cachedIcon != null) + { + Tools.RenderFromBase64(Tools.FixIconData(cachedIcon.Data).Item1, obj.GetComponent()); + } + Destroy(obj); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/CustomIconLoader.cs.meta b/Assets/Scripts/CustomIconLoader.cs.meta new file mode 100644 index 0000000..f099de0 --- /dev/null +++ b/Assets/Scripts/CustomIconLoader.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 3b4dc3e4328e94d9c89e5c6c0582fca6 \ No newline at end of file diff --git a/Assets/Scripts/GamePlayer.cs b/Assets/Scripts/GamePlayer.cs index 8ffac38..65fcc1f 100644 --- a/Assets/Scripts/GamePlayer.cs +++ b/Assets/Scripts/GamePlayer.cs @@ -115,19 +115,10 @@ public class GamePlayer : MonoBehaviour BazookaManager.Instance.SetBirdOverlay(1); } } - else - { - if (customIconData.Selected != null) - { - foreach (var icon in customIconData.Data) - { - if (icon.UUID == customIconData.Selected) - { - Tools.RenderFromBase64(icon.Data, component); - } - } - } - } + // else if (customIconData.Selected != null) + // foreach (var icon in customIconData.Purchased) + // if (icon == customIconData.Selected) + // Tools.RenderFromBase64(icon, component); lastMoveTime = Time.time; UnityEngine.InputSystem.EnhancedTouch.EnhancedTouchSupport.Enable(); diff --git a/Assets/Scripts/IconMarketplace/IconMarketplaceDownloadIcon.cs b/Assets/Scripts/IconMarketplace/IconMarketplaceDownloadIcon.cs index 0368760..7594165 100644 --- a/Assets/Scripts/IconMarketplace/IconMarketplaceDownloadIcon.cs +++ b/Assets/Scripts/IconMarketplace/IconMarketplaceDownloadIcon.cs @@ -129,9 +129,9 @@ public class IconMarketplaceDownloadIcon : MonoBehaviour } } var currentIcons = new JArray(); - foreach (var icon in BazookaManager.Instance.GetCustomBirdIconData().Data) + foreach (var icon in BazookaManager.Instance.GetCustomBirdIconData().Purchased) { - currentIcons.Add(icon.UUID); + currentIcons.Add(icon); } ShowStatus("Loading..."); WWWForm dataForm = new(); @@ -160,14 +160,14 @@ public class IconMarketplaceDownloadIcon : MonoBehaviour } ShowStatus(null); var jsonResponse = JObject.Parse(request.downloadHandler.text); - var icons = JsonConvert.DeserializeObject(jsonResponse["data"].ToString()); + var icons = JsonConvert.DeserializeObject(jsonResponse["data"].ToString()); var localUserID = BazookaManager.Instance.GetAccountID(); foreach (var entry in icons) { GameObject newIcon = Instantiate(sample, content.transform); newIcon.name = "IconEntry"; - Tools.RenderFromBase64(entry.Data, newIcon.transform.GetChild(0).GetChild(0).GetComponent()); + Tools.RenderFromBase64(Tools.FixIconData(entry.Data).Item1, newIcon.transform.GetChild(0).GetChild(0).GetComponent()); newIcon.transform.GetChild(1).GetComponent().text = "Bird Name: " + entry.Name; newIcon.transform.GetChild(2).GetComponent().text = "Price " + Tools.FormatWithCommas(entry.Price) + " coins"; newIcon.transform.GetChild(3).GetComponent().text = "Designer Name: " + entry.CreatorUsername; @@ -187,7 +187,7 @@ public class IconMarketplaceDownloadIcon : MonoBehaviour HandlePurchase(entry, buybtn, sellbtn, localUserID); Tools.RefreshHierarchy(newIcon); }); - bool alreadyBought = BazookaManager.Instance.GetCustomBirdIconData().Data.Any(d => d.UUID == entry.UUID); + bool alreadyBought = BazookaManager.Instance.GetCustomBirdIconData().Purchased.Any(d => d == entry.ID); if (alreadyBought) { buybtn.interactable = false; @@ -221,7 +221,7 @@ public class IconMarketplaceDownloadIcon : MonoBehaviour backButton.interactable = true; } - void HandlePurchase(MarketplaceIconType data, Button button, Button sellButton, BigInteger? localUserID) + void HandlePurchase(MarketplaceTempIcon data, Button button, Button sellButton, BigInteger? localUserID) { button.interactable = false; MarketplaceIconStorageType marketplaceIconStorage = BazookaManager.Instance.GetCustomBirdIconData(); @@ -237,9 +237,7 @@ public class IconMarketplaceDownloadIcon : MonoBehaviour iconPurchaseSound.Stop(); iconPurchaseSound.Play(); } - var list = marketplaceIconStorage.Data.ToList(); - list.Add(data); - marketplaceIconStorage.Data = list.ToArray(); + marketplaceIconStorage.Purchased.Add(data.ID); if (localUserID != data.CreatorUserID) { button.transform.GetChild(0).GetComponent().text = "Purchased"; @@ -253,29 +251,21 @@ public class IconMarketplaceDownloadIcon : MonoBehaviour BazookaManager.Instance.SetCustomBirdIconData(marketplaceIconStorage); } - void HandleSell(MarketplaceIconType data, Button buyBtn, TMP_Text buyttnText, Button sellButton, BigInteger? localUserID) + void HandleSell(MarketplaceTempIcon data, Button buyBtn, TMP_Text buyttnText, Button sellButton, BigInteger? localUserID) { MarketplaceIconStorageType marketplaceIconStorage = BazookaManager.Instance.GetCustomBirdIconData(); - var list = marketplaceIconStorage.Data.ToList(); - var owned = list.FirstOrDefault(d => d.UUID == data.UUID); - if (owned != null) + var owned = marketplaceIconStorage.Purchased.Contains(data.ID); + if (owned) { - list.Remove(owned); - marketplaceIconStorage.Data = list.ToArray(); + marketplaceIconStorage.Purchased.Remove(data.ID); marketplaceIconStorage.Balance += data.Price; - if (data.UUID == marketplaceIconStorage.Selected) marketplaceIconStorage.Selected = null; + if (data.ID == marketplaceIconStorage.Selected) marketplaceIconStorage.Selected = null; iconPurchaseSound.Stop(); iconPurchaseSound.Play(); balanceText.text = Tools.FormatWithCommas(marketplaceIconStorage.Balance); BazookaManager.Instance.SetCustomBirdIconData(marketplaceIconStorage); - if (localUserID != data.CreatorUserID) - { - buyttnText.text = "Purchase"; - } - else - { - buyttnText.text = "Claim"; - } + if (localUserID != data.CreatorUserID) buyttnText.text = "Purchase"; + else buyttnText.text = "Claim"; buyBtn.interactable = true; sellButton.gameObject.SetActive(false); } diff --git a/Assets/Scripts/IconsMenu.cs b/Assets/Scripts/IconsMenu.cs index 78be051..24bf694 100644 --- a/Assets/Scripts/IconsMenu.cs +++ b/Assets/Scripts/IconsMenu.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using Newtonsoft.Json.Linq; using TMPro; +using Unity.VisualScripting; using UnityEngine; using UnityEngine.InputSystem; using UnityEngine.SceneManagement; @@ -20,25 +21,22 @@ public class Iconsmenu : MonoBehaviour [SerializeField] private Image previewOverlay; [SerializeField] private Button[] icons; [SerializeField] private Button[] overlays; - private Dictionary customIcons = new(); [SerializeField] private GameObject previewBirdObject; [SerializeField] private ColorPanel iconColorPanel; [SerializeField] private ColorPanel overlayColorPanel; + private Dictionary customIcons = new(); private void Start() { var customIconData = BazookaManager.Instance.GetCustomBirdIconData(); - foreach (var icon in customIconData.Data) + foreach (var icon in customIconData.Purchased) { var iconEntry = Instantiate(marketplaceIconsSample, marketplaceIconsContent.transform); iconEntry.name = "MarketplaceIcon"; var button = iconEntry.GetComponent