update

Trunk merge updates

Author: NoelStephensUnity

com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/UnifiedNetworkTransformTest.cs

@@ -3,7 +3,6 @@
 using NUnit.Framework;
 using Unity.Netcode.Components;
 using Unity.Netcode.TestHelpers.Runtime;
-using Unity.NetCode;
 using UnityEngine;
 using UnityEngine.TestTools;
 
@@ -35,6 +34,11 @@ internal class UnifiedNetworkTransformTest : IntegrationTestWithApproximation
         private GameObject m_Prefab;
         private NetworkObject m_Instance;
 
+        protected override bool OnSetVerboseDebug()
+        {
+            return true;
+        }
+
         protected override IEnumerator OnSetup()
         {
             // Creates the hybrid prefab
@@ -43,37 +47,9 @@ protected override IEnumerator OnSetup()
             return base.OnSetup();
         }
 
-        protected override void OnServerAndClientsCreated()
-        {
-
-            // Add the hybrid prefab to the prefabs list for
-            // all NetworkManager instances.
-            // TODO: Emma and I discussed actually not making it
-            // a requirement to have NetworkManager instances.
-            // We can get that PR landed and merged back into the
-            // unified branch so this is no longer needed.
-            // (We can modify CreateHybridPrefab to use whatever list
-            // is used to handle this when using the normal prefab creation
-            // methods).
-            var networkPrefab = new NetworkPrefab()
-            {
-                Prefab = m_Prefab,
-            };
-            foreach (var networkManager in m_NetworkManagers)
-            {
-                networkManager.LogLevel = LogLevel.Developer;
-                networkManager.NetworkConfig.Prefabs.Add(networkPrefab);
-                // Set the deferred message timeout to be 5 seconds for this test.
-                // (To see if the messages for the instances ever get processed.)
-                // Enable this to debug deferred
-                //networkManager.NetworkConfig.SpawnTimeout = 5;
-            }
-        }
-
         [UnityTest]
         public IEnumerator BasicMovementTest()
         {
-            m_EnableVerboseDebug = true;
             var authority = GetAuthorityNetworkManager();
             m_Instance = SpawnObject(m_Prefab, m_ServerNetworkManager).GetComponent<NetworkObject>();
 

com.unity.netcode.gameobjects/Tests/Runtime/TestHelpers/NetcodeIntegrationTest.cs

@@ -640,7 +640,7 @@ private void InternalOnOneTimeSetup()
         protected virtual IEnumerator OnSetup()
         {
 #if UNIFIED_NETCODE
-            if(m_AllPrefabsAsHybrid)
+            if (m_AllPrefabsAsHybrid)
             {
                 NetworkSpawnManager.RegisterPendingGhost = RegisterPendingGhost;
             }
@@ -659,7 +659,7 @@ protected virtual IEnumerator OnSetup()
         protected virtual void OnInlineSetup()
         {
 #if UNIFIED_NETCODE
-            if(m_AllPrefabsAsHybrid)
+            if (m_AllPrefabsAsHybrid)
             {
                 NetworkSpawnManager.RegisterPendingGhost = RegisterPendingGhost;
             }
@@ -867,7 +867,20 @@ protected void CreateServerAndClients(int numberOfClients)
             {
                 manager.NetworkConfig.PlayerPrefab = m_PlayerPrefab;
                 SetDistributedAuthorityProperties(manager);
+#if UNIFIED_NETCODE
+                foreach (var pendingPrefab in m_PendingPrefabs)
+                {
+                    var prefab = new NetworkPrefab()
+                    {
+                        Prefab = pendingPrefab
+                    };
+                    manager.NetworkConfig.Prefabs.Add(prefab);
+                }
+#endif
             }
+#if UNIFIED_NETCODE
+            m_PendingPrefabs.Clear();
+#endif
 
             // Provides opportunity to allow child derived classes to
             // modify the NetworkManager's configuration before starting.
@@ -1662,8 +1675,9 @@ protected IEnumerator CoroutineShutdownAndCleanUp()
         protected void UnifiedCleanup()
         {
 #if UNIFIED_NETCODE
-            if(m_AllPrefabsAsHybrid)
+            if (m_AllPrefabsAsHybrid)
             {
+                m_PendingPrefabs.Clear();
                 NetworkSpawnManager.RegisterPendingGhost = null;
                 CleanupPrefabReferences();
             }
@@ -2298,6 +2312,8 @@ protected GameObject CreateNetworkObjectPrefab(string baseName)
         }
 
 #if UNIFIED_NETCODE
+        // Pending prefabs declared before NetworkManagers instantiated
+        private List<GameObject> m_PendingPrefabs = new List<GameObject>();
         protected void CleanupPrefabReferences()
         {
             foreach (var reference in Object.FindObjectsByType<GhostPrefabReference>())
@@ -2330,7 +2346,7 @@ protected GameObject CreateHybridPrefab(string baseName, bool moveToDDOL = true)
             adapter.prefabReference = ScriptableObject.CreateInstance<GhostPrefabReference>();
             adapter.prefabReference.name = "GhostPrefabReference";
             adapter.prefabReference.Prefab = gameObject;
-            adapter.prefabReference.Ghost = adapter;
+
             GhostPrefabReference.s_IsPostProcessing = false;
 
             // TODO: This might be part of the CreateHybridPrefab parameters
@@ -2368,19 +2384,27 @@ protected GameObject CreateHybridPrefab(string baseName, bool moveToDDOL = true)
                 Object.DontDestroyOnLoad(gameObject);
             }
             var authorityNetworkManager = GetAuthorityNetworkManager();
-            authorityNetworkManager.AddNetworkPrefab(gameObject);
-            foreach (var clientNetworkManager in m_ClientNetworkManagers)
+            if (authorityNetworkManager == null)
             {
-                if (clientNetworkManager == authorityNetworkManager)
+                m_PendingPrefabs.Add(gameObject);
+            }
+            else
+            {
+                authorityNetworkManager.AddNetworkPrefab(gameObject);
+                foreach (var clientNetworkManager in m_ClientNetworkManagers)
                 {
-                    continue;
+                    if (clientNetworkManager == authorityNetworkManager)
+                    {
+                        continue;
+                    }
+                    clientNetworkManager.AddNetworkPrefab(gameObject);
                 }
-                clientNetworkManager.AddNetworkPrefab(gameObject);
             }
             return gameObject;
         }
 #endif
 
+
         /// <summary>
         /// Overloaded method <see cref="SpawnObject(NetworkObject, NetworkManager, bool)"/>
         /// </summary>
@@ -2598,7 +2622,7 @@ private void InitializeTestConfiguration(NetworkTopologyTypes networkTopologyTyp
             }
 #if UNIFIED_NETCODE
             m_UseHost = hostOrServer == HostOrServer.Host || hostOrServer == HostOrServer.DAHost || hostOrServer == HostOrServer.UnifiedHost;
-            m_AllPrefabsAsHybrid = (hostOrServer ==  HostOrServer.UnifiedServer || hostOrServer == HostOrServer.UnifiedHost);
+            m_AllPrefabsAsHybrid = (hostOrServer == HostOrServer.UnifiedServer || hostOrServer == HostOrServer.UnifiedHost);
 #else
             m_UseHost = hostOrServer == HostOrServer.Host || hostOrServer == HostOrServer.DAHost;
 #endif