Merge 7fac0955fd into 04bb95311b

- avoids error in editor

.github/workflows/RunUnityTests.yml

@@ -16,7 +16,7 @@ jobs:
           - 2021.3.45f1
           - 2022.3.51f1
           - 2023.2.20f1
-          - 6000.0.24f1
+          - 6000.0.25f1
 
     steps:
       - name: Checkout repository

Assets/Mirror/Components/NetworkTransform/NetworkTransformHybrid2022.cs

@@ -51,11 +51,13 @@ public class NetworkTransformHybrid2022 : NetworkBehaviour
         byte lastSerializedBaselineTick = 0;
         Vector3 lastSerializedBaselinePosition = Vector3.zero;
         Quaternion lastSerializedBaselineRotation = Quaternion.identity;
+        Vector3 lastSerializedBaselineScale = Vector3.one;
 
         // save last deserialized baseline to delta decompress against
         byte lastDeserializedBaselineTick = 0;
         Vector3 lastDeserializedBaselinePosition = Vector3.zero;                // unused, but keep for delta
         Quaternion lastDeserializedBaselineRotation = Quaternion.identity;      // unused, but keep for delta
+        Vector3 lastDeserializedBaselineScale = Vector3.one;                    // unused, but keep for delta
 
         // only sync when changed hack /////////////////////////////////////////
         [Header("Sync Only If Changed")]
@@ -81,7 +83,7 @@ public class NetworkTransformHybrid2022 : NetworkBehaviour
         [Header("Sensitivity"), Tooltip("Sensitivity of changes needed before an updated state is sent over the network")]
         public float positionSensitivity = 0.01f;
         public float rotationSensitivity = 0.01f;
-        // public float scaleSensitivity    = 0.01f;
+        public float scaleSensitivity    = 0.01f;
 
         [Tooltip("Enable to send all unreliable messages twice. Only useful for extremely fast-paced games since it doubles bandwidth costs.")]
         public bool unreliableRedundancy = false;
@@ -93,12 +95,7 @@ public class NetworkTransformHybrid2022 : NetworkBehaviour
         [Header("Selective Sync & interpolation")]
         public bool syncPosition = true;
         public bool syncRotation = true;
-        // public bool syncScale    = false; // rarely used. disabled for perf so we can rely on transform.GetPositionAndRotation.
-
-        // BEGIN CUSTOM CHANGE /////////////////////////////////////////////////
-        // TODO rename to avoid double negative
-        public bool disableSendingThisToClients = false;
-        // END CUSTOM CHANGE ///////////////////////////////////////////////////
+        public bool syncScale    = false;
 
         // debugging ///////////////////////////////////////////////////////////
         [Header("Debug")]
@@ -143,13 +140,13 @@ protected virtual void ApplySnapshot(TransformSnapshot interpolated)
             //    scale, then we should not touch scale etc.
             if (syncPosition) target.localPosition = interpolated.position;
             if (syncRotation) target.localRotation = interpolated.rotation;
-            // if (syncScale)    target.localScale    = interpolated.scale;
+            if (syncScale)    target.localScale    = interpolated.scale;
         }
 
         // check if position / rotation / scale changed since last _full reliable_ sync.
         // squared comparisons for performance
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        bool Changed(Vector3 currentPosition, Quaternion currentRotation)//, Vector3 currentScale)
+        bool Changed(Vector3 currentPosition, Quaternion currentRotation, Vector3 currentScale)
         {
             if (syncPosition)
             {
@@ -169,14 +166,35 @@ bool Changed(Vector3 currentPosition, Quaternion currentRotation)//, Vector3 cur
                 }
             }
 
-            // if (syncScale && Vector3.Distance(last.scale, current.scale) >= scalePrecision)
-            // if (syncScale && (current.scale - last.scale).sqrMagnitude >= scalePrecisionSqr)
-            //     return true;
+            if (syncScale)
+            {
+                float scaleDelta = Vector3.Distance(currentScale, lastSerializedBaselineScale);
+                if (scaleDelta >= scaleSensitivity)
+                {
+                    return true;
+                }
+            }
 
             return false;
         }
 
         // cmd baseline ////////////////////////////////////////////////////////
+        [Command(channel = Channels.Reliable)] // reliable baseline
+        void CmdClientToServerBaseline_PositionRotationScale(byte baselineTick, Vector3 position, Quaternion rotation, Vector3 scale)
+        {
+            lastDeserializedBaselineTick = baselineTick;
+            lastDeserializedBaselinePosition = position;
+            lastDeserializedBaselineRotation = rotation;
+            lastDeserializedBaselineScale    = scale;
+
+            // debug draw: baseline
+            if (debugDraw) Debug.DrawLine(position, position + Vector3.up, Color.yellow, 10f);
+
+            // if baseline counts as delta, insert it into snapshot buffer too
+            if (baselineIsDelta)
+                OnClientToServerDeltaSync(baselineTick, position, rotation, scale);
+        }
+
         [Command(channel = Channels.Reliable)] // reliable baseline
         void CmdClientToServerBaseline_PositionRotation(byte baselineTick, Vector3 position, Quaternion rotation)
         {
@@ -189,7 +207,34 @@ void CmdClientToServerBaseline_PositionRotation(byte baselineTick, Vector3 posit
 
             // if baseline counts as delta, insert it into snapshot buffer too
             if (baselineIsDelta)
-                OnClientToServerDeltaSync(baselineTick, position, rotation);//, scale);
+                OnClientToServerDeltaSync(baselineTick, position, rotation, Vector3.one);
+        }
+
+        [Command(channel = Channels.Reliable)] // reliable baseline
+        void CmdClientToServerBaseline_PositionScale(byte baselineTick, Vector3 position, Vector3 scale)
+        {
+            lastDeserializedBaselineTick = baselineTick;
+            lastDeserializedBaselinePosition = position;
+            lastDeserializedBaselineScale    = scale;
+
+            // debug draw: baseline
+            if (debugDraw) Debug.DrawLine(position, position + Vector3.up, Color.yellow, 10f);
+
+            // if baseline counts as delta, insert it into snapshot buffer too
+            if (baselineIsDelta)
+                OnClientToServerDeltaSync(baselineTick, position, Quaternion.identity, scale);
+        }
+
+        [Command(channel = Channels.Reliable)] // reliable baseline
+        void CmdClientToServerBaseline_RotationScale(byte baselineTick, Quaternion rotation, Vector3 scale)
+        {
+            lastDeserializedBaselineTick = baselineTick;
+            lastDeserializedBaselineRotation = rotation;
+            lastDeserializedBaselineScale    = scale;
+
+            // if baseline counts as delta, insert it into snapshot buffer too
+            if (baselineIsDelta)
+                OnClientToServerDeltaSync(baselineTick, Vector3.zero, rotation, scale);
         }
 
         [Command(channel = Channels.Reliable)] // reliable baseline
@@ -203,7 +248,7 @@ void CmdClientToServerBaseline_Position(byte baselineTick, Vector3 position)
 
             // if baseline counts as delta, insert it into snapshot buffer too
             if (baselineIsDelta)
-                OnClientToServerDeltaSync(baselineTick, position, Quaternion.identity);//, scale);
+                OnClientToServerDeltaSync(baselineTick, position, Quaternion.identity, Vector3.one);
         }
 
         [Command(channel = Channels.Reliable)] // reliable baseline
