Merge develop into feature/isdebug-flag-for-connection-approval

Author: netcode-ci-service

Assets/BossRoom/Scripts/Client/Game/State/ClientCharSelectState.cs

@@ -332,6 +332,18 @@ void OnLobbyClosedChanged(bool wasLobbyClosed, bool isLobbyClosed)
             {
                 ConfigureUIForLobbyMode(LobbyMode.LobbyEnding);
             }
+            else
+            {
+                if (m_LastSeatSelected == -1)
+                {
+                    ConfigureUIForLobbyMode(LobbyMode.ChooseSeat);
+                }
+                else
+                {
+                    ConfigureUIForLobbyMode(LobbyMode.SeatChosen);
+                    m_ClassInfoBox.ConfigureForClass(CharSelectData.AvatarConfiguration[m_LastSeatSelected].CharacterClass);
+                }
+            }
         }
 
         /// <summary>

Assets/BossRoom/Scripts/Server/Game/State/ServerCharSelectState.cs

@@ -12,18 +12,17 @@ namespace Unity.Multiplayer.Samples.BossRoom.Server
     [RequireComponent(typeof(CharSelectData))]
     public class ServerCharSelectState : GameStateBehaviour
     {
-        public override GameState ActiveState { get { return GameState.CharSelect; } }
+        public override GameState ActiveState => GameState.CharSelect;
         public CharSelectData CharSelectData { get; private set; }
 
-        private ServerGameNetPortal m_ServerNetPortal;
+        Coroutine m_WaitToEndLobbyCoroutine;
 
-        private void Awake()
+        void Awake()
         {
             CharSelectData = GetComponent<CharSelectData>();
-            m_ServerNetPortal = GameObject.FindGameObjectWithTag("GameNetPortal").GetComponent<ServerGameNetPortal>();
         }
 
-        private void OnClientChangedSeat(ulong clientId, int newSeatIdx, bool lockedIn)
+        void OnClientChangedSeat(ulong clientId, int newSeatIdx, bool lockedIn)
         {
             int idx = FindLobbyPlayerIdx(clientId);
             if (idx == -1)
@@ -93,7 +92,7 @@ private void OnClientChangedSeat(ulong clientId, int newSeatIdx, bool lockedIn)
         /// <summary>
         /// Returns the index of a client in the master LobbyPlayer list, or -1 if not found
         /// </summary>
-        private int FindLobbyPlayerIdx(ulong clientId)
+        int FindLobbyPlayerIdx(ulong clientId)
         {
             for (int i = 0; i < CharSelectData.LobbyPlayers.Count; ++i)
             {
@@ -107,7 +106,7 @@ private int FindLobbyPlayerIdx(ulong clientId)
         /// Looks through all our connections and sees if everyone has locked in their choice;
         /// if so, we lock in the whole lobby, save state, and begin the transition to gameplay
         /// </summary>
-        private void CloseLobbyIfReady()
+        void CloseLobbyIfReady()
         {
             foreach (CharSelectData.LobbyPlayerState playerInfo in CharSelectData.LobbyPlayers)
             {
@@ -122,10 +121,42 @@ private void CloseLobbyIfReady()
             SaveLobbyResults();
 
             // Delay a few seconds to give the UI time to react, then switch scenes
-            StartCoroutine(WaitToEndLobby());
+            m_WaitToEndLobbyCoroutine = StartCoroutine(WaitToEndLobby());
         }
 
-        private void SaveLobbyResults()
+        /// <summary>
+        /// Cancels the process of closing the lobby, so that if a new player joins, they are able to chose a character.
+        /// </summary>
+        void CancelCloseLobby()
+        {
+            if (m_WaitToEndLobbyCoroutine != null)
+            {
+                StopCoroutine(m_WaitToEndLobbyCoroutine);
+            }
+            CharSelectData.IsLobbyClosed.Value = false;
+            // Set all players unready so they can react to this cancellation
+            SetAllUnready();
+        }
+
+        void SetAllUnready()
+        {
+            for (int i = 0; i < CharSelectData.LobbyPlayers.Count; ++i)
+            {
+                // Set all locked players to active so that they have to confirm their choice again
+                if (CharSelectData.LobbyPlayers[i].SeatState == CharSelectData.SeatState.LockedIn)
+                {
+                    CharSelectData.LobbyPlayers[i] = new CharSelectData.LobbyPlayerState(
+                        CharSelectData.LobbyPlayers[i].ClientId,
+                        CharSelectData.LobbyPlayers[i].PlayerName,
+                        CharSelectData.LobbyPlayers[i].PlayerNum,
+                        CharSelectData.SeatState.Active,
+                        CharSelectData.LobbyPlayers[i].SeatIdx,
+                        CharSelectData.LobbyPlayers[i].LastChangeTime);
+                }
+            }
+        }
+
+        void SaveLobbyResults()
         {
             foreach (CharSelectData.LobbyPlayerState playerInfo in CharSelectData.LobbyPlayers)
             {
@@ -141,7 +172,7 @@ private void SaveLobbyResults()
             }
         }
 
-        private IEnumerator WaitToEndLobby()
+        IEnumerator WaitToEndLobby()
         {
             yield return new WaitForSeconds(3);
             NetworkManager.SceneManager.LoadScene("BossRoom", LoadSceneMode.Single);
@@ -177,15 +208,15 @@ public override void OnNetworkSpawn()
             }
         }
 
-        private void OnSceneEvent(SceneEvent sceneEvent)
+        void OnSceneEvent(SceneEvent sceneEvent)
         {
             // We need to filter out the event that are not a client has finished loading the scene
             if (sceneEvent.SceneEventType != SceneEventType.LoadComplete) return;
             // When the client finishes loading the Lobby Map, we will need to Seat it
             SeatNewPlayer(sceneEvent.ClientId);
         }
 
-        private int GetAvailablePlayerNumber()
+        int GetAvailablePlayerNumber()
         {
             for (int possiblePlayerNumber = 0; possiblePlayerNumber < CharSelectData.k_MaxLobbyPlayers; ++possiblePlayerNumber)
             {
@@ -213,8 +244,14 @@ bool IsPlayerNumberAvailable(int playerNumber)
             return !found;
         }
 
-        private void SeatNewPlayer(ulong clientId)
+        void SeatNewPlayer(ulong clientId)
         {
+            // If lobby is closing and waiting to start the game, cancel to allow that new player to select a character
+            if (CharSelectData.IsLobbyClosed.Value)
+            {
+                CancelCloseLobby();
+            }
+
             SessionPlayerData? sessionPlayerData = SessionManager<SessionPlayerData>.Instance.GetPlayerData(clientId);
             if (sessionPlayerData.HasValue)
             {
@@ -235,7 +272,7 @@ private void SeatNewPlayer(ulong clientId)
             }
         }
 
-        private void OnClientDisconnectCallback(ulong clientId)
+        void OnClientDisconnectCallback(ulong clientId)
         {
             // clear this client's PlayerNumber and any associated visuals (so other players know they're gone).
             for (int i = 0; i < CharSelectData.LobbyPlayers.Count; ++i)
@@ -246,6 +283,19 @@ private void OnClientDisconnectCallback(ulong clientId)
                     break;
                 }
             }
+
+
+            if (CharSelectData.IsLobbyClosed.Value)
+            {
+                // If lobby is closing and waiting to start the game, cancel so that other players can react to it, and
+                // wait for the player coming back if they want to.
+                CancelCloseLobby();
+            }
+            else
+            {
+                // If it is not closing, set everyone as unready for the same reason
+                SetAllUnready();
+            }
         }
     }
 }