Skip to content

Fix: Client Driven Ghost Static Ingredients on Late join [MTT-4505] #157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
Apr 17, 2024
Merged

Fix: Client Driven Ghost Static Ingredients on Late join [MTT-4505] #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
4c6d6f3
added object spawner game objects for startup instead of in-scene pla…
Elfi0Kuhndorf Mar 12, 2024
1b9a27a
implemented spawning logic into a OnServerStarted event
Elfi0Kuhndorf Mar 14, 2024
b843cfd
removed unneccesary lines
Elfi0Kuhndorf Mar 14, 2024
7cfcacd
addressed feedback including namepace, OnDestroy method and null check
Elfi0Kuhndorf Mar 15, 2024
5f62e02
removed public from start and removed vars
Elfi0Kuhndorf Mar 15, 2024
0794412
added prefab variants and added summary as well as debug assert funct…
Elfi0Kuhndorf Mar 15, 2024
9f308cf
update for CHANGELOG
Elfi0Kuhndorf Mar 15, 2024
42812dd
Merge branch 'develop' into fix/MTT-4505-static-ingredients-late-join
Elfi0Kuhndorf Mar 15, 2024
b213bff
included coroutine and small prefab fix
Elfi0Kuhndorf Mar 26, 2024
aad8d02
Merge branch 'develop' into fix/MTT-4505-static-ingredients-late-join
Elfi0Kuhndorf Apr 9, 2024
c50774b
went back to old solution and recreated blue ingredient prefab to fix…
Elfi0Kuhndorf Apr 9, 2024
ddb2e10
addresed comments on PR plus name change of spawner prefabs
Elfi0Kuhndorf Apr 11, 2024
a3327c1
adding NetworkManager.Singleton to functions and changing to var
Elfi0Kuhndorf Apr 12, 2024
fe0c511
removed unneccessary lines, adjusted debug.assert and adjusted tags w…
Elfi0Kuhndorf Apr 15, 2024
e781d9e
removing not needed NetworkObject from Spawner game objects
Elfi0Kuhndorf Apr 16, 2024
72b9c8d
removed tag override from scene
Elfi0Kuhndorf Apr 17, 2024
a6fa463
Merge branch 'develop' into fix/MTT-4505-static-ingredients-late-join
Elfi0Kuhndorf Apr 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions Basic/ClientDriven/Assets/NetworkPrefabs.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
42 changes: 21 additions & 21 deletions Basic/ClientDriven/Assets/Prefabs/Ingredient.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
48 changes: 48 additions & 0 deletions Basic/ClientDriven/Assets/Prefabs/IngredientServerStartSpawner.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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}
7 changes: 7 additions & 0 deletions Basic/ClientDriven/Assets/Prefabs/IngredientServerStartSpawner.prefab.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

67 changes: 67 additions & 0 deletions Basic/ClientDriven/Assets/Prefabs/Ingredient_Blue.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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}
7 changes: 7 additions & 0 deletions Basic/ClientDriven/Assets/Prefabs/Ingredient_Blue.prefab.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

67 changes: 67 additions & 0 deletions Basic/ClientDriven/Assets/Prefabs/Ingredient_Purple.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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}
7 changes: 7 additions & 0 deletions Basic/ClientDriven/Assets/Prefabs/Ingredient_Purple.prefab.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

59 changes: 59 additions & 0 deletions Basic/ClientDriven/Assets/Prefabs/Ingredient_Red.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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}
7 changes: 7 additions & 0 deletions Basic/ClientDriven/Assets/Prefabs/Ingredient_Red.prefab.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading