Moved files, created new asmdefs, decoupled systems via messaging

Author: pdeschain

Assets/BossRoom/Scripts/Game/Client/Game.meta renamed to Assets/BossRoom/Scripts/ApplicationLifecycle.meta

@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using BossRoom.Scripts.Shared.Net.UnityServices.Auth;
+using Unity.Multiplayer.Samples.BossRoom.ApplicationLifecycle.Messages;
 using Unity.Multiplayer.Samples.BossRoom.Client;
 using Unity.Multiplayer.Samples.BossRoom.Server;
 using Unity.Multiplayer.Samples.BossRoom.Shared.Infrastructure;
@@ -24,6 +25,7 @@ public class ApplicationController : MonoBehaviour
 
         LocalLobby m_LocalLobby;
         LobbyServiceFacade m_LobbyServiceFacade;
+        IDisposable m_Subscriptions;
 
         [SerializeField] GameObject[] m_GameObjectsThatWillBeInjectedAutomatically;
 
@@ -50,6 +52,8 @@ private void Awake()
             scope.BindAsSingle<ProfileManager>();
 
             //these message channels are essential and persist for the lifetime of the lobby and relay services
+            scope.BindMessageChannelInstance<QuitGameSessionMessage>();
+            scope.BindMessageChannelInstance<QuitApplicationMessage>();
             scope.BindMessageChannelInstance<UnityServiceErrorMessage>();
             scope.BindMessageChannelInstance<ConnectStatus>();
             scope.BindMessageChannelInstance<DoorStateChangedEventMessage>();
@@ -82,6 +86,14 @@ private void Awake()
             m_LocalLobby = scope.Resolve<LocalLobby>();
             m_LobbyServiceFacade = scope.Resolve<LobbyServiceFacade>();
 
+            var quitGameSessionSub = scope.Resolve<ISubscriber<QuitGameSessionMessage>>();
+            var quitApplicationSub = scope.Resolve<ISubscriber<QuitApplicationMessage>>();
+
+            var subHandles = new DisposableGroup();
+            subHandles.Add(quitGameSessionSub.Subscribe(LeaveSession));
+            subHandles.Add(quitApplicationSub.Subscribe(QuitGame));
+            m_Subscriptions = subHandles;
+
             Application.targetFrameRate = 120;
         }
 
@@ -92,6 +104,7 @@ private void Start()
 
         private void OnDestroy()
         {
+            m_Subscriptions?.Dispose();
             m_LobbyServiceFacade?.EndTracking();
             DIScope.RootScope.Dispose();
             DIScope.RootScope = null;
@@ -126,11 +139,11 @@ private bool OnWantToQuit()
             return canQuit;
         }
 
