using ReconnectMessage to display popups when reconnecting and to remove said popup when failing to reconnect

Author: LPLafontaineB

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

@@ -9,14 +9,16 @@ namespace Unity.Multiplayer.Samples.BossRoom.Visual
     /// </summary>
     public class ConnectionStatusMessageUIManager : MonoBehaviour
     {
-        IDisposable m_Subscriptions;
+        DisposableGroup m_Subscriptions;
 
-        PopupPanel m_CurrentPopup;
+        PopupPanel m_CurrentReconnectPopup;
 
         [Inject]
-        void InjectDependencies(ISubscriber<ConnectStatus> connectStatusSub)
+        void InjectDependencies(ISubscriber<ConnectStatus> connectStatusSub, ISubscriber<ReconnectMessage> reconnectMessageSub)
         {
-            m_Subscriptions = connectStatusSub.Subscribe(OnConnectStatus);
+            m_Subscriptions = new DisposableGroup();
+            m_Subscriptions.Add(connectStatusSub.Subscribe(OnConnectStatus));
+            m_Subscriptions.Add(reconnectMessageSub.Subscribe(OnReconnectMessage));
         }
 
         void Awake()
@@ -31,10 +33,6 @@ void OnDestroy()
 
         void OnConnectStatus(ConnectStatus status)
         {
-            if (m_CurrentPopup != null)
-            {
-                m_CurrentPopup.Hide();
-            }
             switch (status)
             {
                 case ConnectStatus.Undefined:
@@ -44,6 +42,11 @@ void OnConnectStatus(ConnectStatus status)
                     PopupManager.ShowPopupPanel("Connection Failed", "The Host is full and cannot accept any additional connections.");
                     break;
                 case ConnectStatus.Success:
+                    if (m_CurrentReconnectPopup != null)
+                    {
+                        m_CurrentReconnectPopup.Hide();
+                        m_CurrentReconnectPopup = null;
+                    }
                     break;
                 case ConnectStatus.LoggedInAgain:
                     PopupManager.ShowPopupPanel("Connection Failed", "You have logged in elsewhere using the same account.");
@@ -58,12 +61,29 @@ void OnConnectStatus(ConnectStatus status)
                     PopupManager.ShowPopupPanel("Disconnected From Host", "The host has ended the game session.");
                     break;
                 case ConnectStatus.Reconnecting:
-                    m_CurrentPopup = PopupManager.ShowPopupPanel("Connection lost", "Attempting to reconnect...", closeableByUser: false);
                     break;
                 default:
                     Debug.LogWarning($"New ConnectStatus {status} has been added, but no connect message defined for it.");
                     break;
             }
         }
+
+        void OnReconnectMessage(ReconnectMessage message)
+        {
+            if (message.CurrentAttempt == message.MaxAttempt)
+            {
+                m_CurrentReconnectPopup.Hide();
+                m_CurrentReconnectPopup = null;
+            }
+            else if (m_CurrentReconnectPopup != null)
+            {
+                m_CurrentReconnectPopup.SetupPopupPanel("Connection lost", $"Attempting to reconnect...\nAttempt {message.CurrentAttempt+1}/{message.MaxAttempt}", closeableByUser: false);
+            }
+            else
+            {
+                m_CurrentReconnectPopup = PopupManager.ShowPopupPanel("Connection lost", $"Attempting to reconnect...\nAttempt {message.CurrentAttempt+1}/{message.MaxAttempt}", closeableByUser: false);
+            }
+
+        }
     }
 }

Assets/BossRoom/Scripts/Shared/Net/ConnectionManagement/ClientGameNetPortal.cs

@@ -201,6 +201,7 @@ private IEnumerator TryToReconnect(string lobbyCode)
 
                 yield return new WaitWhile(() => NetworkManager.Singleton.ShutdownInProgress); // wait until NetworkManager completes shutting down
                 Debug.Log($"Reconnecting attempt {nbTries + 1}/{k_NbReconnectAttempts}...");
+                m_ReconnectMessagePub.Publish(new ReconnectMessage(nbTries, k_NbReconnectAttempts));
                 if (!string.IsNullOrEmpty(lobbyCode))
                 {
                     var leavingLobby = m_LobbyServiceFacade.EndTracking();
@@ -234,12 +235,13 @@ private IEnumerator TryToReconnect(string lobbyCode)
                 NetworkManager.Singleton.Shutdown();
             }
 
-            SceneManager.LoadScene("MainMenu");
+            SceneLoaderWrapper.Instance.LoadScene("MainMenu");
             if (!DisconnectReason.HasTransitionReason)
             {
                 DisconnectReason.SetDisconnectReason(ConnectStatus.GenericDisconnect);
             }
             m_TryToReconnectCoroutine = null;
+            m_ReconnectMessagePub.Publish(new ReconnectMessage(k_NbReconnectAttempts, k_NbReconnectAttempts));
             m_ConnectStatusPub.Publish(DisconnectReason.Reason);
         }
 

Assets/BossRoom/Scripts/Shared/Net/ConnectionManagement/GameNetPortal.cs

@@ -30,6 +30,12 @@ public struct ReconnectMessage
     {
         public int CurrentAttempt;
         public int MaxAttempt;
+
+        public ReconnectMessage(int currentAttempt, int maxAttempt)
+        {
+            CurrentAttempt = currentAttempt;
+            MaxAttempt = maxAttempt;
+        }
     }
 
     public enum OnlineMode