Merge develop into feature/replace-guid-with-auth-playerid

Author: netcode-ci-service

Assets/BossRoom/Scripts/Client/UI/UIQuitPanel.cs

@@ -13,6 +13,8 @@ public class UIQuitPanel : MonoBehaviour
 
         ApplicationController m_ApplicationController;
 
+        private bool m_QuitMode = true;
+
         [Inject]
         private void InjectDependencies(ApplicationController applicationController)
         {
@@ -21,14 +23,21 @@ private void InjectDependencies(ApplicationController applicationController)
 
         void OnEnable()
         {
-            m_QuitButtonText.text = NetworkManager.Singleton != null && NetworkManager.Singleton.IsListening ?
-                "Leave session?" :
-                "Exit Game?";
+            m_QuitMode = NetworkManager.Singleton == null || !NetworkManager.Singleton.IsListening;
+            m_QuitButtonText.text = m_QuitMode ? "Exit Game?" : "Leave session?";
         }
 
         public void Quit()
         {
-            m_ApplicationController.QuitGame();
+            if (m_QuitMode)
+            {
+                m_ApplicationController.QuitGame();
+            }
+            else
+            {
+                m_ApplicationController.LeaveSession();
+            }
+
             gameObject.SetActive(false);
         }
     }

Assets/BossRoom/Scripts/Shared/ApplicationController.cs

@@ -96,24 +96,26 @@ private bool OnWantToQuit()
             return canQuit;
         }
 
-        public void QuitGame()
+        public void LeaveSession()
         {
-            if (NetworkManager.Singleton.IsListening)
-            {
-                m_LobbyServiceFacade.ForceLeaveLobbyAttempt();
-
-                // first disconnect then return to menu
-                var gameNetPortal = GameNetPortal.Instance;
-                if (gameNetPortal != null)
-                {
-                    gameNetPortal.RequestDisconnect();
-                }
-                SceneManager.LoadScene("MainMenu");
-            }
-            else
+            m_LobbyServiceFacade.ForceLeaveLobbyAttempt();
+
+            // first disconnect then return to menu
+            var gameNetPortal = GameNetPortal.Instance;
+            if (gameNetPortal != null)
             {
-                Application.Quit();
+                gameNetPortal.RequestDisconnect();
             }
+            SceneManager.LoadScene("MainMenu");
+        }
+
+        public void QuitGame()
+        {
+#if UNITY_EDITOR
+            UnityEditor.EditorApplication.isPlaying = false;
+#else
+            Application.Quit();
+#endif
         }
     }
 }

Assets/BossRoom/Scripts/Shared/Net/UnityServices/Lobbies/LobbyServiceFacade.cs

@@ -115,6 +115,7 @@ void OnSuccess(Lobby lobby)
                 CurrentUnityLobby = lobby;
                 m_LocalLobby.ApplyRemoteData(lobby);
 
+                // as client, check if host is still in lobby
                 if (!m_LocalUser.IsHost)
                 {
                     foreach (var lobbyUser in m_LocalLobby.LobbyUsers)
@@ -126,7 +127,7 @@ void OnSuccess(Lobby lobby)
                     }
                     m_UnityServiceErrorMessagePub.Publish(new UnityServiceErrorMessage("Host left the lobby","Disconnecting."));
                     ForceLeaveLobbyAttempt();
-                    m_ApplicationController.QuitGame();
+                    // no need to disconnect Netcode, it should already be handled by Netcode's callback to disconnect
                 }
             }
         }