update

cleaning up some of the POC adjustments.
wrapping some debug within loglevel developer.

Author: NoelStephensUnity

com.unity.netcode.gameobjects/Runtime/Core/NetworkObject.cs

@@ -2865,10 +2865,6 @@ internal struct SceneObject
             public ulong OwnerClientId;
             public ushort OwnershipFlags;
 
-#if UNIFIED_NETCODE
-            public int GhostId;
-#endif
-
             public bool IsPlayerObject
             {
                 get => ByteUtility.GetBit(m_BitField, 0);
@@ -3041,13 +3037,6 @@ public void Serialize(FastBufferWriter writer)
                     writer.WriteValue(OwnerObject.GetSceneOriginHandle());
                 }
 
-#if UNIFIED_NETCODE
-                if (HasGhost)
-                {
-                    writer.WriteValueSafe(GhostId);
-                }
-#endif
-
                 // write placeholder for serialized data size.
                 // Can't be bitpacked because we don't know the value until we calculate it later
                 var positionBeforeSynchronizing = writer.Position;
@@ -3127,13 +3116,6 @@ public void Deserialize(FastBufferReader reader)
                 // scene handle that the NetworkObject resides in.
                 reader.ReadValue(out NetworkSceneHandle);
 
-#if UNIFIED_NETCODE
-                if (HasGhost)
-                {
-                    reader.ReadValueSafe(out GhostId);
-                }
-#endif
-
                 // Read the size of the remaining synchronization data
                 // This data will be read in AddSceneObject()
                 reader.ReadValueSafe(out SynchronizationDataSize);
@@ -3233,7 +3215,6 @@ internal SceneObject GetMessageSceneObject(ulong targetClientId = NetworkManager
                 HasInstantiationData = InstantiationData != null && InstantiationData.Length > 0,
 #if UNIFIED_NETCODE
                 HasGhost = HasGhost,
-                GhostId = HasGhost ? GhostInstance.ghostId : 0,
 #endif
             };
 
@@ -3553,15 +3534,15 @@ private void Awake()
 
         }
 
-        private void OnEnable()
-        {
-            Debug.Log("Enabled!");
-        }
+        //private void OnEnable()
+        //{
+        //    Debug.Log("Enabled!");
+        //}
 
-        private void OnDisable()
-        {
-            Debug.Log("Disabled!");
-        }
+        //private void OnDisable()
+        //{
+        //    Debug.Log("Disabled!");
+        //}
 
 #if UNIFIED_NETCODE
 
@@ -3580,87 +3561,31 @@ private void InitGhost()
             // All instances with Ghosts are automatically registered
             if (HasGhost && NetworkObjectBridge)
             {
-                Debug.Log($"[{nameof(NetworkObject)}] GhostBridge {name} detected and instantiated.");
+                if (NetworkManager.LogLevel == LogLevel.Developer)
+                {
+                    Debug.Log($"[{nameof(NetworkObject)}] GhostBridge {name} detected and instantiated.");
+                }
                 NetworkObjectBridge.NetworkObjectIdChanged += OnNetworkObjectIdChanged;
                 if (NetworkObjectBridge.NetworkObjectId.Value != 0)
                 {
                     RegisterGhostBridge();
                 }
-                //var networkObjectRegistration = (false, (ulong)0);
-                //NetworkManager.SpawnManager.RegisterGhostPendingSpawn(this, NetworkObjectBridge.NetworkObjectId);
-                //try
-                //{
-                //    networkObjectRegistration = GhostAdapter.GetNetworkObjectId();
-                //}
-                //catch (Exception ex)
-                //{
-                //    Debug.LogException(ex);
-                //}
-
-                //if (networkObjectRegistration.Item1)
-                //{
-                //    // Authority and Non-Authority:
-                //    // Upon instantiation it will always register itself as a Ghost that is pending NGO spawn.
-
-                //    // Non-Authority:
-                //    // - If registered prior to the CreateObjectMessage, then upon receiving the CreateObjectMessag it will be processed immediately using this instance.
-                //    // - If registered after receiving the CreateObjectMessage, then upon registering it will also process any deferred CreateObjectMessages
-                //    // If this happens prior to receiving the  is received,
-                //    // Authority:
-                //    // Upon spawning locally, this entry is removed from the ghost pending spawn table.
-
-
-
-                //}
-                //else if (!NetworkManager.IsServer)
-                //{
-                //    StartCoroutine(WaitForGhostData());
-                //}
-                //else
-                //{
-                //    Debug.LogError($"[{name}] Failed to get ghost instance or GhostId is zero!");
-                //}
             }
         }
 
         private void RegisterGhostBridge()
         {
-            Debug.Log($"[{nameof(NetworkObject)}][{nameof(NetworkObjectId)}] NetworkObjectBridge notified instance exists with assigned ID of: {NetworkObjectBridge.NetworkObjectId.Value}");
+            if (NetworkManager.LogLevel == LogLevel.Developer)
+            {
+                Debug.Log($"[{nameof(NetworkObject)}][{nameof(NetworkObjectId)}] NetworkObjectBridge notified instance exists with assigned ID of: {NetworkObjectBridge.NetworkObjectId.Value}");
+            }
             NetworkManager.SpawnManager.RegisterGhostPendingSpawn(this, NetworkObjectBridge.NetworkObjectId.Value);
         }
 
         private void OnNetworkObjectIdChanged(ulong networkObjectId)
         {
             RegisterGhostBridge();
         }
