2.2.5

- Added StatisticsManager, can be placed on your NetworkManager for a variety of game statistics.
- Improved DefaultPrefabObjects are now automatically refreshed before builds.
- Fixed typo in TimeManager when setting lastMultipleTicks value.
- Fixed Odin Inspector causing SceneId to serialize every frame when object is selected.
- Improved SceneManager for mobile devices.
- Fixed generic collection type fields from other assemblies sometimes creating codegen errors.
- Added NetworkObject.IsGlobal, which allows NetworkObejcts to be visible for all players and making them DontDestroyOnLoad.
- Fixed properties with generic return types causing codegen errors.

Author: FirstGearGames

Assets/FishNet/CodeGenerating/Helpers/Extension/ModuleDefinitionExtensions.cs

@@ -9,18 +9,6 @@ namespace FishNet.CodeGenerating.Helping.Extension
 
     public static class ModuleDefinitionExtensions
     {
-
-        /// <summary>
-        /// Returns a TypeReference after being imported into moduleDef.
-        /// </summary>
-        public static TypeReference ImportIfDifferent(this ModuleDefinition moduleDef, TypeReference tr)
-        {
-            if (tr.Module != moduleDef)
-                return moduleDef.ImportReference(tr.CachedResolve());
-            else
-                return tr;
-        }
-
         /// <summary>
         /// Gets a class within CodegenSession.Module.
         /// </summary>

Assets/FishNet/CodeGenerating/Helpers/Extension/TypeDefinitionExtensions.cs

@@ -36,16 +36,18 @@ public static IEnumerable<FieldDefinition> FindAllPublicFields(this TypeDefiniti
                 if (IsExcluded(typeDef, excludedBaseTypes, excludedAssemblyPrefixes))
                     break;
 
-                foreach (FieldDefinition field in typeDef.Fields)
+                foreach (FieldDefinition fd in typeDef.Fields)
                 {
-                    if (ignoreStatic && field.IsStatic)
+                    if (ignoreStatic && fd.IsStatic)
                         continue;
-                    if (field.IsPrivate)
+                    if (fd.IsPrivate)
                         continue;
-                    if (ignoreNonSerialized && field.IsNotSerialized)
+                    if (ignoreNonSerialized && fd.IsNotSerialized)
+                        continue;
+                    if (CodegenSession.GeneralHelper.CodegenExclude(fd))
                         continue;
 
-                    yield return field;
+                    yield return fd;
                 }
 
                 try { typeDef = typeDef.BaseType?.CachedResolve(); }
@@ -58,23 +60,27 @@ public static IEnumerable<FieldDefinition> FindAllPublicFields(this TypeDefiniti
         /// </summary>
         /// <param name="typeDef"></param>
         /// <returns></returns>
-        public static IEnumerable<PropertyDefinition> FindAllPublicProperties(this TypeDefinition typeDef, System.Type[] excludedBaseTypes = null, string[] excludedAssemblyPrefixes = null)
+        public static IEnumerable<PropertyDefinition> FindAllPublicProperties(this TypeDefinition typeDef, bool excludeGenerics = true, System.Type[] excludedBaseTypes = null, string[] excludedAssemblyPrefixes = null)
         {
             while (typeDef != null)
             {
                 if (IsExcluded(typeDef, excludedBaseTypes, excludedAssemblyPrefixes))
                     break;
 
-                foreach (PropertyDefinition prop in typeDef.Properties)
+                foreach (PropertyDefinition pd in typeDef.Properties)
                 {
                     //Missing get or set method.
-                    if (prop.GetMethod == null || prop.SetMethod == null)
+                    if (pd.GetMethod == null || pd.SetMethod == null)
                         continue;
                     //Get or set is private.
-                    if (prop.GetMethod.IsPrivate || prop.SetMethod.IsPrivate)
+                    if (pd.GetMethod.IsPrivate || pd.SetMethod.IsPrivate)
+                        continue;
+                    if (excludeGenerics && pd.GetMethod.ReturnType.IsGenericParameter)
+                        continue;
+                    if (CodegenSession.GeneralHelper.CodegenExclude(pd))
                         continue;
 
-                    yield return prop;
+                    yield return pd;
                 }
 
                 try { typeDef = typeDef.BaseType?.CachedResolve(); }
@@ -107,6 +113,7 @@ private static bool IsExcluded(TypeDefinition typeDef, System.Type[] excludedBas
                         return true;
                 }
             }
+
             //Fall through, not excluded.
             return false;
         }

Assets/FishNet/CodeGenerating/Helpers/Extension/TypeReferenceExtensions.cs

@@ -32,9 +32,9 @@ internal static bool IsClassOrStruct(this TypeReference typeRef)
         /// </summary>
         /// <param name="typeRef"></param>
         /// <returns></returns>
-        public static IEnumerable<PropertyDefinition> FindAllPublicProperties(this TypeReference typeRef, System.Type[] excludedBaseTypes = null, string[] excludedAssemblyPrefixes = null)
+        public static IEnumerable<PropertyDefinition> FindAllPublicProperties(this TypeReference typeRef, bool excludeGenerics = true, System.Type[] excludedBaseTypes = null, string[] excludedAssemblyPrefixes = null)
         {
-            return typeRef.CachedResolve().FindAllPublicProperties(excludedBaseTypes, excludedAssemblyPrefixes);
+            return typeRef.CachedResolve().FindAllPublicProperties(excludeGenerics, excludedBaseTypes, excludedAssemblyPrefixes);
         }
 
 

Assets/FishNet/CodeGenerating/Helpers/ReaderGenerator.cs

@@ -436,22 +436,18 @@ private bool ReadFieldsAndProperties(MethodDefinition readerMd, ParameterDefinit
                 objectTr = CodegenSession.ImportReference(objectTr.CachedResolve());
 
             //Fields.
-            foreach (FieldDefinition fieldDef in objectTr.FindAllPublicFields(true, true, 
+            foreach (FieldDefinition fieldDef in objectTr.FindAllPublicFields(true, true,
                 ReaderHelper.EXCLUDED_AUTO_SERIALIZER_TYPES, ReaderHelper.EXCLUDED_ASSEMBLY_PREFIXES))
             {
-                if (CodegenSession.GeneralHelper.CodegenExclude(fieldDef))
-                    continue;
                 FieldReference importedFr = CodegenSession.ImportReference(fieldDef);
                 if (GetReadMethod(fieldDef.FieldType, out MethodReference readMr))
                     CodegenSession.ReaderHelper.CreateReadIntoClassOrStruct(readerMd, readerPd, readMr, objectVd, importedFr);
             }
 
             //Properties.
             foreach (PropertyDefinition propertyDef in objectTr.FindAllPublicProperties(
-                ReaderHelper.EXCLUDED_AUTO_SERIALIZER_TYPES, ReaderHelper.EXCLUDED_ASSEMBLY_PREFIXES))
+                true, ReaderHelper.EXCLUDED_AUTO_SERIALIZER_TYPES, ReaderHelper.EXCLUDED_ASSEMBLY_PREFIXES))
             {
-                if (CodegenSession.GeneralHelper.CodegenExclude(propertyDef))
-                    continue;
                 if (GetReadMethod(propertyDef.PropertyType, out MethodReference readMr))
                 {
                     MethodReference setMr = CodegenSession.Module.ImportReference(propertyDef.SetMethod);
@@ -462,8 +458,8 @@ private bool ReadFieldsAndProperties(MethodDefinition readerMd, ParameterDefinit
             //Gets or creates writer method and outputs it. Returns true if method is found or created.
             bool GetReadMethod(TypeReference tr, out MethodReference readMr)
             {
-                TypeReference typeRef = CodegenSession.Module.ImportIfDifferent(tr);
-                readMr = CodegenSession.ReaderHelper.GetOrCreateFavoredReadMethodReference(typeRef, true);
+                tr = CodegenSession.ImportReference(tr);
+                readMr = CodegenSession.ReaderHelper.GetOrCreateFavoredReadMethodReference(tr, true);
                 return (readMr != null);
             }
 

Assets/FishNet/CodeGenerating/Helpers/WriterGenerator.cs

@@ -237,18 +237,14 @@ private bool WriteFieldsAndProperties(MethodDefinition writerMd, ParameterDefini
             //Fields
             foreach (FieldDefinition fieldDef in objectTr.FindAllPublicFields(true, true))//, WriterHelper.EXCLUDED_AUTO_SERIALIZER_TYPES))
             {
-                if (CodegenSession.GeneralHelper.CodegenExclude(fieldDef))
-                    continue;
                 if (GetWriteMethod(fieldDef.FieldType, out MethodReference writeMr))
                     CodegenSession.WriterHelper.CreateWrite(writerMd, valuePd, fieldDef, writeMr);
             }
 
             //Properties.
             foreach (PropertyDefinition propertyDef in objectTr.FindAllPublicProperties(
-                WriterHelper.EXCLUDED_AUTO_SERIALIZER_TYPES, WriterHelper.EXCLUDED_ASSEMBLY_PREFIXES))
+                true, WriterHelper.EXCLUDED_AUTO_SERIALIZER_TYPES, WriterHelper.EXCLUDED_ASSEMBLY_PREFIXES))
             {
-                if (CodegenSession.GeneralHelper.CodegenExclude(propertyDef))
-                    continue;
                 if (GetWriteMethod(propertyDef.PropertyType, out MethodReference writerMr))
                 {
                     MethodReference getMr = CodegenSession.Module.ImportReference(propertyDef.GetMethod);
@@ -259,8 +255,8 @@ private bool WriteFieldsAndProperties(MethodDefinition writerMd, ParameterDefini
             //Gets or creates writer method and outputs it. Returns true if method is found or created.
             bool GetWriteMethod(TypeReference tr, out MethodReference writeMr)
             {
-                TypeReference typeRef = CodegenSession.Module.ImportIfDifferent(tr);
-                writeMr = CodegenSession.WriterHelper.GetOrCreateFavoredWriteMethodReference(typeRef, true);
+                tr = CodegenSession.ImportReference(tr);
+                writeMr = CodegenSession.WriterHelper.GetOrCreateFavoredWriteMethodReference(tr, true);
                 return (writeMr != null);
             }
 

Assets/FishNet/Example/All/SceneManager/Scenes/Additive/AdditiveMain.unity

@@ -1147,10 +1147,8 @@ GameObject:
   m_Component:
   - component: {fileID: 7443408887680269496}
   - component: {fileID: 7443408887680269499}
-  - component: {fileID: 7443408887680269500}
-  - component: {fileID: 7443408887680269501}
-  - component: {fileID: 7443408887680269502}
   - component: {fileID: 7443408887680269503}
+  - component: {fileID: 7443408887680269500}
   m_Layer: 0
   m_Name: 'NetworkManager '
   m_TagString: Untagged
@@ -1185,56 +1183,12 @@ MonoBehaviour:
   m_GameObject: {fileID: 7443408887680269498}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3fdaae44044276a49a52229c1597e33b, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  _tickRate: 30
-  _pingInterval: 1
-  _timingInterval: 2
-  _physicsMode: 0
-  _maximumBufferedInputs: 15
---- !u!114 &7443408887680269501
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7443408887680269498}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 6f48f002b825cbd45a19bd96d90f9edb, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  _unreliableMTU: 1023
-  _attackResponseType: 1
-  _ipv4BindAddress: 
-  _ipv6BindAddress: 
-  _port: 7770
-  _maximumClients: 4095
-  _clientAddress: localhost
-  _timeout: 15
---- !u!114 &7443408887680269502
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7443408887680269498}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 68828c85278210948b9d50a8db3aab74, type: 3}
+  m_Script: {fileID: 11500000, guid: 7d331f979d46e8e4a9fc90070c596d44, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  _authenticator: {fileID: 0}
-  SpawnPacking:
-    Position: 0
-    Rotation: 2
-    Scale: 2
-  _changeFrameRate: 1
-  _frameRate: 9999
-  _shareIds: 1
-  _startOnHeadless: 1
-  _limitClientMTU: 1
+  _setHostVisibility: 1
+  _defaultConditions:
+  - {fileID: 11400000, guid: 2033f54fd2794464bae08fa5a55c8996, type: 2}
 --- !u!114 &7443408887680269503
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/FishNet/Runtime/Editor/CodeStripping.cs

@@ -5,6 +5,7 @@
 using System.Xml.Serialization;
 
 #if UNITY_EDITOR
+using FishNet.Editing.PrefabCollectionGenerator;
 using UnityEditor.Compilation;
 using UnityEditor.Build.Reporting;
 using UnityEditor;
@@ -16,7 +17,7 @@ namespace FishNet.Configuring
 
 
     public class CodeStripping
-    
+
     {
 
         /// <summary>
@@ -35,7 +36,7 @@ public static bool RemoveServerLogic
         {
             get
             {
-                
+
 
                 /* This is to protect non pro users from enabling this
                  * without the extra logic code.  */
@@ -51,7 +52,7 @@ public static bool StripBuild
         {
             get
             {
-                
+
 
                 /* This is to protect non pro users from enabling this
                  * without the extra logic code.  */
@@ -61,7 +62,52 @@ public static bool StripBuild
             }
         }
 
-        
+        private static object _compilationContext;
+        public int callbackOrder => 0;
+#if UNITY_EDITOR
+
+        public void OnPreprocessBuild(BuildReport report)
+        {
+            Generator.IgnorePostProcess = true;
+            Generator.GenerateFull();
+            CompilationPipeline.compilationStarted += CompilationPipelineOnCompilationStarted;
+            CompilationPipeline.compilationFinished += CompilationPipelineOnCompilationFinished;
+
+
+        }
+        /* Solution for builds ending with errors and not triggering OnPostprocessBuild.
+        * Link: https://gamedev.stackexchange.com/questions/181611/custom-build-failure-callback
+        */
+        private void CompilationPipelineOnCompilationStarted(object compilationContext)
+        {
+            _compilationContext = compilationContext;
+        }
+
+        private void CompilationPipelineOnCompilationFinished(object compilationContext)
+        {
+            if (compilationContext != _compilationContext)
+                return;
+
+            _compilationContext = null;
+
+            CompilationPipeline.compilationStarted -= CompilationPipelineOnCompilationStarted;
+            CompilationPipeline.compilationFinished -= CompilationPipelineOnCompilationFinished;
+
+            BuildingEnded();
+        }
+
+        private void BuildingEnded()
+        {
+
+
+            Generator.IgnorePostProcess = false;
+        }
+
+        public void OnPostprocessBuild(BuildReport report)
+        {
+            BuildingEnded();
+        }
+#endif
     }
 
 }

Assets/FishNet/Runtime/InstanceFinder.cs

@@ -4,6 +4,7 @@
 using FishNet.Managing.Logging;
 using FishNet.Managing.Scened;
 using FishNet.Managing.Server;
+using FishNet.Managing.Statistic;
 using FishNet.Managing.Timing;
 using FishNet.Managing.Transporting;
 using FishNet.Utility;
@@ -125,7 +126,17 @@ public static RollbackManager RollbackManager
                 return (nm == null) ? null : nm.RollbackManager;
             }
         }
-
+        /// <summary>
+        /// Returns the first instance of StatisticsManager.
+        /// </summary>
+        public static StatisticsManager StatisticsManager
+        {
+            get
+            {
+                NetworkManager nm = NetworkManager;
+                return (nm == null) ? null : nm.StatisticsManager;
+            }
+        }
         /// <summary>
         /// True if the server is active.
         /// </summary>

Assets/FishNet/Runtime/Managing/Client/ClientManager.cs

@@ -256,6 +256,7 @@ private void ParseReceived(ClientReceivedDataArgs args)
 #endif
 
             ArraySegment<byte> segment = args.Data;
+            NetworkManager.StatisticsManager.NetworkTraffic.LocalClientReceivedData((ulong)segment.Count);
             if (segment.Count <= TransportManager.TICK_BYTES)
                 return;