@@ -214,7 +259,18 @@ void CmdClientToServerBaseline_Rotation(byte baselineTick, Quaternion rotation)
 
             // if baseline counts as delta, insert it into snapshot buffer too
             if (baselineIsDelta)
-                OnClientToServerDeltaSync(baselineTick, Vector3.zero, rotation);//, scale);
+                OnClientToServerDeltaSync(baselineTick, Vector3.zero, rotation, Vector3.one);
+        }
+
+        [Command(channel = Channels.Reliable)] // reliable baseline
+        void CmdClientToServerBaseline_Scale(byte baselineTick, Vector3 scale)
+        {
+            lastDeserializedBaselineTick = baselineTick;
+            lastDeserializedBaselineScale = scale;
+
+            // if baseline counts as delta, insert it into snapshot buffer too
+            if (baselineIsDelta)
+                OnClientToServerDeltaSync(baselineTick, Vector3.zero, Quaternion.identity, scale);
         }
 
         // cmd delta ///////////////////////////////////////////////////////////
@@ -225,14 +281,31 @@ void CmdClientToServerDelta_Position(byte baselineTick, Vector3 position)
             if (debugDraw) Debug.DrawLine(position, position + Vector3.up, Color.white, 10f);
 
             // Debug.Log($"[{name}] server received delta for baseline #{lastDeserializedBaselineTick}");
-            OnClientToServerDeltaSync(baselineTick, position, Quaternion.identity);//, scale);
+            OnClientToServerDeltaSync(baselineTick, position, Quaternion.identity, Vector3.one);
         }
 
         [Command(channel = Channels.Unreliable)] // unreliable delta
         void CmdClientToServerDelta_Rotation(byte baselineTick, Quaternion rotation)
         {
             // Debug.Log($"[{name}] server received delta for baseline #{lastDeserializedBaselineTick}");
-            OnClientToServerDeltaSync(baselineTick, Vector3.zero, rotation);//, scale);
+            OnClientToServerDeltaSync(baselineTick, Vector3.zero, rotation, Vector3.one);
+        }
+
+        [Command(channel = Channels.Unreliable)] // unreliable delta
+        void CmdClientToServerDelta_Scale(byte baselineTick, Vector3 scale)
+        {
+            // Debug.Log($"[{name}] server received delta for baseline #{lastDeserializedBaselineTick}");
+            OnClientToServerDeltaSync(baselineTick, Vector3.zero, Quaternion.identity, scale);
+        }
+
+        [Command(channel = Channels.Unreliable)] // unreliable delta
+        void CmdClientToServerDelta_PositionRotationScale(byte baselineTick, Vector3 position, Quaternion rotation, Vector3 scale)
+        {
+            // debug draw: delta
+            if (debugDraw) Debug.DrawLine(position, position + Vector3.up, Color.white, 10f);
+
+            // Debug.Log($"[{name}] server received delta for baseline #{lastDeserializedBaselineTick}");
+            OnClientToServerDeltaSync(baselineTick, position, rotation, scale);
         }
 
         [Command(channel = Channels.Unreliable)] // unreliable delta
@@ -242,11 +315,28 @@ void CmdClientToServerDelta_PositionRotation(byte baselineTick, Vector3 position
             if (debugDraw) Debug.DrawLine(position, position + Vector3.up, Color.white, 10f);
 
             // Debug.Log($"[{name}] server received delta for baseline #{lastDeserializedBaselineTick}");
-            OnClientToServerDeltaSync(baselineTick, position, rotation);//, scale);
+            OnClientToServerDeltaSync(baselineTick, position, rotation, Vector3.one);
+        }
+
+        [Command(channel = Channels.Unreliable)] // unreliable delta
+        void CmdClientToServerDelta_PositionScale(byte baselineTick, Vector3 position, Vector3 scale)
+        {
+            // debug draw: delta
+            if (debugDraw) Debug.DrawLine(position, position + Vector3.up, Color.white, 10f);
+
+            // Debug.Log($"[{name}] server received delta for baseline #{lastDeserializedBaselineTick}");
+            OnClientToServerDeltaSync(baselineTick, position, Quaternion.identity, scale);
+        }
+
+        [Command(channel = Channels.Unreliable)] // unreliable delta
+        void CmdClientToServerDelta_RotationScale(byte baselineTick, Quaternion rotation, Vector3 scale)
+        {
+            // Debug.Log($"[{name}] server received delta for baseline #{lastDeserializedBaselineTick}");
+            OnClientToServerDeltaSync(baselineTick, Vector3.zero, rotation, scale);
         }
 
         // local authority client sends sync message to server for broadcasting
-        protected virtual void OnClientToServerDeltaSync(byte baselineTick, Vector3 position, Quaternion rotation)//, Vector3 scale)
+        protected virtual void OnClientToServerDeltaSync(byte baselineTick, Vector3 position, Quaternion rotation, Vector3 scale)
         {
             // only apply if in client authority mode
             if (syncDirection != SyncDirection.ClientToServer) return;
@@ -280,11 +370,37 @@ protected virtual void OnClientToServerDeltaSync(byte baselineTick, Vector3 posi
                 Time.timeAsDouble,
                 position,
                 rotation,
-                Vector3.one // scale
+                scale
             ));
         }
 
         // rpc baseline ////////////////////////////////////////////////////////
+        [ClientRpc(channel = Channels.Reliable)] // reliable baseline
+        void RpcServerToClientBaseline_PositionRotationScale(byte baselineTick, Vector3 position, Quaternion rotation, Vector3 scale)
+        {
+            // baseline is broadcast to all clients.
+            // ignore if this object is owned by this client.
+            if (IsClientWithAuthority) return;
+
+            // host mode: baseline Rpc is also sent through host's local connection and applied.
+            // applying host's baseline as last deserialized would overwrite the owner client's data and cause jitter.
+            // in other words: never apply the rpcs in host mode.
+            if (isServer) return;
+
+            // save last deserialized baseline tick number to compare deltas against
+            lastDeserializedBaselineTick = baselineTick;
+            lastDeserializedBaselinePosition = position;
+            lastDeserializedBaselineRotation = rotation;
+            lastDeserializedBaselineScale = scale;
+
+            // debug draw: baseline
+            if (debugDraw) Debug.DrawLine(position, position + Vector3.up, Color.yellow, 10f);
+
+            // if baseline counts as delta, insert it into snapshot buffer too
+            if (baselineIsDelta)
+                OnServerToClientDeltaSync(baselineTick, position, rotation, scale);
+        }
+
         [ClientRpc(channel = Channels.Reliable)] // reliable baseline
         void RpcServerToClientBaseline_PositionRotation(byte baselineTick, Vector3 position, Quaternion rotation)
         {
@@ -307,7 +423,54 @@ void RpcServerToClientBaseline_PositionRotation(byte baselineTick, Vector3 posit
 
             // if baseline counts as delta, insert it into snapshot buffer too
             if (baselineIsDelta)
-                OnServerToClientDeltaSync(baselineTick, position, rotation);//, Vector3.zero);//, scale);
+                OnServerToClientDeltaSync(baselineTick, position, rotation, Vector3.one);
+        }
+
+        [ClientRpc(channel = Channels.Reliable)] // reliable baseline
+        void RpcServerToClientBaseline_PositionScale(byte baselineTick, Vector3 position, Vector3 scale)
+        {
+            // baseline is broadcast to all clients.
+            // ignore if this object is owned by this client.
+            if (IsClientWithAuthority) return;
+
+            // host mode: baseline Rpc is also sent through host's local connection and applied.
+            // applying host's baseline as last deserialized would overwrite the owner client's data and cause jitter.
+            // in other words: never apply the rpcs in host mode.
+            if (isServer) return;
+
+            // save last deserialized baseline tick number to compare deltas against
+            lastDeserializedBaselineTick = baselineTick;
+            lastDeserializedBaselinePosition = position;
+            lastDeserializedBaselineScale    = scale;
+
+            // debug draw: baseline
+            if (debugDraw) Debug.DrawLine(position, position + Vector3.up, Color.yellow, 10f);
+
+            // if baseline counts as delta, insert it into snapshot buffer too
+            if (baselineIsDelta)
+                OnServerToClientDeltaSync(baselineTick, position, Quaternion.identity, scale);
+        }
+
+        [ClientRpc(channel = Channels.Reliable)] // reliable baseline
+        void RpcServerToClientBaseline_RotationScale(byte baselineTick, Quaternion rotation, Vector3 scale)
+        {
+            // baseline is broadcast to all clients.
+            // ignore if this object is owned by this client.
+            if (IsClientWithAuthority) return;
+
+            // host mode: baseline Rpc is also sent through host's local connection and applied.
+            // applying host's baseline as last deserialized would overwrite the owner client's data and cause jitter.
+            // in other words: never apply the rpcs in host mode.
+            if (isServer) return;
+
+            // save last deserialized baseline tick number to compare deltas against
+            lastDeserializedBaselineTick = baselineTick;
+            lastDeserializedBaselineRotation = rotation;
+            lastDeserializedBaselineScale    = scale;
+
+            // if baseline counts as delta, insert it into snapshot buffer too
+            if (baselineIsDelta)
+                OnServerToClientDeltaSync(baselineTick, Vector3.zero, rotation, scale);
         }
 
         [ClientRpc(channel = Channels.Reliable)] // reliable baseline
@@ -331,7 +494,7 @@ void RpcServerToClientBaseline_Position(byte baselineTick, Vector3 position)
 
             // if baseline counts as delta, insert it into snapshot buffer too
             if (baselineIsDelta)
-                OnServerToClientDeltaSync(baselineTick, position, Quaternion.identity);//, Vector3.zero);//, scale);
+                OnServerToClientDeltaSync(baselineTick, position, Quaternion.identity, Vector3.one);
         }
 
         [ClientRpc(channel = Channels.Reliable)] // reliable baseline
@@ -352,10 +515,49 @@ void RpcServerToClientBaseline_Rotation(byte baselineTick, Quaternion rotation)
 
             // if baseline counts as delta, insert it into snapshot buffer too
             if (baselineIsDelta)
-                OnServerToClientDeltaSync(baselineTick, Vector3.zero, rotation);//, Vector3.zero);//, scale);
+                OnServerToClientDeltaSync(baselineTick, Vector3.zero, rotation, Vector3.one);
+        }
+
+        [ClientRpc(channel = Channels.Reliable)] // reliable baseline
+        void RpcServerToClientBaseline_Scale(byte baselineTick, Vector3 scale)
+        {
+            // baseline is broadcast to all clients.
+            // ignore if this object is owned by this client.
+            if (IsClientWithAuthority) return;
+
+            // host mode: baseline Rpc is also sent through host's local connection and applied.
+            // applying host's baseline as last deserialized would overwrite the owner client's data and cause jitter.
+            // in other words: never apply the rpcs in host mode.
+            if (isServer) return;
+
+            // save last deserialized baseline tick number to compare deltas against
+            lastDeserializedBaselineTick = baselineTick;
+            lastDeserializedBaselineScale = scale;
+
+            // if baseline counts as delta, insert it into snapshot buffer too
+            if (baselineIsDelta)
+                OnServerToClientDeltaSync(baselineTick, Vector3.zero, Quaternion.identity, scale);
         }
 
         // rpc delta ///////////////////////////////////////////////////////////
