update

Resolving minor issues related to merge.

Author: NoelStephensUnity

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

@@ -639,10 +639,12 @@ private void InternalOnOneTimeSetup()
         /// <returns><see cref="IEnumerator"/></returns>
         protected virtual IEnumerator OnSetup()
         {
-            if(m_allPrefabsAsHybrid)
+#if UNIFIED_NETCODE
+            if(m_AllPrefabsAsHybrid)
             {
                 NetworkSpawnManager.RegisterPendingGhost = RegisterPendingGhost;
             }
+#endif
             yield return null;
         }
 
@@ -656,10 +658,12 @@ protected virtual IEnumerator OnSetup()
         /// </summary>
         protected virtual void OnInlineSetup()
         {
-            if(m_allPrefabsAsHybrid)
+#if UNIFIED_NETCODE
+            if(m_AllPrefabsAsHybrid)
             {
                 NetworkSpawnManager.RegisterPendingGhost = RegisterPendingGhost;
             }
+#endif
         }
 
         /// <summary>
@@ -726,6 +730,7 @@ public IEnumerator SetUp()
             VerboseDebug($"Exiting {nameof(SetUp)}");
         }
 
+#if UNIFIED_NETCODE
         private void RegisterPendingGhost(NetworkObject networkObject, ulong networkObjectId)
         {
             var ghost = networkObject.GetComponent<GhostAdapter>();
@@ -741,6 +746,7 @@ private void RegisterPendingGhost(NetworkObject networkObject, ulong networkObje
             }
             Debug.LogError($"Did not find a world for NetworkObject-{networkObjectId}!!");
         }
+#endif
 
         /// <summary>
         /// Override this to add components or adjustments to the default player prefab
@@ -1653,7 +1659,7 @@ protected IEnumerator CoroutineShutdownAndCleanUp()
         protected void UnifiedCleanup()
         {
 #if UNIFIED_NETCODE
-            if(m_allPrefabsAsHybrid)
+            if(m_AllPrefabsAsHybrid)
             {
                 NetworkSpawnManager.RegisterPendingGhost = null;
                 CleanupPrefabReferences();
@@ -1818,13 +1824,17 @@ protected void DestroySceneNetworkObjects()
                     // and then destroying the ghostAdapter prior to destroying
                     // a hybrid prefab.
                     var ghostAdapter = networkObject.GetComponent<GhostAdapter>();
-                    if (ghostAdapter != null && ghostAdapter.prefabReference != null)
+                    if (ghostAdapter != null)
                     {
-                        var prefabReference = ghostAdapter.prefabReference;
-                        prefabReference.Prefab = null;
-                        ghostAdapter.prefabReference = null;
-                        Object.Destroy(prefabReference);
-                        Object.Destroy(ghostAdapter);
+                        if (ghostAdapter.prefabReference != null)
+                        {
+                            var prefabReference = ghostAdapter.prefabReference;
+                            prefabReference.Prefab = null;
+                            ghostAdapter.prefabReference = null;
+                            Object.Destroy(prefabReference);
+                        }
+                        Object.Destroy(networkObject.gameObject);
+                        continue;
                     }
 #endif
                     // Destroy the GameObject that holds the NetworkObject component
@@ -2254,7 +2264,7 @@ internal void WaitForMessagesReceivedWithTimeTravel(List<Type> messagesInOrder,
         }
 
 #if UNIFIED_NETCODE
-        protected bool m_allPrefabsAsHybrid = false;
+        protected bool m_AllPrefabsAsHybrid = false;
 #endif
 
         /// <summary>
@@ -2267,7 +2277,7 @@ internal void WaitForMessagesReceivedWithTimeTravel(List<Type> messagesInOrder,
         protected GameObject CreateNetworkObjectPrefab(string baseName)
         {
 #if UNIFIED_NETCODE
-            if (m_allPrefabsAsHybrid)
+            if (m_AllPrefabsAsHybrid)
             {
                 return CreateHybridPrefab(baseName);
             }
@@ -2585,7 +2595,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

testproject/Assets/Tests/Manual/DontDestroyOnLoad/ObjectToNotDestroyBehaviour.cs

@@ -9,9 +9,12 @@ namespace TestProject.ManualTests
     /// </summary>
     public class ObjectToNotDestroyBehaviour : NetworkBehaviour
     {
+        public static bool VerboseDebug;
+
         private bool m_ContinueSendingPing;
         private uint m_PingCounter;
 
+
         public uint CurrentPing
         {
             get
@@ -20,12 +23,19 @@ public uint CurrentPing
             }
         }
 
-        /// <summary>
-        /// When enabled, we move ourself to the DontDestroyOnLoad scene
-        /// </summary>
-        private void OnEnable()
+        private void Log(string msg)
+        {
+            if (VerboseDebug)
+            {
+                Debug.Log(msg);
+            }
+        }
+
+        // Migrate into DDOL during pre-spawn
+        protected override void OnNetworkPreSpawn(ref NetworkManager networkManager)
         {
             DontDestroyOnLoad(this);
+            base.OnNetworkPreSpawn(ref networkManager);
         }
 
         /// <summary>
@@ -38,11 +48,11 @@ private void PingUpdateClientRpc(uint pingNumber)
         {
             if (IsHost)
             {
-                Debug.Log($"Sent ping number ({pingNumber}).");
+                Log($"Sent ping number ({pingNumber}).");
             }
             else if (IsClient)
             {
-                Debug.Log($"Receiving ping number ({pingNumber}) from server");
+                Log($"Receiving ping number ({pingNumber}) from server");
                 m_PingCounter = pingNumber;
             }
         }

testproject/Assets/Tests/Runtime/RpcObserverTests.cs

@@ -159,10 +159,12 @@ private IEnumerator RunRpcObserverTest(List<ulong> nonObservers)
         [UnityTest]
         public IEnumerator DespawnRespawnObserverTest()
         {
-            if (m_allPrefabsAsHybrid)
+#if UNIFIED_NETCODE
+            if (m_AllPrefabsAsHybrid)
             {
                 Assert.Ignore("Hybrid spawning does not support despawn-without-destroy.");
             }
+#endif
             var nonObservers = new List<ulong>();
             m_ServerRpcObserverObject.ResetTest();
             // Wait for all clients to report they have spawned an instance of our test prefab