From 677e2a0ceb73564fd3562ab91dab4493f174713f Mon Sep 17 00:00:00 2001 From: Mingu Kim Date: Mon, 3 Feb 2025 00:26:26 +0900 Subject: [PATCH] =?UTF-8?q?UI=20=ED=94=84=EB=A6=AC=ED=8C=B9=20=EB=AA=85?= =?UTF-8?q?=EC=B9=AD=20=EC=88=98=EC=A0=95=20=EB=B0=8F=20=EC=9D=BC=EC=8B=9C?= =?UTF-8?q?=EC=A0=95=EC=A7=80=20=EB=B2=84=ED=8A=BC=20=EC=8A=A4=ED=81=AC?= =?UTF-8?q?=EB=A6=BD=ED=8A=B8=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Resources/UI/Prefabs/UI.GameOverUI.prefab | 8 +- .../Resources/UI/Prefabs/UI.GameWinUI.prefab | 16 +- .../Resources/UI/Prefabs/UI.InGameUI.prefab | 6 +- .../Resources/UI/Prefabs/UI.PauseUI.prefab | 18 +- .../Personal Scenes/dev_mingu/Ingame.unity | 196 +++++++++--------- .../Assets/Gameton/Scripts/UI/PauseUI.cs | 9 +- 6 files changed, 129 insertions(+), 124 deletions(-) diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.GameOverUI.prefab b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.GameOverUI.prefab index 2c2965af..64959f87 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.GameOverUI.prefab +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.GameOverUI.prefab @@ -134,7 +134,7 @@ GameObject: - component: {fileID: 3587595938107552055} - component: {fileID: 4385240914727077399} m_Layer: 5 - m_Name: Image + m_Name: HomeImage m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -450,7 +450,7 @@ GameObject: - component: {fileID: 5341303581847094390} - component: {fileID: 6717597500764570500} m_Layer: 5 - m_Name: Text (TMP) + m_Name: HomeText m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -659,7 +659,7 @@ GameObject: - component: {fileID: 5784221959334775150} - component: {fileID: 2421904774805294183} m_Layer: 5 - m_Name: Text (TMP) + m_Name: RetryText m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1050,7 +1050,7 @@ GameObject: - component: {fileID: 5019175676047146606} - component: {fileID: 2203374734293649712} m_Layer: 5 - m_Name: Image + m_Name: RetryImage m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 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 b04e2bc0..08b06871 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.GameWinUI.prefab +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.GameWinUI.prefab @@ -146,7 +146,7 @@ GameObject: - component: {fileID: 8901376345836538099} - component: {fileID: 6033297644426887262} m_Layer: 5 - m_Name: Text (TMP) + m_Name: MoneyText m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -280,7 +280,7 @@ GameObject: - component: {fileID: 7899651544111904407} - component: {fileID: 7496314656940101554} m_Layer: 5 - m_Name: Image + m_Name: NextStageImage m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -355,7 +355,7 @@ GameObject: - component: {fileID: 543918600240430920} - component: {fileID: 4627387138124807398} m_Layer: 5 - m_Name: Image + m_Name: HomeImage m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -628,7 +628,7 @@ GameObject: - component: {fileID: 6436474930773017188} - component: {fileID: 7402196756876524220} m_Layer: 5 - m_Name: Text (TMP) + m_Name: NextStageText m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -852,7 +852,7 @@ GameObject: - component: {fileID: 3828897685737036382} - component: {fileID: 8357412624079576043} m_Layer: 5 - m_Name: Text (TMP) + m_Name: Item2Text m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -986,7 +986,7 @@ GameObject: - component: {fileID: 3451010269999895564} - component: {fileID: 3704869467895961327} m_Layer: 5 - m_Name: Text (TMP) + m_Name: Item1Text m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1196,7 +1196,7 @@ GameObject: - component: {fileID: 8682634154493821384} - component: {fileID: 2343933244842818426} m_Layer: 5 - m_Name: Text (TMP) + m_Name: HomeText m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1412,7 +1412,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1781236700806201943 RectTransform: m_ObjectHideFlags: 0 diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.InGameUI.prefab b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.InGameUI.prefab index 1dd392ca..1632aff8 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.InGameUI.prefab +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.InGameUI.prefab @@ -12,7 +12,7 @@ GameObject: - component: {fileID: 7315466677257304871} - component: {fileID: 6855610711721862672} m_Layer: 5 - m_Name: Text (TMP) + m_Name: PauseText m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -146,7 +146,7 @@ GameObject: - component: {fileID: 4692612278190400359} - component: {fileID: 5472669934274512144} m_Layer: 5 - m_Name: Text (TMP) + m_Name: PauseText m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -676,7 +676,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: -55, y: 485} + m_AnchoredPosition: {x: -57.5, y: 486} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2198073928601018855 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 00182f56..69921006 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.PauseUI.prefab +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.PauseUI.prefab @@ -257,7 +257,7 @@ GameObject: - component: {fileID: 5700419407644901308} - component: {fileID: 5548964514549469899} m_Layer: 5 - m_Name: Text (TMP) + m_Name: LifeText m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -513,7 +513,7 @@ GameObject: - component: {fileID: 6282812778569934541} - component: {fileID: 8719601141685833893} m_Layer: 5 - m_Name: Image + m_Name: HomeImage m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -588,7 +588,7 @@ GameObject: - component: {fileID: 5851657129592222726} - component: {fileID: 2771084353127925377} m_Layer: 5 - m_Name: Image + m_Name: ContinueImage m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -663,7 +663,7 @@ GameObject: - component: {fileID: 6405668340545745690} - component: {fileID: 248277197586773792} m_Layer: 5 - m_Name: Image + m_Name: RetryImage m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -814,7 +814,7 @@ GameObject: - component: {fileID: 4134337246278512075} - component: {fileID: 1208558973457513949} m_Layer: 5 - m_Name: Text (TMP) + m_Name: RetryText m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1082,7 +1082,7 @@ GameObject: - component: {fileID: 4047406410400155201} - component: {fileID: 4947493580865088661} m_Layer: 5 - m_Name: Text (TMP) + m_Name: PauseText m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1216,7 +1216,7 @@ GameObject: - component: {fileID: 1664888020952220712} - component: {fileID: 1728527144193990239} m_Layer: 5 - m_Name: Text (TMP) + m_Name: ContinueText m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1357,7 +1357,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &5830140097779826096 RectTransform: m_ObjectHideFlags: 0 @@ -1456,3 +1456,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 94f5b0c2758d43b42a74f7fe4ae3a7e4, type: 3} m_Name: m_EditorClassIdentifier: + resumeButton: {fileID: 5341286469171996293} + quitButton: {fileID: 0} diff --git a/Gameton-06/Assets/Gameton/Scenes/Personal Scenes/dev_mingu/Ingame.unity b/Gameton-06/Assets/Gameton/Scenes/Personal Scenes/dev_mingu/Ingame.unity index 90dc22b1..e20ba544 100644 --- a/Gameton-06/Assets/Gameton/Scenes/Personal Scenes/dev_mingu/Ingame.unity +++ b/Gameton-06/Assets/Gameton/Scenes/Personal Scenes/dev_mingu/Ingame.unity @@ -9836,6 +9836,103 @@ Tilemap: e31: 0 e32: 0 e33: 1 +--- !u!1001 &959466699 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2230928671015106332, guid: a3cb38f00e7fb8b4fbb78fd1f7590659, type: 3} + propertyPath: m_Name + value: UI.InGameUI + objectReference: {fileID: 0} + - target: {fileID: 5957244545150369457, guid: a3cb38f00e7fb8b4fbb78fd1f7590659, type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5957244545150369457, guid: a3cb38f00e7fb8b4fbb78fd1f7590659, type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5957244545150369457, guid: a3cb38f00e7fb8b4fbb78fd1f7590659, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5957244545150369457, guid: a3cb38f00e7fb8b4fbb78fd1f7590659, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5957244545150369457, guid: a3cb38f00e7fb8b4fbb78fd1f7590659, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5957244545150369457, guid: a3cb38f00e7fb8b4fbb78fd1f7590659, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5957244545150369457, guid: a3cb38f00e7fb8b4fbb78fd1f7590659, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5957244545150369457, guid: a3cb38f00e7fb8b4fbb78fd1f7590659, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5957244545150369457, guid: a3cb38f00e7fb8b4fbb78fd1f7590659, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5957244545150369457, guid: a3cb38f00e7fb8b4fbb78fd1f7590659, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5957244545150369457, guid: a3cb38f00e7fb8b4fbb78fd1f7590659, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5957244545150369457, guid: a3cb38f00e7fb8b4fbb78fd1f7590659, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5957244545150369457, guid: a3cb38f00e7fb8b4fbb78fd1f7590659, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5957244545150369457, guid: a3cb38f00e7fb8b4fbb78fd1f7590659, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5957244545150369457, guid: a3cb38f00e7fb8b4fbb78fd1f7590659, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5957244545150369457, guid: a3cb38f00e7fb8b4fbb78fd1f7590659, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5957244545150369457, guid: a3cb38f00e7fb8b4fbb78fd1f7590659, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5957244545150369457, guid: a3cb38f00e7fb8b4fbb78fd1f7590659, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5957244545150369457, guid: a3cb38f00e7fb8b4fbb78fd1f7590659, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5957244545150369457, guid: a3cb38f00e7fb8b4fbb78fd1f7590659, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a3cb38f00e7fb8b4fbb78fd1f7590659, type: 3} --- !u!1 &1185367601 GameObject: m_ObjectHideFlags: 0 @@ -12142,103 +12239,6 @@ PrefabInstance: insertIndex: -1 addedObject: {fileID: 1333310382} m_SourcePrefab: {fileID: -8435245712485981826, guid: 06e11f99937f3f940bcf4f4bbb0a9fad, type: 3} ---- !u!1001 &1756254446 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2230928671015106332, guid: a3cb38f00e7fb8b4fbb78fd1f7590659, type: 3} - propertyPath: m_Name - value: UI.InGameUI - objectReference: {fileID: 0} - - target: {fileID: 5957244545150369457, guid: a3cb38f00e7fb8b4fbb78fd1f7590659, type: 3} - propertyPath: m_Pivot.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5957244545150369457, guid: a3cb38f00e7fb8b4fbb78fd1f7590659, type: 3} - propertyPath: m_Pivot.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5957244545150369457, guid: a3cb38f00e7fb8b4fbb78fd1f7590659, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5957244545150369457, guid: a3cb38f00e7fb8b4fbb78fd1f7590659, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5957244545150369457, guid: a3cb38f00e7fb8b4fbb78fd1f7590659, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5957244545150369457, guid: a3cb38f00e7fb8b4fbb78fd1f7590659, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5957244545150369457, guid: a3cb38f00e7fb8b4fbb78fd1f7590659, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5957244545150369457, guid: a3cb38f00e7fb8b4fbb78fd1f7590659, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5957244545150369457, guid: a3cb38f00e7fb8b4fbb78fd1f7590659, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5957244545150369457, guid: a3cb38f00e7fb8b4fbb78fd1f7590659, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5957244545150369457, guid: a3cb38f00e7fb8b4fbb78fd1f7590659, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5957244545150369457, guid: a3cb38f00e7fb8b4fbb78fd1f7590659, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5957244545150369457, guid: a3cb38f00e7fb8b4fbb78fd1f7590659, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5957244545150369457, guid: a3cb38f00e7fb8b4fbb78fd1f7590659, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5957244545150369457, guid: a3cb38f00e7fb8b4fbb78fd1f7590659, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5957244545150369457, guid: a3cb38f00e7fb8b4fbb78fd1f7590659, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5957244545150369457, guid: a3cb38f00e7fb8b4fbb78fd1f7590659, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5957244545150369457, guid: a3cb38f00e7fb8b4fbb78fd1f7590659, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5957244545150369457, guid: a3cb38f00e7fb8b4fbb78fd1f7590659, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5957244545150369457, guid: a3cb38f00e7fb8b4fbb78fd1f7590659, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: a3cb38f00e7fb8b4fbb78fd1f7590659, type: 3} --- !u!1 &1795290567 GameObject: m_ObjectHideFlags: 0 @@ -12469,4 +12469,4 @@ SceneRoots: - {fileID: 1555992584} - {fileID: 257363990} - {fileID: 720822433} - - {fileID: 1756254446} + - {fileID: 959466699} diff --git a/Gameton-06/Assets/Gameton/Scripts/UI/PauseUI.cs b/Gameton-06/Assets/Gameton/Scripts/UI/PauseUI.cs index bac3748c..4cad1968 100644 --- a/Gameton-06/Assets/Gameton/Scripts/UI/PauseUI.cs +++ b/Gameton-06/Assets/Gameton/Scripts/UI/PauseUI.cs @@ -9,10 +9,13 @@ namespace TON { public void OnPressPause() { - UIManager.Show(UIList.PauseUI); + // UIManager.Show(UIList.PauseUI); + Debug.Log("버튼 클릭"); - - Time.timeScale = 0f; + + + // 게임 일시 정지 + // Time.timeScale = 0f; } } }