diff --git a/Assets/Bundles/Prefabs/ProductSlot.prefab b/Assets/Bundles/Prefabs/ProductSlot.prefab index ff6ccb7..df43fda 100644 --- a/Assets/Bundles/Prefabs/ProductSlot.prefab +++ b/Assets/Bundles/Prefabs/ProductSlot.prefab @@ -1017,6 +1017,7 @@ RectTransform: m_Children: - {fileID: 6244786204384409622} - {fileID: 3080193312227414008} + - {fileID: 6295101898716053080} m_Father: {fileID: 8098959201550950962} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} @@ -1452,6 +1453,81 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7958366525701219930 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6295101898716053080} + - component: {fileID: 1237148629479587158} + - component: {fileID: 44218967507509023} + m_Layer: 5 + m_Name: New Image (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6295101898716053080 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7958366525701219930} + 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: 3190770213717081060} + 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: -52, y: 0} + m_SizeDelta: {x: 64, y: 64} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1237148629479587158 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7958366525701219930} + m_CullTransparentMesh: 1 +--- !u!114 &44218967507509023 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7958366525701219930} + 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: b6a8c7f2de072314babd4892dda62f03, 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 &8098959200428602548 GameObject: m_ObjectHideFlags: 0 @@ -1732,6 +1808,8 @@ MonoBehaviour: SaleGO: {fileID: 2683028887287868754} SaleTMP: {fileID: 6863026485895316107} BuyWithCashBtn: {fileID: 5330632654121838058} + go_i_dia: {fileID: 5695716335581800839} + go_i_heart: {fileID: 7958366525701219930} t_buycash: {fileID: 773332100725289787} --- !u!1 &8098959201705279921 GameObject: diff --git a/Assets/Memo.txt b/Assets/Memo.txt index 7e7359a..51ef506 100644 --- a/Assets/Memo.txt +++ b/Assets/Memo.txt @@ -30,4 +30,14 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// 서브 미션 앨범 수집 목록 -데이터 저장, 불러오기 (구글 플레이센터로 변경) \ No newline at end of file +데이터 저장, 불러오기 (구글 플레이센터로 변경) + + +//다이아로 하트 구매 다이아 300개 -> 하트 10개 +//무료 캐시는 다이아 50개 (일일) +5하트 10개 -> 다이아 100개로 변경 +광고 후 하트 : 5/5회로 변경, 광고 시청 시 하트 5개 지급 +광고 시청 후 재시청 딜레이 1분 적용 가능한지? + +광고 시청 횟수는3회 (딜레이 없음) +광고 시청 3회 모두 소진할 경우, 1시간마다 1개씩 광고 기회 충전 \ No newline at end of file diff --git a/Assets/Plugins/Easy Save 3/Resources/ES3/ES3Defaults.asset b/Assets/Plugins/Easy Save 3/Resources/ES3/ES3Defaults.asset index f943c45..61d7701 100644 --- a/Assets/Plugins/Easy Save 3/Resources/ES3/ES3Defaults.asset +++ b/Assets/Plugins/Easy Save 3/Resources/ES3/ES3Defaults.asset @@ -34,6 +34,10 @@ MonoBehaviour: - Assembly-CSharp-firstpass - CFXRDemo - CFXRRuntime + - GoogleMobileAds.Mediation.UnityAds.Android + - GoogleMobileAds.Mediation.UnityAds.Api + - GoogleMobileAds.Mediation.UnityAds.Common + - GoogleMobileAds.Mediation.UnityAds.iOS - KinoBloom.Runtime - Purchasing.Common showAdvancedSettings: 1 diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 2e1a0c5..5f186a4 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -6349,7 +6349,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.43945312, y: 0.5102041, z: 1} + m_LocalScale: {x: 0.6667, y: 0.6667, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} @@ -6386,10 +6386,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 1655609077} 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: 158.20001, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 583.7001, y: -238.70001} + m_SizeDelta: {x: 158.20001, y: 238.70001} m_Pivot: {x: 0.5, y: 0} --- !u!114 &110428666 MonoBehaviour: @@ -7166,10 +7166,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 1129600970} 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: 158.20001, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 583.7001, y: -238.70001} + m_SizeDelta: {x: 158.20001, y: 238.70001} m_Pivot: {x: 0.5, y: 0} --- !u!114 &157977247 MonoBehaviour: @@ -14518,10 +14518,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 1655609077} 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: 158.20001, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 247.30002, y: -238.70001} + m_SizeDelta: {x: 158.20001, y: 238.70001} m_Pivot: {x: 0.5, y: 0} --- !u!114 &294027875 MonoBehaviour: @@ -14798,7 +14798,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &302272077 RectTransform: m_ObjectHideFlags: 0 @@ -14818,8 +14818,8 @@ 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: -35} - m_SizeDelta: {x: 1080, y: 150} + m_AnchoredPosition: {x: 0, y: -220} + m_SizeDelta: {x: 1080, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &302272080 MonoBehaviour: @@ -14833,7 +14833,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a5aa612187180524a9480635ff4c847a, type: 3} m_Name: m_EditorClassIdentifier: - rect: {fileID: 302272077} --- !u!1 &304047706 GameObject: m_ObjectHideFlags: 0 @@ -38495,10 +38494,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 1129600970} 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: 158.20001, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 415.50003, y: -238.70001} + m_SizeDelta: {x: 158.20001, y: 238.70001} m_Pivot: {x: 0.5, y: 0} --- !u!114 &545788163 MonoBehaviour: @@ -46286,10 +46285,10 @@ RectTransform: - {fileID: 264014381} m_Father: {fileID: 1535761049} 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: 705} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -200} + m_SizeDelta: {x: 1080, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!1 &727366516 GameObject: @@ -46398,10 +46397,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 1129600970} 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: 158.20001, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 247.30002, y: -238.70001} + m_SizeDelta: {x: 158.20001, y: 238.70001} m_Pivot: {x: 0.5, y: 0} --- !u!114 &727989100 MonoBehaviour: @@ -56133,7 +56132,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 375.52698, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: -543.66003, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &748618263 MonoBehaviour: @@ -56762,7 +56761,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &771770700 RectTransform: m_ObjectHideFlags: 0 @@ -56963,7 +56962,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: rect: {fileID: 771770700} - OffSet: -133 --- !u!1 &776702280 GameObject: m_ObjectHideFlags: 0 @@ -58396,7 +58394,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: rect: {fileID: 833499341} - OffSet: -133 --- !u!1 &846863393 GameObject: m_ObjectHideFlags: 0 @@ -64262,10 +64259,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 1655609077} 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: 158.20001, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 751.9, y: -238.70001} + m_SizeDelta: {x: 158.20001, y: 238.70001} m_Pivot: {x: 0.5, y: 0} --- !u!114 &899195709 MonoBehaviour: @@ -64976,6 +64973,7 @@ GameObject: - component: {fileID: 922729937} - component: {fileID: 922729939} - component: {fileID: 922729938} + - component: {fileID: 922729940} m_Layer: 5 m_Name: AI_Image m_TagString: Untagged @@ -65000,7 +64998,7 @@ RectTransform: 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_SizeDelta: {x: 0, y: 179.21582} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &922729938 MonoBehaviour: @@ -65040,6 +65038,20 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 922729936} m_CullTransparentMesh: 1 +--- !u!114 &922729940 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 922729936} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86710e43de46f6f4bac7c8e50813a599, type: 3} + m_Name: + m_EditorClassIdentifier: + m_AspectMode: 4 + m_AspectRatio: 0.6667 --- !u!1 &922900351 GameObject: m_ObjectHideFlags: 0 @@ -71050,7 +71062,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: rect: {fileID: 1003766480} - OffSet: -133 --- !u!1 &1008242248 GameObject: m_ObjectHideFlags: 0 @@ -71872,7 +71883,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: -437.76306, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: -1080, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1042151481 MonoBehaviour: @@ -72352,7 +72363,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 375.52698, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: -776.84174, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1070010677 MonoBehaviour: @@ -73403,7 +73414,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: -166.31567, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: -1080, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1114363786 MonoBehaviour: @@ -73663,7 +73674,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: -122.00001, y: 0} - m_SizeDelta: {x: 0, y: -311.3} + m_SizeDelta: {x: -248.99994, y: -311.3} m_Pivot: {x: 0.5, y: 0} --- !u!114 &1129600972 MonoBehaviour: @@ -74808,7 +74819,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: rect: {fileID: 1166114708} - OffSet: -133 --- !u!1 &1167392697 GameObject: m_ObjectHideFlags: 0 @@ -75720,7 +75730,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 88.158264, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: -880.66003, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1230955786 MonoBehaviour: @@ -98580,7 +98590,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: -166.31567, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: -880.66003, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1458972175 MonoBehaviour: @@ -104290,7 +104300,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1535761049 RectTransform: m_ObjectHideFlags: 0 @@ -104315,8 +104325,8 @@ 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: -66.5} - m_SizeDelta: {x: 0, y: -133} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1535761050 MonoBehaviour: @@ -104352,7 +104362,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: rect: {fileID: 1535761049} - OffSet: -133 --- !u!1 &1537648707 GameObject: m_ObjectHideFlags: 0 @@ -109589,10 +109598,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 1129600970} 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: 158.20001, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 751.9, y: -238.70001} + m_SizeDelta: {x: 158.20001, y: 238.70001} m_Pivot: {x: 0.5, y: 0} --- !u!114 &1568529521 MonoBehaviour: @@ -115894,10 +115903,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 1655609077} 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: 158.20001, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 79.100006, y: -238.70001} + m_SizeDelta: {x: 158.20001, y: 238.70001} m_Pivot: {x: 0.5, y: 0} --- !u!114 &1643606556 MonoBehaviour: @@ -116052,7 +116061,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: -122, y: 200} - m_SizeDelta: {x: 0, y: -311.3} + m_SizeDelta: {x: -248.99994, y: -311.3} m_Pivot: {x: 0.5, y: 0} --- !u!114 &1655609078 MonoBehaviour: @@ -121528,7 +121537,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 88.158264, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: -1080, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1674831522 MonoBehaviour: @@ -143365,10 +143374,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 1655609077} 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: 158.20001, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 415.50003, y: -238.70001} + m_SizeDelta: {x: 158.20001, y: 238.70001} m_Pivot: {x: 0.5, y: 0} --- !u!114 &1880837240 MonoBehaviour: @@ -176088,10 +176097,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 1129600970} 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: 158.20001, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 79.100006, y: -238.70001} + m_SizeDelta: {x: 158.20001, y: 238.70001} m_Pivot: {x: 0.5, y: 0} --- !u!114 &2128021909 MonoBehaviour: @@ -195853,7 +195862,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: rect: {fileID: 6584367418171633635} - OffSet: -133 --- !u!222 &7398331620628706104 CanvasRenderer: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Title.unity b/Assets/Scenes/Title.unity index 070173f..fd4e585 100644 --- a/Assets/Scenes/Title.unity +++ b/Assets/Scenes/Title.unity @@ -294,7 +294,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 106099440} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 6b4a5b43f2cdfa1458b26cf8e05f29d2, type: 3} m_Name: @@ -333,7 +333,7 @@ MonoBehaviour: m_ScaleFactor: 1 m_ReferenceResolution: {x: 1080, y: 1920} m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0.5 + m_MatchWidthOrHeight: 0 m_PhysicalUnit: 3 m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 @@ -6610,6 +6610,7 @@ GameObject: - component: {fileID: 1952734779} - component: {fileID: 1952734781} - component: {fileID: 1952734780} + - component: {fileID: 1952734782} m_Layer: 5 m_Name: BackgroundImage m_TagString: Untagged @@ -6632,7 +6633,7 @@ RectTransform: m_Father: {fileID: 106099445} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + 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} @@ -6674,6 +6675,20 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1952734778} m_CullTransparentMesh: 1 +--- !u!114 &1952734782 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1952734778} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86710e43de46f6f4bac7c8e50813a599, type: 3} + m_Name: + m_EditorClassIdentifier: + m_AspectMode: 4 + m_AspectRatio: 0.6667 --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/SingletonManagers/Managers/IAPManager.cs b/Assets/Scripts/SingletonManagers/Managers/IAPManager.cs index 0a34e4f..786271f 100644 --- a/Assets/Scripts/SingletonManagers/Managers/IAPManager.cs +++ b/Assets/Scripts/SingletonManagers/Managers/IAPManager.cs @@ -36,13 +36,13 @@ public class IAPManager : MonoBehaviour, IDetailedStoreListener ConfigurationBuilder builder = ConfigurationBuilder.Instance(StandardPurchasingModule.Instance()); /* 구글 플레이 상품들 추가 */ - builder.AddProduct("com.fgb.adsremove", ProductType.Consumable); - builder.AddProduct("com.fgb.cash200", ProductType.Consumable); - builder.AddProduct("com.fgb.cash1500", ProductType.Consumable); - builder.AddProduct("com.fgb.cash3300", ProductType.Consumable); + //builder.AddProduct("com.fgb.adsremove", ProductType.Consumable); + builder.AddProduct("com.fgb.cash500", ProductType.Consumable); + builder.AddProduct("com.fgb.cash2000", ProductType.Consumable); + builder.AddProduct("com.fgb.cash7500", ProductType.Consumable); builder.AddProduct("com.fgb.heart20", ProductType.Consumable); - builder.AddProduct("com.fgb.heart45", ProductType.Consumable); - builder.AddProduct("com.fgb.heart75", ProductType.Consumable); + builder.AddProduct("com.fgb.heart150", ProductType.Consumable); + builder.AddProduct("com.fgb.heart500", ProductType.Consumable); UnityPurchasing.Initialize(this, builder); @@ -140,21 +140,21 @@ public class IAPManager : MonoBehaviour, IDetailedStoreListener case "com.fgb.heart20": GameManager.DB.AddHeart(20, this.name); break; - case "com.fgb.heart45": - GameManager.DB.AddHeart(45, this.name); + case "com.fgb.heart150": + GameManager.DB.AddHeart(150, this.name); break; - case "com.fgb.heart75": - GameManager.DB.AddHeart(75, this.name); + case "com.fgb.heart500": + GameManager.DB.AddHeart(500, this.name); break; - case "com.fgb.cash200": - GameManager.DB.AddKey(200, this.name); + case "com.fgb.cash500": + GameManager.DB.AddKey(500, this.name); break; - case "com.fgb.cash1500": - GameManager.DB.AddKey(1500, this.name); + case "com.fgb.cash2000": + GameManager.DB.AddKey(2000, this.name); break; - case "com.fgb.cash3300": - GameManager.DB.AddKey(3300, this.name); + case "com.fgb.cash7500": + GameManager.DB.AddKey(7500, this.name); break; } } diff --git a/Assets/Scripts/UI/GamePanel/BannerSpace.cs b/Assets/Scripts/UI/GamePanel/BannerSpace.cs index 2fe21be..bdc3ba8 100644 --- a/Assets/Scripts/UI/GamePanel/BannerSpace.cs +++ b/Assets/Scripts/UI/GamePanel/BannerSpace.cs @@ -5,7 +5,6 @@ using UnityEngine; public class BannerSpace : MonoBehaviour { [SerializeField] private RectTransform rect; - public float OffSet = -133f; private void Awake() { @@ -27,7 +26,7 @@ public class BannerSpace : MonoBehaviour } else { - rect.offsetMax = new Vector2(rect.offsetMax.x, OffSet); + rect.offsetMax = new Vector2(rect.offsetMax.x, -150f); } } } @@ -42,7 +41,7 @@ public class BannerSpace : MonoBehaviour } else { - rect.offsetMax = new Vector2(rect.offsetMax.x, OffSet); + rect.offsetMax = new Vector2(rect.offsetMax.x, -150f); } } } diff --git a/Assets/Scripts/UI/ProductSlot.cs b/Assets/Scripts/UI/ProductSlot.cs index 2db44d8..a101f3d 100644 --- a/Assets/Scripts/UI/ProductSlot.cs +++ b/Assets/Scripts/UI/ProductSlot.cs @@ -26,6 +26,8 @@ public class ProductSlot : CardBase [Space(20)] [SerializeField] private GameObject BuyWithCashBtn; + [SerializeField] private GameObject go_i_dia; + [SerializeField] private GameObject go_i_heart; [SerializeField] private TMPro.TextMeshProUGUI t_buycash; private ProductData _data; @@ -42,6 +44,7 @@ public class ProductSlot : CardBase { GameManager.DB.ResetADSRewardActionCount(); GameManager.DB.ResetFreeHeartCount(); + GameManager.DB.ResetFreeKeyCount(); GameManager.Timer.DeactivateTimer(name); //buyButton.onClick.AddListener(OnBuyButtonClicked); @@ -59,6 +62,7 @@ public class ProductSlot : CardBase { GameManager.DB.ResetADSRewardActionCount(); GameManager.DB.ResetFreeHeartCount(); + GameManager.DB.ResetFreeKeyCount(); GameManager.Timer.DeactivateTimer(name); //buyButton.onClick.AddListener(OnBuyButtonClicked); @@ -236,6 +240,15 @@ public class ProductSlot : CardBase else if (data.productID == "heart_cash") { BuyWithCashBtn.SetActive(true); + go_i_dia.SetActive(true); + go_i_heart.SetActive(false); + t_buycash.text = _data.price.ToString(); + } + else if (data.productID == "cash_heart") + { + BuyWithCashBtn.SetActive(true); + go_i_dia.SetActive(false); + go_i_heart.SetActive(true); t_buycash.text = _data.price.ToString(); } else @@ -257,8 +270,9 @@ public class ProductSlot : CardBase DateTime loadTime = GameManager.Timer.LoadTime(); if (loadTime.Day != DateTime.Now.Day) { - //GameManager.DB.ResetADSRewardActionCount(); - //GameManager.DB.ResetFreeHeartCount(); + GameManager.DB.ResetADSRewardActionCount(); + GameManager.DB.ResetFreeHeartCount(); + GameManager.DB.ResetFreeKeyCount(); } else { @@ -299,7 +313,7 @@ public class ProductSlot : CardBase { if (GameManager.DB.FreeKeyCount > 0) { - GameManager.DB.AddKey(1, this.name); + GameManager.DB.AddKey(50, this.name); GameManager.DB.MinFreeKeyCount(1); if (GameManager.DB.FreeKeyCount <= 0 && PurchaseButton != null) @@ -335,7 +349,7 @@ public class ProductSlot : CardBase if (GameManager.DB.Key >= _data.price) { GameManager.DB.SubKey(_data.price, this.name); - GameManager.DB.AddHeart(1, this.name); + GameManager.DB.AddHeart(_data.rewardAmount, this.name); GameManager.DB.AddBuyKeyCount(1); GameManager.DB.SaveDatas(); @@ -346,6 +360,21 @@ public class ProductSlot : CardBase //GameManager.UI.ShowNStackPopup(EPopupType.NotEnoughGoldPopup); } } + else if (_data.productID == "cash_heart") + { + if (GameManager.DB.Heart >= _data.price) + { + GameManager.DB.SubHeart(_data.price, this.name); + GameManager.DB.AddKey(_data.rewardAmount, this.name); + + GameManager.DB.SaveDatas(); + } + else + { + // 팝업 출력 + //GameManager.UI.ShowNStackPopup(EPopupType.NotEnoughGoldPopup); + } + } else if (_data.productID == "com.fgb.adsremove") { if (GameManager.DB.IsRemoveADS == true) return; diff --git a/Assets/Scripts/UI/ShowPanel.cs b/Assets/Scripts/UI/ShowPanel.cs index 1a4cae4..98c0bfb 100644 --- a/Assets/Scripts/UI/ShowPanel.cs +++ b/Assets/Scripts/UI/ShowPanel.cs @@ -22,7 +22,7 @@ public class ShowPanel : MonoBehaviour zoomStep = 0; m_Cam.orthographicSize = 4f; m_Cam.transform.position = new Vector3(0f, 0f, -10f); - Set_ImageSize(); + //Set_ImageSize(); GameManager.ADS.HideBanner(); } diff --git a/Assets/Scripts/UI/StorePanel.cs b/Assets/Scripts/UI/StorePanel.cs index 3e1753f..8f05a04 100644 --- a/Assets/Scripts/UI/StorePanel.cs +++ b/Assets/Scripts/UI/StorePanel.cs @@ -47,18 +47,19 @@ public class StorePanel : MonoBehaviour if (list_item.Count == 0) { - list_item.Add(new ProductData("com.fgb.adsremove", EProductType.IAP, "강제 광고 제거", "강제 노출 광고 제거", 5500, sprites[3], EProductReward.Delete_Ad, 1)); - list_item.Add(new ProductData("heart_free", EProductType.Gold, "일일 하트 I", "무료 하트", 0, sprites[8], EProductReward.Heart, 1)); - list_item.Add(new ProductData("heart_ads", EProductType.ADS, "일일 하트 II", "광고 후 무료 하트", 0, sprites[8], EProductReward.Heart, 1)); - list_item.Add(new ProductData("key_free", EProductType.Gold, "일일 캐시 I", "무료 캐시", 0, sprites[4], EProductReward.Key, 1)); - list_item.Add(new ProductData("heart_cash", EProductType.Gold, "하트 1개", "보석으로 하트 구매", 200, sprites[0], EProductReward.Heart, 1)); + //list_item.Add(new ProductData("com.fgb.adsremove", EProductType.IAP, "강제 광고 제거", "강제 노출 광고 제거", 5500, sprites[3], EProductReward.Delete_Ad, 1)); + list_item.Add(new ProductData("key_free", EProductType.Gold, "다이아 50개", "일일 무료 다이아", 0, sprites[4], EProductReward.Key, 50)); + list_item.Add(new ProductData("heart_free", EProductType.Gold, "일일 하트 1개", "무료 하트", 0, sprites[8], EProductReward.Heart, 1)); + list_item.Add(new ProductData("heart_ads", EProductType.ADS, "일일 하트 5개", "광고 후 무료 하트", 0, sprites[8], EProductReward.Heart, 5)); + list_item.Add(new ProductData("heart_cash", EProductType.Gold, "하트 10개", "다이아로 하트 구매", 300, sprites[0], EProductReward.Heart, 10)); + list_item.Add(new ProductData("cash_heart", EProductType.Gold, "다이아 100개", "하트로 다이아 구매", 10, sprites[0], EProductReward.Key, 100)); - list_item.Add(new ProductData("com.fgb.cash200", EProductType.IAP, "캐시 200", "", 1000, sprites[5], EProductReward.Key, 200)); - list_item.Add(new ProductData("com.fgb.cash1500", EProductType.IAP, "캐시 1500", "", 6450, sprites[6], EProductReward.Key, 1500)); - list_item.Add(new ProductData("com.fgb.cash3300", EProductType.IAP, "캐시 3300", "", 11000, sprites[7], EProductReward.Key, 3300)); - list_item.Add(new ProductData("com.fgb.heart20", EProductType.IAP, "하트 20개", "", 11000, sprites[9], EProductReward.Heart, 20)); - list_item.Add(new ProductData("com.fgb.heart45", EProductType.IAP, "하트 45개", "", 22000, sprites[10], EProductReward.Heart, 45)); - list_item.Add(new ProductData("com.fgb.heart75", EProductType.IAP, "하트 75개", "", 33000, sprites[11], EProductReward.Heart, 75)); + list_item.Add(new ProductData("com.fgb.cash500", EProductType.IAP, "다이아 500", "", 1000, sprites[5], EProductReward.Key, 500)); + list_item.Add(new ProductData("com.fgb.cash2000", EProductType.IAP, "다이아 2000", "", 6450, sprites[6], EProductReward.Key, 2000)); + list_item.Add(new ProductData("com.fgb.cash7500", EProductType.IAP, "다이아 7500", "", 11000, sprites[7], EProductReward.Key, 7500)); + list_item.Add(new ProductData("com.fgb.heart20", EProductType.IAP, "하트 20개", "", 1100, sprites[9], EProductReward.Heart, 20)); + list_item.Add(new ProductData("com.fgb.heart150", EProductType.IAP, "하트 150개", "", 7700, sprites[10], EProductReward.Heart, 150)); + list_item.Add(new ProductData("com.fgb.heart500", EProductType.IAP, "하트 500개", "", 22000, sprites[11], EProductReward.Heart, 500)); } return; diff --git a/Assets/Scripts/UI/TitleScene/TitleCanvas.cs b/Assets/Scripts/UI/TitleScene/TitleCanvas.cs index a3de614..53f4d22 100644 --- a/Assets/Scripts/UI/TitleScene/TitleCanvas.cs +++ b/Assets/Scripts/UI/TitleScene/TitleCanvas.cs @@ -87,6 +87,7 @@ public class TitleCanvas : MonoBehaviour { GameManager.DB.ResetADSRewardActionCount(); GameManager.DB.ResetFreeHeartCount(); + GameManager.DB.ResetFreeKeyCount(); } state = TitleCanvasState.CheckInternet; diff --git a/Assets/Scripts/UI/TopPanel.cs b/Assets/Scripts/UI/TopPanel.cs index 308c9a9..e6128fa 100644 --- a/Assets/Scripts/UI/TopPanel.cs +++ b/Assets/Scripts/UI/TopPanel.cs @@ -2,33 +2,6 @@ using UnityEngine; public class TopPanel : MonoBehaviour { - - [SerializeField] private RectTransform rect = null; - - private void Awake() - { - if (rect == null) - { - rect = GetComponent(); - } - - if (rect != null) - { - if (GameManager.DB.IsRemoveADS == true) - { - //rect.offsetMax = new Vector2(rect.offsetMax.x, 0); - rect.sizeDelta = new Vector2(rect.sizeDelta.x, 150); - } - else - { - //rect.offsetMax = new Vector2(rect.offsetMax.x, -150); - rect.sizeDelta = new Vector2(rect.sizeDelta.x, 300); - } - } - - GameManager.ADS.OnDestroyBannerAd += OnDestroyBannerAd; - } - private void Start() { if (GameManager.Instance != null) @@ -74,21 +47,4 @@ public class TopPanel : MonoBehaviour { gameObject.SetActive(true); } - - private void OnDestroyBannerAd(bool isDestroy) - { - if (rect != null) - { - if (isDestroy == true) - { - //rect.offsetMax = new Vector2(rect.offsetMax.x, 0); - rect.sizeDelta = new Vector2(rect.sizeDelta.x, 150); - } - else - { - //rect.offsetMax = new Vector2(rect.offsetMax.x, -150); - rect.sizeDelta = new Vector2(rect.sizeDelta.x, 300); - } - } - } -} +} \ No newline at end of file