diff --git a/Assets/Script/Game/GameLogic.cs b/Assets/Script/Game/GameLogic.cs index a795fef..80f032a 100644 --- a/Assets/Script/Game/GameLogic.cs +++ b/Assets/Script/Game/GameLogic.cs @@ -141,6 +141,7 @@ public partial class GameLogic : IDisposable TimerPause(); ExecuteOnMainThread(() => { + GameManager.Instance.panelManager.OpenLoadingPanel(true, true, false, false); GameManager.Instance.panelManager.OpenDrawConfirmPanel("무승부 요청을 승낙하시겠습니까?", () => { GameManager.Instance.panelManager.OpenEffectPanel(Enums.GameResult.Draw); @@ -153,32 +154,52 @@ public partial class GameLogic : IDisposable }); break; case Constants.MultiplayManagerState.DrawRequestSent: + { Debug.Log("무승부 요청 전송 완료"); + ExecuteOnMainThread(() => + { + GameManager.Instance.panelManager.OpenLoadingPanel(true, true, false, false); + }); TimerPause(); break; + } case Constants.MultiplayManagerState.DrawAccepted: Debug.Log("무승부 요청이 승낙이 들어옴"); ExecuteOnMainThread(() => { + GameManager.Instance.panelManager.CloseLoadingPanel(); GameManager.Instance.panelManager.OpenEffectPanel(Enums.GameResult.Draw); EndGame(Enums.GameResult.Draw); }); break; case Constants.MultiplayManagerState.DrawConfirmed: + { Debug.Log("무승부 요청 승낙 완료"); + ExecuteOnMainThread(() => + { + GameManager.Instance.panelManager.CloseLoadingPanel(); + }); break; + } case Constants.MultiplayManagerState.DrawRejected: Debug.Log("무승부 요청이 거부가 들어옴"); TimerUnpause(); ExecuteOnMainThread(() => { + GameManager.Instance.panelManager.CloseLoadingPanel(); GameManager.Instance.panelManager.OpenConfirmPanel("무승부 요청을 거부하였습니다.", () => { }); }); break; case Constants.MultiplayManagerState.DrawRejectionConfirmed: + { Debug.Log("무승부 요청 거부 완료"); + ExecuteOnMainThread(() => + { + GameManager.Instance.panelManager.OpenLoadingPanel(true, true, false, false); + }); TimerUnpause(); break; + } case Constants.MultiplayManagerState.ReceiveTimeout: Debug.Log("상대방이 타임 아웃 됨"); ExecuteOnMainThread(() => @@ -476,7 +497,6 @@ public partial class GameLogic : IDisposable // 기존 멀티플레이 상태 초기화 MultiPlayManager = null; _roomId = null; - GameType = Enums.GameType.SinglePlay; // 싱글 플레이 상태로 변경 InitializeSinglePlayMode(); @@ -533,12 +553,6 @@ public partial class GameLogic : IDisposable return AI_NAMIES[index]; } - // 타이머 일시정지 - private void TimerPause() => FioTimer.PauseTimer(); - - // 타이머 일시정지 해제 - private void TimerUnpause() => FioTimer.StartTimer(); - #endregion public void Dispose()