Created manager to handle connection status messages

Author: LPLafontaineB

Assets/BossRoom/Scenes/Startup.unity

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7f94d9ef30f99dd13a417106572a3d3dda71b434c4f9a41b7b54a717971bb6a8
-size 33791
+oid sha256:7b2c33d4681d53ec62b32b7ff2c81123b4457d8dcd8d0b6d643097e74ae36856
+size 35006

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

@@ -0,0 +1,53 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using Unity.Multiplayer.Samples.BossRoom;
+using Unity.Multiplayer.Samples.BossRoom.Shared.Infrastructure;
+using Unity.Multiplayer.Samples.BossRoom.Visual;
+using UnityEngine;
+
+public class ConnectionStatusMessageUIManager : MonoBehaviour
+{
+
+    IDisposable m_Subscriptions;
+
+    [Inject]
+    void InjectDependencies(ISubscriber<ConnectStatus> connectStatusSub)
+    {
+        m_Subscriptions = connectStatusSub.Subscribe(OnConnectStatus);
+    }
+
+    void Awake()
+    {
+        DontDestroyOnLoad(gameObject);
+    }
+
+    void OnDestroy()
+    {
+        m_Subscriptions?.Dispose();
+    }
+
+    void OnConnectStatus(ConnectStatus status)
+    {
+        switch (status)
+        {
+            case ConnectStatus.Undefined:
+            case ConnectStatus.UserRequestedDisconnect:
+                break;
+            case ConnectStatus.ServerFull:
+                PopupPanel.ShowPopupPanel("Connection Failed", "The Host is full and cannot accept any additional connections.");
+                break;
+            case ConnectStatus.Success:
+                break;
+            case ConnectStatus.LoggedInAgain:
+                PopupPanel.ShowPopupPanel("Connection Failed", "You have logged in elsewhere using the same account.");
+                break;
+            case ConnectStatus.GenericDisconnect:
+                PopupPanel.ShowPopupPanel("Disconnected From Host", "The connection to the host was lost");
+                break;
+            default:
+                Debug.LogWarning($"New ConnectStatus {status} has been added, but no connect message defined for it.");
+                break;
+        }
+    }
+}

Assets/BossRoom/Scripts/Client/UI/ConnectionStatusMessageUIManager.cs.meta

@@ -46,19 +46,13 @@ ClientGameNetPortal clientGameNetPortal
             RegenerateName();
 
             m_ClientNetPortal.NetworkTimedOut += OnNetworkTimeout;
-            m_ClientNetPortal.ConnectFinished += OnConnectFinished;
-
-            //any disconnect reason set? Show it to the user here.
-            /*ConnectStatusToMessage(m_ClientNetPortal.DisconnectReason.Reason, false);
-            m_ClientNetPortal.DisconnectReason.Clear();*/
         }
 
         void OnDestroy()
         {
             if (m_ClientNetPortal != null)
             {
                 m_ClientNetPortal.NetworkTimedOut -= OnNetworkTimeout;
-                m_ClientNetPortal.ConnectFinished -= OnConnectFinished;
             }
         }
 
@@ -218,15 +212,6 @@ void UnblockUIAfterLoadingIsComplete()
             }
         }
 
-        /// <summary>
-        /// Callback when the server sends us back a connection finished event.
-        /// </summary>
-        /// <param name="status"></param>
-        void OnConnectFinished(ConnectStatus status)
-        {
-            ConnectStatusToMessage(status, true);
-        }
-
         /// <summary>
         /// Invoked when the client sent a connection request to the server and didn't hear back at all.
         /// This should create a UI letting the player know that something went wrong and to try again
@@ -235,40 +220,5 @@ void OnNetworkTimeout()
         {
             UnblockUIAfterLoadingIsComplete();
         }
