4.6.14

- Fixed harmless duplicate DefaultPrefabObjects error.
- Fixed builds not completing due to misplaced using statement.
- Added NetworkTransform.UseScaledTime.

Author: FirstGearGames

Assets/FishNet/CodeGenerating/Processing/Rpc/RpcProcessor.cs

@@ -854,8 +854,6 @@ private MethodDefinition CreateRpcLogicMethod(List<AttributeData> datas, Created
             TypeDefinition typeDef = cr.TypeDef;
             MethodDefinition originalMd = cr.OriginalMethodDef;
 
-            
-
             //Methodname for logic methods do not use prefixes because there can be only one.
             string methodName = $"{LOGIC_PREFIX}{GetMethodNameAsParameters(originalMd)}";
 
@@ -968,8 +966,6 @@ private void RedirectOriginalToWriter(List<CreatedRpc> createdRpcs)
              * entry. */
             MethodDefinition originalMd = createdRpcs[0].OriginalMethodDef;
 
-            
-
             ILProcessor processor = originalMd.Body.GetILProcessor();
             originalMd.Body.Instructions.Clear();
 

Assets/FishNet/Runtime/Generated/Component/NetworkAnimator/NetworkAnimator.cs

@@ -647,7 +647,6 @@ private void InitializeOnce()
             foreach (AnimatorControllerParameter item in _animator.parameters)
             {
                 bool process = !_animator.IsParameterControlledByCurve(item.name);
-                
                 if (process)
                 {
                     //Over 250 parameters; who would do this!?

Assets/FishNet/Runtime/Generated/Component/NetworkTransform/Editor/NetworkTransformEditor.cs

@@ -14,6 +14,7 @@ public class NetworkTransformEditor : Editor
         private SerializedProperty _componentConfiguration;
         private SerializedProperty _synchronizeParent;
         private SerializedProperty _packing;
+        private SerializedProperty _useScaledTime;
         private SerializedProperty _interpolation;
         private SerializedProperty _extrapolation;
         private SerializedProperty _enableTeleport;
@@ -35,6 +36,7 @@ protected virtual void OnEnable()
             _componentConfiguration = serializedObject.FindProperty(nameof(_componentConfiguration));
             _synchronizeParent = serializedObject.FindProperty(nameof(_synchronizeParent));
             _packing = serializedObject.FindProperty(nameof(_packing));
+            _useScaledTime = serializedObject.FindProperty(nameof(_useScaledTime));
             _interpolation = serializedObject.FindProperty(nameof(_interpolation));
             _extrapolation = serializedObject.FindProperty(nameof(_extrapolation));
             _enableTeleport = serializedObject.FindProperty(nameof(_enableTeleport));
@@ -59,7 +61,6 @@ public override void OnInspectorGUI()
             LayoutTools.AddObjectField("Script:", MonoScript.FromMonoBehaviour((NetworkTransform)target), typeof(NetworkTransform), false, EditorLayoutEnableType.Disabled);
 
             bool isPro = false;
-            
             if (isPro)
                 EditorGUILayout.HelpBox(EditingConstants.PRO_ASSETS_UNLOCKED_TEXT, MessageType.None);
             else
@@ -77,6 +78,7 @@ public override void OnInspectorGUI()
             //Smoothing.
             EditorGUILayout.LabelField("Smoothing", EditorStyles.boldLabel);
             EditorGUI.indentLevel++;
+            EditorGUILayout.PropertyField(_useScaledTime);
             EditorGUILayout.PropertyField(_interpolation);
             EditorGUILayout.PropertyField(_extrapolation, new GUIContent("* Extrapolation"));
             EditorGUILayout.PropertyField(_enableTeleport);

Assets/FishNet/Runtime/Generated/Component/NetworkTransform/NetworkTransform.cs

@@ -371,6 +371,12 @@ public void InitializeState() { }
             Scale = AutoPackType.Unpacked
         };
         /// <summary>
+        /// True to use scaled deltaTime when smoothing.
+        /// </summary>
+        [Tooltip("True to use scaled deltaTime when smoothing.")]
+        [SerializeField]
+        private bool _useScaledTime = true;
+        /// <summary>
         /// How many ticks to interpolate.
         /// </summary>
         [Tooltip("How many ticks to interpolate.")]
@@ -761,7 +767,8 @@ private void TryClearGoalDatas_OwnershipChange(NetworkConnection prevOwner, bool
 
         private void TimeManager_OnUpdate()
         {
-            MoveToTarget(Time.deltaTime);
+            float deltaTime = _useScaledTime ? Time.deltaTime : Time.unscaledDeltaTime;
+            MoveToTarget(deltaTime);
         }
 
         /// <summary>
@@ -1680,17 +1687,15 @@ private void MoveToTarget(float delta)
                 //No more in buffer, see if can extrapolate.
                 else
                 {
-                    
-                        /* If everything matches up then end queue.
+                    /* If everything matches up then end queue.
                          * Otherwise let it play out until stuff
                          * aligns. Generally the time remaining is enough
                          * but every once in awhile something goes funky
                          * and it's thrown off. */
                         if (!HasChanged(td))
                             _currentGoalData = null;
                         OnInterpolationComplete?.Invoke();
-                        
-                }
+                        }
             }
         }
 
@@ -2200,8 +2205,7 @@ private void SetExtrapolatedData(TransformData prev, TransformData next, Channel
             //Default value.
             next.ExtrapolationState = TransformData.ExtrapolateState.Disabled;
 
-            
-        }
+            }
 
         /// <summary>
         /// Updates a client with transform data.

Assets/FishNet/Runtime/Managing/NetworkManager.cs

@@ -227,7 +227,7 @@ internal void SetBroadcastName<T>(ushort key) where T : struct, IBroadcast
         /// <summary>
         /// Version of this release.
         /// </summary>
-        public const string FISHNET_VERSION = "4.6.13";
+        public const string FISHNET_VERSION = "4.6.14";
         /// <summary>
         /// Maximum framerate allowed.
         /// </summary>

Assets/FishNet/Runtime/Managing/Object/PrefabObjects/DefaultPrefabObjects.cs

@@ -1,11 +1,9 @@
 using FishNet.Documenting;
-using FishNet.Object.Helping;
 using System.Collections.Generic;
 using UnityEngine;
 using GameKit.Dependencies.Utilities;
-#if UNITY_EDITOR
 using System.Text;
-using FishNet.Editing;
+#if UNITY_EDITOR
 using UnityEditor;
 #endif
 using FishNet.Object;
@@ -17,32 +15,10 @@ namespace FishNet.Managing.Object
     public class DefaultPrefabObjects : SinglePrefabObjects
     {
         /// <summary>
-        /// Instance of this class.
+        /// Used for version rebuilding.
         /// </summary>
-        /// <remarks>This is used to ensure only one copy of this class exists on disk.</remarks>
-        [System.NonSerialized]
-        internal static DefaultPrefabObjects Instance;
-
         private StringBuilder _stringBuilder = new();
-        
-        public DefaultPrefabObjects()
-        {
-            if (Instance != null)
-            {
-                string searchLiteral = "\"t: DefaultPrefabObjects\"";
-                Debug.LogError($"{nameof(DefaultPrefabObjects)} already exists. There should be only one instance of {nameof(DefaultPrefabObjects)} in memory, as well on disk. Search (without quotations) {searchLiteral} in your Project tab and delete all copies. A new file will be automatically generated after all {nameof(DefaultPrefabObjects)} are removed.");
-            
-                return;
-            }
-            
-            Instance = this;
-        }
 
-        ~DefaultPrefabObjects() 
-        {
-            if (Instance == this)
-                Instance = null;
-        }
 
         /// <summary>
         /// Sets asset path hashes for prefabs starting at index, or if missing.

Assets/FishNet/Runtime/Plugins/ColliderRollback/Scripts/RollbackManager.cs

@@ -78,32 +78,27 @@ internal void InitializeOnce_Internal(NetworkManager manager)
         [Obsolete("Use Rollback(Vector3, Vector3, float, PreciseTick, RollbackPhysicsType.Physics, bool) instead.")] //Remove on V5
         public void Rollback(Vector3 origin, Vector3 normalizedDirection, float distance, PreciseTick pt, bool asOwnerAndClientHost = false)
         {
-            
-        }
+            }
 
         [Obsolete("Use Rollback(Scene, Vector3, Vector3, float, PreciseTick, RollbackPhysicsType.Physics, bool) instead.")] //Remove on V5
         public void Rollback(Scene scene, Vector3 origin, Vector3 normalizedDirection, float distance, PreciseTick pt, bool asOwnerAndClientHost = false)
         {
-            
-        }
+            }
 
         [Obsolete("Use Rollback(int, Vector3, Vector3, float, PreciseTick, RollbackPhysicsType.Physics, bool) instead.")] //Remove on V5
         public void Rollback(int sceneHandle, Vector3 origin, Vector3 normalizedDirection, float distance, PreciseTick pt, bool asOwnerAndClientHost = false)
         {
-            
-        }
+            }
 
         [Obsolete("Use Rollback(Scene, Vector3, Vector3, float, PreciseTick, RollbackPhysicsType.Physics2D, bool) instead.")] //Remove on V5
         public void Rollback(Scene scene, Vector2 origin, Vector2 normalizedDirection, float distance, PreciseTick pt, bool asOwnerAndClientHost = false)
         {
-            
-        }
+            }
 
         [Obsolete("Use Rollback(Vector3, Vector3, float, PreciseTick, RollbackPhysicsType.Physics2D, bool) instead.")] //Remove on V5
         public void Rollback(Vector2 origin, Vector2 normalizedDirection, float distance, PreciseTick pt, bool asOwnerAndClientHost = false)
         {
-            
-        }
+            }
 
         /// <summary>
         /// Rolls back all colliders.
