diff --git a/Assets/Bundles/Prefabs/CollectionCard.prefab b/Assets/Bundles/Prefabs/CollectionCard.prefab index ac70084..f0c32be 100644 --- a/Assets/Bundles/Prefabs/CollectionCard.prefab +++ b/Assets/Bundles/Prefabs/CollectionCard.prefab @@ -31,9 +31,9 @@ RectTransform: m_Children: - {fileID: 219415349665988191} - {fileID: 5708158940125825565} + - {fileID: 992923851715958944} - {fileID: 8085205632195448666} - {fileID: 2703057293387824824} - - {fileID: 992923851715958944} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -949,7 +949,6 @@ GameObject: - component: {fileID: 992923851715958944} - component: {fileID: 294293568858734497} - component: {fileID: 4494773712612435028} - - component: {fileID: 4533280837404704300} m_Layer: 5 m_Name: heart m_TagString: Untagged @@ -971,10 +970,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 1869107989516562376} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -64, y: -64} - m_SizeDelta: {x: 128, y: 128} + 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_Pivot: {x: 0.5, y: 0.5} --- !u!222 &294293568858734497 CanvasRenderer: @@ -1004,7 +1003,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f427dc0923fdac8438454f9efc8d9f23, type: 3} + m_Sprite: {fileID: 21300000, guid: acb2e1b1886cc1841bc5ba00ef3050bd, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1014,23 +1013,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!111 &4533280837404704300 -Animation: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8728108810734430968} - m_Enabled: 1 - serializedVersion: 4 - m_Animation: {fileID: 7400000, guid: 49f73d0b4035dcd408b8fc44051a62c6, type: 2} - m_Animations: - - {fileID: 7400000, guid: 49f73d0b4035dcd408b8fc44051a62c6, type: 2} - m_WrapMode: 0 - m_PlayAutomatically: 1 - m_AnimatePhysics: 0 - m_UpdateMode: 0 - m_CullingType: 0 --- !u!1 &8870768795708678106 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Bundles/Prefabs/HuntingSlot.prefab b/Assets/Bundles/Prefabs/HuntingSlot.prefab index edda436..52df14f 100644 --- a/Assets/Bundles/Prefabs/HuntingSlot.prefab +++ b/Assets/Bundles/Prefabs/HuntingSlot.prefab @@ -1334,7 +1334,6 @@ GameObject: - component: {fileID: 3672502949414491414} - component: {fileID: 4763140933030595241} - component: {fileID: 5249486102736360356} - - component: {fileID: 6188600231977536331} m_Layer: 5 m_Name: heart m_TagString: Untagged @@ -1356,10 +1355,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 1075369012370353055} 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: 72, y: 71} - m_SizeDelta: {x: 128, y: 128} + 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_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4763140933030595241 CanvasRenderer: @@ -1389,7 +1388,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f427dc0923fdac8438454f9efc8d9f23, type: 3} + m_Sprite: {fileID: 21300000, guid: acb2e1b1886cc1841bc5ba00ef3050bd, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1399,23 +1398,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!111 &6188600231977536331 -Animation: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5557692083460958251} - m_Enabled: 1 - serializedVersion: 4 - m_Animation: {fileID: 7400000, guid: 49f73d0b4035dcd408b8fc44051a62c6, type: 2} - m_Animations: - - {fileID: 7400000, guid: 49f73d0b4035dcd408b8fc44051a62c6, type: 2} - m_WrapMode: 0 - m_PlayAutomatically: 1 - m_AnimatePhysics: 0 - m_UpdateMode: 0 - m_CullingType: 0 --- !u!1 &5580047819361868791 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/UI/Image/Sexy icon_album.png b/Assets/UI/Image/Sexy icon_album.png new file mode 100644 index 0000000..9480950 Binary files /dev/null and b/Assets/UI/Image/Sexy icon_album.png differ diff --git a/Assets/UI/Image/Sexy icon_album.png.meta b/Assets/UI/Image/Sexy icon_album.png.meta new file mode 100644 index 0000000..6685aa5 --- /dev/null +++ b/Assets/UI/Image/Sexy icon_album.png.meta @@ -0,0 +1,155 @@ +fileFormatVersion: 2 +guid: acb2e1b1886cc1841bc5ba00ef3050bd +TextureImporter: + internalIDToNameTable: + - first: + 213: 3206070889262823627 + second: Sexy 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: Sexy icon_album_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 228 + height: 129 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: bc83b3fbc704e7c20800000000000000 + internalID: 3206070889262823627 + 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 2a5ad3d..e05e8c9 100644 --- a/Assets/UI/UIAtlas.spriteatlas +++ b/Assets/UI/UIAtlas.spriteatlas @@ -66,6 +66,7 @@ SpriteAtlas: - ebd9e391ef36c374a92e070927298f85: 21300000 - 588b8a91a1f910b43a44b34b70468919: 21300000 - d2944fa131327b4438faaa7db7bd690f: 21300000 + - acb2e1b1886cc1841bc5ba00ef3050bd: 21300000 - 81ef3cb1966438247a1a5f3c03f337ce: 21300000 - e746cae142edb6f43a327e35722f9a45: 21300000 - 791230f1367930748aa5e52bff55da7b: 21300000 @@ -109,6 +110,7 @@ SpriteAtlas: - bc42d5b6ca215294f966ee4c4aaf71f9: 21300000 - 9a4e02c6e5890d64a8a84d7c268fe66a: 21300000 - 3a59cff615a2f0748810b82b4c401c55: 21300000 + - b0e59167e28b8c2439802c1301767ac8: 21300000 - 242cb3974cefd0e46aade680f04dd832: 21300000 - ccfdd697b3fac6041ae86c011597e221: 21300000 - edb524b79cd5212478a3f81b25857157: 21300000 @@ -158,6 +160,7 @@ SpriteAtlas: - cc97734c8adea6445a7b4b0c95c64395: 21300000 - 95f1519c113dee04fbae9a3519fedced: 21300000 - 2e9c2e9c15a2cfd4a809cd1ddba28e51: 21300000 + - 86b818ac058cde24caf4fed2998373da: 21300000 - 83daa8eced54f2946ba40f7aafa39a77: 21300000 - e857d8fc6d6313141973d87d1b17fd7d: 21300000 - e8e8924db5d728c46994bee5f76639d4: 21300000 @@ -205,6 +208,7 @@ SpriteAtlas: - {fileID: 21300000, guid: ebd9e391ef36c374a92e070927298f85, type: 3} - {fileID: 21300000, guid: 588b8a91a1f910b43a44b34b70468919, type: 3} - {fileID: 21300000, guid: d2944fa131327b4438faaa7db7bd690f, type: 3} + - {fileID: 21300000, guid: acb2e1b1886cc1841bc5ba00ef3050bd, type: 3} - {fileID: 21300000, guid: 81ef3cb1966438247a1a5f3c03f337ce, type: 3} - {fileID: 21300000, guid: e746cae142edb6f43a327e35722f9a45, type: 3} - {fileID: 21300000, guid: 791230f1367930748aa5e52bff55da7b, type: 3} @@ -248,6 +252,7 @@ SpriteAtlas: - {fileID: 21300000, guid: bc42d5b6ca215294f966ee4c4aaf71f9, type: 3} - {fileID: 21300000, guid: 9a4e02c6e5890d64a8a84d7c268fe66a, type: 3} - {fileID: 21300000, guid: 3a59cff615a2f0748810b82b4c401c55, type: 3} + - {fileID: 21300000, guid: b0e59167e28b8c2439802c1301767ac8, type: 3} - {fileID: 21300000, guid: 242cb3974cefd0e46aade680f04dd832, type: 3} - {fileID: 21300000, guid: ccfdd697b3fac6041ae86c011597e221, type: 3} - {fileID: 21300000, guid: edb524b79cd5212478a3f81b25857157, type: 3} @@ -297,6 +302,7 @@ SpriteAtlas: - {fileID: 21300000, guid: cc97734c8adea6445a7b4b0c95c64395, type: 3} - {fileID: 21300000, guid: 95f1519c113dee04fbae9a3519fedced, type: 3} - {fileID: 21300000, guid: 2e9c2e9c15a2cfd4a809cd1ddba28e51, type: 3} + - {fileID: 21300000, guid: 86b818ac058cde24caf4fed2998373da, type: 3} - {fileID: 21300000, guid: 83daa8eced54f2946ba40f7aafa39a77, type: 3} - {fileID: 21300000, guid: e857d8fc6d6313141973d87d1b17fd7d, type: 3} - {fileID: 21300000, guid: e8e8924db5d728c46994bee5f76639d4, type: 3} @@ -343,6 +349,7 @@ SpriteAtlas: - pop up title label - result victory title - ddadack image 2_ddadack + - Sexy icon_album - 2go txt_2go - 4gwang image_4gwang - ssackssri txt_ssackssri @@ -386,6 +393,7 @@ SpriteAtlas: - chungdan image_chungdan - window 2 - jabbuck txt_jabbuck + - label victory origimal_result - lock icon - new pattern - ddadack txt_ddadack @@ -435,6 +443,7 @@ SpriteAtlas: - icon 4_play - ad icon - invalidity image_invalidity + - label lose original_result - blue bg_shop - icon 10_shop - invalidity txt_invalidity