update

Part of the hybrid spawned parenting fixes.

Author: NoelStephensUnity

com.unity.netcode.gameobjects/Runtime/Components/Helpers/NetworkObjectBridge.cs

@@ -1,6 +1,9 @@
 #if UNIFIED_NETCODE
 using Unity.NetCode;
+#if UNITY_EDITOR
 using UnityEditor;
+#endif
+using UnityEngine;
 
 namespace Unity.Netcode
 {
@@ -13,12 +16,13 @@ namespace Unity.Netcode
     public partial class NetworkObjectBridge : GhostBehaviour
     {
 #if UNITY_EDITOR
-        [UnityEngine.HideInInspector]
-        [UnityEngine.SerializeField]
+        [HideInInspector]
+        [SerializeField]
         private bool m_Sorted = false;
         private void OnValidate()
         {
-            // Sort only once when we have first been added.
+            // TODO-UNIFIED: GhostAdapter must be above all GhostBehaviours in order to assure the GhostAdapter is initialized before any GhostBehaviour.
+            // This auto-sorting is required because the GhostBehaviours rely on the GhostAdapter.Awake being invoked before any GhostBehaviour.Awake.
             if (!m_Sorted && !EditorApplication.isPlaying)
             {
                 while (UnityEditorInternal.ComponentUtility.MoveComponentUp(this))
@@ -47,6 +51,22 @@ public void SetNetworkObjectId(ulong networkObjectId)
             NetworkObjectId.PresetValue(networkObjectId);
             NetworkObjectId.Value = networkObjectId;
         }
+
+        /// <summary>
+        /// Currently, NGO provides the parenting event handling via <see cref="ParentSyncMessage"/>.
+        /// Once <see cref="GhostField{InternalTypeT}"/> can provide a form of event notification that
+        /// the value has changed, we can then invert this flow such that the change in the parent value
+        /// drives the event.
+        /// </summary>
+        /// <param name="scale">We use NGO scale, delivered via ParentSyncMessage, that is applied to this
+        /// instance's entity's PostTransformMatrix.</param>
+        internal void HybridParentUpdate(Vector3 scale)
+        {
+            var current = Ghost.GetPositionAndRotation();
+            //Debug.Log($"---- Current LT: {current.Position} | {current.Rotation.eulerAngles}");
+            //Debug.Log($"---- New LT: {transform.localPosition} | {transform.localRotation}");
+            Ghost.ApplyPostTransformMatrixScale(scale);
+        }
     }
 }
 #endif

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

@@ -118,29 +118,42 @@ public void Handle(ref NetworkContext context)
                 // DANGO-TODO: Still determining if we should not apply this change (I am leaning towards not allowing it).
             }
 
+
             networkObject.SetNetworkParenting(LatestParent, WorldPositionStays);
             networkObject.ApplyNetworkParenting(RemoveParent);
 
-            // This check is primarily for client-server network topologies when the motion model is owner authoritative:
-            // When SyncOwnerTransformWhenParented is enabled, then always apply the transform values.
-            // When SyncOwnerTransformWhenParented is disabled, then only synchronize the transform on non-owner instances.
-            if (networkObject.SyncOwnerTransformWhenParented || (!networkObject.SyncOwnerTransformWhenParented && !networkObject.IsOwner))
+#if UNIFIED_NETCODE
+            if (networkObject.HasGhost)
             {
-                // We set all of the transform values after parenting as they are
-                // the values of the server-side post-parenting transform values
-                if (!WorldPositionStays)
-                {
-                    networkObject.transform.SetLocalPositionAndRotation(Position, Rotation);
-                }
-                else
+                // Handles the GhostAdapter side of things for parenting
+                networkObject.NetworkObjectBridge.HybridParentUpdate(Scale);
+            }
+            else
+#endif
+            {
+                // This check is primarily for client-server network topologies when the motion model is owner authoritative:
+                // When SyncOwnerTransformWhenParented is enabled, then always apply the transform values.
+                // When SyncOwnerTransformWhenParented is disabled, then only synchronize the transform on non-owner instances.
+                if (networkObject.SyncOwnerTransformWhenParented || (!networkObject.SyncOwnerTransformWhenParented && !networkObject.IsOwner))
                 {
-                    networkObject.transform.SetPositionAndRotation(Position, Rotation);
+
+                    // We set all of the transform values after parenting as they are
+                    // the values of the server-side post-parenting transform values
+                    if (!WorldPositionStays)
+                    {
+                        networkObject.transform.SetLocalPositionAndRotation(Position, Rotation);
+                    }
+                    else
+                    {
+                        networkObject.transform.SetPositionAndRotation(Position, Rotation);
+                    }
+                    networkObject.transform.localScale = Scale;
                 }
-                networkObject.transform.localScale = Scale;
             }
 
             // If in distributed authority mode and we are running a DAHost and this is the DAHost, then forward the parent changed message to any remaining clients
-            if ((networkManager.DistributedAuthorityMode && !networkManager.CMBServiceConnection && networkManager.DAHost) || (networkObject.AllowOwnerToParent && context.SenderId == networkObject.OwnerClientId && networkManager.IsServer))
+            if ((networkManager.DistributedAuthorityMode && !networkManager.CMBServiceConnection && networkManager.DAHost)
+                || (networkObject.AllowOwnerToParent && context.SenderId == networkObject.OwnerClientId && networkManager.IsServer))
             {
                 var size = 0;
                 var message = this;