@@ -113,8 +108,7 @@ public void Rollback(Vector2 origin, Vector2 normalizedDirection, float distance
         /// <param name = "asOwnerAndClientHost">True if IsOwner of the object the raycast is for. This can be ignored and only provides more accurate results for clientHost.</param>
         public void Rollback(PreciseTick pt, RollbackPhysicsType physicsType, bool asOwnerAndClientHost = false)
         {
-            
-        }
+            }
 
         /// <summary>
         /// Rolls back all colliders in a scene.
@@ -125,8 +119,7 @@ public void Rollback(PreciseTick pt, RollbackPhysicsType physicsType, bool asOwn
         /// <param name = "asOwnerAndClientHost">True if IsOwner of the object the raycast is for. This can be ignored and only provides more accurate results for clientHost.</param>
         public void Rollback(Scene scene, PreciseTick pt, RollbackPhysicsType physicsType, bool asOwnerAndClientHost = false)
         {
-            
-        }
+            }
 
         /// <summary>
         /// Rolls back all colliders in a scene.
@@ -137,8 +130,7 @@ public void Rollback(Scene scene, PreciseTick pt, RollbackPhysicsType physicsTyp
         /// <param name = "asOwnerAndClientHost">True if IsOwner of the object the raycast is for. This can be ignored and only provides more accurate results for clientHost.</param>
         public void Rollback(int sceneHandle, PreciseTick pt, RollbackPhysicsType physicsType, bool asOwnerAndClientHost = false)
         {
-            
-        }
+            }
 
         /// <summary>
         /// Rolls back colliders hit by a test cast against bounding boxes.
@@ -151,8 +143,7 @@ public void Rollback(int sceneHandle, PreciseTick pt, RollbackPhysicsType physic
         /// <param name = "asOwnerAndClientHost">True if IsOwner of the object the raycast is for. This can be ignored and only provides more accurate results for clientHost.</param>
         public void Rollback(Vector3 origin, Vector3 normalizedDirection, float distance, PreciseTick pt, RollbackPhysicsType physicsType, bool asOwnerAndClientHost = false)
         {
-            
-        }
+            }
 
         /// <summary>
         /// Rolls back colliders hit by a test cast against bounding boxes, in a specific scene.
@@ -166,8 +157,7 @@ public void Rollback(Vector3 origin, Vector3 normalizedDirection, float distance
         /// <param name = "asOwnerAndClientHost">True if IsOwner of the object the raycast is for. This can be ignored and only provides more accurate results for clientHost.</param>
         public void Rollback(Scene scene, Vector3 origin, Vector3 normalizedDirection, float distance, PreciseTick pt, RollbackPhysicsType physicsType, bool asOwnerAndClientHost = false)
         {
-            
-        }
+            }
 
         /// <summary>
         /// Rolls back colliders hit by a test cast against bounding boxes, in a specific scene.
@@ -181,19 +171,14 @@ public void Rollback(Scene scene, Vector3 origin, Vector3 normalizedDirection, f
         /// <param name = "asOwnerAndClientHost">True if IsOwner of the object the raycast is for. This can be ignored and only provides more accurate results for clientHost.</param>
         public void Rollback(int sceneHandle, Vector3 origin, Vector3 normalizedDirection, float distance, PreciseTick pt, RollbackPhysicsType physicsType, bool asOwnerAndClientHost = false)
         {
-            
-        }
-
-        
+            }
 
         /// <summary>
         /// Returns all ColliderRollback objects back to their original position.
         /// </summary>
         public void Return()
         {
-            
-        }
+            }
 
-        
-    }
+        }
 }

Assets/FishNet/Runtime/Plugins/Yak/Core/ClientSocket.cs

@@ -28,25 +28,15 @@ internal bool StartConnection()
             return true;
         }
 
-        
-
         /// <summary>
         /// Stops the local socket.
         /// </summary>
         internal bool StopConnection()
         {
-            
             return true;
         }
 
-        
-
-        
-
-        
-
         #region Local server.
-        
         #endregion
     }
 }

Assets/FishNet/Runtime/Plugins/Yak/Core/ServerSocket.cs

@@ -44,14 +44,11 @@ internal bool StartConnection()
             return true;
         }
 
-        
-
         /// <summary>
         /// Stops the local socket.
         /// </summary>
         internal bool StopConnection()
         {
-            
             return true;
         }
 
@@ -61,18 +58,10 @@ internal bool StopConnection()
         /// <param name = "connectionId">ConnectionId of the client to disconnect.</param>
         internal bool StopConnection(int connectionId)
         {
-            
             return true;
         }
 
-        
-
-        
-
         #region Local client.
-        
-
-        
         #endregion
     }
 }

Assets/FishNet/package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.firstgeargames.fishnet",
-  "version": "4.6.13",
+  "version": "4.6.14",
   "displayName": "FishNet: Networking Evolved",
   "description": "A feature-rich Unity networking solution aimed towards reliability, ease of use, efficiency, and flexibility.",
   "unity": "2021.3",