From a0a00845361c8df7f12c73d2899ebd80359ad026 Mon Sep 17 00:00:00 2001 From: Ino Date: Thu, 2 Oct 2025 01:02:19 +0900 Subject: [PATCH] =?UTF-8?q?"3=EB=B2=88=20=EC=BA=90=EB=A6=AD=ED=84=B0=20?= =?UTF-8?q?=EC=97=B4=EA=B8=B0=20=EB=B2=84=ED=8A=BC=EC=9D=98=20=EC=83=89?= =?UTF-8?q?=EC=83=81=EC=9D=B4=20=EB=B0=94=EB=80=8C=EC=A7=80=20=EC=95=8A?= =?UTF-8?q?=EC=95=98=EC=8A=B5=EB=8B=88=EB=8B=A4=204.=20=EC=A2=8C=EC=B8=A1?= =?UTF-8?q?=20=EC=9D=B4=EB=AF=B8=EC=A7=80=EC=99=80=20=EA=B0=99=EC=9D=B4=20?= =?UTF-8?q?=EC=95=A8=EB=B2=94=20=EB=A9=94=EB=89=B4=EC=9D=98=20=EB=AF=B8?= =?UTF-8?q?=EB=B3=B4=EC=9C=A0=20=EC=95=A8=EB=B2=94=EC=9D=B4=20=EC=9E=A0?= =?UTF-8?q?=EA=B2=A8=EC=A7=84=20=EC=83=81=ED=83=9C=EB=A1=9C=20=ED=91=9C?= =?UTF-8?q?=ED=98=84=EB=90=98=EC=A7=80=20=EC=95=8A=EC=95=98=EC=8A=B5?= =?UTF-8?q?=EB=8B=88=EB=8B=A4."?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI_Image/Album/lock icon_album.png | Bin 0 -> 5003 bytes .../UI_Image/Album/lock icon_album.png.meta | 155 +++++++++++++++++ Assets/ResWork/UI_Prefab/AlbumCard.prefab | 157 +++++++++++++++++- Assets/ResWork/UI_Prefab/ProfileCard.prefab | 4 +- Assets/Scenes/SampleScene.unity | 6 +- Assets/Scripts/UI/AlbumCard.cs | 5 +- Assets/Scripts/UI/ProfileCard.cs | 2 +- 7 files changed, 320 insertions(+), 9 deletions(-) create mode 100644 Assets/ResWork/UI_Image/Album/lock icon_album.png create mode 100644 Assets/ResWork/UI_Image/Album/lock icon_album.png.meta diff --git a/Assets/ResWork/UI_Image/Album/lock icon_album.png b/Assets/ResWork/UI_Image/Album/lock icon_album.png new file mode 100644 index 0000000000000000000000000000000000000000..6609c3446fb7c497473fa81cef83e3d3ff904513 GIT binary patch literal 5003 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 JW(CqF;y)dVWflMc literal 0 HcmV?d00001 diff --git a/Assets/ResWork/UI_Image/Album/lock icon_album.png.meta b/Assets/ResWork/UI_Image/Album/lock icon_album.png.meta new file mode 100644 index 0000000..992fa6d --- /dev/null +++ b/Assets/ResWork/UI_Image/Album/lock icon_album.png.meta @@ -0,0 +1,155 @@ +fileFormatVersion: 2 +guid: 898e441b696c0f541995b06f9ce98c00 +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/ResWork/UI_Prefab/AlbumCard.prefab b/Assets/ResWork/UI_Prefab/AlbumCard.prefab index a89d8dc..41bc53f 100644 --- a/Assets/ResWork/UI_Prefab/AlbumCard.prefab +++ b/Assets/ResWork/UI_Prefab/AlbumCard.prefab @@ -30,7 +30,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 1 - m_Children: [] + m_Children: + - {fileID: 8258694081111106707} m_Father: {fileID: 6569661889772096336} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -165,6 +166,82 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &4334567281100443090 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8258694081111106707} + - component: {fileID: 2508770419437261746} + - component: {fileID: 2102262748106688734} + m_Layer: 5 + m_Name: lock + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8258694081111106707 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4334567281100443090} + 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: + - {fileID: 1666783781516855366} + m_Father: {fileID: 6099615855730022169} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2508770419437261746 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4334567281100443090} + m_CullTransparentMesh: 1 +--- !u!114 &2102262748106688734 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4334567281100443090} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 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: b0a7567624709ee45872c0e655845f2d, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &5676652756216956804 GameObject: m_ObjectHideFlags: 0 @@ -301,6 +378,81 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &6922317254467211310 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1666783781516855366} + - component: {fileID: 5106572524309289586} + - component: {fileID: 2944174013238792207} + m_Layer: 5 + m_Name: New Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1666783781516855366 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6922317254467211310} + 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: 8258694081111106707} + 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: 35.4} + m_SizeDelta: {x: 73, y: 93} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5106572524309289586 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6922317254467211310} + m_CullTransparentMesh: 1 +--- !u!114 &2944174013238792207 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6922317254467211310} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 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: 898e441b696c0f541995b06f9ce98c00, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &7007143279820371033 GameObject: m_ObjectHideFlags: 0 @@ -356,6 +508,7 @@ MonoBehaviour: mat_blur: {fileID: 2100000, guid: edc74ead8b0531c4f8bbb7f145978360, type: 2} gos: - {fileID: 8113042082887579480} + - {fileID: 4334567281100443090} --- !u!1 &7577317983603397655 GameObject: m_ObjectHideFlags: 0 @@ -502,6 +655,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4848326f7db925d4fbcdb35f789b75f5, type: 3} m_Name: m_EditorClassIdentifier: + m_Sound: 0 --- !u!1 &8113042082887579480 GameObject: m_ObjectHideFlags: 0 @@ -649,3 +803,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4848326f7db925d4fbcdb35f789b75f5, type: 3} m_Name: m_EditorClassIdentifier: + m_Sound: 0 diff --git a/Assets/ResWork/UI_Prefab/ProfileCard.prefab b/Assets/ResWork/UI_Prefab/ProfileCard.prefab index 748733f..98e5e1b 100644 --- a/Assets/ResWork/UI_Prefab/ProfileCard.prefab +++ b/Assets/ResWork/UI_Prefab/ProfileCard.prefab @@ -1480,8 +1480,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: e177b954bb5aa1b4dbb1f46b9598ee42, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: d51802e044e2918449e2e316748b7b4e, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index f26a143..7e46357 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -2784,7 +2784,7 @@ 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: 2756, y: -25} + m_AnchoredPosition: {x: 2756, y: -25.000015} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!61 &85415561 @@ -15699,7 +15699,7 @@ 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: -2756, y: -25} + m_AnchoredPosition: {x: -2756, y: -25.000015} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!61 &420248622 @@ -60764,7 +60764,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -55.772705} + m_AnchoredPosition: {x: 0, y: -55.77272} m_SizeDelta: {x: 0, y: -111.5455} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1630921640 diff --git a/Assets/Scripts/UI/AlbumCard.cs b/Assets/Scripts/UI/AlbumCard.cs index 8f7ce7a..03b8900 100644 --- a/Assets/Scripts/UI/AlbumCard.cs +++ b/Assets/Scripts/UI/AlbumCard.cs @@ -8,7 +8,7 @@ public class AlbumCard : CardBase public Image i_girl; public TextMeshProUGUI t_price; public Material mat_blur; - public GameObject[] gos; // 0 열기 버튼 + public GameObject[] gos; // 0 열기 버튼, 1 잠금 버튼 albumtabledata m_Data; AsyncOperationHandle m_Handle; @@ -35,7 +35,8 @@ public class AlbumCard : CardBase { gos[0].SetActive(m_Data.n_Index == SaveMgr.Ins.Get_UnLockIndex() + 1 && m_Data.n_Price > 0); t_price.text = m_Data.n_Price.ToString(); - if (i_girl.enabled) i_girl.material = IsObtain() ? null : mat_blur; + //if (i_girl.enabled) i_girl.material = IsObtain() ? null : mat_blur; + gos[1].SetActive(!IsObtain()); } public bool IsObtain() { return m_Data.n_Index <= SaveMgr.Ins.Get_UnLockIndex(); } diff --git a/Assets/Scripts/UI/ProfileCard.cs b/Assets/Scripts/UI/ProfileCard.cs index ca102b9..5834b3f 100644 --- a/Assets/Scripts/UI/ProfileCard.cs +++ b/Assets/Scripts/UI/ProfileCard.cs @@ -46,7 +46,7 @@ public class ProfileCard : MonoBehaviour texts[1].text = $"{count}/{maxcount}"; i_girl.material = count == 0 ? mat_Gray : null; go_openbtn.SetActive(count == 0); - i_openbtn.sprite = UIAtlasMgr.Ins.Get_Sprite(CanOpen() ? "red btn long" : "black btn"); + i_openbtn.sprite = UIAtlasMgr.Ins.Get_Sprite(CanOpen() ? "black btn" : "gray btn"); go_viewbtn.SetActive(count == 0); go_albumbtn.SetActive(count > 0); go_chatbtn.SetActive(count > 0);