+        [ClientRpc(channel = Channels.Unreliable)] // unreliable delta
+        void RpcServerToClientDelta_PositionRotationScale(byte baselineTick, Vector3 position, Quaternion rotation, Vector3 scale)
+        {
+            // delta is broadcast to all clients.
+            // ignore if this object is owned by this client.
+            if (IsClientWithAuthority) return;
+
+            // host mode: baseline Rpc is also sent through host's local connection and applied.
+            // applying host's baseline as last deserialized would overwrite the owner client's data and cause jitter.
+            // in other words: never apply the rpcs in host mode.
+            if (isServer) return;
+
+            // debug draw: delta
+            if (debugDraw) Debug.DrawLine(position, position + Vector3.up, Color.white, 10f);
+
+            OnServerToClientDeltaSync(baselineTick, position, rotation, scale);
+        }
+
         [ClientRpc(channel = Channels.Unreliable)] // unreliable delta
         void RpcServerToClientDelta_PositionRotation(byte baselineTick, Vector3 position, Quaternion rotation)
         {
@@ -371,9 +573,41 @@ void RpcServerToClientDelta_PositionRotation(byte baselineTick, Vector3 position
             // debug draw: delta
             if (debugDraw) Debug.DrawLine(position, position + Vector3.up, Color.white, 10f);
 
-            OnServerToClientDeltaSync(baselineTick, position, rotation);//, scale);
+            OnServerToClientDeltaSync(baselineTick, position, rotation, Vector3.one);
         }
 
+        [ClientRpc(channel = Channels.Unreliable)] // unreliable delta
+        void RpcServerToClientDelta_PositionScale(byte baselineTick, Vector3 position, Vector3 scale)
+        {
+            // delta is broadcast to all clients.
+            // ignore if this object is owned by this client.
+            if (IsClientWithAuthority) return;
+
+            // host mode: baseline Rpc is also sent through host's local connection and applied.
+            // applying host's baseline as last deserialized would overwrite the owner client's data and cause jitter.
+            // in other words: never apply the rpcs in host mode.
+            if (isServer) return;
+
+            // debug draw: delta
+            if (debugDraw) Debug.DrawLine(position, position + Vector3.up, Color.white, 10f);
+
+            OnServerToClientDeltaSync(baselineTick, position, Quaternion.identity, scale);
+        }
+
+        [ClientRpc(channel = Channels.Unreliable)] // unreliable delta
+        void RpcServerToClientDelta_RotationScale(byte baselineTick, Quaternion rotation, Vector3 scale)
+        {
+            // delta is broadcast to all clients.
+            // ignore if this object is owned by this client.
+            if (IsClientWithAuthority) return;
+
+            // host mode: baseline Rpc is also sent through host's local connection and applied.
+            // applying host's baseline as last deserialized would overwrite the owner client's data and cause jitter.
+            // in other words: never apply the rpcs in host mode.
+            if (isServer) return;
+
+            OnServerToClientDeltaSync(baselineTick, Vector3.zero, rotation, scale);
+        }
 
         [ClientRpc(channel = Channels.Unreliable)] // unreliable delta
         void RpcServerToClientDelta_Position(byte baselineTick, Vector3 position)
@@ -390,10 +624,9 @@ void RpcServerToClientDelta_Position(byte baselineTick, Vector3 position)
             // debug draw: delta
             if (debugDraw) Debug.DrawLine(position, position + Vector3.up, Color.white, 10f);
 
-            OnServerToClientDeltaSync(baselineTick, position, Quaternion.identity);//, scale);
+            OnServerToClientDeltaSync(baselineTick, position, Quaternion.identity, Vector3.one);
         }
 
-
         [ClientRpc(channel = Channels.Unreliable)] // unreliable delta
         void RpcServerToClientDelta_Rotation(byte baselineTick, Quaternion rotation)
         {
@@ -406,11 +639,26 @@ void RpcServerToClientDelta_Rotation(byte baselineTick, Quaternion rotation)
             // in other words: never apply the rpcs in host mode.
             if (isServer) return;
 
-            OnServerToClientDeltaSync(baselineTick, Vector3.zero, rotation);//, scale);
+            OnServerToClientDeltaSync(baselineTick, Vector3.zero, rotation, Vector3.one);
+        }
+
+        [ClientRpc(channel = Channels.Unreliable)] // unreliable delta
+        void RpcServerToClientDelta_Scale(byte baselineTick, Vector3 scale)
+        {
+            // delta is broadcast to all clients.
+            // ignore if this object is owned by this client.
+            if (IsClientWithAuthority) return;
+
+            // host mode: baseline Rpc is also sent through host's local connection and applied.
+            // applying host's baseline as last deserialized would overwrite the owner client's data and cause jitter.
+            // in other words: never apply the rpcs in host mode.
+            if (isServer) return;
+
+            OnServerToClientDeltaSync(baselineTick, Vector3.zero, Quaternion.identity, scale);
         }
 
         // server broadcasts sync message to all clients
-        protected virtual void OnServerToClientDeltaSync(byte baselineTick, Vector3 position, Quaternion rotation)//, Vector3 scale)
+        protected virtual void OnServerToClientDeltaSync(byte baselineTick, Vector3 position, Quaternion rotation, Vector3 scale)
         {
             // in host mode, the server sends rpcs to all clients.
             // the host client itself will receive them too.
@@ -466,7 +714,7 @@ protected virtual void OnServerToClientDeltaSync(byte baselineTick, Vector3 posi
                 Time.timeAsDouble,
                 position,
                 rotation,
-                Vector3.one // scale
+                scale
             ));
         }
 
@@ -484,16 +732,33 @@ void UpdateServerBaseline(double localTime)
                 // perf: get position/rotation directly. TransformSnapshot is too expensive.
                 // TransformSnapshot snapshot = ConstructSnapshot();
                 target.GetLocalPositionAndRotation(out Vector3 position, out Quaternion rotation);
+                Vector3 scale = target.localScale;
 
                 // save bandwidth by only transmitting what is needed.
                 // -> ArraySegment with random data is slower since byte[] copying
                 // -> Vector3? and Quaternion? nullables takes more bandwidth
                 byte frameCount = (byte)Time.frameCount; // perf: only access Time.frameCount once!
-                if (syncPosition && syncRotation)
+
+                if (syncPosition && syncRotation && syncScale)
+                {
+                    // no unreliable redundancy: baseline is reliable
+                    RpcServerToClientBaseline_PositionRotationScale(frameCount, position, rotation, scale);
+                }
+                else if (syncPosition && syncRotation)
                 {
                     // no unreliable redundancy: baseline is reliable
                     RpcServerToClientBaseline_PositionRotation(frameCount, position, rotation);
                 }
+                else if (syncPosition && syncScale)
+                {
+                    // no unreliable redundancy: baseline is reliable
+                    RpcServerToClientBaseline_PositionScale(frameCount, position, scale);
+                }
+                else if (syncRotation && syncScale)
+                {
+                    // no unreliable redundancy: baseline is reliable
+                    RpcServerToClientBaseline_RotationScale(frameCount, rotation, scale);
+                }
                 else if (syncPosition)
                 {
                     // no unreliable redundancy: baseline is reliable
@@ -504,6 +769,15 @@ void UpdateServerBaseline(double localTime)
                     // no unreliable redundancy: baseline is reliable
                     RpcServerToClientBaseline_Rotation(frameCount, rotation);
                 }
+                else if (syncScale)
+                {
+                    // no unreliable redundancy: baseline is reliable
+                    RpcServerToClientBaseline_Scale(frameCount, scale);
+                }
+
+                // position, rotation, scale
+                // position, rotation, !scale
+                // position,
 
                 // save the last baseline's tick number.
                 // included in baseline to identify which one it was on client
@@ -512,6 +786,7 @@ void UpdateServerBaseline(double localTime)
                 lastBaselineTime = NetworkTime.localTime;
                 lastSerializedBaselinePosition = position;
                 lastSerializedBaselineRotation = rotation;
+                lastSerializedBaselineScale = scale;
 
                 // baseline was just sent after a change. reset change detection.
                 changedSinceBaseline = false;
@@ -567,6 +842,7 @@ void UpdateServerDelta(double localTime)
                 // perf: get position/rotation directly. TransformSnapshot is too expensive.
                 // TransformSnapshot snapshot = ConstructSnapshot();
                 target.GetLocalPositionAndRotation(out Vector3 position, out Quaternion rotation);
+                Vector3 scale = target.localScale;
 
                 // look for changes every unreliable sendInterval!
                 // every reliable interval isn't enough, this would cause MrG's grid issue:
@@ -576,7 +852,7 @@ void UpdateServerDelta(double localTime)
                 //   => client wouldn't know we moved back to A1
                 // every update works, but it's unnecessary overhead since sends only happen every sendInterval
                 // every unreliable sendInterval is the perfect place to look for changes.
-                if (onlySyncOnChange && Changed(position, rotation))
+                if (onlySyncOnChange && Changed(position, rotation, scale))
                     changedSinceBaseline = true;
 
                 // only sync on change:
@@ -586,13 +862,35 @@ void UpdateServerDelta(double localTime)
                 // save bandwidth by only transmitting what is needed.
                 // -> ArraySegment with random data is slower since byte[] copying
                 // -> Vector3? and Quaternion? nullables takes more bandwidth
-                if (syncPosition && syncRotation)
+
+                if (syncPosition && syncRotation && syncScale)
+                {
+                    // unreliable redundancy to make up for potential message drops
+                    RpcServerToClientDelta_PositionRotationScale(lastSerializedBaselineTick, position, rotation, scale);
+                    if (unreliableRedundancy)
+                        RpcServerToClientDelta_PositionRotationScale(lastSerializedBaselineTick, position, rotation, scale);
+                }
+                else if (syncPosition && syncRotation)
                 {
                     // unreliable redundancy to make up for potential message drops
                     RpcServerToClientDelta_PositionRotation(lastSerializedBaselineTick, position, rotation);
                     if (unreliableRedundancy)
                         RpcServerToClientDelta_PositionRotation(lastSerializedBaselineTick, position, rotation);
                 }
+                else if (syncPosition && syncScale)
+                {
+                    // unreliable redundancy to make up for potential message drops
+                    RpcServerToClientDelta_PositionScale(lastSerializedBaselineTick, position, scale);
+                    if (unreliableRedundancy)
+                        RpcServerToClientDelta_PositionScale(lastSerializedBaselineTick, position, scale);
+                }
+                else if (syncRotation && syncScale)
+                {
+                    // unreliable redundancy to make up for potential message drops
+                    RpcServerToClientDelta_RotationScale(lastSerializedBaselineTick, rotation, scale);
+                    if (unreliableRedundancy)
+                        RpcServerToClientDelta_RotationScale(lastSerializedBaselineTick, rotation, scale);
+                }
                 else if (syncPosition)
                 {
                     // unreliable redundancy to make up for potential message drops
@@ -607,7 +905,13 @@ void UpdateServerDelta(double localTime)
                     if (unreliableRedundancy)
                         RpcServerToClientDelta_Rotation(lastSerializedBaselineTick, rotation);
                 }
-
+                else if (syncScale)
+                {
+                    // unreliable redundancy to make up for potential message drops
+                    RpcServerToClientDelta_Scale(lastSerializedBaselineTick, scale);
+                    if (unreliableRedundancy)
+                        RpcServerToClientDelta_Scale(lastSerializedBaselineTick, scale);
+                }
 
                 lastDeltaTime = localTime;
             }
@@ -653,12 +957,9 @@ void UpdateServer()
             // perf: only grab NetworkTime.localTime property once.
             double localTime = NetworkTime.localTime;
 
-            // should we broadcast at all?
-            if (!disableSendingThisToClients) // CUSTOM CHANGE: see comment at definition
-            {
+            // broadcast
             UpdateServerBaseline(localTime);
             UpdateServerDelta(localTime);
-            }
 
             // interpolate remote clients
             UpdateServerInterpolation();
@@ -676,16 +977,33 @@ void UpdateClientBaseline(double localTime)
                 // perf: get position/rotation directly. TransformSnapshot is too expensive.
                 // TransformSnapshot snapshot = ConstructSnapshot();
                 target.GetLocalPositionAndRotation(out Vector3 position, out Quaternion rotation);
+                Vector3 scale = target.localScale;
 
                 // save bandwidth by only transmitting what is needed.
                 // -> ArraySegment with random data is slower since byte[] copying
                 // -> Vector3? and Quaternion? nullables takes more bandwidth
                 byte frameCount = (byte)Time.frameCount; // perf: only access Time.frameCount once!
-                if (syncPosition && syncRotation)
+
+                if (syncPosition && syncRotation && syncScale)
+                {
+                    // no unreliable redundancy: baseline is reliable
+                    CmdClientToServerBaseline_PositionRotationScale(frameCount, position, rotation, scale);
+                }
+                else if (syncPosition && syncRotation)
                 {
                     // no unreliable redundancy: baseline is reliable
                     CmdClientToServerBaseline_PositionRotation(frameCount, position, rotation);
                 }
+                else if (syncPosition && syncScale)
+                {
+                    // no unreliable redundancy: baseline is reliable
+                    CmdClientToServerBaseline_PositionScale(frameCount, position, scale);
+                }
+                else if (syncRotation && syncScale)
+                {
+                    // no unreliable redundancy: baseline is reliable
+                    CmdClientToServerBaseline_RotationScale(frameCount, rotation, scale);
+                }
                 else if (syncPosition)
                 {
                     // no unreliable redundancy: baseline is reliable
@@ -696,6 +1014,11 @@ void UpdateClientBaseline(double localTime)
                     // no unreliable redundancy: baseline is reliable
                     CmdClientToServerBaseline_Rotation(frameCount, rotation);
                 }
+                else if (syncScale)
+                {
+                    // no unreliable redundancy: baseline is reliable
+                    CmdClientToServerBaseline_Scale(frameCount, scale);
+                }
 
                 // save the last baseline's tick number.
                 // included in baseline to identify which one it was on client
@@ -704,6 +1027,7 @@ void UpdateClientBaseline(double localTime)
                 lastBaselineTime = NetworkTime.localTime;
                 lastSerializedBaselinePosition = position;
                 lastSerializedBaselineRotation = rotation;
+                lastSerializedBaselineScale = scale;
 
                 // baseline was just sent after a change. reset change detection.
                 changedSinceBaseline = false;
