From 4c6d6f3f90b7fa547c5c4dab4219899b42766845 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elfi=20K=C3=BChndorf?= Date: Tue, 12 Mar 2024 13:30:02 +0100 Subject: [PATCH 01/14] added object spawner game objects for startup instead of in-scene place objects there to copy behavior in Boss Room and to keep it consistent between different clients including late joiners --- .../Assets/Prefabs/ObjectSpawner.prefab | 47 ++ .../Assets/Prefabs/ObjectSpawner.prefab.meta | 7 + .../Assets/Scenes/Bootstrap.unity | 771 ++++++------------ .../Assets/Scripts/NetworkObjectSpawner.cs | 30 + .../Scripts/NetworkObjectSpawner.cs.meta | 11 + 5 files changed, 363 insertions(+), 503 deletions(-) create mode 100644 Basic/ClientDriven/Assets/Prefabs/ObjectSpawner.prefab create mode 100644 Basic/ClientDriven/Assets/Prefabs/ObjectSpawner.prefab.meta create mode 100644 Basic/ClientDriven/Assets/Scripts/NetworkObjectSpawner.cs create mode 100644 Basic/ClientDriven/Assets/Scripts/NetworkObjectSpawner.cs.meta diff --git a/Basic/ClientDriven/Assets/Prefabs/ObjectSpawner.prefab b/Basic/ClientDriven/Assets/Prefabs/ObjectSpawner.prefab new file mode 100644 index 000000000..e731c915a --- /dev/null +++ b/Basic/ClientDriven/Assets/Prefabs/ObjectSpawner.prefab @@ -0,0 +1,47 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &536145635693947214 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 207166779390499285} + - component: {fileID: 1695740223341187737} + m_Layer: 0 + m_Name: ObjectSpawner + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &207166779390499285 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 536145635693947214} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1695740223341187737 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 536145635693947214} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a358fd16b205c224fae652283f7cedae, type: 3} + m_Name: + m_EditorClassIdentifier: + prefabReference: {fileID: 5818429371130516787, guid: a6b33b41508134c09957e076f4d53415, type: 3} diff --git a/Basic/ClientDriven/Assets/Prefabs/ObjectSpawner.prefab.meta b/Basic/ClientDriven/Assets/Prefabs/ObjectSpawner.prefab.meta new file mode 100644 index 000000000..88d3d7db3 --- /dev/null +++ b/Basic/ClientDriven/Assets/Prefabs/ObjectSpawner.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 34c1add8edaf6e44787b5c1a6803a83e +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Basic/ClientDriven/Assets/Scenes/Bootstrap.unity b/Basic/ClientDriven/Assets/Scenes/Bootstrap.unity index 4a1d9259e..a89f567a8 100644 --- a/Basic/ClientDriven/Assets/Scenes/Bootstrap.unity +++ b/Basic/ClientDriven/Assets/Scenes/Bootstrap.unity @@ -123,7 +123,7 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1001 &181529897 +--- !u!1001 &232086523 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -131,75 +131,83 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: m_RootOrder - value: 8 - objectReference: {fileID: 0} - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} + - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: m_LocalPosition.x - value: 7.19 + value: 3.03 objectReference: {fileID: 0} - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} + - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: m_LocalPosition.y - value: 1.42 + value: 1.58 objectReference: {fileID: 0} - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} + - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: m_LocalPosition.z - value: 2.05 + value: 5.24 objectReference: {fileID: 0} - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} + - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} + - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} + - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} + - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} + - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} + - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} + - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5818429371130516787, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: GlobalObjectIdHash - value: 588047825 - objectReference: {fileID: 0} - - target: {fileID: 8268979759230423690, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: CurrentIngredientType - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8268979759230423690, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: CurrentIngredientType.m_InternalValue - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8268979759230423690, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: currentIngredientType.m_InternalValue - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8321201880322001125, guid: a6b33b41508134c09957e076f4d53415, type: 3} + - target: {fileID: 536145635693947214, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: m_Name - value: Ingredient (3) + value: ObjectSpawner (3) objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: a6b33b41508134c09957e076f4d53415, type: 3} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 536145635693947214, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} + insertIndex: 1 + addedObject: {fileID: 232086525} + m_SourcePrefab: {fileID: 100100000, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} +--- !u!1 &232086524 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 536145635693947214, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} + m_PrefabInstance: {fileID: 232086523} + m_PrefabAsset: {fileID: 0} +--- !u!114 &232086525 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 232086524} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3} + m_Name: + m_EditorClassIdentifier: + GlobalObjectIdHash: 2945538600 + AlwaysReplicateAsRoot: 0 + SynchronizeTransform: 1 + ActiveSceneSynchronization: 1 + SceneMigrationSynchronization: 0 + SpawnWithObservers: 1 + DontDestroyWithOwner: 0 + AutoObjectParentSync: 1 --- !u!1 &232705322 GameObject: m_ObjectHideFlags: 0 @@ -231,87 +239,6 @@ Transform: m_Children: [] m_Father: {fileID: 1980547847} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &320533761 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: m_RootOrder - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: m_LocalPosition.x - value: -6.93 - objectReference: {fileID: 0} - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: m_LocalPosition.y - value: 1.42 - objectReference: {fileID: 0} - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: m_LocalPosition.z - value: -14.16 - objectReference: {fileID: 0} - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4644362981357575575, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: d1a9058ddc5c2461298f65541af6fcd9, type: 2} - - target: {fileID: 5818429371130516787, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: GlobalObjectIdHash - value: 1277636585 - objectReference: {fileID: 0} - - target: {fileID: 6206319821543937579, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: d1a9058ddc5c2461298f65541af6fcd9, type: 2} - - target: {fileID: 6691487417621146171, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: d1a9058ddc5c2461298f65541af6fcd9, type: 2} - - target: {fileID: 8268979759230423690, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: currentIngredientType - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8321201880322001125, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: m_Name - value: Ingredient (2) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: a6b33b41508134c09957e076f4d53415, type: 3} --- !u!1 &406937058 GameObject: m_ObjectHideFlags: 0 @@ -532,38 +459,7 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f6d148d888ffbf54b9afe9936dfaec1f, type: 3} ---- !u!1 &796975752 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 796975753} - m_Layer: 0 - m_Name: IngredientSpawnPoint (3) - m_TagString: Untagged - m_Icon: {fileID: -5397416234189338067, guid: 0000000000000000d000000000000000, type: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &796975753 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 796975752} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -9.75, y: 0.75, z: 11.52} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2060465724} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &883084307 +--- !u!1001 &666714754 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -571,91 +467,139 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: m_RootOrder - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} + - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: m_LocalPosition.x - value: -10.82 + value: -5.93 objectReference: {fileID: 0} - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} + - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: m_LocalPosition.y - value: 1.42 + value: 1.58 objectReference: {fileID: 0} - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} + - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: m_LocalPosition.z - value: 13.44 + value: -3.02 objectReference: {fileID: 0} - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} + - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} + - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} + - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} + - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} + - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} + - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} + - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4644362981357575575, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: b423dced7a4ac4f40a119b84a23cfc9b, type: 2} - - target: {fileID: 5818429371130516787, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: GlobalObjectIdHash - value: 2015703404 - objectReference: {fileID: 0} - - target: {fileID: 6206319821543937579, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: b423dced7a4ac4f40a119b84a23cfc9b, type: 2} - - target: {fileID: 6691487417621146171, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: b423dced7a4ac4f40a119b84a23cfc9b, type: 2} - - target: {fileID: 8268979759230423690, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: CurrentIngredientType - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8268979759230423690, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: currentIngredientType - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8268979759230423690, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: CurrentIngredientType.m_InternalValue - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8268979759230423690, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: currentIngredientType.m_InternalValue - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8321201880322001125, guid: a6b33b41508134c09957e076f4d53415, type: 3} + - target: {fileID: 536145635693947214, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: m_Name - value: Ingredient (1) + value: ObjectSpawner (1) objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: a6b33b41508134c09957e076f4d53415, type: 3} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 536145635693947214, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} + insertIndex: 1 + addedObject: {fileID: 666714756} + m_SourcePrefab: {fileID: 100100000, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} +--- !u!1 &666714755 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 536145635693947214, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} + m_PrefabInstance: {fileID: 666714754} + m_PrefabAsset: {fileID: 0} +--- !u!114 &666714756 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 666714755} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3} + m_Name: + m_EditorClassIdentifier: + GlobalObjectIdHash: 2336653778 + AlwaysReplicateAsRoot: 0 + SynchronizeTransform: 1 + ActiveSceneSynchronization: 1 + SceneMigrationSynchronization: 0 + SpawnWithObservers: 1 + DontDestroyWithOwner: 0 + AutoObjectParentSync: 1 +--- !u!1 &765414554 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 536145635693947214, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} + m_PrefabInstance: {fileID: 2255677428018747830} + m_PrefabAsset: {fileID: 0} +--- !u!114 &765414557 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 765414554} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3} + m_Name: + m_EditorClassIdentifier: + GlobalObjectIdHash: 2969950326 + AlwaysReplicateAsRoot: 0 + SynchronizeTransform: 1 + ActiveSceneSynchronization: 1 + SceneMigrationSynchronization: 0 + SpawnWithObservers: 1 + DontDestroyWithOwner: 0 + AutoObjectParentSync: 1 +--- !u!1 &796975752 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 796975753} + m_Layer: 0 + m_Name: IngredientSpawnPoint (3) + m_TagString: Untagged + m_Icon: {fileID: -5397416234189338067, guid: 0000000000000000d000000000000000, type: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &796975753 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 796975752} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -9.75, y: 0.75, z: 11.52} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2060465724} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &966089317 GameObject: m_ObjectHideFlags: 0 @@ -1222,99 +1166,6 @@ Transform: m_Children: [] m_Father: {fileID: 2060465724} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &1719355277 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: m_RootOrder - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: m_LocalPosition.x - value: 0.61 - objectReference: {fileID: 0} - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: m_LocalPosition.y - value: 1.42 - objectReference: {fileID: 0} - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: m_LocalPosition.z - value: 10.04 - objectReference: {fileID: 0} - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4644362981357575575, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: b423dced7a4ac4f40a119b84a23cfc9b, type: 2} - - target: {fileID: 5818429371130516787, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: GlobalObjectIdHash - value: 1167607349 - objectReference: {fileID: 0} - - target: {fileID: 6206319821543937579, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: b423dced7a4ac4f40a119b84a23cfc9b, type: 2} - - target: {fileID: 6691487417621146171, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: b423dced7a4ac4f40a119b84a23cfc9b, type: 2} - - target: {fileID: 8268979759230423690, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: CurrentIngredientType - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8268979759230423690, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: currentIngredientType - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8268979759230423690, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: CurrentIngredientType.m_InternalValue - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8268979759230423690, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: currentIngredientType.m_InternalValue - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8321201880322001125, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: m_Name - value: Ingredient (4) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: a6b33b41508134c09957e076f4d53415, type: 3} --- !u!1 &1773263766 GameObject: m_ObjectHideFlags: 0 @@ -1394,152 +1245,6 @@ Transform: - {fileID: 474653828} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &1869134603 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: m_RootOrder - value: 11 - objectReference: {fileID: 0} - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: m_LocalPosition.x - value: 12.44 - objectReference: {fileID: 0} - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: m_LocalPosition.y - value: 1.42 - objectReference: {fileID: 0} - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: m_LocalPosition.z - value: -10.44 - objectReference: {fileID: 0} - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 43.354 - objectReference: {fileID: 0} - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -56.524 - objectReference: {fileID: 0} - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 66.302 - objectReference: {fileID: 0} - - target: {fileID: 5818429371130516787, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: GlobalObjectIdHash - value: 2317574502 - objectReference: {fileID: 0} - - target: {fileID: 6206319821543937579, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: d1a9058ddc5c2461298f65541af6fcd9, type: 2} - - target: {fileID: 6691487417621146171, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6691487417621146171, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: d1a9058ddc5c2461298f65541af6fcd9, type: 2} - - target: {fileID: 8268979759230423690, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: currentIngredientType - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8321201880322001125, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: m_Name - value: Ingredient (6) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: a6b33b41508134c09957e076f4d53415, type: 3} ---- !u!1001 &1895732253 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: m_RootOrder - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: m_LocalPosition.x - value: 14.26 - objectReference: {fileID: 0} - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: m_LocalPosition.y - value: 1.42 - objectReference: {fileID: 0} - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: m_LocalPosition.z - value: -7.03 - objectReference: {fileID: 0} - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4644362981357575575, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: d1a9058ddc5c2461298f65541af6fcd9, type: 2} - - target: {fileID: 5818429371130516787, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: GlobalObjectIdHash - value: 1282886573 - objectReference: {fileID: 0} - - target: {fileID: 6206319821543937579, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: d1a9058ddc5c2461298f65541af6fcd9, type: 2} - - target: {fileID: 6691487417621146171, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: d1a9058ddc5c2461298f65541af6fcd9, type: 2} - - target: {fileID: 8268979759230423690, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: currentIngredientType - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8321201880322001125, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: m_Name - value: Ingredient (5) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: a6b33b41508134c09957e076f4d53415, type: 3} --- !u!1 &1971400596 stripped GameObject: m_CorrespondingSourceObject: {fileID: 2182991878644361159, guid: d793abe7ff9aa094eb534e73a82fdab5, type: 3} @@ -1728,6 +1433,91 @@ Transform: m_CorrespondingSourceObject: {fileID: 3608989045728912046, guid: 2cb44b699415ff447a63b3c87e56fd16, type: 3} m_PrefabInstance: {fileID: 1997149792} m_PrefabAsset: {fileID: 0} +--- !u!1001 &2024285500 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} + propertyPath: m_LocalPosition.x + value: -5.93 + objectReference: {fileID: 0} + - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} + propertyPath: m_LocalPosition.y + value: 1.58 + objectReference: {fileID: 0} + - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} + propertyPath: m_LocalPosition.z + value: 5.24 + objectReference: {fileID: 0} + - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 536145635693947214, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} + propertyPath: m_Name + value: ObjectSpawner (2) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 536145635693947214, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} + insertIndex: 1 + addedObject: {fileID: 2024285502} + m_SourcePrefab: {fileID: 100100000, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} +--- !u!1 &2024285501 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 536145635693947214, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} + m_PrefabInstance: {fileID: 2024285500} + m_PrefabAsset: {fileID: 0} +--- !u!114 &2024285502 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2024285501} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3} + m_Name: + m_EditorClassIdentifier: + GlobalObjectIdHash: 3035510238 + AlwaysReplicateAsRoot: 0 + SynchronizeTransform: 1 + ActiveSceneSynchronization: 1 + SceneMigrationSynchronization: 0 + SpawnWithObservers: 1 + DontDestroyWithOwner: 0 + AutoObjectParentSync: 1 --- !u!1 &2051538844 GameObject: m_ObjectHideFlags: 0 @@ -2108,7 +1898,7 @@ PrefabInstance: insertIndex: -1 addedObject: {fileID: 1368949947} m_SourcePrefab: {fileID: 100100000, guid: d793abe7ff9aa094eb534e73a82fdab5, type: 3} ---- !u!1001 &5723720766742547469 +--- !u!1001 &2255677428018747830 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -2116,80 +1906,58 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: m_RootOrder - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} + - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: m_LocalPosition.x - value: -14.38 + value: 3.62 objectReference: {fileID: 0} - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} + - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: m_LocalPosition.y - value: 1.42 + value: 1.58 objectReference: {fileID: 0} - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} + - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: m_LocalPosition.z - value: 11.72 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} + - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} + - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} + - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} + - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} + - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} + - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} + - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5818429371130516787, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: GlobalObjectIdHash - value: 2123788497 - objectReference: {fileID: 0} - - target: {fileID: 8268979759230423690, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: CurrentIngredientType - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8268979759230423690, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: m_StartingIngredientType - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8268979759230423690, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: CurrentIngredientType.m_InternalValue - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8268979759230423690, guid: a6b33b41508134c09957e076f4d53415, type: 3} - propertyPath: currentIngredientType.m_InternalValue - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8321201880322001125, guid: a6b33b41508134c09957e076f4d53415, type: 3} + - target: {fileID: 536145635693947214, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: m_Name - value: Ingredient + value: ObjectSpawner objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 1702713463106468697, guid: a6b33b41508134c09957e076f4d53415, type: 3} + m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: a6b33b41508134c09957e076f4d53415, type: 3} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 536145635693947214, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} + insertIndex: 1 + addedObject: {fileID: 765414557} + m_SourcePrefab: {fileID: 100100000, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 @@ -2199,13 +1967,6 @@ SceneRoots: - {fileID: 2060465724} - {fileID: 1980547847} - {fileID: 1299635456} - - {fileID: 5723720766742547469} - - {fileID: 883084307} - - {fileID: 320533761} - - {fileID: 181529897} - - {fileID: 1719355277} - - {fileID: 1895732253} - - {fileID: 1869134603} - {fileID: 966089318} - {fileID: 330446109092541879} - {fileID: 2051538846} @@ -2213,3 +1974,7 @@ SceneRoots: - {fileID: 1826537008} - {fileID: 602928376} - {fileID: 1370077996} + - {fileID: 2255677428018747830} + - {fileID: 666714754} + - {fileID: 2024285500} + - {fileID: 232086523} diff --git a/Basic/ClientDriven/Assets/Scripts/NetworkObjectSpawner.cs b/Basic/ClientDriven/Assets/Scripts/NetworkObjectSpawner.cs new file mode 100644 index 000000000..db4a8ae34 --- /dev/null +++ b/Basic/ClientDriven/Assets/Scripts/NetworkObjectSpawner.cs @@ -0,0 +1,30 @@ +using System; +using Unity.Netcode; +using UnityEngine; +using UnityEngine.Networking; +using Random = System.Random; + +public class NetworkObjectSpawner : NetworkBehaviour +{ + public NetworkObject prefabReference; + Random m_RandomGenerator = new Random(); + + public override void OnNetworkSpawn() + { + base.OnNetworkSpawn(); + if (!IsServer) + { + enabled = false; + return; + } + + if (IsServer) + { + var instantiatedNetworkObject = Instantiate(prefabReference, transform.position, transform.rotation, null); + var ingredient = instantiatedNetworkObject.GetComponent(); + ingredient.NetworkObject.Spawn(); + ingredient.currentIngredientType.Value = (IngredientType)m_RandomGenerator.Next((int)IngredientType.MAX); + enabled = false; + } + } +} diff --git a/Basic/ClientDriven/Assets/Scripts/NetworkObjectSpawner.cs.meta b/Basic/ClientDriven/Assets/Scripts/NetworkObjectSpawner.cs.meta new file mode 100644 index 000000000..83de48352 --- /dev/null +++ b/Basic/ClientDriven/Assets/Scripts/NetworkObjectSpawner.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a358fd16b205c224fae652283f7cedae +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: From 1b9a27a706cee17651edd3d15d2fa7b0a7501e29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elfi=20K=C3=BChndorf?= Date: Thu, 14 Mar 2024 17:15:15 +0100 Subject: [PATCH 02/14] implemented spawning logic into a OnServerStarted event --- .../Assets/Scenes/Bootstrap.unity | 32 +++++++++++++------ .../Assets/Scripts/NetworkObjectSpawner.cs | 32 ++++++++----------- 2 files changed, 36 insertions(+), 28 deletions(-) diff --git a/Basic/ClientDriven/Assets/Scenes/Bootstrap.unity b/Basic/ClientDriven/Assets/Scenes/Bootstrap.unity index a89f567a8..53e88dcda 100644 --- a/Basic/ClientDriven/Assets/Scenes/Bootstrap.unity +++ b/Basic/ClientDriven/Assets/Scenes/Bootstrap.unity @@ -133,11 +133,11 @@ PrefabInstance: m_Modifications: - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: m_LocalPosition.x - value: 3.03 + value: 3 objectReference: {fileID: 0} - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: m_LocalPosition.y - value: 1.58 + value: 1.5 objectReference: {fileID: 0} - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: m_LocalPosition.z @@ -175,6 +175,10 @@ PrefabInstance: propertyPath: m_Name value: ObjectSpawner (3) objectReference: {fileID: 0} + - target: {fileID: 1695740223341187737, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} + propertyPath: prefabReference + value: + objectReference: {fileID: 5818429371130516787, guid: a6b33b41508134c09957e076f4d53415, type: 3} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -469,15 +473,15 @@ PrefabInstance: m_Modifications: - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: m_LocalPosition.x - value: -5.93 + value: -6 objectReference: {fileID: 0} - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: m_LocalPosition.y - value: 1.58 + value: 1.5 objectReference: {fileID: 0} - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: m_LocalPosition.z - value: -3.02 + value: -1 objectReference: {fileID: 0} - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: m_LocalRotation.w @@ -511,6 +515,10 @@ PrefabInstance: propertyPath: m_Name value: ObjectSpawner (1) objectReference: {fileID: 0} + - target: {fileID: 1695740223341187737, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} + propertyPath: prefabReference + value: + objectReference: {fileID: 5818429371130516787, guid: a6b33b41508134c09957e076f4d53415, type: 3} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -1443,11 +1451,11 @@ PrefabInstance: m_Modifications: - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: m_LocalPosition.x - value: -5.93 + value: -6 objectReference: {fileID: 0} - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: m_LocalPosition.y - value: 1.58 + value: 1.5 objectReference: {fileID: 0} - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: m_LocalPosition.z @@ -1485,6 +1493,10 @@ PrefabInstance: propertyPath: m_Name value: ObjectSpawner (2) objectReference: {fileID: 0} + - target: {fileID: 1695740223341187737, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} + propertyPath: prefabReference + value: + objectReference: {fileID: 5818429371130516787, guid: a6b33b41508134c09957e076f4d53415, type: 3} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -1908,15 +1920,15 @@ PrefabInstance: m_Modifications: - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: m_LocalPosition.x - value: 3.62 + value: 3 objectReference: {fileID: 0} - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: m_LocalPosition.y - value: 1.58 + value: 1.5 objectReference: {fileID: 0} - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: -1 objectReference: {fileID: 0} - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: m_LocalRotation.w diff --git a/Basic/ClientDriven/Assets/Scripts/NetworkObjectSpawner.cs b/Basic/ClientDriven/Assets/Scripts/NetworkObjectSpawner.cs index db4a8ae34..6b8005e99 100644 --- a/Basic/ClientDriven/Assets/Scripts/NetworkObjectSpawner.cs +++ b/Basic/ClientDriven/Assets/Scripts/NetworkObjectSpawner.cs @@ -6,25 +6,21 @@ public class NetworkObjectSpawner : NetworkBehaviour { - public NetworkObject prefabReference; - Random m_RandomGenerator = new Random(); + [SerializeField] NetworkObject prefabReference; - public override void OnNetworkSpawn() + public void Start() { - base.OnNetworkSpawn(); - if (!IsServer) - { - enabled = false; - return; - } + NetworkManager.Singleton.OnServerStarted += OnServerStartedIngredientSpawn; + enabled = false; + } - if (IsServer) - { - var instantiatedNetworkObject = Instantiate(prefabReference, transform.position, transform.rotation, null); - var ingredient = instantiatedNetworkObject.GetComponent(); - ingredient.NetworkObject.Spawn(); - ingredient.currentIngredientType.Value = (IngredientType)m_RandomGenerator.Next((int)IngredientType.MAX); - enabled = false; - } + void OnServerStartedIngredientSpawn() + { + Random randomGenerator = new Random(); + var instantiatedNetworkObject = Instantiate(prefabReference, transform.position, transform.rotation, null); + var ingredient = instantiatedNetworkObject.GetComponent(); + ingredient.NetworkObject.Spawn(); + ingredient.currentIngredientType.Value = (IngredientType)randomGenerator.Next((int)IngredientType.MAX); + enabled = false; } -} +} \ No newline at end of file From b843cfd6befdf007b1846ccfde65e6aa0c8da0c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elfi=20K=C3=BChndorf?= Date: Thu, 14 Mar 2024 17:29:18 +0100 Subject: [PATCH 03/14] removed unneccesary lines --- Basic/ClientDriven/Assets/Scripts/NetworkObjectSpawner.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/Basic/ClientDriven/Assets/Scripts/NetworkObjectSpawner.cs b/Basic/ClientDriven/Assets/Scripts/NetworkObjectSpawner.cs index 6b8005e99..f638f519c 100644 --- a/Basic/ClientDriven/Assets/Scripts/NetworkObjectSpawner.cs +++ b/Basic/ClientDriven/Assets/Scripts/NetworkObjectSpawner.cs @@ -11,7 +11,6 @@ public class NetworkObjectSpawner : NetworkBehaviour public void Start() { NetworkManager.Singleton.OnServerStarted += OnServerStartedIngredientSpawn; - enabled = false; } void OnServerStartedIngredientSpawn() @@ -21,6 +20,5 @@ void OnServerStartedIngredientSpawn() var ingredient = instantiatedNetworkObject.GetComponent(); ingredient.NetworkObject.Spawn(); ingredient.currentIngredientType.Value = (IngredientType)randomGenerator.Next((int)IngredientType.MAX); - enabled = false; } } \ No newline at end of file From 7cfcacd1d05c66b522a20391a5c5be5a8fe3bde9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elfi=20K=C3=BChndorf?= Date: Fri, 15 Mar 2024 11:49:48 +0100 Subject: [PATCH 04/14] addressed feedback including namepace, OnDestroy method and null check --- .../Assets/Scripts/NetworkObjectSpawner.cs | 40 +++++++++++++------ 1 file changed, 27 insertions(+), 13 deletions(-) diff --git a/Basic/ClientDriven/Assets/Scripts/NetworkObjectSpawner.cs b/Basic/ClientDriven/Assets/Scripts/NetworkObjectSpawner.cs index f638f519c..20ccb17ee 100644 --- a/Basic/ClientDriven/Assets/Scripts/NetworkObjectSpawner.cs +++ b/Basic/ClientDriven/Assets/Scripts/NetworkObjectSpawner.cs @@ -4,21 +4,35 @@ using UnityEngine.Networking; using Random = System.Random; -public class NetworkObjectSpawner : NetworkBehaviour +namespace Unity.Multiplayer.Samples.ClientDriven { - [SerializeField] NetworkObject prefabReference; - - public void Start() + public class NetworkObjectSpawner : MonoBehaviour { - NetworkManager.Singleton.OnServerStarted += OnServerStartedIngredientSpawn; - } + [SerializeField] NetworkObject prefabReference; - void OnServerStartedIngredientSpawn() - { - Random randomGenerator = new Random(); - var instantiatedNetworkObject = Instantiate(prefabReference, transform.position, transform.rotation, null); - var ingredient = instantiatedNetworkObject.GetComponent(); - ingredient.NetworkObject.Spawn(); - ingredient.currentIngredientType.Value = (IngredientType)randomGenerator.Next((int)IngredientType.MAX); + public void Start() + { + if (NetworkManager.Singleton != null) + { + NetworkManager.Singleton.OnServerStarted += OnServerStartedIngredientSpawn; + } + } + + void OnDestroy() + { + if (NetworkManager.Singleton != null) + { + NetworkManager.Singleton.OnServerStarted -= OnServerStartedIngredientSpawn; + } + } + + void OnServerStartedIngredientSpawn() + { + Random randomGenerator = new Random(); + var instantiatedNetworkObject = Instantiate(prefabReference, transform.position, transform.rotation, null); + var ingredient = instantiatedNetworkObject.GetComponent(); + ingredient.NetworkObject.Spawn(); + ingredient.currentIngredientType.Value = (IngredientType)randomGenerator.Next((int)IngredientType.MAX); + } } } \ No newline at end of file From 5f62e02ae6505920eaeeab31828aa664bffda459 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elfi=20K=C3=BChndorf?= Date: Fri, 15 Mar 2024 14:44:37 +0100 Subject: [PATCH 05/14] removed public from start and removed vars --- Basic/ClientDriven/Assets/Scripts/NetworkObjectSpawner.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Basic/ClientDriven/Assets/Scripts/NetworkObjectSpawner.cs b/Basic/ClientDriven/Assets/Scripts/NetworkObjectSpawner.cs index 20ccb17ee..df77e9b1b 100644 --- a/Basic/ClientDriven/Assets/Scripts/NetworkObjectSpawner.cs +++ b/Basic/ClientDriven/Assets/Scripts/NetworkObjectSpawner.cs @@ -10,7 +10,7 @@ public class NetworkObjectSpawner : MonoBehaviour { [SerializeField] NetworkObject prefabReference; - public void Start() + void Start() { if (NetworkManager.Singleton != null) { @@ -28,9 +28,9 @@ void OnDestroy() void OnServerStartedIngredientSpawn() { - Random randomGenerator = new Random(); - var instantiatedNetworkObject = Instantiate(prefabReference, transform.position, transform.rotation, null); - var ingredient = instantiatedNetworkObject.GetComponent(); + Random randomGenerator = new Random(); + NetworkObject instantiatedNetworkObject = Instantiate(prefabReference, transform.position, transform.rotation, null); + ServerIngredient ingredient = instantiatedNetworkObject.GetComponent(); ingredient.NetworkObject.Spawn(); ingredient.currentIngredientType.Value = (IngredientType)randomGenerator.Next((int)IngredientType.MAX); } From 07944124d3f86eca3a5858e6e4f73f7b657f06ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elfi=20K=C3=BChndorf?= Date: Fri, 15 Mar 2024 17:22:59 +0100 Subject: [PATCH 06/14] added prefab variants and added summary as well as debug assert function to NetworkObjectSpawner --- .../ClientDriven/Assets/NetworkPrefabs.asset | 15 +++++ .../Assets/Prefabs/Ingredient.prefab | 42 ++++++------- .../Assets/Prefabs/Ingredient_Blue.prefab | 59 +++++++++++++++++++ .../Prefabs/Ingredient_Blue.prefab.meta | 7 +++ .../Assets/Prefabs/Ingredient_Purple.prefab | 59 +++++++++++++++++++ .../Prefabs/Ingredient_Purple.prefab.meta | 7 +++ .../Assets/Prefabs/Ingredient_Red.prefab | 59 +++++++++++++++++++ .../Assets/Prefabs/Ingredient_Red.prefab.meta | 7 +++ .../Assets/Scenes/Bootstrap.unity | 26 +++++++- .../Assets/Scripts/NetworkObjectSpawner.cs | 28 ++++++--- 10 files changed, 278 insertions(+), 31 deletions(-) create mode 100644 Basic/ClientDriven/Assets/Prefabs/Ingredient_Blue.prefab create mode 100644 Basic/ClientDriven/Assets/Prefabs/Ingredient_Blue.prefab.meta create mode 100644 Basic/ClientDriven/Assets/Prefabs/Ingredient_Purple.prefab create mode 100644 Basic/ClientDriven/Assets/Prefabs/Ingredient_Purple.prefab.meta create mode 100644 Basic/ClientDriven/Assets/Prefabs/Ingredient_Red.prefab create mode 100644 Basic/ClientDriven/Assets/Prefabs/Ingredient_Red.prefab.meta diff --git a/Basic/ClientDriven/Assets/NetworkPrefabs.asset b/Basic/ClientDriven/Assets/NetworkPrefabs.asset index e1d68b4d8..c2cda3555 100644 --- a/Basic/ClientDriven/Assets/NetworkPrefabs.asset +++ b/Basic/ClientDriven/Assets/NetworkPrefabs.asset @@ -19,3 +19,18 @@ MonoBehaviour: SourcePrefabToOverride: {fileID: 3439633038736912633, guid: 2a2c42bf260b04db580cf31345132259, type: 3} SourceHashToOverride: 0 OverridingTargetPrefab: {fileID: 2233080138743716588, guid: 6db9810ba5bf046f7af9c7017b746129, type: 3} + - Override: 0 + Prefab: {fileID: 4013193825546441291, guid: 93ffadfcde7ae054397f3f63b51d2188, type: 3} + SourcePrefabToOverride: {fileID: 3439633038736912633, guid: 2a2c42bf260b04db580cf31345132259, type: 3} + SourceHashToOverride: 0 + OverridingTargetPrefab: {fileID: 2233080138743716588, guid: 6db9810ba5bf046f7af9c7017b746129, type: 3} + - Override: 0 + Prefab: {fileID: 4013193825546441291, guid: 404a6c73dd6ffb14490f25c33e93ffff, type: 3} + SourcePrefabToOverride: {fileID: 3439633038736912633, guid: 2a2c42bf260b04db580cf31345132259, type: 3} + SourceHashToOverride: 0 + OverridingTargetPrefab: {fileID: 2233080138743716588, guid: 6db9810ba5bf046f7af9c7017b746129, type: 3} + - Override: 0 + Prefab: {fileID: 4013193825546441291, guid: d0360ef45c142b744b880b5819cf7f00, type: 3} + SourcePrefabToOverride: {fileID: 3439633038736912633, guid: 2a2c42bf260b04db580cf31345132259, type: 3} + SourceHashToOverride: 0 + OverridingTargetPrefab: {fileID: 2233080138743716588, guid: 6db9810ba5bf046f7af9c7017b746129, type: 3} diff --git a/Basic/ClientDriven/Assets/Prefabs/Ingredient.prefab b/Basic/ClientDriven/Assets/Prefabs/Ingredient.prefab index d36c425b2..a48b3cb42 100644 --- a/Basic/ClientDriven/Assets/Prefabs/Ingredient.prefab +++ b/Basic/ClientDriven/Assets/Prefabs/Ingredient.prefab @@ -11,9 +11,9 @@ GameObject: - component: {fileID: 4621998539424734916} - component: {fileID: 4840591773774142929} - component: {fileID: 7759258758774188825} + - component: {fileID: 5818429371130516787} - component: {fileID: 8268979759230423690} - component: {fileID: 2014424453305718345} - - component: {fileID: 5818429371130516787} - component: {fileID: 5607146804455042385} - component: {fileID: 2549828380439460752} - component: {fileID: -5120166168328346616} @@ -92,6 +92,26 @@ Rigidbody: m_Interpolate: 1 m_Constraints: 0 m_CollisionDetection: 3 +--- !u!114 &5818429371130516787 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8321201880322001125} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3} + m_Name: + m_EditorClassIdentifier: + GlobalObjectIdHash: 3406890450 + AlwaysReplicateAsRoot: 0 + SynchronizeTransform: 1 + ActiveSceneSynchronization: 0 + SceneMigrationSynchronization: 1 + SpawnWithObservers: 1 + DontDestroyWithOwner: 0 + AutoObjectParentSync: 1 --- !u!114 &8268979759230423690 MonoBehaviour: m_ObjectHideFlags: 0 @@ -136,26 +156,6 @@ MonoBehaviour: InLocalSpace: 0 Interpolate: 1 SlerpPosition: 0 ---- !u!114 &5818429371130516787 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8321201880322001125} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3} - m_Name: - m_EditorClassIdentifier: - GlobalObjectIdHash: 951099334 - AlwaysReplicateAsRoot: 0 - SynchronizeTransform: 1 - ActiveSceneSynchronization: 0 - SceneMigrationSynchronization: 1 - SpawnWithObservers: 1 - DontDestroyWithOwner: 0 - AutoObjectParentSync: 1 --- !u!114 &5607146804455042385 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Basic/ClientDriven/Assets/Prefabs/Ingredient_Blue.prefab b/Basic/ClientDriven/Assets/Prefabs/Ingredient_Blue.prefab new file mode 100644 index 000000000..52a561f77 --- /dev/null +++ b/Basic/ClientDriven/Assets/Prefabs/Ingredient_Blue.prefab @@ -0,0 +1,59 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &4957165217442912942 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8321201880322001125, guid: a6b33b41508134c09957e076f4d53415, type: 3} + propertyPath: m_Name + value: Ingredient + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a6b33b41508134c09957e076f4d53415, type: 3} diff --git a/Basic/ClientDriven/Assets/Prefabs/Ingredient_Blue.prefab.meta b/Basic/ClientDriven/Assets/Prefabs/Ingredient_Blue.prefab.meta new file mode 100644 index 000000000..f4101765d --- /dev/null +++ b/Basic/ClientDriven/Assets/Prefabs/Ingredient_Blue.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 93ffadfcde7ae054397f3f63b51d2188 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Basic/ClientDriven/Assets/Prefabs/Ingredient_Purple.prefab b/Basic/ClientDriven/Assets/Prefabs/Ingredient_Purple.prefab new file mode 100644 index 000000000..52a561f77 --- /dev/null +++ b/Basic/ClientDriven/Assets/Prefabs/Ingredient_Purple.prefab @@ -0,0 +1,59 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &4957165217442912942 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8321201880322001125, guid: a6b33b41508134c09957e076f4d53415, type: 3} + propertyPath: m_Name + value: Ingredient + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a6b33b41508134c09957e076f4d53415, type: 3} diff --git a/Basic/ClientDriven/Assets/Prefabs/Ingredient_Purple.prefab.meta b/Basic/ClientDriven/Assets/Prefabs/Ingredient_Purple.prefab.meta new file mode 100644 index 000000000..94f14fe08 --- /dev/null +++ b/Basic/ClientDriven/Assets/Prefabs/Ingredient_Purple.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 404a6c73dd6ffb14490f25c33e93ffff +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Basic/ClientDriven/Assets/Prefabs/Ingredient_Red.prefab b/Basic/ClientDriven/Assets/Prefabs/Ingredient_Red.prefab new file mode 100644 index 000000000..52a561f77 --- /dev/null +++ b/Basic/ClientDriven/Assets/Prefabs/Ingredient_Red.prefab @@ -0,0 +1,59 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &4957165217442912942 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8321201880322001125, guid: a6b33b41508134c09957e076f4d53415, type: 3} + propertyPath: m_Name + value: Ingredient + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a6b33b41508134c09957e076f4d53415, type: 3} diff --git a/Basic/ClientDriven/Assets/Prefabs/Ingredient_Red.prefab.meta b/Basic/ClientDriven/Assets/Prefabs/Ingredient_Red.prefab.meta new file mode 100644 index 000000000..22d14d9f0 --- /dev/null +++ b/Basic/ClientDriven/Assets/Prefabs/Ingredient_Red.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d0360ef45c142b744b880b5819cf7f00 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Basic/ClientDriven/Assets/Scenes/Bootstrap.unity b/Basic/ClientDriven/Assets/Scenes/Bootstrap.unity index 53e88dcda..ae3467651 100644 --- a/Basic/ClientDriven/Assets/Scenes/Bootstrap.unity +++ b/Basic/ClientDriven/Assets/Scenes/Bootstrap.unity @@ -178,7 +178,11 @@ PrefabInstance: - target: {fileID: 1695740223341187737, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: prefabReference value: - objectReference: {fileID: 5818429371130516787, guid: a6b33b41508134c09957e076f4d53415, type: 3} + objectReference: {fileID: 1473896641872547741, guid: 404a6c73dd6ffb14490f25c33e93ffff, type: 3} + - target: {fileID: 1695740223341187737, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} + propertyPath: m_NetworkManager + value: + objectReference: {fileID: 1114774667} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -518,7 +522,11 @@ PrefabInstance: - target: {fileID: 1695740223341187737, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: prefabReference value: - objectReference: {fileID: 5818429371130516787, guid: a6b33b41508134c09957e076f4d53415, type: 3} + objectReference: {fileID: 1473896641872547741, guid: 404a6c73dd6ffb14490f25c33e93ffff, type: 3} + - target: {fileID: 1695740223341187737, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} + propertyPath: m_NetworkManager + value: + objectReference: {fileID: 1114774667} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -1496,7 +1504,11 @@ PrefabInstance: - target: {fileID: 1695740223341187737, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: prefabReference value: - objectReference: {fileID: 5818429371130516787, guid: a6b33b41508134c09957e076f4d53415, type: 3} + objectReference: {fileID: 1473896641872547741, guid: d0360ef45c142b744b880b5819cf7f00, type: 3} + - target: {fileID: 1695740223341187737, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} + propertyPath: m_NetworkManager + value: + objectReference: {fileID: 1114774667} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -1962,6 +1974,14 @@ PrefabInstance: propertyPath: m_Name value: ObjectSpawner objectReference: {fileID: 0} + - target: {fileID: 1695740223341187737, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} + propertyPath: prefabReference + value: + objectReference: {fileID: 1473896641872547741, guid: 93ffadfcde7ae054397f3f63b51d2188, type: 3} + - target: {fileID: 1695740223341187737, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} + propertyPath: m_NetworkManager + value: + objectReference: {fileID: 1114774667} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Basic/ClientDriven/Assets/Scripts/NetworkObjectSpawner.cs b/Basic/ClientDriven/Assets/Scripts/NetworkObjectSpawner.cs index df77e9b1b..cb61ebfe2 100644 --- a/Basic/ClientDriven/Assets/Scripts/NetworkObjectSpawner.cs +++ b/Basic/ClientDriven/Assets/Scripts/NetworkObjectSpawner.cs @@ -6,33 +6,47 @@ namespace Unity.Multiplayer.Samples.ClientDriven { + /// + /// Spawn a NetworkObject at this transform's position when NetworkManer's server is started. + /// + /// + /// A NetworkManager is expected to be part of the scene that this NetworkObject is a part of. + /// public class NetworkObjectSpawner : MonoBehaviour { - [SerializeField] NetworkObject prefabReference; + [SerializeField] + private NetworkObject prefabReference; + [SerializeField] + private NetworkManager m_NetworkManager; void Start() { - if (NetworkManager.Singleton != null) + Debug.Assert(m_NetworkManager != null, "The NetworkManager needs to be referenced!"); + if (m_NetworkManager == null) { - NetworkManager.Singleton.OnServerStarted += OnServerStartedIngredientSpawn; + return; } + + m_NetworkManager.OnServerStarted += OnServerStartedIngredientSpawn; } void OnDestroy() { - if (NetworkManager.Singleton != null) + Debug.Assert(m_NetworkManager != null, "The NetworkManager needs to be referenced!"); + if (m_NetworkManager == null) { - NetworkManager.Singleton.OnServerStarted -= OnServerStartedIngredientSpawn; + return; } + + m_NetworkManager.OnServerStarted -= OnServerStartedIngredientSpawn; } void OnServerStartedIngredientSpawn() { - Random randomGenerator = new Random(); + Random randomGenerator = new Random(); NetworkObject instantiatedNetworkObject = Instantiate(prefabReference, transform.position, transform.rotation, null); ServerIngredient ingredient = instantiatedNetworkObject.GetComponent(); ingredient.NetworkObject.Spawn(); - ingredient.currentIngredientType.Value = (IngredientType)randomGenerator.Next((int)IngredientType.MAX); } } } \ No newline at end of file From 9f308cff370ea51f87dd2b3596767588e2a6f133 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elfi=20K=C3=BChndorf?= Date: Fri, 15 Mar 2024 17:29:21 +0100 Subject: [PATCH 07/14] update for CHANGELOG --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 80f982532..1880e1a94 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [Unreleased] + +### Client Driven + +#### Fixed +- Added Spawner with event executed on Server Start to fix incosistent ghost ingredients issue (#157) + ## [1.5.0] 2023-12-15 ### Bitesize Samples Repository From b213bff90dce961ceea643e1f0b8d012479ffd7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elfi=20K=C3=BChndorf?= Date: Tue, 26 Mar 2024 14:24:36 +0100 Subject: [PATCH 08/14] included coroutine and small prefab fix --- .../Assets/Prefabs/Ingredient_Purple.prefab | 10 +++++- .../Assets/Scripts/NetworkObjectSpawner.cs | 34 +++++++++++-------- 2 files changed, 28 insertions(+), 16 deletions(-) diff --git a/Basic/ClientDriven/Assets/Prefabs/Ingredient_Purple.prefab b/Basic/ClientDriven/Assets/Prefabs/Ingredient_Purple.prefab index 52a561f77..71f2f9ae3 100644 --- a/Basic/ClientDriven/Assets/Prefabs/Ingredient_Purple.prefab +++ b/Basic/ClientDriven/Assets/Prefabs/Ingredient_Purple.prefab @@ -48,9 +48,17 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5818429371130516787, guid: a6b33b41508134c09957e076f4d53415, type: 3} + propertyPath: GlobalObjectIdHash + value: 4112275378 + objectReference: {fileID: 0} + - target: {fileID: 8268979759230423690, guid: a6b33b41508134c09957e076f4d53415, type: 3} + propertyPath: currentIngredientType.m_InternalValue + value: 2 + objectReference: {fileID: 0} - target: {fileID: 8321201880322001125, guid: a6b33b41508134c09957e076f4d53415, type: 3} propertyPath: m_Name - value: Ingredient + value: Ingredient_Purple objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] diff --git a/Basic/ClientDriven/Assets/Scripts/NetworkObjectSpawner.cs b/Basic/ClientDriven/Assets/Scripts/NetworkObjectSpawner.cs index cb61ebfe2..3d1e330a1 100644 --- a/Basic/ClientDriven/Assets/Scripts/NetworkObjectSpawner.cs +++ b/Basic/ClientDriven/Assets/Scripts/NetworkObjectSpawner.cs @@ -3,6 +3,7 @@ using UnityEngine; using UnityEngine.Networking; using Random = System.Random; +using System.Collections; namespace Unity.Multiplayer.Samples.ClientDriven { @@ -12,41 +13,44 @@ namespace Unity.Multiplayer.Samples.ClientDriven /// /// A NetworkManager is expected to be part of the scene that this NetworkObject is a part of. /// - public class NetworkObjectSpawner : MonoBehaviour + internal class NetworkObjectSpawner : MonoBehaviour { [SerializeField] - private NetworkObject prefabReference; - [SerializeField] - private NetworkManager m_NetworkManager; + NetworkObject prefabReference; void Start() { - Debug.Assert(m_NetworkManager != null, "The NetworkManager needs to be referenced!"); - if (m_NetworkManager == null) + if (NetworkManager.Singleton == null && NetworkManager.Singleton.IsServer) { - return; + StartCoroutine(NetworkManagerCoroutine()); } - m_NetworkManager.OnServerStarted += OnServerStartedIngredientSpawn; + if (NetworkManager.Singleton != null) + { + NetworkManager.Singleton.OnServerStarted += OnServerStartedIngredientSpawn; + } + } + + IEnumerator NetworkManagerCoroutine() + { + Debug.Log("NetworkManager not here..."); + yield return new WaitUntil(() => NetworkManager.Singleton != null); + Debug.Log("NetworkManager is here!"); } void OnDestroy() { - Debug.Assert(m_NetworkManager != null, "The NetworkManager needs to be referenced!"); - if (m_NetworkManager == null) + if (NetworkManager.Singleton != null) { - return; + NetworkManager.Singleton.OnServerStarted -= OnServerStartedIngredientSpawn; } - - m_NetworkManager.OnServerStarted -= OnServerStartedIngredientSpawn; } void OnServerStartedIngredientSpawn() { - Random randomGenerator = new Random(); NetworkObject instantiatedNetworkObject = Instantiate(prefabReference, transform.position, transform.rotation, null); ServerIngredient ingredient = instantiatedNetworkObject.GetComponent(); ingredient.NetworkObject.Spawn(); } } -} \ No newline at end of file +} From c50774b43919786fbe034cba6b5357c10ec3404d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elfi=20K=C3=BChndorf?= Date: Tue, 9 Apr 2024 13:39:29 +0200 Subject: [PATCH 09/14] went back to old solution and recreated blue ingredient prefab to fix issue old blue ingredient prefab for some reason did not save blue color setting even though adjusting and saving it on prefab directly (possibly bug?) --- .../ClientDriven/Assets/NetworkPrefabs.asset | 2 +- .../Assets/Prefabs/Ingredient_Blue.prefab | 2 +- .../Assets/Scenes/Bootstrap.unity | 2 +- .../Assets/Scripts/NetworkObjectSpawner.cs | 28 ++++++------------- 4 files changed, 12 insertions(+), 22 deletions(-) diff --git a/Basic/ClientDriven/Assets/NetworkPrefabs.asset b/Basic/ClientDriven/Assets/NetworkPrefabs.asset index c2cda3555..77b29c821 100644 --- a/Basic/ClientDriven/Assets/NetworkPrefabs.asset +++ b/Basic/ClientDriven/Assets/NetworkPrefabs.asset @@ -20,7 +20,7 @@ MonoBehaviour: SourceHashToOverride: 0 OverridingTargetPrefab: {fileID: 2233080138743716588, guid: 6db9810ba5bf046f7af9c7017b746129, type: 3} - Override: 0 - Prefab: {fileID: 4013193825546441291, guid: 93ffadfcde7ae054397f3f63b51d2188, type: 3} + Prefab: {fileID: 34856496335307672, guid: 93ffadfcde7ae054397f3f63b51d2188, type: 3} SourcePrefabToOverride: {fileID: 3439633038736912633, guid: 2a2c42bf260b04db580cf31345132259, type: 3} SourceHashToOverride: 0 OverridingTargetPrefab: {fileID: 2233080138743716588, guid: 6db9810ba5bf046f7af9c7017b746129, type: 3} diff --git a/Basic/ClientDriven/Assets/Prefabs/Ingredient_Blue.prefab b/Basic/ClientDriven/Assets/Prefabs/Ingredient_Blue.prefab index 52a561f77..cab7911c0 100644 --- a/Basic/ClientDriven/Assets/Prefabs/Ingredient_Blue.prefab +++ b/Basic/ClientDriven/Assets/Prefabs/Ingredient_Blue.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1001 &4957165217442912942 +--- !u!1001 &8286918849967262589 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 diff --git a/Basic/ClientDriven/Assets/Scenes/Bootstrap.unity b/Basic/ClientDriven/Assets/Scenes/Bootstrap.unity index ae3467651..2fff334fd 100644 --- a/Basic/ClientDriven/Assets/Scenes/Bootstrap.unity +++ b/Basic/ClientDriven/Assets/Scenes/Bootstrap.unity @@ -1977,7 +1977,7 @@ PrefabInstance: - target: {fileID: 1695740223341187737, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: prefabReference value: - objectReference: {fileID: 1473896641872547741, guid: 93ffadfcde7ae054397f3f63b51d2188, type: 3} + objectReference: {fileID: 2575560247572078158, guid: 93ffadfcde7ae054397f3f63b51d2188, type: 3} - target: {fileID: 1695740223341187737, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: m_NetworkManager value: diff --git a/Basic/ClientDriven/Assets/Scripts/NetworkObjectSpawner.cs b/Basic/ClientDriven/Assets/Scripts/NetworkObjectSpawner.cs index 3d1e330a1..f1d09f137 100644 --- a/Basic/ClientDriven/Assets/Scripts/NetworkObjectSpawner.cs +++ b/Basic/ClientDriven/Assets/Scripts/NetworkObjectSpawner.cs @@ -3,7 +3,6 @@ using UnityEngine; using UnityEngine.Networking; using Random = System.Random; -using System.Collections; namespace Unity.Multiplayer.Samples.ClientDriven { @@ -16,38 +15,29 @@ namespace Unity.Multiplayer.Samples.ClientDriven internal class NetworkObjectSpawner : MonoBehaviour { [SerializeField] - NetworkObject prefabReference; + private NetworkObject prefabReference; + [SerializeField] + private NetworkManager m_NetworkManager; void Start() { - if (NetworkManager.Singleton == null && NetworkManager.Singleton.IsServer) - { - StartCoroutine(NetworkManagerCoroutine()); - } - - if (NetworkManager.Singleton != null) + Debug.Assert(m_NetworkManager != null, "The NetworkManager needs to be referenced!"); + if (m_NetworkManager == null) { - NetworkManager.Singleton.OnServerStarted += OnServerStartedIngredientSpawn; + return; } - } - IEnumerator NetworkManagerCoroutine() - { - Debug.Log("NetworkManager not here..."); - yield return new WaitUntil(() => NetworkManager.Singleton != null); - Debug.Log("NetworkManager is here!"); + m_NetworkManager.OnServerStarted += OnServerStartedIngredientSpawn; } void OnDestroy() { - if (NetworkManager.Singleton != null) - { - NetworkManager.Singleton.OnServerStarted -= OnServerStartedIngredientSpawn; - } + m_NetworkManager.OnServerStarted -= OnServerStartedIngredientSpawn; } void OnServerStartedIngredientSpawn() { + Random randomGenerator = new Random(); NetworkObject instantiatedNetworkObject = Instantiate(prefabReference, transform.position, transform.rotation, null); ServerIngredient ingredient = instantiatedNetworkObject.GetComponent(); ingredient.NetworkObject.Spawn(); From ddb2e10009fac237be5d50c160357e92bb9aa6f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elfi=20K=C3=BChndorf?= Date: Thu, 11 Apr 2024 11:15:26 +0200 Subject: [PATCH 10/14] addresed comments on PR plus name change of spawner prefabs dragging GameObjects above art section in scene + code adjustments in NetworkObjectSpawner --- ...ab => IngredientServerStartSpawner.prefab} | 5 +- ... IngredientServerStartSpawner.prefab.meta} | 0 .../Assets/Prefabs/Ingredient_Blue.prefab | 10 +++- .../Assets/Scenes/Bootstrap.unity | 48 +++++++++++++++---- .../Assets/Scripts/NetworkObjectSpawner.cs | 13 +++-- CHANGELOG.md | 2 +- 6 files changed, 59 insertions(+), 19 deletions(-) rename Basic/ClientDriven/Assets/Prefabs/{ObjectSpawner.prefab => IngredientServerStartSpawner.prefab} (91%) rename Basic/ClientDriven/Assets/Prefabs/{ObjectSpawner.prefab.meta => IngredientServerStartSpawner.prefab.meta} (100%) diff --git a/Basic/ClientDriven/Assets/Prefabs/ObjectSpawner.prefab b/Basic/ClientDriven/Assets/Prefabs/IngredientServerStartSpawner.prefab similarity index 91% rename from Basic/ClientDriven/Assets/Prefabs/ObjectSpawner.prefab rename to Basic/ClientDriven/Assets/Prefabs/IngredientServerStartSpawner.prefab index e731c915a..fdd66d78e 100644 --- a/Basic/ClientDriven/Assets/Prefabs/ObjectSpawner.prefab +++ b/Basic/ClientDriven/Assets/Prefabs/IngredientServerStartSpawner.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 207166779390499285} - component: {fileID: 1695740223341187737} m_Layer: 0 - m_Name: ObjectSpawner + m_Name: IngredientServerStartSpawner m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -44,4 +44,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a358fd16b205c224fae652283f7cedae, type: 3} m_Name: m_EditorClassIdentifier: - prefabReference: {fileID: 5818429371130516787, guid: a6b33b41508134c09957e076f4d53415, type: 3} + m_PrefabReference: {fileID: 0} + m_NetworkManager: {fileID: 0} diff --git a/Basic/ClientDriven/Assets/Prefabs/ObjectSpawner.prefab.meta b/Basic/ClientDriven/Assets/Prefabs/IngredientServerStartSpawner.prefab.meta similarity index 100% rename from Basic/ClientDriven/Assets/Prefabs/ObjectSpawner.prefab.meta rename to Basic/ClientDriven/Assets/Prefabs/IngredientServerStartSpawner.prefab.meta diff --git a/Basic/ClientDriven/Assets/Prefabs/Ingredient_Blue.prefab b/Basic/ClientDriven/Assets/Prefabs/Ingredient_Blue.prefab index cab7911c0..db871b301 100644 --- a/Basic/ClientDriven/Assets/Prefabs/Ingredient_Blue.prefab +++ b/Basic/ClientDriven/Assets/Prefabs/Ingredient_Blue.prefab @@ -48,9 +48,17 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5818429371130516787, guid: a6b33b41508134c09957e076f4d53415, type: 3} + propertyPath: GlobalObjectIdHash + value: 1010565204 + objectReference: {fileID: 0} + - target: {fileID: 8268979759230423690, guid: a6b33b41508134c09957e076f4d53415, type: 3} + propertyPath: currentIngredientType.m_InternalValue + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8321201880322001125, guid: a6b33b41508134c09957e076f4d53415, type: 3} propertyPath: m_Name - value: Ingredient + value: Ingredient_Blue objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] diff --git a/Basic/ClientDriven/Assets/Scenes/Bootstrap.unity b/Basic/ClientDriven/Assets/Scenes/Bootstrap.unity index 2fff334fd..19d260e07 100644 --- a/Basic/ClientDriven/Assets/Scenes/Bootstrap.unity +++ b/Basic/ClientDriven/Assets/Scenes/Bootstrap.unity @@ -173,7 +173,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 536145635693947214, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: m_Name - value: ObjectSpawner (3) + value: IngredientServerStartSpawner (3) + objectReference: {fileID: 0} + - target: {fileID: 536145635693947214, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} + propertyPath: m_TagString + value: EditorOnly objectReference: {fileID: 0} - target: {fileID: 1695740223341187737, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: prefabReference @@ -183,6 +187,10 @@ PrefabInstance: propertyPath: m_NetworkManager value: objectReference: {fileID: 1114774667} + - target: {fileID: 1695740223341187737, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} + propertyPath: m_PrefabReference + value: + objectReference: {fileID: 1473896641872547741, guid: 404a6c73dd6ffb14490f25c33e93ffff, type: 3} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -517,7 +525,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 536145635693947214, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: m_Name - value: ObjectSpawner (1) + value: IngredientServerStartSpawner (1) + objectReference: {fileID: 0} + - target: {fileID: 536145635693947214, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} + propertyPath: m_TagString + value: EditorOnly objectReference: {fileID: 0} - target: {fileID: 1695740223341187737, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: prefabReference @@ -527,6 +539,10 @@ PrefabInstance: propertyPath: m_NetworkManager value: objectReference: {fileID: 1114774667} + - target: {fileID: 1695740223341187737, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} + propertyPath: m_PrefabReference + value: + objectReference: {fileID: 1473896641872547741, guid: 404a6c73dd6ffb14490f25c33e93ffff, type: 3} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -1499,7 +1515,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 536145635693947214, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: m_Name - value: ObjectSpawner (2) + value: IngredientServerStartSpawner (2) + objectReference: {fileID: 0} + - target: {fileID: 536145635693947214, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} + propertyPath: m_TagString + value: EditorOnly objectReference: {fileID: 0} - target: {fileID: 1695740223341187737, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: prefabReference @@ -1509,6 +1529,10 @@ PrefabInstance: propertyPath: m_NetworkManager value: objectReference: {fileID: 1114774667} + - target: {fileID: 1695740223341187737, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} + propertyPath: m_PrefabReference + value: + objectReference: {fileID: 1473896641872547741, guid: d0360ef45c142b744b880b5819cf7f00, type: 3} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -1972,7 +1996,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 536145635693947214, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: m_Name - value: ObjectSpawner + value: IngredientServerStartSpawner + objectReference: {fileID: 0} + - target: {fileID: 536145635693947214, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} + propertyPath: m_TagString + value: EditorOnly objectReference: {fileID: 0} - target: {fileID: 1695740223341187737, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: prefabReference @@ -1982,6 +2010,10 @@ PrefabInstance: propertyPath: m_NetworkManager value: objectReference: {fileID: 1114774667} + - target: {fileID: 1695740223341187737, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} + propertyPath: m_PrefabReference + value: + objectReference: {fileID: 2575560247572078158, guid: 93ffadfcde7ae054397f3f63b51d2188, type: 3} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -1996,6 +2028,10 @@ SceneRoots: m_Roots: - {fileID: 1114774669} - {fileID: 1038740739} + - {fileID: 2255677428018747830} + - {fileID: 666714754} + - {fileID: 2024285500} + - {fileID: 232086523} - {fileID: 2060465724} - {fileID: 1980547847} - {fileID: 1299635456} @@ -2006,7 +2042,3 @@ SceneRoots: - {fileID: 1826537008} - {fileID: 602928376} - {fileID: 1370077996} - - {fileID: 2255677428018747830} - - {fileID: 666714754} - - {fileID: 2024285500} - - {fileID: 232086523} diff --git a/Basic/ClientDriven/Assets/Scripts/NetworkObjectSpawner.cs b/Basic/ClientDriven/Assets/Scripts/NetworkObjectSpawner.cs index f1d09f137..afb35a8c6 100644 --- a/Basic/ClientDriven/Assets/Scripts/NetworkObjectSpawner.cs +++ b/Basic/ClientDriven/Assets/Scripts/NetworkObjectSpawner.cs @@ -1,4 +1,3 @@ -using System; using Unity.Netcode; using UnityEngine; using UnityEngine.Networking; @@ -7,7 +6,7 @@ namespace Unity.Multiplayer.Samples.ClientDriven { /// - /// Spawn a NetworkObject at this transform's position when NetworkManer's server is started. + /// Spawn a NetworkObject at this transform's position when NetworkManager's server is started. /// /// /// A NetworkManager is expected to be part of the scene that this NetworkObject is a part of. @@ -15,7 +14,7 @@ namespace Unity.Multiplayer.Samples.ClientDriven internal class NetworkObjectSpawner : MonoBehaviour { [SerializeField] - private NetworkObject prefabReference; + NetworkObject m_PrefabReference; [SerializeField] private NetworkManager m_NetworkManager; @@ -27,18 +26,18 @@ void Start() return; } - m_NetworkManager.OnServerStarted += OnServerStartedIngredientSpawn; + m_NetworkManager.OnServerStarted += SpawnIngredient; } void OnDestroy() { - m_NetworkManager.OnServerStarted -= OnServerStartedIngredientSpawn; + m_NetworkManager.OnServerStarted -= SpawnIngredient; } - void OnServerStartedIngredientSpawn() + void SpawnIngredient() { Random randomGenerator = new Random(); - NetworkObject instantiatedNetworkObject = Instantiate(prefabReference, transform.position, transform.rotation, null); + NetworkObject instantiatedNetworkObject = Instantiate(m_PrefabReference, transform.position, transform.rotation, null); ServerIngredient ingredient = instantiatedNetworkObject.GetComponent(); ingredient.NetworkObject.Spawn(); } diff --git a/CHANGELOG.md b/CHANGELOG.md index d927f284b..255762e7d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,7 @@ ### Client Driven #### Fixed -- Added Spawner with event executed on Server Start to fix incosistent ghost ingredients issue (#157) +- Added Spawner with event executed on Server Start to fix inconsistent ghost ingredients issue (#157) ## [1.5.0] 2023-12-15 From a3327c16ebc3c32fa26fa0601a7fff66bfff6010 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elfi=20K=C3=BChndorf?= Date: Fri, 12 Apr 2024 14:47:03 +0200 Subject: [PATCH 11/14] adding NetworkManager.Singleton to functions and changing to var --- .../Assets/Scripts/NetworkObjectSpawner.cs | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/Basic/ClientDriven/Assets/Scripts/NetworkObjectSpawner.cs b/Basic/ClientDriven/Assets/Scripts/NetworkObjectSpawner.cs index afb35a8c6..eb4665cae 100644 --- a/Basic/ClientDriven/Assets/Scripts/NetworkObjectSpawner.cs +++ b/Basic/ClientDriven/Assets/Scripts/NetworkObjectSpawner.cs @@ -15,30 +15,31 @@ internal class NetworkObjectSpawner : MonoBehaviour { [SerializeField] NetworkObject m_PrefabReference; - [SerializeField] - private NetworkManager m_NetworkManager; void Start() { - Debug.Assert(m_NetworkManager != null, "The NetworkManager needs to be referenced!"); - if (m_NetworkManager == null) + Debug.Assert(NetworkManager.Singleton != null, "The NetworkManager needs to be referenced!"); + if (NetworkManager.Singleton == null) { return; } - m_NetworkManager.OnServerStarted += SpawnIngredient; + NetworkManager.Singleton.OnServerStarted += SpawnIngredient; } void OnDestroy() { - m_NetworkManager.OnServerStarted -= SpawnIngredient; + if(NetworkManager.Singleton != null) + { + NetworkManager.Singleton.OnServerStarted -= SpawnIngredient; + } } void SpawnIngredient() { - Random randomGenerator = new Random(); + var randomGenerator = new Random(); NetworkObject instantiatedNetworkObject = Instantiate(m_PrefabReference, transform.position, transform.rotation, null); - ServerIngredient ingredient = instantiatedNetworkObject.GetComponent(); + var ingredient = instantiatedNetworkObject.GetComponent(); ingredient.NetworkObject.Spawn(); } } From fe0c511b8fc911d6f161c7cdb88a56aa9cb06651 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elfi=20K=C3=BChndorf?= Date: Mon, 15 Apr 2024 11:59:41 +0200 Subject: [PATCH 12/14] removed unneccessary lines, adjusted debug.assert and adjusted tags within the scene --- Basic/ClientDriven/Assets/Scenes/Bootstrap.unity | 12 ++++++------ .../Assets/Scripts/NetworkObjectSpawner.cs | 5 +---- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/Basic/ClientDriven/Assets/Scenes/Bootstrap.unity b/Basic/ClientDriven/Assets/Scenes/Bootstrap.unity index 19d260e07..2ffe3174b 100644 --- a/Basic/ClientDriven/Assets/Scenes/Bootstrap.unity +++ b/Basic/ClientDriven/Assets/Scenes/Bootstrap.unity @@ -177,7 +177,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 536145635693947214, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: m_TagString - value: EditorOnly + value: Untagged objectReference: {fileID: 0} - target: {fileID: 1695740223341187737, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: prefabReference @@ -529,7 +529,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 536145635693947214, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: m_TagString - value: EditorOnly + value: Untagged objectReference: {fileID: 0} - target: {fileID: 1695740223341187737, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: prefabReference @@ -643,7 +643,7 @@ GameObject: - component: {fileID: 966089318} m_Layer: 0 m_Name: -------- Art -------- - m_TagString: Untagged + m_TagString: EditorOnly m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -992,8 +992,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1299635456} - - component: {fileID: 1299635455} - component: {fileID: 1299635454} + - component: {fileID: 1299635455} m_Layer: 0 m_Name: ScoreReplicator m_TagString: Untagged @@ -1519,7 +1519,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 536145635693947214, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: m_TagString - value: EditorOnly + value: Untagged objectReference: {fileID: 0} - target: {fileID: 1695740223341187737, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: prefabReference @@ -2000,7 +2000,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 536145635693947214, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: m_TagString - value: EditorOnly + value: Untagged objectReference: {fileID: 0} - target: {fileID: 1695740223341187737, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: prefabReference diff --git a/Basic/ClientDriven/Assets/Scripts/NetworkObjectSpawner.cs b/Basic/ClientDriven/Assets/Scripts/NetworkObjectSpawner.cs index eb4665cae..b7b8a5948 100644 --- a/Basic/ClientDriven/Assets/Scripts/NetworkObjectSpawner.cs +++ b/Basic/ClientDriven/Assets/Scripts/NetworkObjectSpawner.cs @@ -1,7 +1,5 @@ using Unity.Netcode; using UnityEngine; -using UnityEngine.Networking; -using Random = System.Random; namespace Unity.Multiplayer.Samples.ClientDriven { @@ -18,7 +16,7 @@ internal class NetworkObjectSpawner : MonoBehaviour void Start() { - Debug.Assert(NetworkManager.Singleton != null, "The NetworkManager needs to be referenced!"); + Debug.Assert(NetworkManager.Singleton != null, "A NetworkManager is likely not a part of this MonoBehaviour's scene."); if (NetworkManager.Singleton == null) { return; @@ -37,7 +35,6 @@ void OnDestroy() void SpawnIngredient() { - var randomGenerator = new Random(); NetworkObject instantiatedNetworkObject = Instantiate(m_PrefabReference, transform.position, transform.rotation, null); var ingredient = instantiatedNetworkObject.GetComponent(); ingredient.NetworkObject.Spawn(); From e781d9e808c1b394f7e0563c61cc5ff145baabfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elfi=20K=C3=BChndorf?= Date: Tue, 16 Apr 2024 10:31:21 +0200 Subject: [PATCH 13/14] removing not needed NetworkObject from Spawner game objects --- .../Assets/Scenes/Bootstrap.unity | 120 +----------------- 1 file changed, 4 insertions(+), 116 deletions(-) diff --git a/Basic/ClientDriven/Assets/Scenes/Bootstrap.unity b/Basic/ClientDriven/Assets/Scenes/Bootstrap.unity index 2ffe3174b..ec88692eb 100644 --- a/Basic/ClientDriven/Assets/Scenes/Bootstrap.unity +++ b/Basic/ClientDriven/Assets/Scenes/Bootstrap.unity @@ -194,36 +194,8 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 536145635693947214, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} - insertIndex: 1 - addedObject: {fileID: 232086525} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} ---- !u!1 &232086524 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 536145635693947214, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} - m_PrefabInstance: {fileID: 232086523} - m_PrefabAsset: {fileID: 0} ---- !u!114 &232086525 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 232086524} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3} - m_Name: - m_EditorClassIdentifier: - GlobalObjectIdHash: 2945538600 - AlwaysReplicateAsRoot: 0 - SynchronizeTransform: 1 - ActiveSceneSynchronization: 1 - SceneMigrationSynchronization: 0 - SpawnWithObservers: 1 - DontDestroyWithOwner: 0 - AutoObjectParentSync: 1 --- !u!1 &232705322 GameObject: m_ObjectHideFlags: 0 @@ -546,61 +518,8 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 536145635693947214, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} - insertIndex: 1 - addedObject: {fileID: 666714756} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} ---- !u!1 &666714755 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 536145635693947214, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} - m_PrefabInstance: {fileID: 666714754} - m_PrefabAsset: {fileID: 0} ---- !u!114 &666714756 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 666714755} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3} - m_Name: - m_EditorClassIdentifier: - GlobalObjectIdHash: 2336653778 - AlwaysReplicateAsRoot: 0 - SynchronizeTransform: 1 - ActiveSceneSynchronization: 1 - SceneMigrationSynchronization: 0 - SpawnWithObservers: 1 - DontDestroyWithOwner: 0 - AutoObjectParentSync: 1 ---- !u!1 &765414554 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 536145635693947214, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} - m_PrefabInstance: {fileID: 2255677428018747830} - m_PrefabAsset: {fileID: 0} ---- !u!114 &765414557 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 765414554} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3} - m_Name: - m_EditorClassIdentifier: - GlobalObjectIdHash: 2969950326 - AlwaysReplicateAsRoot: 0 - SynchronizeTransform: 1 - ActiveSceneSynchronization: 1 - SceneMigrationSynchronization: 0 - SpawnWithObservers: 1 - DontDestroyWithOwner: 0 - AutoObjectParentSync: 1 --- !u!1 &796975752 GameObject: m_ObjectHideFlags: 0 @@ -1536,36 +1455,8 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 536145635693947214, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} - insertIndex: 1 - addedObject: {fileID: 2024285502} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} ---- !u!1 &2024285501 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 536145635693947214, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} - m_PrefabInstance: {fileID: 2024285500} - m_PrefabAsset: {fileID: 0} ---- !u!114 &2024285502 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2024285501} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3} - m_Name: - m_EditorClassIdentifier: - GlobalObjectIdHash: 3035510238 - AlwaysReplicateAsRoot: 0 - SynchronizeTransform: 1 - ActiveSceneSynchronization: 1 - SceneMigrationSynchronization: 0 - SpawnWithObservers: 1 - DontDestroyWithOwner: 0 - AutoObjectParentSync: 1 --- !u!1 &2051538844 GameObject: m_ObjectHideFlags: 0 @@ -2017,10 +1908,7 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 536145635693947214, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} - insertIndex: 1 - addedObject: {fileID: 765414557} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} --- !u!1660057539 &9223372036854775807 SceneRoots: From 72b9c8d0be4057236a67f13c522e1177bd016a37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elfi=20K=C3=BChndorf?= Date: Wed, 17 Apr 2024 11:25:37 +0200 Subject: [PATCH 14/14] removed tag override from scene --- Basic/ClientDriven/Assets/Scenes/Bootstrap.unity | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/Basic/ClientDriven/Assets/Scenes/Bootstrap.unity b/Basic/ClientDriven/Assets/Scenes/Bootstrap.unity index ec88692eb..eabf639dd 100644 --- a/Basic/ClientDriven/Assets/Scenes/Bootstrap.unity +++ b/Basic/ClientDriven/Assets/Scenes/Bootstrap.unity @@ -175,10 +175,6 @@ PrefabInstance: propertyPath: m_Name value: IngredientServerStartSpawner (3) objectReference: {fileID: 0} - - target: {fileID: 536145635693947214, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} - propertyPath: m_TagString - value: Untagged - objectReference: {fileID: 0} - target: {fileID: 1695740223341187737, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: prefabReference value: @@ -499,10 +495,6 @@ PrefabInstance: propertyPath: m_Name value: IngredientServerStartSpawner (1) objectReference: {fileID: 0} - - target: {fileID: 536145635693947214, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} - propertyPath: m_TagString - value: Untagged - objectReference: {fileID: 0} - target: {fileID: 1695740223341187737, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: prefabReference value: @@ -1436,10 +1428,6 @@ PrefabInstance: propertyPath: m_Name value: IngredientServerStartSpawner (2) objectReference: {fileID: 0} - - target: {fileID: 536145635693947214, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} - propertyPath: m_TagString - value: Untagged - objectReference: {fileID: 0} - target: {fileID: 1695740223341187737, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: prefabReference value: @@ -1889,10 +1877,6 @@ PrefabInstance: propertyPath: m_Name value: IngredientServerStartSpawner objectReference: {fileID: 0} - - target: {fileID: 536145635693947214, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} - propertyPath: m_TagString - value: Untagged - objectReference: {fileID: 0} - target: {fileID: 1695740223341187737, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3} propertyPath: prefabReference value: