diff --git a/Basic/ClientDriven/Assets/NetworkPrefabs.asset b/Basic/ClientDriven/Assets/NetworkPrefabs.asset
index e1d68b4d8..77b29c821 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: 34856496335307672, 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/IngredientServerStartSpawner.prefab b/Basic/ClientDriven/Assets/Prefabs/IngredientServerStartSpawner.prefab
new file mode 100644
index 000000000..fdd66d78e
--- /dev/null
+++ b/Basic/ClientDriven/Assets/Prefabs/IngredientServerStartSpawner.prefab
@@ -0,0 +1,48 @@
+%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: IngredientServerStartSpawner
+ 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:
+ m_PrefabReference: {fileID: 0}
+ m_NetworkManager: {fileID: 0}
diff --git a/Basic/ClientDriven/Assets/Prefabs/IngredientServerStartSpawner.prefab.meta b/Basic/ClientDriven/Assets/Prefabs/IngredientServerStartSpawner.prefab.meta
new file mode 100644
index 000000000..88d3d7db3
--- /dev/null
+++ b/Basic/ClientDriven/Assets/Prefabs/IngredientServerStartSpawner.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 34c1add8edaf6e44787b5c1a6803a83e
+PrefabImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Basic/ClientDriven/Assets/Prefabs/Ingredient_Blue.prefab b/Basic/ClientDriven/Assets/Prefabs/Ingredient_Blue.prefab
new file mode 100644
index 000000000..db871b301
--- /dev/null
+++ b/Basic/ClientDriven/Assets/Prefabs/Ingredient_Blue.prefab
@@ -0,0 +1,67 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &8286918849967262589
+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: 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_Blue
+ 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..71f2f9ae3
--- /dev/null
+++ b/Basic/ClientDriven/Assets/Prefabs/Ingredient_Purple.prefab
@@ -0,0 +1,67 @@
+%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: 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_Purple
+ 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 4a1d9259e..eabf639dd 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,67 @@ 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
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.5
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: IngredientServerStartSpawner (3)
objectReference: {fileID: 0}
+ - target: {fileID: 1695740223341187737, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
+ propertyPath: prefabReference
+ value:
+ objectReference: {fileID: 1473896641872547741, guid: 404a6c73dd6ffb14490f25c33e93ffff, type: 3}
+ - target: {fileID: 1695740223341187737, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
+ 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: []
m_AddedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+ m_SourcePrefab: {fileID: 100100000, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
--- !u!1 &232705322
GameObject:
m_ObjectHideFlags: 0
@@ -231,87 +223,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 +443,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 +451,98 @@ 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: -6
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.5
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: -1
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
+ - target: {fileID: 536145635693947214, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
+ propertyPath: m_Name
+ value: IngredientServerStartSpawner (1)
objectReference: {fileID: 0}
- - target: {fileID: 6206319821543937579, guid: a6b33b41508134c09957e076f4d53415, type: 3}
- propertyPath: m_Materials.Array.data[0]
+ - target: {fileID: 1695740223341187737, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
+ propertyPath: prefabReference
value:
- objectReference: {fileID: 2100000, guid: b423dced7a4ac4f40a119b84a23cfc9b, type: 2}
- - target: {fileID: 6691487417621146171, guid: a6b33b41508134c09957e076f4d53415, type: 3}
- propertyPath: m_Materials.Array.data[0]
+ objectReference: {fileID: 1473896641872547741, guid: 404a6c73dd6ffb14490f25c33e93ffff, type: 3}
+ - target: {fileID: 1695740223341187737, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
+ propertyPath: m_NetworkManager
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 (1)
- objectReference: {fileID: 0}
+ 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: []
m_AddedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+ m_SourcePrefab: {fileID: 100100000, guid: 34c1add8edaf6e44787b5c1a6803a83e, 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!1 &966089317
GameObject:
m_ObjectHideFlags: 0
@@ -667,7 +554,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
@@ -1016,8 +903,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
@@ -1222,99 +1109,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 +1188,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 +1376,75 @@ 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: -6
+ objectReference: {fileID: 0}
+ - target: {fileID: 207166779390499285, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 1.5
+ 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: IngredientServerStartSpawner (2)
+ objectReference: {fileID: 0}
+ - target: {fileID: 1695740223341187737, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
+ propertyPath: prefabReference
+ value:
+ objectReference: {fileID: 1473896641872547741, guid: d0360ef45c142b744b880b5819cf7f00, type: 3}
+ - target: {fileID: 1695740223341187737, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
+ 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: []
+ m_AddedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
--- !u!1 &2051538844
GameObject:
m_ObjectHideFlags: 0
@@ -2108,7 +1825,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,96 +1833,80 @@ 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
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.5
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: -1
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: IngredientServerStartSpawner
objectReference: {fileID: 0}
- m_RemovedComponents:
- - {fileID: 1702713463106468697, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+ - target: {fileID: 1695740223341187737, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
+ propertyPath: prefabReference
+ value:
+ objectReference: {fileID: 2575560247572078158, guid: 93ffadfcde7ae054397f3f63b51d2188, type: 3}
+ - target: {fileID: 1695740223341187737, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
+ 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: []
m_AddedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+ m_SourcePrefab: {fileID: 100100000, guid: 34c1add8edaf6e44787b5c1a6803a83e, type: 3}
--- !u!1660057539 &9223372036854775807
SceneRoots:
m_ObjectHideFlags: 0
m_Roots:
- {fileID: 1114774669}
- {fileID: 1038740739}
+ - {fileID: 2255677428018747830}
+ - {fileID: 666714754}
+ - {fileID: 2024285500}
+ - {fileID: 232086523}
- {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}
diff --git a/Basic/ClientDriven/Assets/Scripts/NetworkObjectSpawner.cs b/Basic/ClientDriven/Assets/Scripts/NetworkObjectSpawner.cs
new file mode 100644
index 000000000..b7b8a5948
--- /dev/null
+++ b/Basic/ClientDriven/Assets/Scripts/NetworkObjectSpawner.cs
@@ -0,0 +1,43 @@
+using Unity.Netcode;
+using UnityEngine;
+
+namespace Unity.Multiplayer.Samples.ClientDriven
+{
+ ///
+ /// 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.
+ ///
+ internal class NetworkObjectSpawner : MonoBehaviour
+ {
+ [SerializeField]
+ NetworkObject m_PrefabReference;
+
+ void Start()
+ {
+ Debug.Assert(NetworkManager.Singleton != null, "A NetworkManager is likely not a part of this MonoBehaviour's scene.");
+ if (NetworkManager.Singleton == null)
+ {
+ return;
+ }
+
+ NetworkManager.Singleton.OnServerStarted += SpawnIngredient;
+ }
+
+ void OnDestroy()
+ {
+ if(NetworkManager.Singleton != null)
+ {
+ NetworkManager.Singleton.OnServerStarted -= SpawnIngredient;
+ }
+ }
+
+ void SpawnIngredient()
+ {
+ NetworkObject instantiatedNetworkObject = Instantiate(m_PrefabReference, transform.position, transform.rotation, null);
+ var ingredient = instantiatedNetworkObject.GetComponent();
+ ingredient.NetworkObject.Spawn();
+ }
+ }
+}
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:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 62f3bcfb8..255762e7d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,11 @@
#### Cleanup
- Formatted .cs files inside the Bitesize Samples repository to adhere to coding standards (#156) Internal testing job definition files were added in order for internal processes to execute.
+### Client Driven
+
+#### Fixed
+- Added Spawner with event executed on Server Start to fix inconsistent ghost ingredients issue (#157)
+
## [1.5.0] 2023-12-15
### Bitesize Samples Repository