From e5a4ebc32e8423932ed5cee9b43cf3687d5a06ca Mon Sep 17 00:00:00 2001 From: Ino Date: Sat, 20 Dec 2025 11:48:58 +0900 Subject: [PATCH] =?UTF-8?q?"1.=20=ED=8A=B9=EA=B0=80=20=ED=8C=A8=ED=82=A4?= =?UTF-8?q?=EC=A7=80(=EC=B4=88=ED=8A=B9=EA=B0=80=20=ED=8C=A8=ED=82=A4?= =?UTF-8?q?=EC=A7=80,=20=EC=98=AC=EC=9D=B8=EC=9B=90=20=ED=8C=A8=ED=82=A4?= =?UTF-8?q?=EC=A7=80)=EB=8A=94=20=ED=95=9C=EB=B2=88=20=EA=B5=AC=EB=A7=A4?= =?UTF-8?q?=ED=95=98=EB=A9=B4=20=EC=82=AC=EB=9D=BC=EC=A7=80=EB=8A=94?= =?UTF-8?q?=EB=8D=B0,=20=EC=A3=BC=EA=B0=84=20=ED=8C=A8=ED=82=A4=EC=A7=80?= =?UTF-8?q?=EB=A1=9C=20=EC=98=AE=EA=B2=A8=EC=84=9C=20=EB=A7=A4=EC=A3=BC=20?= =?UTF-8?q?1=ED=9A=8C=20=EA=B5=AC=EB=A7=A4=ED=95=A0=20=EC=88=98=20?= =?UTF-8?q?=EC=9E=88=EB=8F=84=EB=A1=9D=20=EB=B3=80=EA=B2=BD=20=EB=B0=94?= =?UTF-8?q?=EB=9E=8D=EB=8B=88=EB=8B=A4.=20-=20=EC=8D=B8=ED=83=80=EB=8A=94?= =?UTF-8?q?=20=ED=8C=A8=ED=82=A4=EC=A7=80=EC=99=80=20=EB=8D=B0=EC=9D=B4?= =?UTF-8?q?=ED=8A=B8=20=ED=8C=A8=ED=82=A4=EC=A7=80=EB=8A=94=20=EC=A0=9C?= =?UTF-8?q?=EC=99=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2.구매 제한이 걸린 패키지 상품일 경우, 항목에서 제거하지 말고 UI 표기를 예시처럼 수정바랍니다. " --- Assets/ResWork/Table/table_shop.cs | 2 +- Assets/Scenes/SampleScene.unity | 44 ++++++++++---------- Assets/Scripts/AttachToGameObject/SaveMgr.cs | 18 +++++--- Assets/Scripts/UI/ShopCard.cs | 8 +++- 4 files changed, 43 insertions(+), 29 deletions(-) diff --git a/Assets/ResWork/Table/table_shop.cs b/Assets/ResWork/Table/table_shop.cs index bea7f5a..bee1c27 100644 --- a/Assets/ResWork/Table/table_shop.cs +++ b/Assets/ResWork/Table/table_shop.cs @@ -3,7 +3,7 @@ using Newtonsoft.Json; using System; using System.Collections.Generic; -public enum eInAppInitType { None, Week, One1, One2, Disable_Buy1, Disable_Buy2 } +public enum eInAppInitType { None, Week1, Week2, Week3, One1, One2, Disable_Buy1, Disable_Buy2 } public enum eShopBuyType { IAP, AD, Coin, Heart } [Serializable] diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index c27b92b..854fe17 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -16347,7 +16347,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: 34, y: 333} + m_AnchoredPosition: {x: 34, y: 235.00003} m_SizeDelta: {x: -50.10004, y: -89.630005} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &372107469 @@ -17899,7 +17899,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &413986003 RectTransform: m_ObjectHideFlags: 0 @@ -19432,7 +19432,7 @@ RectTransform: 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: -234.2, y: 216} + m_AnchoredPosition: {x: -234.2, y: 109} m_SizeDelta: {x: 440, y: 302.74} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &449645076 @@ -24692,7 +24692,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &561204604 RectTransform: m_ObjectHideFlags: 0 @@ -24706,12 +24706,11 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1093844487} - - {fileID: 2037068572} m_Father: {fileID: 1500699731} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 540, y: -1134.55} + m_AnchoredPosition: {x: 540, y: -1464.5001} m_SizeDelta: {x: 1080, y: 438.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &563898771 @@ -48834,7 +48833,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: 46, y: 143} + m_AnchoredPosition: {x: 46, y: 45.00003} m_SizeDelta: {x: 0, y: -100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1072563889 @@ -51966,7 +51965,7 @@ RectTransform: 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: 233.89, y: 216} + m_AnchoredPosition: {x: 233.89, y: 108.999985} m_SizeDelta: {x: 440, y: 302.74} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1142258171 @@ -53379,7 +53378,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: 0, y: 340} + m_AnchoredPosition: {x: 0, y: 242} m_SizeDelta: {x: 956, y: 66} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1176259466 @@ -62276,12 +62275,13 @@ RectTransform: m_Children: - {fileID: 407815040} - {fileID: 1442342427} + - {fileID: 2037068572} m_Father: {fileID: 1500699731} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 540, y: -245.85} - m_SizeDelta: {x: 1080, y: 491.7} + m_AnchoredPosition: {x: 540, y: -410.825} + m_SizeDelta: {x: 1080, y: 821.65} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1370974287 GameObject: @@ -65310,8 +65310,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 540, y: -2571.51} - m_SizeDelta: {x: 1080, y: 963.62} + m_AnchoredPosition: {x: 540, y: -2523.69} + m_SizeDelta: {x: 1080, y: 1061.68} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1444161457 GameObject: @@ -67147,7 +67147,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 3053.32} + m_SizeDelta: {x: 0, y: 3054.5303} m_Pivot: {x: 0, y: 1} --- !u!114 &1500699733 MonoBehaviour: @@ -67479,7 +67479,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 540, y: -1721.65} + m_AnchoredPosition: {x: 540, y: -1624.8} m_SizeDelta: {x: 1080, y: 758.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1521461584 @@ -75103,7 +75103,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 305, y: -244.96503} + m_AnchoredPosition: {x: 305, y: -410.82498} m_SizeDelta: {x: 440, y: 302.74} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1683898157 @@ -86615,7 +86615,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 540, y: -703.60004} + m_AnchoredPosition: {x: 540, y: -1033.55} m_SizeDelta: {x: 1080, y: 446.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1924078572 @@ -92491,7 +92491,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 775, y: -244.96503} + m_AnchoredPosition: {x: 775, y: -410.82498} m_SizeDelta: {x: 440, y: 302.74} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2008271271 @@ -94198,19 +94198,19 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2037068571} - 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: - {fileID: 1683898156} - {fileID: 2008271270} - m_Father: {fileID: 561204604} + m_Father: {fileID: 1370435585} 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: -51.999985} - m_SizeDelta: {x: 0, y: 51.830032} + m_AnchoredPosition: {x: 0, y: -239} + m_SizeDelta: {x: 0, y: -0.000061035156} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2037068573 MonoBehaviour: diff --git a/Assets/Scripts/AttachToGameObject/SaveMgr.cs b/Assets/Scripts/AttachToGameObject/SaveMgr.cs index 3fe9592..d645b8a 100644 --- a/Assets/Scripts/AttachToGameObject/SaveMgr.cs +++ b/Assets/Scripts/AttachToGameObject/SaveMgr.cs @@ -192,7 +192,9 @@ public class SaveMgr : MonoBehaviourSingletonTemplate { m_SaveData.WeekOfYear = woy; - m_SaveData.BuyShopWeekly = false; + m_SaveData.BuyShopWeekly1 = false; + m_SaveData.BuyShopWeekly2 = false; + m_SaveData.BuyShopWeekly3 = false; Save(); } @@ -394,7 +396,9 @@ public class SaveMgr : MonoBehaviourSingletonTemplate switch (data.e_InAppInitType) { default: if (data.b_AdRemove) return !m_SaveData.NoAD; else return true; - case eInAppInitType.Week: return !m_SaveData.BuyShopWeekly; + case eInAppInitType.Week1: return !m_SaveData.BuyShopWeekly1; + case eInAppInitType.Week2: return !m_SaveData.BuyShopWeekly2; + case eInAppInitType.Week3: return !m_SaveData.BuyShopWeekly3; case eInAppInitType.One1: return !m_SaveData.BuyShopOne1; case eInAppInitType.One2: return !m_SaveData.BuyShopOne2; case eInAppInitType.Disable_Buy1: return !m_SaveData.BuyShopDisableOne1; @@ -405,7 +409,9 @@ public class SaveMgr : MonoBehaviourSingletonTemplate { switch (inittype) { - case eInAppInitType.Week: m_SaveData.BuyShopWeekly = true; break; + case eInAppInitType.Week1: m_SaveData.BuyShopWeekly1 = true; break; + case eInAppInitType.Week2: m_SaveData.BuyShopWeekly2 = true; break; + case eInAppInitType.Week3: m_SaveData.BuyShopWeekly3 = true; break; case eInAppInitType.One1: m_SaveData.BuyShopOne1 = true; break; case eInAppInitType.One2: m_SaveData.BuyShopOne2 = true; break; case eInAppInitType.Disable_Buy1: m_SaveData.BuyShopDisableOne1 = true; break; @@ -486,7 +492,9 @@ public class SaveMgr : MonoBehaviourSingletonTemplate ProtectedBool _NoAD; public bool NoAD { get { return _NoAD; } set { _NoAD = value; _NoAD.Obfuscate(); } } ProtectedBool _InfinityMiniGame; public bool InfinityMiniGame { get { return _InfinityMiniGame; } set { _InfinityMiniGame = value; _InfinityMiniGame.Obfuscate(); } } ProtectedBool _LuckyGameCharge; public bool LuckyGameCharge { get { return _LuckyGameCharge; } set { _LuckyGameCharge = value; _LuckyGameCharge.Obfuscate(); } } - ProtectedBool _BuyShopWeekly; public bool BuyShopWeekly { get { return _BuyShopWeekly; } set { _BuyShopWeekly = value; _BuyShopWeekly.Obfuscate(); } } + ProtectedBool _BuyShopWeekly1; public bool BuyShopWeekly1 { get { return _BuyShopWeekly1; } set { _BuyShopWeekly1 = value; _BuyShopWeekly1.Obfuscate(); } } + ProtectedBool _BuyShopWeekly2; public bool BuyShopWeekly2 { get { return _BuyShopWeekly2; } set { _BuyShopWeekly2 = value; _BuyShopWeekly2.Obfuscate(); } } + ProtectedBool _BuyShopWeekly3; public bool BuyShopWeekly3 { get { return _BuyShopWeekly3; } set { _BuyShopWeekly3 = value; _BuyShopWeekly3.Obfuscate(); } } ProtectedBool _BuyShopOne1; public bool BuyShopOne1 { get { return _BuyShopOne1; } set { _BuyShopOne1 = value; _BuyShopOne1.Obfuscate(); } } ProtectedBool _BuyShopOne2; public bool BuyShopOne2 { get { return _BuyShopOne2; } set { _BuyShopOne2 = value; _BuyShopOne2.Obfuscate(); } } ProtectedBool _BuyShopDisableOne1; public bool BuyShopDisableOne1 { get { return _BuyShopDisableOne1; } set { _BuyShopDisableOne1 = value; _BuyShopDisableOne1.Obfuscate(); } } @@ -518,7 +526,7 @@ public class SaveMgr : MonoBehaviourSingletonTemplate NoAD = false; InfinityMiniGame = false; LuckyGameCharge = false; - BuyShopWeekly = false; + BuyShopWeekly1 = BuyShopWeekly2 = BuyShopWeekly3 = false; BuyShopOne1 = false; BuyShopOne2 = false; BuyShopDisableOne1 = false; diff --git a/Assets/Scripts/UI/ShopCard.cs b/Assets/Scripts/UI/ShopCard.cs index 0e62217..4525159 100644 --- a/Assets/Scripts/UI/ShopCard.cs +++ b/Assets/Scripts/UI/ShopCard.cs @@ -136,7 +136,13 @@ public class ShopCard : MonoBehaviour void Set_UI() { - if (go_BuyComplete != null) go_BuyComplete.SetActive(!SaveMgr.Ins.CanBuyShopPackage(m_Data)); + if (go_BuyComplete != null) + { + go_BuyComplete.SetActive(!SaveMgr.Ins.CanBuyShopPackage(m_Data)); + go_BuyComplete.GetComponentInChildren().text = + m_Data.e_InAppInitType == eInAppInitType.Week1 || m_Data.e_InAppInitType == eInAppInitType.Week2 || + m_Data.e_InAppInitType == eInAppInitType.Week3 ? "주 1회\n구매 가능" : "구매 완료"; + } switch (m_Data.e_InAppInitType) { case eInAppInitType.One1: