diff --git a/Assets/ResWork/UI_Image/Main/btn x.png b/Assets/ResWork/UI_Image/Main/btn x.png new file mode 100644 index 0000000..c45ffd8 Binary files /dev/null and b/Assets/ResWork/UI_Image/Main/btn x.png differ diff --git a/Assets/ResWork/UI_Image/Main/btn x.png.meta b/Assets/ResWork/UI_Image/Main/btn x.png.meta new file mode 100644 index 0000000..85ef05b --- /dev/null +++ b/Assets/ResWork/UI_Image/Main/btn x.png.meta @@ -0,0 +1,169 @@ +fileFormatVersion: 2 +guid: c1f4596e657125349a3497081fc2557a +TextureImporter: + internalIDToNameTable: + - first: + 213: -4824049080057350209 + second: exit btn_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 + - 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: exit btn_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 113 + height: 113 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: fb7b12cabe88d0db0800000000000000 + internalID: -4824049080057350209 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + exit btn_0: -4824049080057350209 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 6437e24..b8c819e 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -2786,7 +2786,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.000015} + m_AnchoredPosition: {x: 2756, y: -25} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!61 &85415561 @@ -14211,7 +14211,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 2030797965} + - {fileID: 1213711858} - {fileID: 882171496} m_Father: {fileID: 476355706} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} @@ -16017,7 +16017,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.000015} + m_AnchoredPosition: {x: -2756, y: -25} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!61 &420248622 @@ -41497,7 +41497,7 @@ GameObject: - component: {fileID: 1080775680} - component: {fileID: 1080775679} m_Layer: 5 - m_Name: btn_choice + m_Name: btn_ok m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -45979,6 +45979,82 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1207406150} m_CullTransparentMesh: 1 +--- !u!1 &1213711857 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1213711858} + - component: {fileID: 1213711860} + - component: {fileID: 1213711859} + 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 &1213711858 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1213711857} + m_LocalRotation: {x: 0, y: 0, z: 1, w: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2030797965} + m_Father: {fileID: 371721585} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 984, y: 0} + m_SizeDelta: {x: 91, y: 83} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1213711859 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1213711857} + 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: 2baf5c2ad80d0ae44ae8582711755627, 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!222 &1213711860 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1213711857} + m_CullTransparentMesh: 1 --- !u!1 &1218008523 GameObject: m_ObjectHideFlags: 0 @@ -63476,7 +63552,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.77272} + m_AnchoredPosition: {x: 0, y: -55.772705} m_SizeDelta: {x: 0, y: -111.5455} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1630921640 @@ -66280,6 +66356,9 @@ MonoBehaviour: m_Game_Lucky: {fileID: 1257193657} m_Game_Mini: {fileID: 2007599845} go_shop: {fileID: 1629576850} + images_botbtn: + - {fileID: 1630921643} + - {fileID: 892977664} --- !u!1 &1705483890 GameObject: m_ObjectHideFlags: 0 @@ -80031,16 +80110,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2030797964} - m_LocalRotation: {x: 0, y: 0, z: 1, w: 0} + 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: 371721585} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} + m_Father: {fileID: 1213711858} + 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_AnchoredPosition: {x: 141, y: 0} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2030797966 diff --git a/Assets/Scripts/UI/LobbyUI.cs b/Assets/Scripts/UI/LobbyUI.cs index 1450b47..f030cdb 100644 --- a/Assets/Scripts/UI/LobbyUI.cs +++ b/Assets/Scripts/UI/LobbyUI.cs @@ -33,6 +33,9 @@ public class LobbyUI : MonoBehaviourSingletonTemplate public Game_Mini m_Game_Mini; [SerializeField] GameObject go_shop; + public Image[] images_botbtn; // 0 앨범, 1 상점 + int CurMenu = 2; + IEnumerator Start() { yield return null; @@ -82,17 +85,54 @@ public class LobbyUI : MonoBehaviourSingletonTemplate case "btn_option": m_OptionUI.Set(); break; case "btn_album": - Go_Home(); - m_AlbumUI.Set(); - DSUtil.InActivateGameObjects(gos_homeBot); + if (CurMenu != 1) + { + CurMenu = 1; + Go_Home(); + m_AlbumUI.Set(); + DSUtil.InActivateGameObjects(gos_homeBot); + images_botbtn[0].sprite = UIAtlasMgr.Ins.Get_Sprite("btn x"); + (images_botbtn[0].transform as RectTransform).sizeDelta = new Vector2(91, 91); + } + else + { + CurMenu = 2; + Go_Home(); + images_botbtn[0].sprite = UIAtlasMgr.Ins.Get_Sprite("album icon"); + (images_botbtn[0].transform as RectTransform).sizeDelta = new Vector2(91, 83); + } + break; + case "btn_home": + if (CurMenu != 2) + { + CurMenu = 2; + Go_Home(); + + images_botbtn[0].sprite = UIAtlasMgr.Ins.Get_Sprite("album icon"); + (images_botbtn[0].transform as RectTransform).sizeDelta = new Vector2(91, 83); + images_botbtn[1].sprite = UIAtlasMgr.Ins.Get_Sprite("shop icon"); + (images_botbtn[1].transform as RectTransform).sizeDelta = new Vector2(91, 83); + } break; - case "btn_home": Go_Home(); break; case "btn_gacha": m_GachaUI.Set(); break; case "btn_shop": - Go_Home(); - go_shop.SetActive(true); - DSUtil.InActivateGameObjects(gos_homeBot); - break; + if (CurMenu != 3) + { + CurMenu = 3; + Go_Home(); + go_shop.SetActive(true); + DSUtil.InActivateGameObjects(gos_homeBot); + images_botbtn[1].sprite = UIAtlasMgr.Ins.Get_Sprite("btn x"); + (images_botbtn[1].transform as RectTransform).sizeDelta = new Vector2(91, 91); + } + else + { + CurMenu = 2; + Go_Home(); + images_botbtn[1].sprite = UIAtlasMgr.Ins.Get_Sprite("shop icon"); + (images_botbtn[1].transform as RectTransform).sizeDelta = new Vector2(91, 83); + } + break; case "btn_minigame": if (SaveMgr.Ins.IsInfinityMiniGame())