-
-        /// <summary>
-        /// Takes a ConnectStatus and shows an appropriate message to the user. This can be called on: (1) successful connect,
-        /// (2) failed connect, (3) disconnect.
-        /// </summary>
-        /// <param name="connecting">pass true if this is being called in response to a connect finishing.</param>
-        void ConnectStatusToMessage(ConnectStatus status, bool connecting)
-        {
-            switch (status)
-            {
-                case ConnectStatus.Undefined:
-                case ConnectStatus.UserRequestedDisconnect:
-                    break;
-                case ConnectStatus.ServerFull:
-                    PopupPanel.ShowPopupPanel("Connection Failed", "The Host is full and cannot accept any additional connections.");
-                    break;
-                case ConnectStatus.Success:
-                    if (connecting)
-                    {
-                        PopupPanel.ShowPopupPanel("Success!", "Joining Now...");
-                    }
-                    break;
-                case ConnectStatus.LoggedInAgain:
-                    PopupPanel.ShowPopupPanel("Connection Failed", "You have logged in elsewhere using the same account.");
-                    break;
-                case ConnectStatus.GenericDisconnect:
-                    var title = connecting ? "Connection Failed" : "Disconnected From Host";
-                    var text = connecting ? "Something went wrong" : "The connection to the host was lost";
-                    PopupPanel.ShowPopupPanel(title, text);
-                    break;
-                default:
-                    Debug.LogWarning($"New ConnectStatus {status} has been added, but no connect message defined for it.");
-                    break;
-            }
-        }
     }
 }

Assets/BossRoom/Scripts/Client/UI/Lobby/LobbyUIMediator.cs

@@ -23,8 +23,6 @@ public class PopupPanel : MonoBehaviour
         /// </summary>
         Action m_ConfirmFunction;
 
-        IDisposable m_Subscriptions;
-
         static PopupPanel s_Instance;
 
         void Awake()
@@ -36,41 +34,6 @@ void Awake()
         void OnDestroy()
         {
             s_Instance = null;
-            m_Subscriptions?.Dispose();
-        }
-
-        [Inject]
-        void InjectDependencies(
-            ISubscriber<UnityServiceErrorMessage> unityServiceErrorMessageSub,
-            ISubscriber<ConnectStatus> connectStatusSub)
-        {
-            m_Subscriptions = connectStatusSub.Subscribe(OnConnectStatus);
-        }
-
-        void OnConnectStatus(ConnectStatus status)
-        {
-            switch (status)
-            {
-                case ConnectStatus.Undefined:
-                case ConnectStatus.UserRequestedDisconnect:
-                    break;
-                case ConnectStatus.ServerFull:
-                    SetupNotifierDisplay("Connection Failed", "The Host is full and cannot accept any additional connections.");
-                    break;
-                case ConnectStatus.Success:
-                    break;
-                case ConnectStatus.LoggedInAgain:
-                    SetupNotifierDisplay("Connection Failed", "You have logged in elsewhere using the same account.");
-                    break;
-                case ConnectStatus.GenericDisconnect:
-                    var title = false ? "Connection Failed" : "Disconnected From Host";
-                    var text = false ? "Something went wrong" : "The connection to the host was lost";
-                    SetupNotifierDisplay(title, text);
-                    break;
-                default:
-                    Debug.LogWarning($"New ConnectStatus {status} has been added, but no connect message defined for it.");
-                    break;
-            }
         }
 
         public void OnConfirmClick()
@@ -100,15 +63,15 @@ public static void ShowPopupPanel(string titleText, string mainText, Action conf
         {
             if (s_Instance != null)
             {
-                s_Instance.SetupNotifierDisplay(titleText, mainText, confirmFunction);
+                s_Instance.SetupPopupPanel(titleText, mainText, confirmFunction);
             }
             else
             {
                 Debug.LogError($"No PopupPanel instance found. Cannot display message: {titleText}: {mainText}");
             }
         }
 
-        void SetupNotifierDisplay(string titleText, string mainText, Action confirmFunction = null)
+        void SetupPopupPanel(string titleText, string mainText, Action confirmFunction = null)
         {
             ResetState();
 

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

@@ -28,8 +28,6 @@ public class ClientGameNetPortal : MonoBehaviour
         /// </summary>
         private const int k_TimeoutDuration = 10;
 
-        public event Action<ConnectStatus> ConnectFinished;
-
         /// <summary>
         /// This event fires when the client sent out a request to start the client, but failed to hear back after an allotted amount of
         /// time from the host.
@@ -109,8 +107,6 @@ public void OnConnectFinished(ConnectStatus status)
                 //this indicates a game level failure, rather than a network failure. See note in ServerGameNetPortal.
                 DisconnectReason.SetDisconnectReason(status);
             }
-
-            ConnectFinished?.Invoke(status);
         }
 
         private void OnDisconnectReasonReceived(ConnectStatus status)