feat: simpler quitting flow (#579)

* Removed SettingsPanelCanvas from DDOL and added it to each scene

* Now specifies that it should only quit the game on the prefab inside the MainMenu scene, otherwise always calls LeaveSession()

* Moved injection in QuitPanel to GameStateBehaviour

Author: LPLafontaineB

Assets/BossRoom/Prefabs/UI/SettingsPanelCanvas.prefab

@@ -1568,7 +1568,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &7464515512587493124
 RectTransform:
   m_ObjectHideFlags: 0
@@ -1641,7 +1641,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 063abc7eeacd3df4db23e185d26aab43, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_QuitButtonText: {fileID: 1810020744250180940}
+  m_QuitMode: 0
 --- !u!1 &7139291127274050927
 GameObject:
   m_ObjectHideFlags: 0
@@ -2025,7 +2025,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 'Exit Game?
+  m_Text: 'Return to Menu?
 
 '
 --- !u!1 &8177924889016445002
@@ -2693,6 +2693,17 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: addf3685293c35d48a673397c748f116, type: 3}
+--- !u!114 &3993040222486159765 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 7721113380232533813, guid: addf3685293c35d48a673397c748f116, type: 3}
+  m_PrefabInstance: {fileID: 6650909944053036704}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!224 &3993040222838124397 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 7721113380319664589, guid: addf3685293c35d48a673397c748f116, type: 3}
@@ -2715,4 +2726,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 1106bff381881f94187fe4be82e21554, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_QualityBtnText: {fileID: 0}
+  m_QualityBtnText: {fileID: 3993040222486159765}

Assets/BossRoom/Scenes/BossRoom.unity

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a201b5fab7c70e1141de41d77fad6fbf1432a417078e671cdf98c8f179eba8a1
-size 492844
+oid sha256:f5587f5d1e82bfa08774734c89fe180eff94391a5fc08ba3fa8c01f474e9df3d
+size 497738

Assets/BossRoom/Scenes/CharSelect.unity

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c567c2c519ab8d6b12d7c9759ec8d228451cc2280d37c3501a24b681773a25eb
-size 36967
+oid sha256:e8179f271b4ccb6536d6e4f017a591759d3e80ca2809667684c907300c1c5f92
+size 40830

Assets/BossRoom/Scenes/MainMenu.unity

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6902954da5d6368d430ea4373fc5a42c9be98deaebbe313c3d279b0dbece098d
-size 78856
+oid sha256:ae6cf7edc25f198a59ea3e6076a6bc8c8ce631b4201b26fcfc3703b523977d8e
+size 83887

Assets/BossRoom/Scenes/PostGame.unity

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c963f5f975ac11e6707da820f1daa60300e87323a7e81cc3a527f3c9b1fef827
-size 51516
+oid sha256:4c11f84c175b1dd9496d25f84bd4e0c29ca64c90df9346d1f26578dfef5523f6
+size 56409

Assets/BossRoom/Scenes/Startup.unity

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b72ef30fe5939bc280416c3707afd0c6945d0ba5126d43f82a59f284dffe19d3
-size 35886
+oid sha256:4b25a7b1afa55c020e06da49b3dfa5a499af97a24052e58da5c1aad428597c28
+size 27108

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

@@ -101,16 +101,9 @@ enum LobbyMode
 
         Dictionary<LobbyMode, List<GameObject>> m_LobbyUIElementsByMode;
 
-        [SerializeField] GameObject[] m_GameObjectsThatWillBeInjectedAutomatically;
-        DIScope m_Scope;
-
-        void Awake()
+        protected override void Awake()
         {
-            //creating a child scope just to have manual control over the lifetime of the things
-            //that shouldn't live past the current scene existence
-            m_Scope = new DIScope(DIScope.RootScope);
-
-            m_Scope.FinalizeScopeConstruction();
+            base.Awake();
 
             Instance = this;
             CharSelectData = GetComponent<CharSelectData>();
@@ -121,16 +114,6 @@ void Awake()
                 { LobbyMode.LobbyEnding, m_UIElementsForLobbyEnding },
                 { LobbyMode.FatalError, m_UIElementsForFatalError },
             };
