Merge develop

Author: TwoTenPvP

com.unity.multiplayer.mlapi/Editor/NetworkObjectEditor.cs

@@ -43,7 +43,7 @@ public override void OnInspectorGUI()
             {
                 EditorGUILayout.LabelField("PrefabHashGenerator: ", m_NetworkObject.PrefabHashGenerator, EditorStyles.label);
                 EditorGUILayout.LabelField("PrefabHash: ", m_NetworkObject.PrefabHash.ToString(), EditorStyles.label);
-                EditorGUILayout.LabelField("InstanceId: ", m_NetworkObject.NetworkInstanceId.ToString(), EditorStyles.label);
+                EditorGUILayout.LabelField("GlobalObjectIdHash64: ", m_NetworkObject.GlobalObjectIdHash64.ToString("X"), EditorStyles.label);
                 EditorGUILayout.LabelField("NetworkId: ", m_NetworkObject.NetworkObjectId.ToString(), EditorStyles.label);
                 EditorGUILayout.LabelField("OwnerId: ", m_NetworkObject.OwnerClientId.ToString(), EditorStyles.label);
                 EditorGUILayout.LabelField("IsSpawned: ", m_NetworkObject.IsSpawned.ToString(), EditorStyles.label);
@@ -83,7 +83,7 @@ public override void OnInspectorGUI()
             {
                 base.OnInspectorGUI();
                 EditorGUILayout.LabelField("PrefabHash: ", m_NetworkObject.PrefabHash.ToString(), EditorStyles.label);
-                EditorGUILayout.LabelField("InstanceId: ", m_NetworkObject.NetworkInstanceId.ToString(), EditorStyles.label);
+                EditorGUILayout.LabelField("GlobalObjectIdHash64: ", m_NetworkObject.GlobalObjectIdHash64.ToString("X"), EditorStyles.label);
             }
         }
     }

com.unity.multiplayer.mlapi/Editor/NetworkScenePostProcessor.cs

@@ -1525,7 +1525,7 @@ internal void HandleApproval(ulong ownerClientId, bool createPlayerObject, ulong
 
                                 if (observedObject.IsSceneObject == null || observedObject.IsSceneObject.Value)
                                 {
-                                    writer.WriteUInt64Packed(observedObject.NetworkInstanceId);
+                                    writer.WriteUInt64Packed(observedObject.GlobalObjectIdHash64);
                                 }
                                 else
                                 {

com.unity.multiplayer.mlapi/Editor/NetworkScenePostProcessor.cs.meta

@@ -20,11 +20,20 @@ namespace MLAPI
     [DisallowMultipleComponent]
     public sealed class NetworkObject : MonoBehaviour
     {
+        [HideInInspector]
+        [SerializeField]
+        internal ulong GlobalObjectIdHash64;
+
+#if UNITY_EDITOR
         private void OnValidate()
         {
+            var globalObjectIdString = UnityEditor.GlobalObjectId.GetGlobalObjectIdSlow(this).ToString();
+            GlobalObjectIdHash64 = XXHash.Hash64(globalObjectIdString);
+
             // Set this so the hash can be serialized on Scene objects. For prefabs, they are generated at runtime.
             ValidateHash();
         }
+#endif
 
         internal void ValidateHash()
         {
@@ -77,15 +86,6 @@ internal set
 
         internal ulong? OwnerClientIdInternal = null;
 
-        /// <summary>
-        /// InstanceId is the id that is unique to the object and scene for a scene object when UsePrefabSync is false.
-        /// If UsePrefabSync is true or if it's used on non scene objects, this has no effect.
-        /// Should not be set manually
-        /// </summary>
-        [HideInInspector]
-        [SerializeField]
-        internal ulong NetworkInstanceId;
-
         /// <summary>
         /// The Prefab unique hash. This should not be set my the user but rather changed by editing the PrefabHashGenerator.
         /// It has to be the same for all instances of a prefab

com.unity.multiplayer.mlapi/Runtime/Core/NetworkManager.cs

@@ -307,7 +307,7 @@ private static void OnSceneUnloadServer(Guid switchSceneGuid)
                                 }
                                 else
                                 {
-                                    writer.WriteUInt64Packed(newSceneObjects[i].NetworkInstanceId);
+                                    writer.WriteUInt64Packed(newSceneObjects[i].GlobalObjectIdHash64);
                                 }
 
                                 if (NetworkManager.Singleton.NetworkConfig.EnableNetworkVariable)

com.unity.multiplayer.mlapi/Runtime/Core/NetworkObject.cs

@@ -497,7 +497,7 @@ internal void WriteSpawnCallForObject(Serialization.NetworkBuffer buffer, ulong
 
                     if (networkObject.IsSceneObject == null || networkObject.IsSceneObject.Value)
                     {
-                        writer.WriteUInt64Packed(networkObject.NetworkInstanceId);
+                        writer.WriteUInt64Packed(networkObject.GlobalObjectIdHash64);
                     }
                     else
                     {
@@ -682,7 +682,7 @@ internal void ClientCollectSoftSyncSceneObjectSweep(NetworkObject[] networkObjec
             {
                 if (networkObjects[i].IsSceneObject == null)
                 {
-                    PendingSoftSyncObjects.Add(networkObjects[i].NetworkInstanceId, networkObjects[i]);
+                    PendingSoftSyncObjects.Add(networkObjects[i].GlobalObjectIdHash64, networkObjects[i]);
                 }
             }
         }