From 967c9505e9da8977b11c5ab6437a76ecc8f4bb3a Mon Sep 17 00:00:00 2001 From: "aube.lee" Date: Sun, 16 Feb 2025 18:18:20 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=EA=B2=8C=EC=9E=84=20=EB=82=B4=20?= =?UTF-8?q?=EC=9D=BC=EC=8B=9C=EC=A0=95=EC=A7=80/=EA=B2=8C=EC=9E=84=20?= =?UTF-8?q?=EC=A2=85=EB=A3=8C=20=ED=8C=9D=EC=97=85=20=EB=B0=B1=EA=B7=B8?= =?UTF-8?q?=EB=9D=BC=EC=9A=B4=EB=93=9C=20=EC=98=81=EC=97=AD=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/Prefabs/UI.GameClearUI.prefab | 40 +++++++++ .../Resources/UI/Prefabs/UI.GameOverUI.prefab | 78 ++++++++++++++++ .../Resources/UI/Prefabs/UI.PauseUI.prefab | 89 +++++++++++++++++-- .../Gameton/Scripts/Scenes/StageScene.cs | 6 -- 4 files changed, 199 insertions(+), 14 deletions(-) diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.GameClearUI.prefab b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.GameClearUI.prefab index 9a8162c1..f3f533e1 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.GameClearUI.prefab +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.GameClearUI.prefab @@ -1406,6 +1406,8 @@ GameObject: - component: {fileID: 6226417930591628686} - component: {fileID: 2964090217482882256} - component: {fileID: 4380963916613820530} + - component: {fileID: 1035342880815794835} + - component: {fileID: 5726968870984839829} m_Layer: 5 m_Name: UI.GameClearUI m_TagString: Untagged @@ -1502,6 +1504,44 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 55 +--- !u!222 &1035342880815794835 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6480810126100203075} + m_CullTransparentMesh: 1 +--- !u!114 &5726968870984839829 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6480810126100203075} + 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: 0, g: 0, b: 0, a: 0.39215687} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + 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 &9197721667137178930 GameObject: m_ObjectHideFlags: 0 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 64959f87..66df4dfb 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.GameOverUI.prefab +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.GameOverUI.prefab @@ -209,6 +209,10 @@ GameObject: - component: {fileID: 232079733217537479} - component: {fileID: 561719364496921617} - component: {fileID: 8586670804004827437} + - component: {fileID: 610752698116592690} + - component: {fileID: 6319895504446759409} + - component: {fileID: 453703696255310589} + - component: {fileID: 1800726636175914131} m_Layer: 5 m_Name: UI.GameOverUI m_TagString: Untagged @@ -304,6 +308,80 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 55 +--- !u!114 &610752698116592690 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2896585157172790074} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe8f6eb3a4a94d398bb09abb4f01b61c, type: 3} + m_Name: + m_EditorClassIdentifier: + Body: {fileID: 0} + Animator: {fileID: 0} + AudioSource: {fileID: 0} +--- !u!95 &6319895504446759409 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2896585157172790074} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 0} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!222 &453703696255310589 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2896585157172790074} + m_CullTransparentMesh: 1 +--- !u!114 &1800726636175914131 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2896585157172790074} + 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: 0, g: 0, b: 0, a: 0.39215687} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + 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 &4094061956783481919 GameObject: m_ObjectHideFlags: 0 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 58d1a9c9..e0d4d68f 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.PauseUI.prefab +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.PauseUI.prefab @@ -1363,6 +1363,8 @@ GameObject: - component: {fileID: 174779954931244145} - component: {fileID: 4186505378186692388} - component: {fileID: 5289490854944505444} + - component: {fileID: 3594752767898100485} + - component: {fileID: 5913941067138568251} m_Layer: 5 m_Name: UI.PauseUI m_TagString: Untagged @@ -1469,6 +1471,41 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 94f5b0c2758d43b42a74f7fe4ae3a7e4, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!222 &3594752767898100485 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8671327827710467541} + m_CullTransparentMesh: 1 +--- !u!114 &5913941067138568251 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8671327827710467541} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 0.39215687} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 --- !u!1001 &1705821960064226749 PrefabInstance: m_ObjectHideFlags: 0 @@ -1495,19 +1532,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 644337214924361488, guid: f141f308efb487e4290aa10c1273c3a1, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 644337214924361488, guid: f141f308efb487e4290aa10c1273c3a1, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 644337214924361488, guid: f141f308efb487e4290aa10c1273c3a1, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 120 objectReference: {fileID: 0} - target: {fileID: 644337214924361488, guid: f141f308efb487e4290aa10c1273c3a1, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -50 objectReference: {fileID: 0} - target: {fileID: 694752155933920904, guid: f141f308efb487e4290aa10c1273c3a1, type: 3} propertyPath: m_Pivot.x @@ -1589,30 +1626,66 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4047522518680092082, guid: f141f308efb487e4290aa10c1273c3a1, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4047522518680092082, guid: f141f308efb487e4290aa10c1273c3a1, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4047522518680092082, guid: f141f308efb487e4290aa10c1273c3a1, type: 3} + propertyPath: m_AnchoredPosition.x + value: 510 + objectReference: {fileID: 0} + - target: {fileID: 4047522518680092082, guid: f141f308efb487e4290aa10c1273c3a1, type: 3} + propertyPath: m_AnchoredPosition.y + value: -50 + objectReference: {fileID: 0} - target: {fileID: 4207200870247786412, guid: f141f308efb487e4290aa10c1273c3a1, type: 3} propertyPath: m_PresetInfoIsWorld value: 0 objectReference: {fileID: 0} - target: {fileID: 4370703558549895965, guid: f141f308efb487e4290aa10c1273c3a1, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4370703558549895965, guid: f141f308efb487e4290aa10c1273c3a1, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4370703558549895965, guid: f141f308efb487e4290aa10c1273c3a1, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 430 objectReference: {fileID: 0} - target: {fileID: 4370703558549895965, guid: f141f308efb487e4290aa10c1273c3a1, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -50 + objectReference: {fileID: 0} + - target: {fileID: 4950687460265832273, guid: f141f308efb487e4290aa10c1273c3a1, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4950687460265832273, guid: f141f308efb487e4290aa10c1273c3a1, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4950687460265832273, guid: f141f308efb487e4290aa10c1273c3a1, type: 3} + propertyPath: m_AnchoredPosition.x + value: 300 + objectReference: {fileID: 0} + - target: {fileID: 4950687460265832273, guid: f141f308efb487e4290aa10c1273c3a1, type: 3} + propertyPath: m_AnchoredPosition.y + value: -50 objectReference: {fileID: 0} - target: {fileID: 8240765158807428481, guid: f141f308efb487e4290aa10c1273c3a1, type: 3} propertyPath: m_Name value: UI.LobyOptionUI objectReference: {fileID: 0} + - target: {fileID: 8240765158807428481, guid: f141f308efb487e4290aa10c1273c3a1, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Gameton-06/Assets/Gameton/Scripts/Scenes/StageScene.cs b/Gameton-06/Assets/Gameton/Scripts/Scenes/StageScene.cs index 10311e7f..849e47b0 100644 --- a/Gameton-06/Assets/Gameton/Scripts/Scenes/StageScene.cs +++ b/Gameton-06/Assets/Gameton/Scripts/Scenes/StageScene.cs @@ -59,11 +59,5 @@ namespace TON UIManager.Hide(UIList.ControllerUI); } - void OnEscapeExecute() - { - // TODO : 게임 일시정지 UI 노출 시 수행 - // Time.timeScale = 0f; - // UIManager.Show(UIList.PausePopupUI); - } } }