From 73c8c122015c4733c4731496afb48f0c3da91df4 Mon Sep 17 00:00:00 2001 From: Ino Date: Fri, 29 Aug 2025 23:50:14 +0900 Subject: [PATCH] =?UTF-8?q?=EC=95=A8=EB=B2=94=20=EB=93=B1=20ui=20=EC=9D=BC?= =?UTF-8?q?=EB=B6=80=20=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Bundles/Prefabs/HuntingSlot_Empry.prefab | 47 ------------------- .../Prefabs/HuntingSlot_Empry.prefab.meta | 7 --- Assets/Scenes/Main.unity | 14 +++--- .../SingletonManagers/Managers/ADSManager.cs | 4 +- Assets/Scripts/UI/GamePanel/BannerSpace.cs | 13 +++-- Assets/Scripts/UI/HuntingSlot.cs | 17 ++++++- Assets/Scripts/UI/ShowPanel.cs | 4 ++ 7 files changed, 36 insertions(+), 70 deletions(-) delete mode 100644 Assets/Bundles/Prefabs/HuntingSlot_Empry.prefab delete mode 100644 Assets/Bundles/Prefabs/HuntingSlot_Empry.prefab.meta diff --git a/Assets/Bundles/Prefabs/HuntingSlot_Empry.prefab b/Assets/Bundles/Prefabs/HuntingSlot_Empry.prefab deleted file mode 100644 index c8ad6e7..0000000 --- a/Assets/Bundles/Prefabs/HuntingSlot_Empry.prefab +++ /dev/null @@ -1,47 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &7410697389645852299 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7410697389645852296} - - component: {fileID: 7410697389645852302} - m_Layer: 5 - m_Name: HuntingSlot_Empry - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7410697389645852296 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7410697389645852299} - 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: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7410697389645852302 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7410697389645852299} - m_CullTransparentMesh: 1 diff --git a/Assets/Bundles/Prefabs/HuntingSlot_Empry.prefab.meta b/Assets/Bundles/Prefabs/HuntingSlot_Empry.prefab.meta deleted file mode 100644 index 8421cea..0000000 --- a/Assets/Bundles/Prefabs/HuntingSlot_Empry.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 6f427dbbb09cdcc4c996d920328a4647 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index b68f19a..fbebe68 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -13538,10 +13538,10 @@ RectTransform: - {fileID: 1297051184} m_Father: {fileID: 726633383} 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: 3.06, y: -114.33} - m_SizeDelta: {x: 498.96, y: 101.53} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 288, y: 0} + m_SizeDelta: {x: 498.95996, y: 101.53} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &265543179 GameObject: @@ -43927,7 +43927,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &644139346 RectTransform: m_ObjectHideFlags: 0 @@ -44185,7 +44185,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} m_AnchoredPosition: {x: -65, y: 0} - m_SizeDelta: {x: 100, y: 100} + m_SizeDelta: {x: 105, y: 105} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &663256576 GameObject: @@ -44606,7 +44606,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -5.77, y: -110} + m_AnchoredPosition: {x: -261, y: -133} m_SizeDelta: {x: 418.35, y: 110.63} m_Pivot: {x: 0.5, y: 1} --- !u!114 &726633384 diff --git a/Assets/Scripts/SingletonManagers/Managers/ADSManager.cs b/Assets/Scripts/SingletonManagers/Managers/ADSManager.cs index 06c4614..6b2d4ae 100644 --- a/Assets/Scripts/SingletonManagers/Managers/ADSManager.cs +++ b/Assets/Scripts/SingletonManagers/Managers/ADSManager.cs @@ -10,7 +10,7 @@ public class ADSManager : MonoBehaviour protected const int reloadInterval = 5; protected const int maxRetryCount = 20; - // ̺Ʈ + // 이벤트 연결용 public event Action OnCompletedRewardedAd; public event Action OnCompletedInterstitialAd; public event Action OnDestroyBannerAd; @@ -580,7 +580,7 @@ public class ADSManager : MonoBehaviour public override void ShowAd() { - if (GameManager.DB.IsRemoveADS == false && adAvailable == true) + if (GameManager.DB.IsRemoveADS == false && adAvailable == true && ad != null) { ad.Show(); } diff --git a/Assets/Scripts/UI/GamePanel/BannerSpace.cs b/Assets/Scripts/UI/GamePanel/BannerSpace.cs index 32b5eae..2fe21be 100644 --- a/Assets/Scripts/UI/GamePanel/BannerSpace.cs +++ b/Assets/Scripts/UI/GamePanel/BannerSpace.cs @@ -8,25 +8,28 @@ public class BannerSpace : MonoBehaviour public float OffSet = -133f; private void Awake() + { + GameManager.ADS.OnDestroyBannerAd += OnDestroyBannerAd; + } + + private void OnEnable() { if (rect == null) { rect = GetComponent(); } - if(rect != null) + if (rect != null) { - if(GameManager.DB.IsRemoveADS == true) + if (GameManager.DB.IsRemoveADS == true) { rect.offsetMax = new Vector2(rect.offsetMax.x, 0); } else { rect.offsetMax = new Vector2(rect.offsetMax.x, OffSet); - } + } } - - GameManager.ADS.OnDestroyBannerAd += OnDestroyBannerAd; } private void OnDestroyBannerAd(bool isDestroy) diff --git a/Assets/Scripts/UI/HuntingSlot.cs b/Assets/Scripts/UI/HuntingSlot.cs index dd8482b..e4102fb 100644 --- a/Assets/Scripts/UI/HuntingSlot.cs +++ b/Assets/Scripts/UI/HuntingSlot.cs @@ -209,6 +209,19 @@ public class HuntingSlot : CardBase public void OnClick_Slot(bool left) { GameManager.Sound.PlaySFX(ESFXType.Button_Hit); - GameObject.Find("AlbumPanel").GetComponent().ShowPanel(left ? _data_left : _data_right); + + var unlockTargetIndex = GameManager.DB.GetUnlockTargetIndex(left); + var group = left ? _data_left.n_Group : _data_right.n_Group; + + if (group == unlockTargetIndex) + { // 구매 가능 + } + else if (group > unlockTargetIndex) + { // 잠김 + } + else + { // 열림 + GameObject.Find("AlbumPanel").GetComponent().ShowPanel(left ? _data_left : _data_right); + } } -} +} \ No newline at end of file diff --git a/Assets/Scripts/UI/ShowPanel.cs b/Assets/Scripts/UI/ShowPanel.cs index e921a7e..9a2b770 100644 --- a/Assets/Scripts/UI/ShowPanel.cs +++ b/Assets/Scripts/UI/ShowPanel.cs @@ -22,6 +22,8 @@ public class ShowPanel : MonoBehaviour m_Cam.orthographicSize = 4f; m_Cam.transform.position = new Vector3(0f, 0f, -10f); Set_ImageSize(); + + GameManager.ADS.HideBanner(); } void Set_ImageSize() @@ -49,6 +51,8 @@ public class ShowPanel : MonoBehaviour case 0: // 나가기 gameObject.SetActive(false); DSUtil.ActivateGameObjects(gos_off); + GameManager.ADS.ShowBanner(); + i_image.sprite = null; break; case 1: // 풀 스크린 go_btns.SetActive(false);