Reset NetworkAnimator - changes are in another PR

Author: noellie-velez

com.unity.netcode.gameobjects/Runtime/Components/NetworkAnimator.cs

@@ -194,7 +194,7 @@ internal void DeregisterUpdate()
         internal NetworkAnimatorStateChangeHandler(NetworkAnimator networkAnimator)
         {
             m_NetworkAnimator = networkAnimator;
-            m_IsServer = networkAnimator.LocalNetworkManager.IsServer;
+            m_IsServer = networkAnimator.NetworkManager.IsServer;
             NetworkUpdateLoop.RegisterNetworkUpdate(this, NetworkUpdateStage.PreUpdate);
         }
     }
@@ -279,7 +279,7 @@ public Animator Animator
         private Dictionary<int, Dictionary<int, TransitionStateinfo>> m_DestinationStateToTransitioninfo = new Dictionary<int, Dictionary<int, TransitionStateinfo>>();
 
         // Named differently to avoid serialization conflicts with NetworkBehaviour
-        internal NetworkManager LocalNetworkManager;
+        private NetworkManager m_LocalNetworkManager;
 
         internal bool DistributedAuthorityMode;
 
@@ -915,9 +915,8 @@ internal AnimationMessage GetAnimationMessage()
         internal override void InternalOnNetworkPreSpawn(ref NetworkManager networkManager)
         {
             // Save internal state references
-            LocalNetworkManager = networkManager;
-            DistributedAuthorityMode = LocalNetworkManager.DistributedAuthorityMode;
-            base.InternalOnNetworkPreSpawn(ref networkManager);
+            m_LocalNetworkManager = networkManager;
+            DistributedAuthorityMode = m_LocalNetworkManager.DistributedAuthorityMode;
         }
 
         /// <inheritdoc/>
@@ -940,14 +939,12 @@ public override void OnNetworkSpawn()
 
             // Create a handler for state changes
             m_NetworkAnimatorStateChangeHandler = new NetworkAnimatorStateChangeHandler(this);
-            base.OnNetworkSpawn();
         }
 
         /// <inheritdoc/>
         public override void OnNetworkDespawn()
         {
             SpawnCleanup();
-            base.OnNetworkDespawn();
         }
 
         /// <summary>
@@ -1068,7 +1065,6 @@ protected override void OnSynchronize<T>(ref BufferSerializer<T> serializer)
                     UpdateAnimationState(animationState);
                 }
             }
-            base.OnSynchronize(ref serializer);
         }
 
         /// <summary>
@@ -1180,7 +1176,7 @@ internal void CheckForAnimatorChanges()
 
             if (m_Animator.runtimeAnimatorController == null)
             {
-                if (LocalNetworkManager.LogLevel == LogLevel.Developer)
+                if (m_LocalNetworkManager.LogLevel == LogLevel.Developer)
                 {
                     Debug.LogError($"[{GetType().Name}] Could not find an assigned {nameof(RuntimeAnimatorController)}! Cannot check {nameof(Animator)} for changes in state!");
                 }
@@ -1215,9 +1211,9 @@ internal void CheckForAnimatorChanges()
                 {
                     // Just notify all remote clients and not the local server
                     m_TargetGroup.Clear();
-                    foreach (var clientId in LocalNetworkManager.ConnectionManager.ConnectedClientIds)
+                    foreach (var clientId in m_LocalNetworkManager.ConnectionManager.ConnectedClientIds)
                     {
-                        if (clientId == LocalNetworkManager.LocalClientId || !NetworkObject.Observers.Contains(clientId))
+                        if (clientId == m_LocalNetworkManager.LocalClientId || !NetworkObject.Observers.Contains(clientId))
                         {
                             continue;
                         }
@@ -1245,7 +1241,7 @@ private void SendParametersUpdate(RpcParams rpcParams = default, bool sendDirect
                 }
                 else
                 {
-                    Debug.LogError($"[{name}][Client-{LocalNetworkManager.LocalClientId}] Attempting to send parameter updates but not the owner!");
+                    Debug.LogError($"[{name}][Client-{m_LocalNetworkManager.LocalClientId}] Attempting to send parameter updates but not the owner!");
                 }
             }
             else
@@ -1495,18 +1491,18 @@ internal void UpdateAnimationState(AnimationState animationState)
                             // Cross fade from the current to the destination state for the transitions duration while starting at the server's current normalized time of the transition
                             m_Animator.CrossFade(transitionStateInfo.DestinationState, transitionStateInfo.TransitionDuration, transitionStateInfo.Layer, 0.0f, animationState.NormalizedTime);
                         }
-                        else if (LocalNetworkManager.LogLevel == LogLevel.Developer)
+                        else if (m_LocalNetworkManager.LogLevel == LogLevel.Developer)
                         {
                             NetworkLog.LogWarning($"Current State Hash ({currentState.fullPathHash}) != AnimationState.StateHash ({animationState.StateHash})");
                         }
                     }
