From 20219615b9c216c2c194b6e5c587a09e8c5955c0 Mon Sep 17 00:00:00 2001 From: "aube.lee" Date: Tue, 4 Mar 2025 21:29:45 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=EB=8B=A4=EC=8B=9C=ED=95=98=EA=B8=B0=20?= =?UTF-8?q?=EC=95=88=EB=82=B4=20=ED=8C=9D=EC=97=85=20=EB=A1=9C=EC=A7=81=20?= =?UTF-8?q?=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Resources/UI/Prefabs/UI.PauseUI.prefab | 84 +++++++++---------- .../Assets/Gameton/Scripts/UI/GameWinUI.cs | 2 +- .../Assets/Gameton/Scripts/UI/PauseUI.cs | 3 +- 3 files changed, 45 insertions(+), 44 deletions(-) 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 2cc5bf33..a2b5d237 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.PauseUI.prefab +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.PauseUI.prefab @@ -749,7 +749,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5490627752139354865, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5490627752139354865, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} propertyPath: m_AnchorMin.x @@ -757,7 +757,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5490627752139354865, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5490627752139354865, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} propertyPath: m_SizeDelta.x @@ -797,11 +797,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5490627752139354865, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 439.99997 objectReference: {fileID: 0} - target: {fileID: 5490627752139354865, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -100 objectReference: {fileID: 0} - target: {fileID: 5490627752139354865, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1002,7 +1002,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3325059767138359770, guid: 0e07e566979a34647848af731786bffa, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3325059767138359770, guid: 0e07e566979a34647848af731786bffa, type: 3} propertyPath: m_AnchorMin.x @@ -1010,7 +1010,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3325059767138359770, guid: 0e07e566979a34647848af731786bffa, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3325059767138359770, guid: 0e07e566979a34647848af731786bffa, type: 3} propertyPath: m_SizeDelta.x @@ -1050,11 +1050,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3325059767138359770, guid: 0e07e566979a34647848af731786bffa, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 146.66666 objectReference: {fileID: 0} - target: {fileID: 3325059767138359770, guid: 0e07e566979a34647848af731786bffa, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -100 objectReference: {fileID: 0} - target: {fileID: 3325059767138359770, guid: 0e07e566979a34647848af731786bffa, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1212,27 +1212,27 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 379111498896210418, guid: 337e10d50a493a74f9362a255e6df564, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 379111498896210418, guid: 337e10d50a493a74f9362a255e6df564, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 379111498896210418, guid: 337e10d50a493a74f9362a255e6df564, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 51 objectReference: {fileID: 0} - target: {fileID: 379111498896210418, guid: 337e10d50a493a74f9362a255e6df564, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 45 objectReference: {fileID: 0} - target: {fileID: 379111498896210418, guid: 337e10d50a493a74f9362a255e6df564, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 259.5 objectReference: {fileID: 0} - target: {fileID: 379111498896210418, guid: 337e10d50a493a74f9362a255e6df564, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -37.5 objectReference: {fileID: 0} - target: {fileID: 1252597083677857153, guid: 337e10d50a493a74f9362a255e6df564, type: 3} propertyPath: m_Pivot.x @@ -1316,51 +1316,51 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1364775333403814030, guid: 337e10d50a493a74f9362a255e6df564, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1364775333403814030, guid: 337e10d50a493a74f9362a255e6df564, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1364775333403814030, guid: 337e10d50a493a74f9362a255e6df564, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 51 objectReference: {fileID: 0} - target: {fileID: 1364775333403814030, guid: 337e10d50a493a74f9362a255e6df564, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 45 objectReference: {fileID: 0} - target: {fileID: 1364775333403814030, guid: 337e10d50a493a74f9362a255e6df564, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 203.5 objectReference: {fileID: 0} - target: {fileID: 1364775333403814030, guid: 337e10d50a493a74f9362a255e6df564, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -37.5 objectReference: {fileID: 0} - target: {fileID: 2728462664568427272, guid: 337e10d50a493a74f9362a255e6df564, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2728462664568427272, guid: 337e10d50a493a74f9362a255e6df564, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2728462664568427272, guid: 337e10d50a493a74f9362a255e6df564, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 51 objectReference: {fileID: 0} - target: {fileID: 2728462664568427272, guid: 337e10d50a493a74f9362a255e6df564, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 45 objectReference: {fileID: 0} - target: {fileID: 2728462664568427272, guid: 337e10d50a493a74f9362a255e6df564, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 35.5 objectReference: {fileID: 0} - target: {fileID: 2728462664568427272, guid: 337e10d50a493a74f9362a255e6df564, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -37.5 objectReference: {fileID: 0} - target: {fileID: 4461160867968987091, guid: 337e10d50a493a74f9362a255e6df564, type: 3} propertyPath: m_Name @@ -1368,51 +1368,51 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6191435713966186740, guid: 337e10d50a493a74f9362a255e6df564, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6191435713966186740, guid: 337e10d50a493a74f9362a255e6df564, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6191435713966186740, guid: 337e10d50a493a74f9362a255e6df564, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 51 objectReference: {fileID: 0} - target: {fileID: 6191435713966186740, guid: 337e10d50a493a74f9362a255e6df564, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 45 objectReference: {fileID: 0} - target: {fileID: 6191435713966186740, guid: 337e10d50a493a74f9362a255e6df564, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 147.5 objectReference: {fileID: 0} - target: {fileID: 6191435713966186740, guid: 337e10d50a493a74f9362a255e6df564, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -37.5 objectReference: {fileID: 0} - target: {fileID: 8147212306719867562, guid: 337e10d50a493a74f9362a255e6df564, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8147212306719867562, guid: 337e10d50a493a74f9362a255e6df564, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8147212306719867562, guid: 337e10d50a493a74f9362a255e6df564, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 51 objectReference: {fileID: 0} - target: {fileID: 8147212306719867562, guid: 337e10d50a493a74f9362a255e6df564, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 45 objectReference: {fileID: 0} - target: {fileID: 8147212306719867562, guid: 337e10d50a493a74f9362a255e6df564, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 91.5 objectReference: {fileID: 0} - target: {fileID: 8147212306719867562, guid: 337e10d50a493a74f9362a255e6df564, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -37.5 objectReference: {fileID: 0} - target: {fileID: 8352075515778809451, guid: 337e10d50a493a74f9362a255e6df564, type: 3} propertyPath: m_hasFontAssetChanged @@ -1562,7 +1562,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5490627752139354865, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5490627752139354865, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} propertyPath: m_AnchorMin.x @@ -1570,7 +1570,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5490627752139354865, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5490627752139354865, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} propertyPath: m_SizeDelta.x @@ -1610,11 +1610,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5490627752139354865, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 733.33325 objectReference: {fileID: 0} - target: {fileID: 5490627752139354865, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -100 objectReference: {fileID: 0} - target: {fileID: 5490627752139354865, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} propertyPath: m_LocalEulerAnglesHint.x diff --git a/Gameton-06/Assets/Gameton/Scripts/UI/GameWinUI.cs b/Gameton-06/Assets/Gameton/Scripts/UI/GameWinUI.cs index 2a36ed84..a845806a 100644 --- a/Gameton-06/Assets/Gameton/Scripts/UI/GameWinUI.cs +++ b/Gameton-06/Assets/Gameton/Scripts/UI/GameWinUI.cs @@ -102,7 +102,7 @@ namespace TON rechargeModal.SetActive(true); return; } - OnClickStageRetryButton(); + retryModal.SetActive(true); } public void OnClickStageRetryButton() { diff --git a/Gameton-06/Assets/Gameton/Scripts/UI/PauseUI.cs b/Gameton-06/Assets/Gameton/Scripts/UI/PauseUI.cs index f2dd77dc..901e3aa1 100644 --- a/Gameton-06/Assets/Gameton/Scripts/UI/PauseUI.cs +++ b/Gameton-06/Assets/Gameton/Scripts/UI/PauseUI.cs @@ -71,8 +71,9 @@ namespace TON return; } - OnClickStageRetryButton(); + retryModal.SetActive(true); } + public void OnClickStageRetryButton() { Time.timeScale = 1f;