-
-            foreach (var autoInjectedGameObject in m_GameObjectsThatWillBeInjectedAutomatically)
-            {
-                m_Scope.InjectIn(autoInjectedGameObject);
-            }
-        }
-
-        public override void OnDestroy()
-        {
-            m_Scope.Dispose();
         }
 
         protected override void Start()

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

@@ -21,32 +21,30 @@ public class ClientMainMenuState : GameStateBehaviour
     {
         public override GameState ActiveState { get { return GameState.MainMenu; } }
 
-        [SerializeField] GameObject[] m_GameObjectsThatWillBeInjectedAutomatically;
-        DIScope m_Scope;
-
         [SerializeField] NameGenerationData m_NameGenerationData;
         [SerializeField] LobbyUIMediator m_LobbyUIMediator;
         [SerializeField] IPUIMediator m_IPUIMediator;
 
         [SerializeField] CanvasGroup m_MainMenuButtonsCanvasGroup;
         [SerializeField] GameObject m_SignInSpinner;
 
-        void Awake()
+        protected override void Awake()
         {
             m_MainMenuButtonsCanvasGroup.interactable = false;
             m_LobbyUIMediator.Hide();
-            DIScope.RootScope.InjectIn(this);
+            base.Awake();
+        }
+
+        protected override void InitializeScope()
+        {
+            Scope.BindInstanceAsSingle(m_NameGenerationData);
+            Scope.BindInstanceAsSingle(m_LobbyUIMediator);
+            Scope.BindInstanceAsSingle(m_IPUIMediator);
         }
 
         [Inject]
         void InjectDependenciesAndInitialize(AuthenticationServiceFacade authServiceFacade, LocalLobbyUser localUser, LocalLobby localLobby)
         {
-            m_Scope = new DIScope(DIScope.RootScope);
-
-            m_Scope.BindInstanceAsSingle(m_NameGenerationData);
-            m_Scope.BindInstanceAsSingle(m_LobbyUIMediator);
-            m_Scope.BindInstanceAsSingle(m_IPUIMediator);
-
             var unityAuthenticationInitOptions = new InitializationOptions();
             var profile = ProfileManager.Profile;
             if (profile.Length > 0)
@@ -56,13 +54,6 @@ void InjectDependenciesAndInitialize(AuthenticationServiceFacade authServiceFaca
 
             authServiceFacade.DoSignInAsync(OnAuthSignIn,  OnSignInFailed, unityAuthenticationInitOptions);
 
-            m_Scope.FinalizeScopeConstruction();
-
-            foreach (var autoInjectedGameObject in m_GameObjectsThatWillBeInjectedAutomatically)
-            {
-                m_Scope.InjectIn(autoInjectedGameObject);
-            }
-
             void OnAuthSignIn()
             {
                 m_MainMenuButtonsCanvasGroup.interactable = true;
@@ -81,11 +72,6 @@ void OnSignInFailed()
             }
         }
 
-        public override void OnDestroy()
-        {
-            m_Scope?.Dispose();
-        }
-
         public void OnStartClicked()
         {
             m_LobbyUIMediator.ToggleJoinLobbyUI();

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

@@ -1,41 +1,42 @@
+using System;
 using Unity.Multiplayer.Samples.BossRoom.Shared;
 using Unity.Multiplayer.Samples.BossRoom.Shared.Infrastructure;
-using Unity.Netcode;
 using UnityEngine;
-using UnityEngine.UI;
 
 namespace Unity.Multiplayer.Samples.BossRoom.Client
 {
     public class UIQuitPanel : MonoBehaviour
     {
+        enum QuitMode
+        {
+            ReturnToMenu,
+            QuitApplication
+        }
+
         [SerializeField]
-        Text m_QuitButtonText;
+        QuitMode m_QuitMode = QuitMode.ReturnToMenu;
 
         ApplicationController m_ApplicationController;
 
-        private bool m_QuitMode = true;
 
         [Inject]
-        private void InjectDependencies(ApplicationController applicationController)
+        void InjectDependencies(ApplicationController applicationController)
         {
             m_ApplicationController = applicationController;
         }
 
-        void OnEnable()
-        {
-            m_QuitMode = NetworkManager.Singleton == null || !NetworkManager.Singleton.IsListening;
-            m_QuitButtonText.text = m_QuitMode ? "Exit Game?" : "Leave session?";
-        }
-
         public void Quit()
         {
-            if (m_QuitMode)
-            {
-                m_ApplicationController.QuitGame();
-            }
-            else
+            switch (m_QuitMode)
             {
-                m_ApplicationController.LeaveSession();
+                case QuitMode.ReturnToMenu:
+                    m_ApplicationController.LeaveSession();
+                    break;
+                case QuitMode.QuitApplication:
+                    m_ApplicationController.QuitGame();
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException();
             }
 
             gameObject.SetActive(false);

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

@@ -18,25 +18,8 @@ public class UISettingsCanvas : MonoBehaviour
 
         void Awake()
         {
-            // the settings canvas should exist in all scenes!
-            DontDestroyOnLoad(gameObject);
-
             // hide the settings window at startup (this is just to handle the common case where an artist forgets to disable the window in the prefab)
             DisablePanels();
-            SceneManager.sceneLoaded += OnSceneLoaded;
-        }
-
-        void OnDestroy()
-        {
-            SceneManager.sceneLoaded -= OnSceneLoaded;
-        }
-
-        void OnSceneLoaded(Scene scene, LoadSceneMode loadSceneMode)
-        {
-            if (loadSceneMode == LoadSceneMode.Single)
-            {
-                DisablePanels();
-            }
         }
 
         void DisablePanels()

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

@@ -17,8 +17,9 @@ public class ServerCharSelectState : GameStateBehaviour
 
         Coroutine m_WaitToEndLobbyCoroutine;
 
-        void Awake()
+        protected override void Awake()
         {
+            base.Awake();
             CharSelectData = GetComponent<CharSelectData>();
         }
 

Assets/BossRoom/Scripts/Shared/Game/State/GameStateBehaviour.cs

@@ -1,3 +1,5 @@
+using System;
+using Unity.Multiplayer.Samples.BossRoom.Shared.Infrastructure;
 using Unity.Netcode;
 using UnityEngine;
 
@@ -53,6 +55,29 @@ public virtual bool Persists
         /// </summary>
         private static GameObject s_ActiveStateGO;
 
+        public DIScope Scope
+        {
+            get => m_Scope;
+            private set => m_Scope = value;
+        }
+
+        DIScope m_Scope;
+
+        [SerializeField]
+        GameObject[] m_GameObjectsThatWillBeInjectedAutomatically;
+
+        protected virtual void Awake()
+        {
+            DIScope.RootScope.InjectIn(this);
+            Scope = new DIScope(DIScope.RootScope);
+            InitializeScope();
+            Scope.FinalizeScopeConstruction();
+            foreach (var autoInjectedGameObject in m_GameObjectsThatWillBeInjectedAutomatically)
+            {
+                Scope.InjectIn(autoInjectedGameObject);
+            }
+        }
+
         // Start is called before the first frame update
         protected virtual void Start()
         {
@@ -87,8 +112,13 @@ protected virtual void Start()
             }
         }
 
+        protected virtual void InitializeScope()
+        {
+        }
+
         public override void OnDestroy()
         {
+            Scope?.Dispose();
             base.OnDestroy();
             if (!Persists)
             {