Merge branch 'main' into DO-83-사운드-추가-및-적용

This commit is contained in:
99jamin 2025-03-31 11:39:04 +09:00
commit d152b1879a

View File

@ -69,19 +69,20 @@ public class GameUIController : MonoBehaviour
} }
public void OnClickDrawRequestButton() public void OnClickDrawRequestButton()
{
if (GameManager.Instance.GetRequestDrawChance())
{
GameManager.Instance.panelManager.OpenConfirmPanel("무승부 신청을 하시겠습니까?", () =>
{ {
if (GameManager.Instance.CheckIsSinglePlay()) if (GameManager.Instance.CheckIsSinglePlay())
{ {
GameManager.Instance.DrawSinglePlay(); GameManager.Instance.DrawSinglePlay();
} }
else else
{
if (GameManager.Instance.GetRequestDrawChance())
{
GameManager.Instance.panelManager.OpenConfirmPanel("무승부 신청을 하시겠습니까?", () =>
{ {
_multiplayManager.RequestDraw(); _multiplayManager.RequestDraw();
}); }
}, true);
GameManager.Instance.SetRequestDrawChanceFalse(); GameManager.Instance.SetRequestDrawChanceFalse();
} }
else else
@ -89,17 +90,10 @@ public class GameUIController : MonoBehaviour
GameManager.Instance.panelManager.OpenConfirmPanel("무승부 요청이 제한돼있습니다.",()=>{}); GameManager.Instance.panelManager.OpenConfirmPanel("무승부 요청이 제한돼있습니다.",()=>{});
} }
} }
}
public void OnClickRevengeRequestButton() public void OnClickRevengeRequestButton()
{ {
if (!GameManager.Instance.GetGameLogic().OpponentExist) if (!GameManager.Instance.GetGameLogic().OpponentExist || GameManager.Instance.CheckIsSinglePlay())
{
GameManager.Instance.panelManager.OpenConfirmPanel("상대방이 방을 나갔습니다.",() => { });
return;
}
if (GameManager.Instance.CheckIsSinglePlay())
{ {
GameManager.Instance.panelManager.OpenConfirmPanel("상대방이 방을 나갔습니다.",() => { }); GameManager.Instance.panelManager.OpenConfirmPanel("상대방이 방을 나갔습니다.",() => { });
} }
@ -109,7 +103,7 @@ public class GameUIController : MonoBehaviour
{ {
GameManager.Instance.panelManager.OpenLoadingPanel(true, true, false, false); GameManager.Instance.panelManager.OpenLoadingPanel(true, true, false, false);
_multiplayManager.RequestRevengeRequest(); _multiplayManager.RequestRevengeRequest();
}); }, true);
} }
} }