@@ -748,6 +1072,7 @@ void UpdateClientDelta(double localTime)
                 // perf: get position/rotation directly. TransformSnapshot is too expensive.
                 // TransformSnapshot snapshot = ConstructSnapshot();
                 target.GetLocalPositionAndRotation(out Vector3 position, out Quaternion rotation);
+                Vector3 scale = target.localScale;
 
                 // look for changes every unreliable sendInterval!
                 //
@@ -758,7 +1083,7 @@ void UpdateClientDelta(double localTime)
                 //   => server wouldn't know we moved back to A1
                 // every update works, but it's unnecessary overhead since sends only happen every sendInterval
                 // every unreliable sendInterval is the perfect place to look for changes.
-                if (onlySyncOnChange && Changed(position, rotation))
+                if (onlySyncOnChange && Changed(position, rotation, scale))
                     changedSinceBaseline = true;
 
                 // only sync on change:
@@ -768,16 +1093,39 @@ void UpdateClientDelta(double localTime)
                 // save bandwidth by only transmitting what is needed.
                 // -> ArraySegment with random data is slower since byte[] copying
                 // -> Vector3? and Quaternion? nullables takes more bandwidth
-                if (syncPosition && syncRotation)
+
+                if (syncPosition && syncRotation && syncScale)
                 {
+                    CmdClientToServerDelta_PositionRotationScale(lastSerializedBaselineTick, position, rotation, scale);
+                    if (unreliableRedundancy)
+                        CmdClientToServerDelta_PositionRotationScale(lastSerializedBaselineTick, position, rotation, scale);
+                }
+                else if (syncPosition && syncRotation)
+                {
+                    // send snapshot without timestamp.
+                    // receiver gets it from batch timestamp to save bandwidth.
                     // unreliable redundancy to make up for potential message drops
                     CmdClientToServerDelta_PositionRotation(lastSerializedBaselineTick, position, rotation);
                     if (unreliableRedundancy)
                         CmdClientToServerDelta_PositionRotation(lastSerializedBaselineTick, position, rotation);
 
                 }
+                else if (syncPosition && syncScale)
+                {
+                    CmdClientToServerDelta_PositionScale(lastSerializedBaselineTick, position, scale);
+                    if (unreliableRedundancy)
+                        CmdClientToServerDelta_PositionScale(lastSerializedBaselineTick, position, scale);
+                }
+                else if (syncRotation && syncScale)
+                {
+                    CmdClientToServerDelta_RotationScale(lastSerializedBaselineTick, rotation, scale);
+                    if (unreliableRedundancy)
+                        CmdClientToServerDelta_RotationScale(lastSerializedBaselineTick, rotation, scale);
+                }
                 else if (syncPosition)
                 {
+                    // send snapshot without timestamp.
+                    // receiver gets it from batch timestamp to save bandwidth.
                     // unreliable redundancy to make up for potential message drops
                     CmdClientToServerDelta_Position(lastSerializedBaselineTick, position);
                     if (unreliableRedundancy)
@@ -785,11 +1133,19 @@ void UpdateClientDelta(double localTime)
                 }
                 else if (syncRotation)
                 {
+                    // send snapshot without timestamp.
+                    // receiver gets it from batch timestamp to save bandwidth.
                     // unreliable redundancy to make up for potential message drops
                     CmdClientToServerDelta_Rotation(lastSerializedBaselineTick, rotation);
                     if (unreliableRedundancy)
                         CmdClientToServerDelta_Rotation(lastSerializedBaselineTick, rotation);
                 }
+                else if (syncScale)
+                {
+                    CmdClientToServerDelta_Scale(lastSerializedBaselineTick, scale);
+                    if (unreliableRedundancy)
+                        CmdClientToServerDelta_Scale(lastSerializedBaselineTick, scale);
+                }
 
                 lastDeltaTime = localTime;
             }
@@ -841,6 +1197,7 @@ void UpdateClient()
             }
         }
 
+        // Update() without LateUpdate() split: otherwise perf. is cut in half!
         void Update()
         {
             // if server then always sync to others.
@@ -977,11 +1334,13 @@ public virtual void Reset()
             lastSerializedBaselineTick = 0;
             lastSerializedBaselinePosition = Vector3.zero;
             lastSerializedBaselineRotation = Quaternion.identity;
+            lastSerializedBaselineScale    = Vector3.one;
             changedSinceBaseline = false;
 
             lastDeserializedBaselineTick = 0;
             lastDeserializedBaselinePosition = Vector3.zero;
             lastDeserializedBaselineRotation = Quaternion.identity;
+            lastDeserializedBaselineScale    = Vector3.one;
 
             // Debug.Log($"[{name}] Reset to baselineTick=0");
         }
@@ -1003,6 +1362,7 @@ public override void OnSerialize(NetworkWriter writer, bool initialState)
                 // perf: get position/rotation directly. TransformSnapshot is too expensive.
                 // TransformSnapshot snapshot = ConstructSnapshot();
                 target.GetLocalPositionAndRotation(out Vector3 position, out Quaternion rotation);
+                Vector3 scale = target.localScale;
 
                 // always include the tick for deltas to compare against.
                 byte frameCount = (byte)Time.frameCount; // perf: only access Time.frameCount once!
@@ -1010,6 +1370,7 @@ public override void OnSerialize(NetworkWriter writer, bool initialState)
 
                 if (syncPosition) writer.WriteVector3(position);
                 if (syncRotation) writer.WriteQuaternion(rotation);
+                if (syncScale)    writer.WriteVector3(scale);
 
                 // IMPORTANT
                 // OnSerialize(initial) is called for the spawn payload whenever
@@ -1025,6 +1386,7 @@ public override void OnSerialize(NetworkWriter writer, bool initialState)
                 lastBaselineTime = NetworkTime.localTime;
                 lastSerializedBaselinePosition = position;
                 lastSerializedBaselineRotation = rotation;
+                lastSerializedBaselineScale    = scale;
             }
         }
 
@@ -1039,6 +1401,7 @@ public override void OnDeserialize(NetworkReader reader, bool initialState)
                 lastDeserializedBaselineTick = reader.ReadByte();
                 Vector3 position = Vector3.zero;
                 Quaternion rotation = Quaternion.identity;
+                Vector3 scale = Vector3.one;
 
                 if (syncPosition)
                 {
@@ -1050,10 +1413,15 @@ public override void OnDeserialize(NetworkReader reader, bool initialState)
                     rotation = reader.ReadQuaternion();
                     lastDeserializedBaselineRotation = rotation;
                 }
+                if (syncScale)
+                {
+                    scale = reader.ReadVector3();
+                    lastDeserializedBaselineScale = scale;
+                }
 
                 // if baseline counts as delta, insert it into snapshot buffer too
                 if (baselineIsDelta)
