From 40afaaa86821861441b2a4d6823a39b61fe7e88b Mon Sep 17 00:00:00 2001 From: "aube.lee" Date: Mon, 3 Feb 2025 00:56:45 +0900 Subject: [PATCH] =?UTF-8?q?Ui=20=EB=A0=88=EC=9D=B4=EC=95=84=EC=9B=83=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Resources/UI/Prefabs/UI.InGameUI.prefab | 162 ++++++++++++++++-- .../UI/Prefabs/UI.InGameUI.prefab.meta | 2 +- .../Personal Scenes/dev_mingu/Controller.cs | 18 +- .../Personal Scenes/dev_mingu/Ingame.unity | 81 ++++----- .../Gameton/Scripts/Common/BootStrapper.cs | 3 +- .../Assets/Gameton/Scripts/UI/IngameUI.cs | 12 ++ .../Assets/Gameton/Scripts/UI/PauseUI.cs | 11 +- 7 files changed, 206 insertions(+), 83 deletions(-) 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 1632aff8..d9dc2d96 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.InGameUI.prefab +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.InGameUI.prefab @@ -1,5 +1,69 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &59216895737327049 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 689135930413181788} + - component: {fileID: 643447308525929212} + m_Layer: 0 + m_Name: Button Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &689135930413181788 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 59216895737327049} + 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: + - {fileID: 2587651429737153657} + - {fileID: 6573351524042496593} + m_Father: {fileID: 3954124197450694553} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -80, y: 0} + m_SizeDelta: {x: 300, y: 100} + m_Pivot: {x: 1, y: 0.5} +--- !u!114 &643447308525929212 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 59216895737327049} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &469601439051705668 GameObject: m_ObjectHideFlags: 0 @@ -295,16 +359,16 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1142933324909196102} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: -3.7653713} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6688714734115661525} - m_Father: {fileID: 5957244545150369457} + m_Father: {fileID: 689135930413181788} 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: 880.99994, y: 461} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2800419191577383493 @@ -389,9 +453,9 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 5289490854944505444, guid: 1aaa74623c10c5c4ab71b4444606bee8, type: 3} - m_TargetAssemblyTypeName: TON.PauseUI, Assembly-CSharp - m_MethodName: OnPressPause + - m_Target: {fileID: 1115065242490731874} + m_TargetAssemblyTypeName: TON.IngameUI, Assembly-CSharp + m_MethodName: OnPressPauseButton m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -413,8 +477,9 @@ GameObject: - component: {fileID: 7673811864096136654} - component: {fileID: 3028871954880495625} - component: {fileID: 6005358235688311495} + - component: {fileID: 1115065242490731874} m_Layer: 5 - m_Name: UI.InGameUI + m_Name: UI.IngameUI m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -432,8 +497,7 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 6573351524042496593} - - {fileID: 2587651429737153657} + - {fileID: 3954124197450694553} - {fileID: 785013066348389420} - {fileID: 2962770884742879643} - {fileID: 8862689834726366112} @@ -507,6 +571,22 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 55 +--- !u!114 &1115065242490731874 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2230928671015106332} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c00fc90238999db44b3bd05365097e20, type: 3} + m_Name: + m_EditorClassIdentifier: + hpBar: {fileID: 0} + spBar: {fileID: 0} + hpText: {fileID: 0} + spText: {fileID: 0} --- !u!1 &2837283741072849140 GameObject: m_ObjectHideFlags: 0 @@ -641,6 +721,42 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &3267681041312651074 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3954124197450694553} + m_Layer: 0 + m_Name: Top Layout + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3954124197450694553 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3267681041312651074} + 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: 1 + m_Children: + - {fileID: 689135930413181788} + m_Father: {fileID: 5957244545150369457} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 200} + m_Pivot: {x: 0.5, y: 1} --- !u!1 &3496399392294800122 GameObject: m_ObjectHideFlags: 0 @@ -953,16 +1069,16 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7958758309437744408} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: -3.7653713} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7804835953420384360} - m_Father: {fileID: 5957244545150369457} + m_Father: {fileID: 689135930413181788} 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: 756, y: 461} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &298478946457726797 @@ -1046,4 +1162,16 @@ MonoBehaviour: m_TargetGraphic: {fileID: 5896725935741723649} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 2230928671015106332} + m_TargetAssemblyTypeName: + m_MethodName: + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.InGameUI.prefab.meta b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.InGameUI.prefab.meta index 4875a6da..65eaaab5 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.InGameUI.prefab.meta +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.InGameUI.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a3cb38f00e7fb8b4fbb78fd1f7590659 +guid: ac2beb72c1055fb49bde831d9a3a4ac8 PrefabImporter: externalObjects: {} userData: diff --git a/Gameton-06/Assets/Gameton/Scenes/Personal Scenes/dev_mingu/Controller.cs b/Gameton-06/Assets/Gameton/Scenes/Personal Scenes/dev_mingu/Controller.cs index 202d5d40..54302292 100644 --- a/Gameton-06/Assets/Gameton/Scenes/Personal Scenes/dev_mingu/Controller.cs +++ b/Gameton-06/Assets/Gameton/Scenes/Personal Scenes/dev_mingu/Controller.cs @@ -20,15 +20,15 @@ namespace TON private void Update() { bool isMoving = false; - + if (Input.GetKey(KeyCode.RightArrow)) { var position = _cachedTransform.position; position.x += 5.0f * Time.deltaTime; _cachedTransform.position = position; - + isMoving = true; - + _spriteRenderer.flipX = false; } if (Input.GetKey(KeyCode.LeftArrow)) @@ -36,9 +36,9 @@ namespace TON var position = _cachedTransform.position; position.x -= 5.0f * Time.deltaTime; _cachedTransform.position = position; - + isMoving = true; - + _spriteRenderer.flipX = true; } if (Input.GetKey(KeyCode.UpArrow)) @@ -46,13 +46,13 @@ namespace TON var position = _cachedTransform.position; position.y += 10.0f * Time.deltaTime; _cachedTransform.position = position; - + isMoving = true; - + _spriteRenderer.flipX = true; } - - _anmator.SetBool("IsMoving", isMoving); + + // _anmator.SetBool("IsMoving", isMoving); } } } 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 e20ba544..32653274 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 @@ -9848,6 +9848,26 @@ PrefabInstance: propertyPath: m_Name value: UI.InGameUI objectReference: {fileID: 0} + - target: {fileID: 2230928671015106332, guid: a3cb38f00e7fb8b4fbb78fd1f7590659, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2587651429737153657, guid: a3cb38f00e7fb8b4fbb78fd1f7590659, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2587651429737153657, guid: a3cb38f00e7fb8b4fbb78fd1f7590659, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2587651429737153657, guid: a3cb38f00e7fb8b4fbb78fd1f7590659, type: 3} + propertyPath: m_AnchoredPosition.x + value: 75 + objectReference: {fileID: 0} + - target: {fileID: 2587651429737153657, guid: a3cb38f00e7fb8b4fbb78fd1f7590659, type: 3} + propertyPath: m_AnchoredPosition.y + value: -50 + objectReference: {fileID: 0} - target: {fileID: 5957244545150369457, guid: a3cb38f00e7fb8b4fbb78fd1f7590659, type: 3} propertyPath: m_Pivot.x value: 0 @@ -9928,6 +9948,22 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6573351524042496593, guid: a3cb38f00e7fb8b4fbb78fd1f7590659, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6573351524042496593, guid: a3cb38f00e7fb8b4fbb78fd1f7590659, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6573351524042496593, guid: a3cb38f00e7fb8b4fbb78fd1f7590659, type: 3} + propertyPath: m_AnchoredPosition.x + value: 225 + objectReference: {fileID: 0} + - target: {fileID: 6573351524042496593, guid: a3cb38f00e7fb8b4fbb78fd1f7590659, type: 3} + propertyPath: m_AnchoredPosition.y + value: -50 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -12239,50 +12275,6 @@ PrefabInstance: insertIndex: -1 addedObject: {fileID: 1333310382} m_SourcePrefab: {fileID: -8435245712485981826, guid: 06e11f99937f3f940bcf4f4bbb0a9fad, type: 3} ---- !u!1 &1795290567 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1795290568} - - component: {fileID: 1795290569} - m_Layer: 0 - m_Name: TON.InputSytem - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1795290568 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1795290567} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.34585175, y: 0.61144084, z: 10.801609} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1795290569 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1795290567} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 94c58e7fc0b907b43bbe208a18ca6ded, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1986734010 GameObject: m_ObjectHideFlags: 0 @@ -12460,7 +12452,6 @@ SceneRoots: m_ObjectHideFlags: 0 m_Roots: - {fileID: 1986734011} - - {fileID: 1795290568} - {fileID: 718284631} - {fileID: 2135657552} - {fileID: 535565209} diff --git a/Gameton-06/Assets/Gameton/Scripts/Common/BootStrapper.cs b/Gameton-06/Assets/Gameton/Scripts/Common/BootStrapper.cs index 7643f51c..c7b7385c 100644 --- a/Gameton-06/Assets/Gameton/Scripts/Common/BootStrapper.cs +++ b/Gameton-06/Assets/Gameton/Scripts/Common/BootStrapper.cs @@ -43,8 +43,9 @@ namespace TON Main.Singleton.Initialize(); // TODO : Custom Order After System Load + UIManager.Show(UIList.IngameUI); UIManager.Show(UIList.ControllerUI); - // UIManager.Show(UIList.LogUI); + // UIManager.Show(UIList.TitleUI); } } } diff --git a/Gameton-06/Assets/Gameton/Scripts/UI/IngameUI.cs b/Gameton-06/Assets/Gameton/Scripts/UI/IngameUI.cs index 5e633dbb..29397246 100644 --- a/Gameton-06/Assets/Gameton/Scripts/UI/IngameUI.cs +++ b/Gameton-06/Assets/Gameton/Scripts/UI/IngameUI.cs @@ -30,6 +30,18 @@ namespace TON + public void OnPressPauseButton() + { + UIManager.Show(UIList.PauseUI); + + Debug.Log("버튼 클릭"); + + // UIManager.Show(UIList.PauseUI); + + + // 게임 일시 정지 + // Time.timeScale = 0f; + } } } diff --git a/Gameton-06/Assets/Gameton/Scripts/UI/PauseUI.cs b/Gameton-06/Assets/Gameton/Scripts/UI/PauseUI.cs index 4cad1968..d7620dc1 100644 --- a/Gameton-06/Assets/Gameton/Scripts/UI/PauseUI.cs +++ b/Gameton-06/Assets/Gameton/Scripts/UI/PauseUI.cs @@ -7,15 +7,6 @@ namespace TON { public class PauseUI : UIBase { - public void OnPressPause() - { - // UIManager.Show(UIList.PauseUI); - - Debug.Log("버튼 클릭"); - - - // 게임 일시 정지 - // Time.timeScale = 0f; - } + } }