diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.GameWinUI.prefab b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.GameWinUI.prefab index 9f6653a6..3c5b0d53 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.GameWinUI.prefab +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.GameWinUI.prefab @@ -1978,7 +1978,6 @@ RectTransform: - {fileID: 8309246643985150052} - {fileID: 4381857254374141117} - {fileID: 2521041396983871113} - - {fileID: 3560245689515020415} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -2101,7 +2100,6 @@ MonoBehaviour: m_EditorClassIdentifier: rechargeModal: {fileID: 3404085104768005771} retryModal: {fileID: 3534850040710458559} - homeModal: {fileID: 7865321277774431614} title: {fileID: 3072291578172711816} goldReward: {fileID: 2511594787156804949} expReward: {fileID: 3421040063749252687} @@ -2823,149 +2821,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 360, y: 90} m_Pivot: {x: 0.5, y: 0} ---- !u!1001 &64960028099837783 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1781236700806201943} - m_Modifications: - - target: {fileID: 1303106263457310075, guid: c885c2fae59f7094aa3d7df1a760b720, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 2648027058164122620} - - target: {fileID: 1303106263457310075, guid: c885c2fae59f7094aa3d7df1a760b720, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: OnClickHomeButton - objectReference: {fileID: 0} - - target: {fileID: 1303106263457310075, guid: c885c2fae59f7094aa3d7df1a760b720, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: TON.GameWinUI, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 3570862311249145640, guid: c885c2fae59f7094aa3d7df1a760b720, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3570862311249145640, guid: c885c2fae59f7094aa3d7df1a760b720, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3570862311249145640, guid: c885c2fae59f7094aa3d7df1a760b720, type: 3} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3570862311249145640, guid: c885c2fae59f7094aa3d7df1a760b720, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3570862311249145640, guid: c885c2fae59f7094aa3d7df1a760b720, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3570862311249145640, guid: c885c2fae59f7094aa3d7df1a760b720, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3570862311249145640, guid: c885c2fae59f7094aa3d7df1a760b720, type: 3} - propertyPath: m_SizeDelta.x - value: -800 - objectReference: {fileID: 0} - - target: {fileID: 3570862311249145640, guid: c885c2fae59f7094aa3d7df1a760b720, type: 3} - propertyPath: m_SizeDelta.y - value: -200 - objectReference: {fileID: 0} - - target: {fileID: 3570862311249145640, guid: c885c2fae59f7094aa3d7df1a760b720, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3570862311249145640, guid: c885c2fae59f7094aa3d7df1a760b720, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3570862311249145640, guid: c885c2fae59f7094aa3d7df1a760b720, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3570862311249145640, guid: c885c2fae59f7094aa3d7df1a760b720, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3570862311249145640, guid: c885c2fae59f7094aa3d7df1a760b720, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3570862311249145640, guid: c885c2fae59f7094aa3d7df1a760b720, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3570862311249145640, guid: c885c2fae59f7094aa3d7df1a760b720, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3570862311249145640, guid: c885c2fae59f7094aa3d7df1a760b720, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3570862311249145640, guid: c885c2fae59f7094aa3d7df1a760b720, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3570862311249145640, guid: c885c2fae59f7094aa3d7df1a760b720, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3570862311249145640, guid: c885c2fae59f7094aa3d7df1a760b720, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3570862311249145640, guid: c885c2fae59f7094aa3d7df1a760b720, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6095526632406671128, guid: c885c2fae59f7094aa3d7df1a760b720, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 6095526632406671128, guid: c885c2fae59f7094aa3d7df1a760b720, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 2648027058164122620} - - target: {fileID: 6095526632406671128, guid: c885c2fae59f7094aa3d7df1a760b720, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: OnClickCloseButton - objectReference: {fileID: 0} - - target: {fileID: 6095526632406671128, guid: c885c2fae59f7094aa3d7df1a760b720, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: TON.GameWinUI, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 6095526632406671128, guid: c885c2fae59f7094aa3d7df1a760b720, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_StringArgument - value: home - objectReference: {fileID: 0} - - target: {fileID: 7908871571231242793, guid: c885c2fae59f7094aa3d7df1a760b720, type: 3} - propertyPath: m_Name - value: UI.HomeModal - objectReference: {fileID: 0} - - target: {fileID: 7908871571231242793, guid: c885c2fae59f7094aa3d7df1a760b720, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: c885c2fae59f7094aa3d7df1a760b720, type: 3} ---- !u!224 &3560245689515020415 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 3570862311249145640, guid: c885c2fae59f7094aa3d7df1a760b720, type: 3} - m_PrefabInstance: {fileID: 64960028099837783} - m_PrefabAsset: {fileID: 0} ---- !u!1 &7865321277774431614 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7908871571231242793, guid: c885c2fae59f7094aa3d7df1a760b720, type: 3} - m_PrefabInstance: {fileID: 64960028099837783} - m_PrefabAsset: {fileID: 0} --- !u!1001 &685096132383014060 PrefabInstance: m_ObjectHideFlags: 0 @@ -3032,7 +2887,7 @@ PrefabInstance: objectReference: {fileID: 2648027058164122620} - target: {fileID: 3924096021625724153, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: OnClickHomeModal + value: OnClickHomeButton objectReference: {fileID: 0} - target: {fileID: 3924096021625724153, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.PauseUI.prefab b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.PauseUI.prefab index 5f943b64..283485f1 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.PauseUI.prefab +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.PauseUI.prefab @@ -1459,43 +1459,43 @@ PrefabInstance: m_Modifications: - target: {fileID: 27539374732905338, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 27539374732905338, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 27539374732905338, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_AnchoredPosition.x - value: 360 + value: 0 objectReference: {fileID: 0} - target: {fileID: 27539374732905338, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_AnchoredPosition.y - value: -100 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1150813010971508066, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1150813010971508066, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1150813010971508066, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_SizeDelta.x - value: 51 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1150813010971508066, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_SizeDelta.y - value: 45 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1150813010971508066, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_AnchoredPosition.x - value: 259.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1150813010971508066, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_AnchoredPosition.y - value: -37.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1194212059389526510, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_fontAsset @@ -1511,43 +1511,43 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1632260334339437034, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1632260334339437034, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1632260334339437034, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_AnchoredPosition.x - value: 600 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1632260334339437034, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_AnchoredPosition.y - value: -100 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1750486691344034846, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1750486691344034846, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1750486691344034846, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_SizeDelta.x - value: 51 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1750486691344034846, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_SizeDelta.y - value: 45 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1750486691344034846, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_AnchoredPosition.x - value: 203.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1750486691344034846, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_AnchoredPosition.y - value: -37.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2014817396651137805, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_fontAsset @@ -1659,27 +1659,27 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3415751508290410392, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3415751508290410392, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3415751508290410392, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_SizeDelta.x - value: 51 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3415751508290410392, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_SizeDelta.y - value: 45 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3415751508290410392, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_AnchoredPosition.x - value: 35.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3415751508290410392, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_AnchoredPosition.y - value: -37.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4542825537873683785, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_Name @@ -1687,7 +1687,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4542825537873683785, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5607894149688796868, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_fontAsset @@ -1703,19 +1703,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6005301849909924835, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6005301849909924835, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6005301849909924835, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_AnchoredPosition.x - value: 120 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6005301849909924835, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_AnchoredPosition.y - value: -100 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6498735799474681239, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_AnchoredPosition.y @@ -1723,27 +1723,27 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6869740172896691300, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6869740172896691300, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6869740172896691300, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_SizeDelta.x - value: 51 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6869740172896691300, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_SizeDelta.y - value: 45 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6869740172896691300, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_AnchoredPosition.x - value: 147.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6869740172896691300, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_AnchoredPosition.y - value: -37.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7681041094976077926, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_fontAsset @@ -1783,27 +1783,27 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8911194147253732922, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8911194147253732922, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8911194147253732922, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_SizeDelta.x - value: 51 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8911194147253732922, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_SizeDelta.y - value: 45 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8911194147253732922, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_AnchoredPosition.x - value: 91.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8911194147253732922, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_AnchoredPosition.y - value: -37.5 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] diff --git a/Gameton-06/Assets/Gameton/Scripts/Character/PlayerDataManager.cs b/Gameton-06/Assets/Gameton/Scripts/Character/PlayerDataManager.cs index 3561dce8..8d5da789 100644 --- a/Gameton-06/Assets/Gameton/Scripts/Character/PlayerDataManager.cs +++ b/Gameton-06/Assets/Gameton/Scripts/Character/PlayerDataManager.cs @@ -63,6 +63,23 @@ namespace TON // UpdateUI(); }); } + public void UseGold(int amount) + { + if (goldAmount - amount < amount) + { + // 골드 재화 사용 불가 팝업 + UIManager.Show(UIList.GoldPopup); + return; + } + + goldAmount -= amount; + cashDataManager.UpdateGoldData(goldAmount, updatedData => + { + // TODO: UI 업데이트 로직 적용 + // UpdateUI(); + }); + } + public void AddFish(int amount) { fishAmount += amount; @@ -72,6 +89,22 @@ namespace TON // UpdateUI(); }); } + public void UseFish(int amount) + { + if (fishAmount - amount < amount) + { + // 생선 재화 사용 불가 팝업 + UIManager.Show(UIList.FishPopup); + return; + } + + fishAmount -= amount; + cashDataManager.UpdateFishData(fishAmount, updatedData => + { + // TODO: UI 업데이트 로직 적용 + // UpdateUI(); + }); + } // 플레이어가 사망했을때 호출 public void PlayerDeadEvent() diff --git a/Gameton-06/Assets/Gameton/Scripts/UI/GameWinUI.cs b/Gameton-06/Assets/Gameton/Scripts/UI/GameWinUI.cs index 221f2929..8ebb76dd 100644 --- a/Gameton-06/Assets/Gameton/Scripts/UI/GameWinUI.cs +++ b/Gameton-06/Assets/Gameton/Scripts/UI/GameWinUI.cs @@ -15,7 +15,6 @@ namespace TON public GameObject rechargeModal; public GameObject retryModal; - public GameObject homeModal; [SerializeField] private TextMeshProUGUI title; [SerializeField] private TextMeshProUGUI goldReward; @@ -26,21 +25,26 @@ namespace TON [SerializeField] private GameObject levelUpText; [SerializeField] private TextMeshProUGUI fishAmount; + private int goldAmount = 0; // 광고 보상 수령 후 초기화 + private void OnEnable() { + Time.timeScale = 0f; + goldAmount = StageManager.Singleton.goldReward; + InitModalActive(); SetUITextMesh(); UpdateFishCount(); + // 해당 UI 노출과 함께 게임 클리어 정보 저장 StageManager.Singleton.StageClear(); // 현재 획득한 경험치로 인한 레벨업 처리 SetLevelUpText(StageManager.Singleton.expReward); - // TODO: 획득한 골드 정보 저장 로직 구현 - - + // 획득한 골드 정보 저장 + PlayerDataManager.Singleton.AddGold(goldAmount); } public void InitModalActive() @@ -48,22 +52,23 @@ namespace TON levelUpText.SetActive(false); rechargeModal.SetActive(false); retryModal.SetActive(false); - homeModal.SetActive(false); } public void SetUITextMesh() { title.text = (StageManager.Singleton.waveCount == 10) ? YOU_WIN : GAME_OVER; wave.text = $"{StageManager.Singleton.waveCount} wave"; - goldReward.text = $"{StageManager.Singleton.goldReward} G"; + goldReward.text = $"{goldAmount} G"; expReward.text = $"EXP {StageManager.Singleton.expReward}"; - playTime.text = $"{StageManager.Singleton.PlayTime / 60}m {StageManager.Singleton.PlayTime % 60:F2}s"; + score.text = $"{StageManager.Singleton.gameScore}"; + + float clearTime = StageManager.Singleton.PlayTime; + playTime.text = $"{(int)(clearTime / 60)}m {(int)(clearTime % 60)}s"; } public void UpdateFishCount() { fishAmount.text = string.Format("{0:#,###}", PlayerDataManager.Singleton.fishAmount); - } @@ -81,14 +86,10 @@ namespace TON PlayerDataManager.Singleton.UpdatePlayerData(); } - public void OnClickHomeModal() - { - homeModal.SetActive(true); - } public void OnClickHomeButton() { + Time.timeScale = 1f; UIManager.Hide(UIList.GameWinUI); - Main.Singleton.ChangeScene(SceneType.Lobby); } @@ -97,13 +98,11 @@ namespace TON // 가지고 있는 하트가 없다면 입장 불가 if (HeartDataManager.Singleton.GetCurrentHearts() < 1) { - Time.timeScale = 0f; // 하트 충전 modal 출력 rechargeModal.SetActive(true); return; } - - retryModal.SetActive(true); + OnClickStageRetryButton(); } public void OnClickStageRetryButton() { @@ -125,9 +124,6 @@ namespace TON case "retry": retryModal.SetActive(false); break; - case "home": - homeModal.SetActive(false); - break; } } @@ -163,6 +159,10 @@ namespace TON { // TODO: 광고 시청 로직 추가, 골드 보상 2배 적용 후 Lobby로 이동 Debug.Log("OnClickAdButton::: "); + + PlayerDataManager.Singleton.AddGold(goldAmount); + OnClickHomeButton(); + } } diff --git a/Gameton-06/Assets/Gameton/Scripts/UI/IngameUI.cs b/Gameton-06/Assets/Gameton/Scripts/UI/IngameUI.cs index 56c86a2e..299555fd 100644 --- a/Gameton-06/Assets/Gameton/Scripts/UI/IngameUI.cs +++ b/Gameton-06/Assets/Gameton/Scripts/UI/IngameUI.cs @@ -56,6 +56,12 @@ namespace TON private void Update() { UpdatePlayTimeDisplay(); + UpdateGameScore(); + } + + private void UpdateGameScore() + { + scoreText.text = $"{StageManager.Singleton.gameScore}"; } private void UpdatePlayTimeDisplay() diff --git a/Gameton-06/Assets/Gameton/Scripts/UI/PauseUI.cs b/Gameton-06/Assets/Gameton/Scripts/UI/PauseUI.cs index d7f54496..9f5d8d66 100644 --- a/Gameton-06/Assets/Gameton/Scripts/UI/PauseUI.cs +++ b/Gameton-06/Assets/Gameton/Scripts/UI/PauseUI.cs @@ -31,10 +31,10 @@ namespace TON // 컨티뉴 버튼 선택 시 public void OnPressContinueButton() { - // UI 숨김 - UIManager.Hide(UIList.PauseUI); // 게임 재생 Time.timeScale = 1f; + // UI 숨김 + UIManager.Hide(UIList.PauseUI); } public void OnClickHomeModal()