-                    OnServerToClientDeltaSync(lastDeserializedBaselineTick, position, rotation);//, scale);
+                    OnServerToClientDeltaSync(lastDeserializedBaselineTick, position, rotation, scale);
             }
         }
         // CUSTOM CHANGE ///////////////////////////////////////////////////////////

Assets/Mirror/Examples/PlayerTest/PlayerRBReliable.prefab

@@ -1,5 +1,111 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &2505838817581327622
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8070823805368028938}
+  - component: {fileID: 9066655185906928051}
+  - component: {fileID: 4760233786622638652}
+  - component: {fileID: 2239866139065920034}
+  m_Layer: 0
+  m_Name: PlayerName
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8070823805368028938
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2505838817581327622}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 1.4999999, z: 0}
+  m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
+  m_Children: []
+  m_Father: {fileID: 5650773562400175449}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!23 &9066655185906928051
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2505838817581327622}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10100, guid: 0000000000000000e000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+--- !u!102 &4760233786622638652
+TextMesh:
+  serializedVersion: 3
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2505838817581327622}
+  m_Text: RB Reliable
+  m_OffsetZ: 0
+  m_CharacterSize: 0.5
+  m_LineSpacing: 1
+  m_Anchor: 4
+  m_Alignment: 1
+  m_TabSize: 4
+  m_FontSize: 100
+  m_FontStyle: 0
+  m_RichText: 1
+  m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+  m_Color:
+    serializedVersion: 2
+    rgba: 4294967040
+--- !u!114 &2239866139065920034
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2505838817581327622}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: afa2d590c474413d9fc183551385ed85, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &3564599214188516024
 GameObject:
   m_ObjectHideFlags: 0
@@ -194,6 +300,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 4320229852458648655}
+  - {fileID: 8070823805368028938}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/Mirror/Examples/PlayerTest/PlayerRBUnreliable.prefab

@@ -1,5 +1,111 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1900176203039934355
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4129545300081926521}
+  - component: {fileID: 6572775962608386051}
+  - component: {fileID: 3912971638250293984}
+  - component: {fileID: 4630973873820678624}
+  m_Layer: 0
+  m_Name: PlayerName
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4129545300081926521
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1900176203039934355}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 1.4999999, z: 0}
+  m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
+  m_Children: []
+  m_Father: {fileID: 6814142693731383418}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!23 &6572775962608386051
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1900176203039934355}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10100, guid: 0000000000000000e000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+--- !u!102 &3912971638250293984
+TextMesh:
+  serializedVersion: 3
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1900176203039934355}
+  m_Text: RB Unreliable
+  m_OffsetZ: 0
+  m_CharacterSize: 0.5
+  m_LineSpacing: 1
+  m_Anchor: 4
+  m_Alignment: 1
+  m_TabSize: 4
+  m_FontSize: 100
+  m_FontStyle: 0
+  m_RichText: 1
+  m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+  m_Color:
+    serializedVersion: 2
+    rgba: 4278255615
+--- !u!114 &4630973873820678624
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1900176203039934355}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: afa2d590c474413d9fc183551385ed85, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &2414815785185615771
 GameObject:
   m_ObjectHideFlags: 0
@@ -194,6 +300,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 3102887894851733868}
+  - {fileID: 4129545300081926521}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/Mirror/Examples/PlayerTest/PlayerReliable.prefab

@@ -79,6 +79,112 @@ MeshRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
+--- !u!1 &5366675989284536270
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1545974004720046327}
+  - component: {fileID: 1128890847761595466}
+  - component: {fileID: 396193860522376263}
+  - component: {fileID: 6075803386746488465}
+  m_Layer: 0
+  m_Name: PlayerName
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1545974004720046327
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5366675989284536270}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 1.5, z: 0}
+  m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
+  m_Children: []
+  m_Father: {fileID: 4659514702152478195}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!23 &1128890847761595466
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5366675989284536270}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10100, guid: 0000000000000000e000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+--- !u!102 &396193860522376263
+TextMesh:
+  serializedVersion: 3
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5366675989284536270}
+  m_Text: Reliable
+  m_OffsetZ: 0
+  m_CharacterSize: 0.5
+  m_LineSpacing: 1
+  m_Anchor: 4
+  m_Alignment: 1
+  m_TabSize: 4
+  m_FontSize: 100
+  m_FontStyle: 0
+  m_RichText: 1
+  m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+  m_Color:
+    serializedVersion: 2
+    rgba: 4294967040
+--- !u!114 &6075803386746488465
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5366675989284536270}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: afa2d590c474413d9fc183551385ed85, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &5844787331012650587
 GameObject:
   m_ObjectHideFlags: 0
@@ -195,6 +301,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 3834521907656645861}
+  - {fileID: 1545974004720046327}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/Mirror/Examples/PlayerTest/PlayerUnreliable.prefab

@@ -159,6 +159,112 @@ MeshRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
+--- !u!1 &7554601580530514207
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8679949096303753939}
+  - component: {fileID: 3142866354055383265}
+  - component: {fileID: 8297296856940116434}
+  - component: {fileID: 1123801447343694564}
+  m_Layer: 0
+  m_Name: PlayerName
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8679949096303753939
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7554601580530514207}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 1.4999999, z: 0}
+  m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
+  m_Children: []
+  m_Father: {fileID: 4659514702152478195}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!23 &3142866354055383265
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7554601580530514207}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10100, guid: 0000000000000000e000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+--- !u!102 &8297296856940116434
+TextMesh:
+  serializedVersion: 3
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7554601580530514207}
+  m_Text: Unreliable
+  m_OffsetZ: 0
+  m_CharacterSize: 0.5
+  m_LineSpacing: 1
+  m_Anchor: 4
+  m_Alignment: 1
+  m_TabSize: 4
+  m_FontSize: 100
+  m_FontStyle: 0
+  m_RichText: 1
+  m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+  m_Color:
+    serializedVersion: 2
+    rgba: 4278255615
+--- !u!114 &1123801447343694564
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7554601580530514207}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: afa2d590c474413d9fc183551385ed85, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &7863680369626900553
 GameObject:
   m_ObjectHideFlags: 0
@@ -195,6 +301,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 3834521907656645861}
+  - {fileID: 8679949096303753939}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/Mirror/Examples/PlayerTest/TankReliable.prefab

@@ -38,6 +38,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 702109291309605218}
+  - {fileID: 1245118046271587945}
   - {fileID: 8174595063106582951}
   m_Father: {fileID: 0}
   m_RootOrder: 0
@@ -197,7 +198,6 @@ MonoBehaviour:
   maxTurnSpeed: 100
   turnAcceleration: 3
   runtimeData:
-    _horizontal: 0
     _vertical: 0
     _turnSpeed: 0
     _animVelocity: 0
