Merge branch 'release/GDC2022' into feature/auto-reconnect

Author: LPLafontaineB

Assets/BossRoom/Scripts/Client/Game/Character/ClientCharacterVisualization.cs

@@ -64,14 +64,30 @@ public class ClientCharacterVisualization : NetworkBehaviour
 
         Quaternion m_LerpedRotation;
 
+        void Awake()
+        {
+            foreach (var rendererComponent in GetComponentsInChildren<Renderer>())
+            {
+                rendererComponent.enabled = false;
+            }
+
+            enabled = false;
+        }
+
         public override void OnNetworkSpawn()
         {
             if (!IsClient || transform.parent == null)
             {
-                enabled = false;
                 return;
             }
 
+            foreach (var rendererComponent in GetComponentsInChildren<Renderer>())
+            {
+                rendererComponent.enabled = true;
+            }
+
+            enabled = true;
+
             m_ActionViz = new ActionVisualization(this);
 
             m_NetState = GetComponentInParent<NetworkCharacterState>();

Assets/BossRoom/Scripts/Server/Game/Character/ServerAnimationHandler.cs

@@ -11,23 +11,22 @@ public class ServerAnimationHandler : NetworkBehaviour
         NetworkAnimator m_NetworkAnimator;
 
         [SerializeField]
-        private VisualizationConfiguration m_VisualizationConfiguration;
+        VisualizationConfiguration m_VisualizationConfiguration;
 
         [SerializeField]
         NetworkLifeState m_NetworkLifeState;
 
-        public NetworkAnimator NetworkAnimator
-        {
-            get => m_NetworkAnimator;
-            set => m_NetworkAnimator = value;
-        }
+        public NetworkAnimator NetworkAnimator => m_NetworkAnimator;
 
         public override void OnNetworkSpawn()
         {
-            m_NetworkLifeState.LifeState.OnValueChanged += OnLifeStateChanged;
+            if (IsServer)
+            {
+                m_NetworkLifeState.LifeState.OnValueChanged += OnLifeStateChanged;
+            }
         }
 
-        private void OnLifeStateChanged(LifeState previousValue, LifeState newValue)
+        void OnLifeStateChanged(LifeState previousValue, LifeState newValue)
         {
             switch (newValue)
             {
@@ -47,7 +46,10 @@ private void OnLifeStateChanged(LifeState previousValue, LifeState newValue)
 
         public override void OnNetworkDespawn()
         {
-            m_NetworkLifeState.LifeState.OnValueChanged -= OnLifeStateChanged;
+            if (IsServer)
+            {
+                m_NetworkLifeState.LifeState.OnValueChanged -= OnLifeStateChanged;
+            }
         }
     }
 }

Assets/BossRoom/Scripts/Shared/Game/UI/Editor/NetworkLatencyWarning.cs

@@ -20,7 +20,7 @@ public class NetworkLatencyWarning : MonoBehaviour
 
         void Update()
         {
-            if (NetworkManager.Singleton.IsClient || NetworkManager.Singleton.IsServer)
+            if (NetworkManager.Singleton != null && (NetworkManager.Singleton.IsClient || NetworkManager.Singleton.IsServer))
             {
                 var chosenTransport = NetworkManager.Singleton.NetworkConfig.NetworkTransport;
 

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

@@ -133,8 +133,9 @@ private void OnDisconnectReasonReceived(ConnectStatus status)
 
         private void OnDisconnectOrTimeout(ulong clientID)
         {
-            // Only handle client disconnect
-            if (!NetworkManager.Singleton.IsHost)
+            // This is also called on the Host when a different client disconnects. To make sure we only handle our own disconnection, verify that we are either
+            // not a host (in which case we know this is about us) or that the clientID is the same as ours if we are the host.
+            if (!NetworkManager.Singleton.IsHost || NetworkManager.Singleton.IsHost && NetworkManager.Singleton.LocalClientId == clientID)
             {
                 //On a client disconnect we want to take them back to the main menu.
                 //We have to check here in SceneManager if our active scene is the main menu, as if it is, it means we timed out rather than a raw disconnect;

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

@@ -60,10 +60,10 @@ public LobbyServiceFacade(
             m_LobbyApiInterface = m_ServiceScope.Resolve<LobbyAPIInterface>();
             m_JoinedLobbyContentHeartbeat = m_ServiceScope.Resolve<JoinedLobbyContentHeartbeat>();
 
-            m_RateLimitQuery = new RateLimitCooldown(1.5f, updateRunner);
-            m_RateLimitJoin = new RateLimitCooldown(3f, updateRunner);
-            m_RateLimitQuickJoin = new RateLimitCooldown(10f,  updateRunner);
-            m_RateLimitHost = new RateLimitCooldown(3f, updateRunner);
+            m_RateLimitQuery = new RateLimitCooldown(0f, updateRunner);
+            m_RateLimitJoin = new RateLimitCooldown(0f, updateRunner);
+            m_RateLimitQuickJoin = new RateLimitCooldown(0f, updateRunner);
+            m_RateLimitHost = new RateLimitCooldown(0f, updateRunner);
         }
 
         public void Dispose()