-                    else if (LocalNetworkManager.LogLevel == LogLevel.Developer)
+                    else if (m_LocalNetworkManager.LogLevel == LogLevel.Developer)
                     {
                         NetworkLog.LogError($"[DestinationState To Transition Info] Layer ({animationState.Layer}) sub-table does not contain destination state ({animationState.DestinationStateHash})!");
                     }
                 }
                 // For reference, it is valid to have no transition information
-                //else if (m_LocalNetworkManager.LogLevel == LogLevel.Developer)
+                //else if (NetworkManager.LogLevel == LogLevel.Developer)
                 //{
                 //    NetworkLog.LogError($"[DestinationState To Transition Info] Layer ({animationState.Layer}) does not exist!");
                 //}
@@ -1543,7 +1539,7 @@ private unsafe void SendServerParametersUpdateRpc(ParametersUpdateMessage parame
                     return;
                 }
                 UpdateParameters(ref parametersUpdate);
-                var connectedClientIds = LocalNetworkManager.ConnectionManager.ConnectedClientIds;
+                var connectedClientIds = m_LocalNetworkManager.ConnectionManager.ConnectedClientIds;
                 if (connectedClientIds.Count <= (IsHost ? 2 : 1))
                 {
                     return;
@@ -1609,7 +1605,7 @@ private void SendServerAnimStateRpc(AnimationMessage animationMessage, RpcParams
                     UpdateAnimationState(animationState);
                 }
 
-                var connectedClientIds = LocalNetworkManager.ConnectionManager.ConnectedClientIds;
+                var connectedClientIds = m_LocalNetworkManager.ConnectionManager.ConnectedClientIds;
                 if (connectedClientIds.Count <= (IsHost ? 2 : 1))
                 {
                     return;
@@ -1656,7 +1652,7 @@ private void ProcessAnimStates(AnimationMessage animationMessage)
         {
             if (HasAuthority)
             {
-                if (LocalNetworkManager.LogLevel == LogLevel.Developer)
+                if (m_LocalNetworkManager.LogLevel == LogLevel.Developer)
                 {
                     var hostOrOwner = DistributedAuthorityMode ? "Owner" : "Host";
                     var clientServerOrDAMode = DistributedAuthorityMode ? "distributed authority" : "client-server";
@@ -1681,7 +1677,7 @@ internal void SendServerAnimTriggerRpc(AnimationTriggerMessage animationTriggerM
             // Ignore if a non-owner sent this.
             if (rpcParams.Receive.SenderClientId != OwnerClientId)
             {
-                if (LocalNetworkManager.LogLevel == LogLevel.Developer)
+                if (m_LocalNetworkManager.LogLevel == LogLevel.Developer)
                 {
                     NetworkLog.LogWarning($"[Owner Authoritative] Detected the a non-authoritative client is sending the server animation trigger updates. If you recently changed ownership of the {name} object, then this could be the reason.");
                 }
@@ -1691,7 +1687,7 @@ internal void SendServerAnimTriggerRpc(AnimationTriggerMessage animationTriggerM
             // set the trigger locally on the server
             InternalSetTrigger(animationTriggerMessage.Hash, animationTriggerMessage.IsTriggerSet);
 
-            var connectedClientIds = LocalNetworkManager.ConnectionManager.ConnectedClientIds;
+            var connectedClientIds = m_LocalNetworkManager.ConnectionManager.ConnectedClientIds;
 
             m_TargetGroup.Clear();
             foreach (var clientId in connectedClientIds)