-        public void LeaveSession(bool UserRequested)
+        private void LeaveSession(QuitGameSessionMessage msg)
         {
             m_LobbyServiceFacade.EndTracking();
 
-            if (UserRequested)
+            if (msg.UserRequested)
             {
                 // first disconnect then return to menu
                 var gameNetPortal = GameNetPortal.Instance;
@@ -142,7 +155,7 @@ public void LeaveSession(bool UserRequested)
             SceneLoaderWrapper.Instance.LoadScene("MainMenu", useNetworkSceneManager: false);
         }
 
-        public void QuitGame()
+        private void QuitGame(QuitApplicationMessage msg)
         {
 #if UNITY_EDITOR
             UnityEditor.EditorApplication.isPlaying = false;

Assets/BossRoom/Scripts/Game/ApplicationController.cs renamed to Assets/BossRoom/Scripts/ApplicationLifecycle/ApplicationController.cs

@@ -0,0 +1,22 @@
+{
+    "name": "BossRoom.ApplicationLifecycle",
+    "rootNamespace": "",
+    "references": [
+        "GUID:ed77cc04b29ffca42860b1220217e140",
+        "GUID:5ed68ed74b4874cce9e11f74a1f5e9ae",
+        "GUID:ec2e12d3de28e40839f9a0b685184f49",
+        "GUID:e3abc1ceb6eae4836a8ff106702e66e5",
+        "GUID:1491147abca9d7d4bb7105af628b223e",
+        "GUID:e9e5562f77c754b2ca364915385b3d43",
+        "GUID:e0cd26848372d4e5c891c569017e11f1"
+    ],
+    "includePlatforms": [],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}

Assets/BossRoom/Scripts/Game/ApplicationController.cs.meta renamed to Assets/BossRoom/Scripts/ApplicationLifecycle/ApplicationController.cs.meta

@@ -0,0 +1,3 @@
+{
+	"name": "BossRoom.ApplicationLifecycle.Messages"
+}

Assets/BossRoom/Scripts/ApplicationLifecycle/BossRoom.ApplicationLifecycle.asmdef

@@ -0,0 +1,8 @@
+using System;
+
+namespace Unity.Multiplayer.Samples.BossRoom.ApplicationLifecycle.Messages
+{
+    public struct QuitApplicationMessage
+    {
+    }
+}

Assets/BossRoom/Scripts/ApplicationLifecycle/BossRoom.ApplicationLifecycle.asmdef.meta

@@ -0,0 +1,9 @@
+using UnityEngine;
+
+namespace Unity.Multiplayer.Samples.BossRoom.ApplicationLifecycle.Messages
+{
+    public struct QuitGameSessionMessage
+    {
+        public bool UserRequested;
+    }
+}

Assets/BossRoom/Scripts/ApplicationLifecycle/Messages.meta

@@ -0,0 +1,4 @@
+{
+	"name": "BossRoom.Audio",
+	"references":[ "GUID:ec2e12d3de28e40839f9a0b685184f49" ]
+}

Assets/BossRoom/Scripts/ApplicationLifecycle/Messages/BossRoom.ApplicationLifecycle.Messages.asmdef

@@ -0,0 +1,16 @@
+{
+    "name": "BossRoom.CameraController",
+    "rootNamespace": "",
+    "references": [
+        "GUID:4307f53044263cf4b835bd812fc161a4"
+    ],
+    "includePlatforms": [],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}

Assets/BossRoom/Scripts/ApplicationLifecycle/Messages/BossRoom.ApplicationLifecycle.Messages.asmdef.meta

@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using System.Threading.Tasks;
+using Unity.Multiplayer.Samples.BossRoom.ApplicationLifecycle.Messages;
 using Unity.Multiplayer.Samples.BossRoom.Shared;
 using Unity.Multiplayer.Samples.BossRoom.Shared.Infrastructure;
 using Unity.Multiplayer.Samples.BossRoom.Shared.Net.UnityServices.Lobbies;
@@ -30,20 +31,20 @@ public class ClientGameNetPortal : MonoBehaviour
 
         Coroutine m_TryToReconnectCoroutine;
 
-        ApplicationController m_ApplicationController;
         LobbyServiceFacade m_LobbyServiceFacade;
         LocalLobby m_LocalLobby;
+        IPublisher<QuitGameSessionMessage> m_QuitGameSessionPub;
         IPublisher<ConnectStatus> m_ConnectStatusPub;
         IPublisher<ReconnectMessage> m_ReconnectMessagePub;
 
         [Inject]
-        private void InjectDependencies(ApplicationController applicationController, LobbyServiceFacade lobbyServiceFacade,
-            LocalLobby localLobby, IPublisher<ConnectStatus> connectStatusPub, IPublisher<ReconnectMessage> reconnectMessagePub)
+        private void InjectDependencies(LobbyServiceFacade lobbyServiceFacade, LocalLobby localLobby, IPublisher<QuitGameSessionMessage> quitGameSessionPub, IPublisher<ConnectStatus> connectStatusPub, IPublisher<ReconnectMessage> reconnectMessagePub)
         {
-            m_ApplicationController = applicationController;
+            m_QuitGameSessionPub = quitGameSessionPub;
             m_LobbyServiceFacade = lobbyServiceFacade;
             m_LocalLobby = localLobby;
             m_ConnectStatusPub = connectStatusPub;
+
             m_ReconnectMessagePub = reconnectMessagePub;
         }
 
@@ -156,12 +157,13 @@ private void OnDisconnectOrTimeout(ulong clientID)
                     case ConnectStatus.UserRequestedDisconnect:
                     case ConnectStatus.HostEndedSession:
                     case ConnectStatus.ServerFull:
-                        m_ApplicationController.LeaveSession(false); // go through the normal leave flow
+
+                        m_QuitGameSessionPub.Publish(new QuitGameSessionMessage(){UserRequested = false}); // go through the normal leave flow
                         break;
                     case ConnectStatus.LoggedInAgain:
                         if (m_TryToReconnectCoroutine == null)
                         {
-                            m_ApplicationController.LeaveSession(false); // if not trying to reconnect, go through the normal leave flow
+                            m_QuitGameSessionPub.Publish(new QuitGameSessionMessage(){UserRequested = false}); // if not trying to reconnect, go through the normal leave flow
                         }
                         break;
                     case ConnectStatus.GenericDisconnect:
@@ -222,7 +224,7 @@ private IEnumerator TryToReconnect(string lobbyCode)
 
             // If the coroutine has not been stopped before this, it means we failed to connect during all attempts
             Debug.Log("All tries failed, returning to main menu");
-            m_ApplicationController.LeaveSession(false);
+            m_QuitGameSessionPub.Publish(new QuitGameSessionMessage(){UserRequested = false});
             if (!DisconnectReason.HasTransitionReason)
             {
                 DisconnectReason.SetDisconnectReason(ConnectStatus.GenericDisconnect);

Assets/BossRoom/Scripts/ApplicationLifecycle/Messages/QuitApplicationMessage.cs

@@ -0,0 +1,19 @@
+{
+    "name": "BossRoom.DebugCheats",
+    "rootNamespace": "",
+    "references": [
+        "GUID:1491147abca9d7d4bb7105af628b223e",
+        "GUID:ec2e12d3de28e40839f9a0b685184f49",
+        "GUID:ed77cc04b29ffca42860b1220217e140",
+        "GUID:e9e5562f77c754b2ca364915385b3d43"
+    ],
+    "includePlatforms": [],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}