From 4983407c8777a3e24c0caa2a603366c9a3bb84da Mon Sep 17 00:00:00 2001
From: minsikim-42 <spalstlr321@naver.com>
Date: Wed, 15 May 2024 23:48:46 +0900
Subject: [PATCH] Fix Turn Error

---
 .DS_Store                                     | Bin 18436 -> 18436 bytes
 Assets/1Scenes/Intro.unity                    |   4 ++--
 Assets/2Scripts/InGameManager.cs              |  16 +++++++++++++++-
 Assets/2Scripts/NetworkManager.cs             |   2 +-
 .../Resources/PhotonServerSettings.asset      |   2 ++
 5 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index 62302877d9e0f384e96b02a1099f8880036b01cf..fe0e364b6d3ec730ba47223e5c8f0e2f9b3fc6c8 100644
GIT binary patch
delta 442
zcmZpfz}PZ@ae_Z%`^11pll2V58CfT1nFmfz(p8)M-N0qD5Yt!Ii4DA)**RD^7_}zv
zGS8dLBcM4spV4D8uYdwSqr+w%g`-T2J0@RJDpZ%Kt~RqY&`~h9G^y25s5Ub*)lo1p
zHmj}W<PcTXw+@QW&dJTo@0y&UEYH}zxkFilXR<J({^W@UVv{B1MHr<g3ot58z9Yx8
zxxgTiv7VQqgdvq7ks+5M1V|SHc?Jx6Kz;#3foD#Ba#Buy5(5K+00RSKH;|t99}Ivj
z1_nGjbJ7iilk;;6K*~6z>SS@Nt_N9^oA2TRwTQ#=OUt#kA4eT=Yk}xUAyG#`29lE$
kfc{}%&;)vR^HsyCtebT-TG){SNnkU(!#9@AmL}}X06<A}7XSbN

delta 208
zcmZpfz}PZ@ae_Z%)5L&BljG!h*%@9%FfcH%POcItoZM&-uvv`hBkRNl{>|(hEF6p)
zn_mei@=sP^y2oh0nMdI$6XUkYmy`-s#j2}~O>`72%xZNMsx6HSbQDaC&1!2oIYgE9
zt%KsTb8_?YJ0@o-%QJRv?o!s^nOGLhC^@-MUukleJkMl1M()Y32J)Nr400JaPc@p!
wIyp*EaI&m`#N@4Fl9PKF`6u%V<Zjl|=wP2%7QUI?;Ty~5gQmGmSX6le07yze8UO$Q

diff --git a/Assets/1Scenes/Intro.unity b/Assets/1Scenes/Intro.unity
index 357dcd62f0..9f4eee5b74 100644
--- a/Assets/1Scenes/Intro.unity
+++ b/Assets/1Scenes/Intro.unity
@@ -4632,8 +4632,8 @@ MonoBehaviour:
   isResult: 0
   result: 
   resultText: 
-  isTestMode: 1
-  testCreateRoom: 1
+  isTestMode: 0
+  testCreateRoom: 0
   testJoinRoom: 0
 --- !u!4 &1657573346
 Transform:
diff --git a/Assets/2Scripts/InGameManager.cs b/Assets/2Scripts/InGameManager.cs
index 4ba860bf43..3a227ebf44 100644
--- a/Assets/2Scripts/InGameManager.cs
+++ b/Assets/2Scripts/InGameManager.cs
@@ -5,6 +5,7 @@
 using Photon.Pun;
 using Photon.Realtime;
 using TMPro;
+using Unity.Collections;
 using UnityEngine;
 using UnityEngine.SceneManagement;
 using Random = UnityEngine.Random;
@@ -477,6 +478,11 @@ private void RPC_UpdateTimer(int time)
         timerText.text = time.ToString();
     }
     
+    public bool GetIsTurn(string nickName)
+    {
+        return turnList[turnIndex].nickName == nickName;
+    }
+
     private void TurnOver()
     {
         EndTurn(); // 턴 종료
@@ -731,8 +737,9 @@ public void ExitInGame()
             PV.RPC(nameof(RPC_ExitInGame), RpcTarget.All);
         }
         // 방장이 아닌 플레이어가 방을 나갈 경우
-        else
+        else // 나머지 클라이언트에게 알림
         {
+            PV.RPC(nameof(RPC_LeaveUpdateTurn), RpcTarget.Others, PhotonNetwork.LocalPlayer.NickName);
             LeaveRoom(); // 방 나가기
         }
     }
@@ -749,6 +756,13 @@ private void LeaveRoom()
 
         PhotonNetwork.LoadLevel("Lobby"); // 로비 씬으로 이동
     }
+
+    [PunRPC]
+    private void RPC_LeaveUpdateTurn(string nickName)
+    {
+        var turn = turnList.Find((t) => t.nickName == nickName);
+        turnList.Remove(turn);
+    }
     
     public void Result(int t)
     {
diff --git a/Assets/2Scripts/NetworkManager.cs b/Assets/2Scripts/NetworkManager.cs
index 7800edd5db..823e21e03c 100644
--- a/Assets/2Scripts/NetworkManager.cs
+++ b/Assets/2Scripts/NetworkManager.cs
@@ -412,7 +412,7 @@ public override void OnPlayerLeftRoom(Player player)
         }
         else if (SceneManager.GetActiveScene().name == "Game")
         {
-            if (PhotonNetwork.IsMasterClient)
+            if (InGameManager.IT.GetIsTurn(player.NickName) && PhotonNetwork.IsMasterClient)
                 InGameManager.IT.NextTurn(); // 다음 턴
         }
     }
diff --git a/Assets/Photon/PhotonUnityNetworking/Resources/PhotonServerSettings.asset b/Assets/Photon/PhotonUnityNetworking/Resources/PhotonServerSettings.asset
index 2894efc6cd..fbb624d44c 100644
--- a/Assets/Photon/PhotonUnityNetworking/Resources/PhotonServerSettings.asset
+++ b/Assets/Photon/PhotonUnityNetworking/Resources/PhotonServerSettings.asset
@@ -59,6 +59,8 @@ MonoBehaviour:
   - RPC_Result
   - RPC_Die
   - RPC_SetTeamNum
+  - RPC_SetTurn
+  - RPC_LeaveUpdateTurn
   DisableAutoOpenWizard: 1
   ShowSettings: 1
   DevRegionSetOnce: 1