diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 63033a455..2a826f14e 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -945,23 +945,23 @@ PrefabInstance: m_Modifications: - target: {fileID: 2762200673560835878, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2762200673560835878, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2762200673560835878, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 125 objectReference: {fileID: 0} - target: {fileID: 2762200673560835878, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 70 objectReference: {fileID: 0} - target: {fileID: 2762200673560835878, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 62.5 objectReference: {fileID: 0} - target: {fileID: 4605209629826112846, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} propertyPath: m_Name @@ -993,7 +993,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6604521975151366511, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 125 objectReference: {fileID: 0} - target: {fileID: 6604521975151366511, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} propertyPath: m_SizeDelta.y @@ -1029,7 +1029,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6604521975151366511, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 62.5 objectReference: {fileID: 0} - target: {fileID: 6604521975151366511, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} propertyPath: m_AnchoredPosition.y @@ -1049,27 +1049,27 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7680063181065998356, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7680063181065998356, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7680063181065998356, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 125 objectReference: {fileID: 0} - target: {fileID: 7680063181065998356, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 30 objectReference: {fileID: 0} - target: {fileID: 7680063181065998356, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 62.5 objectReference: {fileID: 0} - target: {fileID: 7680063181065998356, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -100 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -1449,23 +1449,23 @@ PrefabInstance: m_Modifications: - target: {fileID: 2762200673560835878, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2762200673560835878, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2762200673560835878, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 125 objectReference: {fileID: 0} - target: {fileID: 2762200673560835878, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 70 objectReference: {fileID: 0} - target: {fileID: 2762200673560835878, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 62.5 objectReference: {fileID: 0} - target: {fileID: 4605209629826112846, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} propertyPath: m_Name @@ -1497,7 +1497,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6604521975151366511, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 125 objectReference: {fileID: 0} - target: {fileID: 6604521975151366511, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} propertyPath: m_SizeDelta.y @@ -1533,7 +1533,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6604521975151366511, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 62.5 objectReference: {fileID: 0} - target: {fileID: 6604521975151366511, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} propertyPath: m_AnchoredPosition.y @@ -1553,27 +1553,27 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7680063181065998356, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7680063181065998356, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7680063181065998356, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 125 objectReference: {fileID: 0} - target: {fileID: 7680063181065998356, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 30 objectReference: {fileID: 0} - target: {fileID: 7680063181065998356, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 62.5 objectReference: {fileID: 0} - target: {fileID: 7680063181065998356, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -100 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -1750,10 +1750,10 @@ RectTransform: - {fileID: 354219456} m_Father: {fileID: 1303941225} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 150} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 150, y: -95} + m_SizeDelta: {x: 260, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1113566539 GameObject: @@ -1789,10 +1789,10 @@ RectTransform: - {fileID: 851469559} m_Father: {fileID: 1303941225} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 100} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 150, y: -240} + m_SizeDelta: {x: 260, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1113566541 MonoBehaviour: @@ -2087,7 +2087,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 300, y: 0} + m_SizeDelta: {x: 300, y: -812} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1303941226 MonoBehaviour: @@ -2190,7 +2190,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &1342294688 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2286,23 +2286,23 @@ PrefabInstance: m_Modifications: - target: {fileID: 2762200673560835878, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2762200673560835878, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2762200673560835878, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 125 objectReference: {fileID: 0} - target: {fileID: 2762200673560835878, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 70 objectReference: {fileID: 0} - target: {fileID: 2762200673560835878, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 62.5 objectReference: {fileID: 0} - target: {fileID: 4605209629826112846, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} propertyPath: m_Name @@ -2334,7 +2334,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6604521975151366511, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 125 objectReference: {fileID: 0} - target: {fileID: 6604521975151366511, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} propertyPath: m_SizeDelta.y @@ -2370,7 +2370,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6604521975151366511, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 197.5 objectReference: {fileID: 0} - target: {fileID: 6604521975151366511, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} propertyPath: m_AnchoredPosition.y @@ -2390,27 +2390,27 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7680063181065998356, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7680063181065998356, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7680063181065998356, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 125 objectReference: {fileID: 0} - target: {fileID: 7680063181065998356, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 30 objectReference: {fileID: 0} - target: {fileID: 7680063181065998356, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 62.5 objectReference: {fileID: 0} - target: {fileID: 7680063181065998356, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -100 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -2617,23 +2617,23 @@ PrefabInstance: m_Modifications: - target: {fileID: 2762200673560835878, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2762200673560835878, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2762200673560835878, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 125 objectReference: {fileID: 0} - target: {fileID: 2762200673560835878, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 70 objectReference: {fileID: 0} - target: {fileID: 2762200673560835878, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 62.5 objectReference: {fileID: 0} - target: {fileID: 4605209629826112846, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} propertyPath: m_Name @@ -2665,7 +2665,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6604521975151366511, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 125 objectReference: {fileID: 0} - target: {fileID: 6604521975151366511, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} propertyPath: m_SizeDelta.y @@ -2701,7 +2701,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6604521975151366511, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 197.5 objectReference: {fileID: 0} - target: {fileID: 6604521975151366511, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} propertyPath: m_AnchoredPosition.y @@ -2721,27 +2721,27 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7680063181065998356, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7680063181065998356, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7680063181065998356, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 125 objectReference: {fileID: 0} - target: {fileID: 7680063181065998356, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 30 objectReference: {fileID: 0} - target: {fileID: 7680063181065998356, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 62.5 objectReference: {fileID: 0} - target: {fileID: 7680063181065998356, guid: 1000c07897c1b4e419a00573ff6810ed, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -100 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -2951,10 +2951,10 @@ RectTransform: - {fileID: 708788700} m_Father: {fileID: 1303941225} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 100} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 150, y: -360} + m_SizeDelta: {x: 260, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1987668295 MonoBehaviour: diff --git a/Assets/Scripts/Scenes/BaseScene.cs b/Assets/Scripts/Scenes/BaseScene.cs index de9ab7757..852887fdc 100644 --- a/Assets/Scripts/Scenes/BaseScene.cs +++ b/Assets/Scripts/Scenes/BaseScene.cs @@ -87,21 +87,25 @@ public abstract class BaseScene : MonoBehaviour { OnPenel = true; PanelObject = panel.gameObject; - PanelObject.GetComponent().color = new Color(0, 0, 0, 0.3f); PanelObject.transform.SetAsLastSibling(); Manager.System.PauseSystem(); + + // 패널 클릭 이벤트에 OffMenu 연결 + panel.OnPanelClicked -= OffMenu; + panel.OnPanelClicked += OffMenu; } } + public void OffMenu() { if (OnPenel) { Manager.UI.SwitchOnObject("Panel", false); + Manager.System.ResumeSystem(); PanelObject = null; OnPenel = false; } } - } diff --git a/Assets/Scripts/UI/UIPanel.cs b/Assets/Scripts/UI/UIPanel.cs index 103b12483..d2ea3f21a 100644 --- a/Assets/Scripts/UI/UIPanel.cs +++ b/Assets/Scripts/UI/UIPanel.cs @@ -9,7 +9,7 @@ using UnityEngine.UI; public class UIPanel : MonoBehaviour { private Image _background; - public event Action OnPanelClicked; + public event Action OnPanelClicked; void Awake() { @@ -23,15 +23,13 @@ public class UIPanel : MonoBehaviour EventTrigger.Entry entry = new EventTrigger.Entry(); entry.eventID = EventTriggerType.PointerClick; - entry.callback.AddListener((eventData => {ClickedPanel(); })); + entry.callback.AddListener((eventData) => { + OnPanelClicked?.Invoke(); + }); trigger.triggers.Clear(); trigger.triggers.Add(entry); } - private void ClickedPanel() - { - OnPanelClicked?.Invoke(gameObject.name); - } }