-
-        //private System.Collections.IEnumerator WaitForGhostData()
-        //{
-        //    var waitPeriod = new WaitForSeconds(0.1f);
-        //    var timeout = Time.realtimeSinceStartup + 5.0f;
-        //    while (timeout > Time.realtimeSinceStartup)
-        //    {
-        //        enabled = true;
-        //        var networkObjectRegistration = (false, (ulong)0);
-        //        try
-        //        {
-        //            networkObjectRegistration = GhostAdapter.GetNetworkObjectId();
-        //        }
-        //        catch (Exception ex)
-        //        {
-        //            Debug.LogException(ex);
-        //        }
-        //        if (networkObjectRegistration.Item1)
-        //        {
-        //            NetworkManager.SpawnManager.RegisterGhostPendingSpawn(this, networkObjectRegistration.Item2);
-        //            yield break;
-        //        }
-        //        yield return waitPeriod;
-        //    }
-
-        //    Debug.Log("Timed out waiting for Ghost to be registered!");
-
-        //}
 #endif
 
         /// <summary>

com.unity.netcode.gameobjects/Runtime/Messaging/Messages/CreateObjectMessage.cs

@@ -121,12 +121,19 @@ public bool Deserialize(FastBufferReader reader, ref NetworkContext context, int
             }
 
 #if UNIFIED_NETCODE
-            UnityEngine.Debug.Log($"Received {nameof(CreateObjectMessage)} for NetworkObjectId-{ObjectInfo.NetworkObjectId}.");
+            if (networkManager.LogLevel == LogLevel.Developer)
+            {
+                UnityEngine.Debug.Log($"Received {nameof(CreateObjectMessage)} for NetworkObjectId-{ObjectInfo.NetworkObjectId}.");
+            }
+            
             // For now, we will defer the create object message until the associated Ghost is spawned
             if (ObjectInfo.HasGhost && !networkManager.SpawnManager.GhostsPendingSpawn.ContainsKey(ObjectInfo.NetworkObjectId))
             {
-                UnityEngine.Debug.Log($"Deferring {nameof(CreateObjectMessage)} to wait for Ghost.");
-                networkManager.DeferredMessageManager.DeferMessage(IDeferredNetworkMessageManager.TriggerType.OnGhostSpawned, (ulong)ObjectInfo.GhostId, reader, ref context, k_Name);
+                if (networkManager.LogLevel == LogLevel.Developer)
+                {
+                    UnityEngine.Debug.Log($"Deferring {nameof(CreateObjectMessage)} to wait for Ghost.");
+                }
+                networkManager.DeferredMessageManager.DeferMessage(IDeferredNetworkMessageManager.TriggerType.OnGhostSpawned, ObjectInfo.NetworkObjectId, reader, ref context, k_Name);
                 return false;
             }
 #endif

com.unity.netcode.gameobjects/Runtime/Spawning/NetworkSpawnManager.cs

@@ -36,7 +36,10 @@ public class NetworkSpawnManager
 
         public void RegisterGhostPendingSpawn(NetworkObject networkObject, ulong networkObjectId)
         {
-            Debug.Log($"[{nameof(RegisterGhostPendingSpawn)}] Registering {networkObject.name} with a {nameof(NetworkObject.NetworkObjectId)} of {networkObjectId}.");
+            if (NetworkManager.LogLevel == LogLevel.Developer)
+            {
+                Debug.Log($"[{nameof(RegisterGhostPendingSpawn)}] Registering {networkObject.name} with a {nameof(NetworkObject.NetworkObjectId)} of {networkObjectId}.");
+            }
             GhostsPendingSpawn.TryAdd(networkObjectId, networkObject);
             NetworkManager.DeferredMessageManager.ProcessTriggers(IDeferredNetworkMessageManager.TriggerType.OnGhostSpawned, (ulong)networkObject.GhostInstance.ghostId);
         }
@@ -1138,7 +1141,6 @@ internal void AuthorityLocalSpawn([NotNull] NetworkObject networkObject, ulong n
             if (networkObject.HasGhost)
             {
                 networkObject.NetworkObjectBridge.NetworkObjectId.Value = networkObject.NetworkObjectId;
-                //networkObject.GhostAdapter.RegisterNetworkObjectId(networkObject.NetworkObjectId);
             }
 #endif