From feb5be1b539be70625cbad7e5836f5a99e430e81 Mon Sep 17 00:00:00 2001 From: Jay <96156114+jaydev00a@users.noreply.github.com> Date: Fri, 28 Mar 2025 18:06:30 +0900 Subject: [PATCH] =?UTF-8?q?DO-84=20[Feat]=20=EB=B2=84=ED=8A=BC=20=EB=B0=94?= =?UTF-8?q?=EC=9D=B8=EB=94=A9=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/GameUIController.cs | 5 +++- .../Prefabs/Panels/InGameMenu Panel.prefab | 24 +++++++++++++++++++ .../Resources/Prefabs/[Canvas] Game UI.prefab | 2 +- Assets/Script/Game/GameManager.cs | 12 ++++++++++ .../InGameMenuPanelController.cs | 7 +++++- 5 files changed, 47 insertions(+), 3 deletions(-) diff --git a/Assets/GameUIController.cs b/Assets/GameUIController.cs index 761fc20..008b2cb 100644 --- a/Assets/GameUIController.cs +++ b/Assets/GameUIController.cs @@ -47,7 +47,10 @@ public class GameUIController : MonoBehaviour { if (GameManager.Instance.CheckIsSinglePlay()) { - GameManager.Instance.SurrenderSinglePlay(); + GameManager.Instance.panelManager.OpenConfirmPanel("항복 하시겠습니까?", () => + { + GameManager.Instance.SurrenderSinglePlay(); + }, true); } else { diff --git a/Assets/Resources/Prefabs/Panels/InGameMenu Panel.prefab b/Assets/Resources/Prefabs/Panels/InGameMenu Panel.prefab index 4ed12ce..6089584 100644 --- a/Assets/Resources/Prefabs/Panels/InGameMenu Panel.prefab +++ b/Assets/Resources/Prefabs/Panels/InGameMenu Panel.prefab @@ -323,6 +323,18 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 3566405136616423668} m_Modifications: + - target: {fileID: 395529687980811166, guid: 68c08f4284cbef249b634faff8e01ea8, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 7505759082282251323} + - target: {fileID: 395529687980811166, guid: 68c08f4284cbef249b634faff8e01ea8, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: OpenSettingsPanel + objectReference: {fileID: 0} + - target: {fileID: 395529687980811166, guid: 68c08f4284cbef249b634faff8e01ea8, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: InGameMenuPanelController, Assembly-CSharp + objectReference: {fileID: 0} - target: {fileID: 707007925660630557, guid: 68c08f4284cbef249b634faff8e01ea8, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -434,6 +446,18 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 3566405136616423668} m_Modifications: + - target: {fileID: 6714588036628504957, guid: f3cb9e5a77dfb6b47b5f145a4ff28e6c, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 7505759082282251323} + - target: {fileID: 6714588036628504957, guid: f3cb9e5a77dfb6b47b5f145a4ff28e6c, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: OnClickDrawRegisterButton + objectReference: {fileID: 0} + - target: {fileID: 6714588036628504957, guid: f3cb9e5a77dfb6b47b5f145a4ff28e6c, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: InGameMenuPanelController, Assembly-CSharp + objectReference: {fileID: 0} - target: {fileID: 6925205169732826551, guid: f3cb9e5a77dfb6b47b5f145a4ff28e6c, type: 3} propertyPath: m_Name value: Draw Register Button diff --git a/Assets/Resources/Prefabs/[Canvas] Game UI.prefab b/Assets/Resources/Prefabs/[Canvas] Game UI.prefab index 5b29c84..a8b585e 100644 --- a/Assets/Resources/Prefabs/[Canvas] Game UI.prefab +++ b/Assets/Resources/Prefabs/[Canvas] Game UI.prefab @@ -397,7 +397,7 @@ MonoBehaviour: m_Calls: - m_Target: {fileID: 3933575647777291622} m_TargetAssemblyTypeName: GameUIController, Assembly-CSharp - m_MethodName: + m_MethodName: OnClickRevengeRequestButton m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} diff --git a/Assets/Script/Game/GameManager.cs b/Assets/Script/Game/GameManager.cs index 9b396cd..cb52125 100644 --- a/Assets/Script/Game/GameManager.cs +++ b/Assets/Script/Game/GameManager.cs @@ -125,6 +125,18 @@ public class GameManager : Singleton if (_gameUIController == null) return; _gameUIController.SetButtonsIndicator(gameInProgress); } + + public void OnClickDrawRegisterButton() + { + if (_gameUIController == null) return; + _gameUIController.OnClickDrawRequestButton(); + } + + public void OpenSettingsPanel() + { + if (_gameUIController == null) return; + panelManager.OpenSettingsPanel(); + } public bool GetRequestDrawChance() { diff --git a/Assets/Script/UI/PanelController/InGameMenuPanelController.cs b/Assets/Script/UI/PanelController/InGameMenuPanelController.cs index b62de20..5892b38 100644 --- a/Assets/Script/UI/PanelController/InGameMenuPanelController.cs +++ b/Assets/Script/UI/PanelController/InGameMenuPanelController.cs @@ -20,7 +20,12 @@ public class InGameMenuPanelController : PanelController public void OnClickDrawRegisterButton() { - // GameManager.Instance.lManager. + GameManager.Instance.OnClickDrawRegisterButton(); + } + + public void OpenSettingsPanel() + { + GameManager.Instance.OpenSettingsPanel(); } ///