diff --git a/Assets/Bundles/Prefabs/CollectionCard.prefab b/Assets/Bundles/Prefabs/CollectionCard.prefab index f0c32be..de5db08 100644 --- a/Assets/Bundles/Prefabs/CollectionCard.prefab +++ b/Assets/Bundles/Prefabs/CollectionCard.prefab @@ -972,8 +972,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 64.5} - m_SizeDelta: {x: 228, y: 129} + m_AnchoredPosition: {x: 0, y: 132.7} + m_SizeDelta: {x: 171, y: 97} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &294293568858734497 CanvasRenderer: @@ -1045,10 +1045,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8085205632195448666} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 128, y: 128} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -50, y: -60} + m_SizeDelta: {x: 73, y: 93} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &732220931594025630 CanvasRenderer: @@ -1078,7 +1078,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 242cb3974cefd0e46aade680f04dd832, type: 3} + m_Sprite: {fileID: 21300000, guid: 6808ec83d69d87d4ca852307ca2fc83c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/Bundles/Prefabs/HuntingSlot.prefab b/Assets/Bundles/Prefabs/HuntingSlot.prefab index f6cc152..6a09231 100644 --- a/Assets/Bundles/Prefabs/HuntingSlot.prefab +++ b/Assets/Bundles/Prefabs/HuntingSlot.prefab @@ -1068,10 +1068,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8817793937024032257} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 128, y: 128} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -50, y: -60} + m_SizeDelta: {x: 73, y: 93} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7216742770242446639 CanvasRenderer: @@ -1095,13 +1095,13 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 242cb3974cefd0e46aade680f04dd832, type: 3} + m_Sprite: {fileID: 21300000, guid: 6808ec83d69d87d4ca852307ca2fc83c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1357,8 +1357,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 64.5} - m_SizeDelta: {x: 228, y: 129} + m_AnchoredPosition: {x: 0, y: 133} + m_SizeDelta: {x: 171, y: 97} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4763140933030595241 CanvasRenderer: @@ -2405,17 +2405,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8107059925483495915} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1075369011134930243} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 128, y: 128} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -50, y: -60} + m_SizeDelta: {x: 73, y: 93} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4623350048656433480 CanvasRenderer: @@ -2445,7 +2445,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 242cb3974cefd0e46aade680f04dd832, type: 3} + m_Sprite: {fileID: 21300000, guid: 6808ec83d69d87d4ca852307ca2fc83c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/UI/Image/Sexy icon_album.png b/Assets/UI/Image/Sexy icon_album.png index 9480950..02cb7e1 100644 Binary files a/Assets/UI/Image/Sexy icon_album.png and b/Assets/UI/Image/Sexy icon_album.png differ diff --git a/Assets/UI/Image/lock icon_album.png b/Assets/UI/Image/lock icon_album.png new file mode 100644 index 0000000..6609c34 Binary files /dev/null and b/Assets/UI/Image/lock icon_album.png differ diff --git a/Assets/UI/Image/lock icon_album.png.meta b/Assets/UI/Image/lock icon_album.png.meta new file mode 100644 index 0000000..35bab0c --- /dev/null +++ b/Assets/UI/Image/lock icon_album.png.meta @@ -0,0 +1,155 @@ +fileFormatVersion: 2 +guid: 6808ec83d69d87d4ca852307ca2fc83c +TextureImporter: + internalIDToNameTable: + - first: + 213: -5842772535014286533 + second: lock icon_album_0 + 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: 1 + 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 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: lock icon_album_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 73 + height: 93 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: b3b9013f55d4aeea0800000000000000 + internalID: -5842772535014286533 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UI/UIAtlas.spriteatlas b/Assets/UI/UIAtlas.spriteatlas index bb14b1c..1b34e48 100644 --- a/Assets/UI/UIAtlas.spriteatlas +++ b/Assets/UI/UIAtlas.spriteatlas @@ -88,6 +88,7 @@ SpriteAtlas: - 11b3e463969a98f4689c4b13651c0ac1: 21300000 - 20910e73c2d410445aef67558d384856: 21300000 - 50c9ae73508184a489ff159f1cf0c178: 21300000 + - 6808ec83d69d87d4ca852307ca2fc83c: 21300000 - a3c4d1a34338dd548bc729ff5fb6b207: 21300000 - ba7c63d392b1fa6449ea4e65bf25bcab: 21300000 - 990694d32bf174f42bc872264a4ca5b5: 21300000 @@ -243,6 +244,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 11b3e463969a98f4689c4b13651c0ac1, type: 3} - {fileID: 21300000, guid: 20910e73c2d410445aef67558d384856, type: 3} - {fileID: 21300000, guid: 50c9ae73508184a489ff159f1cf0c178, type: 3} + - {fileID: 21300000, guid: 6808ec83d69d87d4ca852307ca2fc83c, type: 3} - {fileID: 21300000, guid: a3c4d1a34338dd548bc729ff5fb6b207, type: 3} - {fileID: 21300000, guid: ba7c63d392b1fa6449ea4e65bf25bcab, type: 3} - {fileID: 21300000, guid: 990694d32bf174f42bc872264a4ca5b5, type: 3} @@ -397,6 +399,7 @@ SpriteAtlas: - icon 3_shop - b3gwang txt_b3gwang - youbonus txt_youbonus + - lock icon_album - ddadack effect_ddadack - icon 2_shop - icon 2_play