@@ -328,6 +328,112 @@ MonoBehaviour:
   rotationSensitivity: 0.01
   positionPrecision: 0.01
   scalePrecision: 0.01
+--- !u!1 &8370326626297540303
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1245118046271587945}
+  - component: {fileID: 2132579043257509693}
+  - component: {fileID: 7297775110981071875}
+  - component: {fileID: 755026988438523126}
+  m_Layer: 0
+  m_Name: PlayerName
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1245118046271587945
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8370326626297540303}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 4.5, z: 0}
+  m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
+  m_Children: []
+  m_Father: {fileID: 4659514702152478195}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!23 &2132579043257509693
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8370326626297540303}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10100, guid: 0000000000000000e000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+--- !u!102 &7297775110981071875
+TextMesh:
+  serializedVersion: 3
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8370326626297540303}
+  m_Text: Reliable
+  m_OffsetZ: 0
+  m_CharacterSize: 0.5
+  m_LineSpacing: 1
+  m_Anchor: 4
+  m_Alignment: 1
+  m_TabSize: 4
+  m_FontSize: 100
+  m_FontStyle: 0
+  m_RichText: 1
+  m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+  m_Color:
+    serializedVersion: 2
+    rgba: 4294967040
+--- !u!114 &755026988438523126
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8370326626297540303}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: afa2d590c474413d9fc183551385ed85, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &9109672380512621037
 GameObject:
   m_ObjectHideFlags: 0
@@ -359,7 +465,7 @@ Transform:
   m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
   m_Children: []
   m_Father: {fileID: 4659514702152478195}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!23 &4153780752967283830
 MeshRenderer:
@@ -446,6 +552,11 @@ PrefabInstance:
       propertyPath: m_Name
       value: BasePrefab
       objectReference: {fileID: 0}
+    - target: {fileID: 3638700596990361445, guid: dad07e68d3659e6439279d0d4110cf4c,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 3638700596990361445, guid: dad07e68d3659e6439279d0d4110cf4c,
         type: 3}
       propertyPath: m_LocalPosition.x

Assets/Mirror/Examples/PlayerTest/TankUnreliable.prefab

@@ -38,6 +38,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 702109291309605218}
+  - {fileID: 3980373565918037634}
   - {fileID: 8174595063106582951}
   m_Father: {fileID: 0}
   m_RootOrder: 0
@@ -197,7 +198,6 @@ MonoBehaviour:
   maxTurnSpeed: 100
   turnAcceleration: 3
   runtimeData:
-    _horizontal: 0
     _vertical: 0
     _turnSpeed: 0
     _animVelocity: 0
@@ -328,6 +328,112 @@ MonoBehaviour:
   positionSensitivity: 0.01
   rotationSensitivity: 0.01
   scaleSensitivity: 0.01
+--- !u!1 &8921157218750951074
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3980373565918037634}
+  - component: {fileID: 6676747655999921495}
+  - component: {fileID: 2065557788844610204}
+  - component: {fileID: 7150452883383585942}
+  m_Layer: 0
+  m_Name: PlayerName
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3980373565918037634
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8921157218750951074}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 4.5, z: 0}
+  m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
+  m_Children: []
+  m_Father: {fileID: 4659514702152478195}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!23 &6676747655999921495
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8921157218750951074}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10100, guid: 0000000000000000e000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+--- !u!102 &2065557788844610204
+TextMesh:
+  serializedVersion: 3
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8921157218750951074}
+  m_Text: Unreliable
+  m_OffsetZ: 0
+  m_CharacterSize: 0.5
+  m_LineSpacing: 1
+  m_Anchor: 4
+  m_Alignment: 1
+  m_TabSize: 4
+  m_FontSize: 100
+  m_FontStyle: 0
+  m_RichText: 1
+  m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+  m_Color:
+    serializedVersion: 2
+    rgba: 4278255615
+--- !u!114 &7150452883383585942
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8921157218750951074}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: afa2d590c474413d9fc183551385ed85, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &9109672380512621037
 GameObject:
   m_ObjectHideFlags: 0
@@ -359,7 +465,7 @@ Transform:
   m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
   m_Children: []
   m_Father: {fileID: 4659514702152478195}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!23 &4153780752967283830
 MeshRenderer:
@@ -446,6 +552,11 @@ PrefabInstance:
       propertyPath: m_Name
       value: BasePrefab
       objectReference: {fileID: 0}
+    - target: {fileID: 3638700596990361445, guid: dad07e68d3659e6439279d0d4110cf4c,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 3638700596990361445, guid: dad07e68d3659e6439279d0d4110cf4c,
         type: 3}
       propertyPath: m_LocalPosition.x

Assets/Mirror/Examples/_Common/Scripts/PlayerCamera.cs

@@ -19,11 +19,6 @@ void Awake()
             mainCam = Camera.main;
         }
 
-        void OnDisable()
-        {
-            //Debug.Log("PlayerCamera.OnDisable");
-        }
-
         public override void OnStartLocalPlayer()
         {
             if (mainCam != null)
@@ -38,16 +33,46 @@ public override void OnStartLocalPlayer()
                 Debug.LogWarning("PlayerCamera: Could not find a camera in scene with 'MainCamera' tag.");
         }
 
+        void OnApplicationQuit()
+        {
+            //Debug.Log("PlayerCamera.OnApplicationQuit");
+            ReleaseCamera();
+        }
+
         public override void OnStopLocalPlayer()
+        {
+            //Debug.Log("PlayerCamera.OnStopLocalPlayer");
+            ReleaseCamera();
+        }
+
+        void OnDisable()
+        {
+            //Debug.Log("PlayerCamera.OnDisable");
+            ReleaseCamera();
+        }
+
+        void OnDestroy()
+        {
+            //Debug.Log("PlayerCamera.OnDestroy");
+            ReleaseCamera();
+        }
+
+        void ReleaseCamera()
         {
             if (mainCam != null && mainCam.transform.parent == transform)
             {
+                //Debug.Log("PlayerCamera.ReleaseCamera");
+
                 mainCam.transform.SetParent(null);
-                SceneManager.MoveGameObjectToScene(mainCam.gameObject, SceneManager.GetActiveScene());
                 mainCam.orthographic = true;
                 mainCam.orthographicSize = 15f;
                 mainCam.transform.localPosition = new Vector3(0f, 70f, 0f);
                 mainCam.transform.localEulerAngles = new Vector3(90f, 0f, 0f);
+
+                if (mainCam.gameObject.scene != SceneManager.GetActiveScene())
+                    SceneManager.MoveGameObjectToScene(mainCam.gameObject, SceneManager.GetActiveScene());
+
+                mainCam = null;
             }
         }
     }