Merge pull request #87 from Degulleo/DO-84-버튼들-바인딩-추가

Do 84 버튼들 바인딩 추가
2025-03-28 18:15:52 +09:00 · 2025-03-28 18:15:52 +09:00 · e53b375410
commit e53b375410
parent 56050e0a9d 47acdcbda7
9 changed files with 50 additions and 54599 deletions
--- a/Assets/GameUIController.cs
+++ b/Assets/GameUIController.cs
@ -45,11 +45,6 @@ public class GameUIController : MonoBehaviour
        GameManager.Instance.OnClickConfirmButton();
    }
    
-    public void OnClickRetryButton()
-    {
-        GameManager.Instance.RetryGame();
-    }
-
    public void OnClickExitButton()
    {
        // "Main" 씬으로 이동
@ -59,8 +54,11 @@ public class GameUIController : MonoBehaviour
    public void OnClickSurrenderButton()
    {
        if (GameManager.Instance.CheckIsSinglePlay())
+        {
+            GameManager.Instance.panelManager.OpenConfirmPanel("항복 하시겠습니까?", () =>
            {
                GameManager.Instance.SurrenderSinglePlay();
+            }, true);
        }
        else
        {
--- a/Assets/LYC.meta
+++ b/Assets/LYC.meta
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 2c121ebd683637b4a9f10f3360db1bd5
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/LYC/GameLYC.unity
+++ b/Assets/LYC/GameLYC.unity
--- a/Assets/LYC/GameLYC.unity.meta
+++ b/Assets/LYC/GameLYC.unity.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: ded4103a87c2de84db5f4ce2675227ef
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Resources/Prefabs/Panels/InGameMenu
+++ b/Assets/Resources/Prefabs/Panels/InGameMenu
@ -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
--- a/Assets/Resources/Prefabs/[Canvas]
+++ b/Assets/Resources/Prefabs/[Canvas]
@ -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}
--- a/Assets/Script/Game/GameLogic.cs
+++ b/Assets/Script/Game/GameLogic.cs
@ -517,9 +517,6 @@ public partial class GameLogic : IDisposable

    public Enums.PlayerType[,] GetBoard() => _board;

-    // 보드 초기화
-    public void ResetBoard() => Array.Clear(_board, 0, _board.Length);
-
    // 상대가 매칭되지 않을 경우 AI로 전환하는 함수
    private void SwitchToSinglePlayer()
    {
--- a/Assets/Script/Game/GameManager.cs
+++ b/Assets/Script/Game/GameManager.cs
@ -95,14 +95,7 @@ public class GameManager : Singleton<GameManager>
        }
        InitPanels();
    }
-    //임시 재시작 재대결
-    public void RetryGame()
-    {
-        if (_gameLogic == null) return;
-        _gameLogic.ResetBoard();
-        _stoneController.InitStones();
-        _gameLogic.SetState(_gameLogic.FirstPlayerState);
-    }
+    
    //유저 이름 Game UI에 초기화
    public void InitPlayersName(string playerNameA, string playerNameB)
    {
@ -128,6 +121,18 @@ public class GameManager : Singleton<GameManager>
        _gameUIController.SetButtonsIndicator(gameInProgress);
    }
    
+    public void OnClickDrawRegisterButton()
+    {
+        if (_gameUIController == null) return;
+        _gameUIController.OnClickDrawRequestButton();
+    }
+    
+    public void OpenSettingsPanel()
+    {
+        if (_gameUIController == null) return;
+        panelManager.OpenSettingsPanel();
+    }
+
    public bool GetRequestDrawChance()
    {
        if (_gameLogic == null) return false;
--- 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();
    }
    
    /// <summary>