Skip to content

fix: fixing order of components in GameObject containing a NetworkObject component [MTT-6239] #866

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 6 commits into from
Sep 1, 2023
Merged

fix: fixing order of components in GameObject containing a NetworkObject component [MTT-6239] #866

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e21e119
moving NetworkObject components above NetworkBehaviours in component …
LPLafontaineB Aug 28, 2023
2c4df23
moving NetworkObject component up in UIMessageManager GameObject
LPLafontaineB Aug 28, 2023
a02546d
adding changelog entry
LPLafontaineB Aug 28, 2023
9092354
Merge branch 'develop' into fix/networkbehaviours-not-despawned-on-sc…
LPLafontaineB Aug 31, 2023
389d47f
Merge branch 'develop' into fix/networkbehaviours-not-despawned-on-sc…
LPLafontaineB Aug 31, 2023
139dab7
Merge branch 'develop' into fix/networkbehaviours-not-despawned-on-sc…
LPLafontaineB Aug 31, 2023
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
40 changes: 26 additions & 14 deletions Assets/Prefabs/AdditiveSceneLoader.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ GameObject:
m_Component:
- component: {fileID: 3765979716845461200}
- component: {fileID: 3765979716845461207}
- component: {fileID: 3765979716845461206}
- component: {fileID: 3029178677072641126}
- component: {fileID: 3765979716845461206}
m_Layer: 2
m_Name: AdditiveSceneLoader
m_TagString: Untagged
Expand All @@ -26,12 +26,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3765979716845461205}
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_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &3765979716845461207
BoxCollider:
Expand All @@ -41,12 +42,20 @@ BoxCollider:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3765979716845461205}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 1
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 2
serializedVersion: 3
m_Size: {x: 0, y: 0, z: 0}
m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &3765979716845461206
--- !u!114 &3029178677072641126
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
Expand All @@ -55,13 +64,17 @@ MonoBehaviour:
m_GameObject: {fileID: 3765979716845461205}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4506649f88aac74ea839a52818e3174, type: 3}
m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
m_Name:
m_EditorClassIdentifier:
m_DelayBeforeUnload: 5
m_SceneName:
m_PlayerTag: Player
--- !u!114 &3029178677072641126
GlobalObjectIdHash: 951099334
AlwaysReplicateAsRoot: 0
SynchronizeTransform: 1
ActiveSceneSynchronization: 0
SceneMigrationSynchronization: 1
DontDestroyWithOwner: 0
AutoObjectParentSync: 1
--- !u!114 &3765979716845461206
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
Expand All @@ -70,10 +83,9 @@ MonoBehaviour:
m_GameObject: {fileID: 3765979716845461205}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
m_Script: {fileID: 11500000, guid: f4506649f88aac74ea839a52818e3174, type: 3}
m_Name:
m_EditorClassIdentifier:
GlobalObjectIdHash: 951099334
AlwaysReplicateAsRoot: 0
DontDestroyWithOwner: 0
AutoObjectParentSync: 1
m_DelayBeforeUnload: 5
m_SceneName:
m_PlayerTag: Player
34 changes: 17 additions & 17 deletions Assets/Prefabs/DebugCheatsManager.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 2726635115303138402}
- component: {fileID: 7241368247586282332}
- component: {fileID: 6695920927348029111}
- component: {fileID: 7241368247586282332}
m_Layer: 0
m_Name: DebugCheatsManager
m_TagString: Untagged
Expand All @@ -25,15 +25,15 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 776943915682426285}
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_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &7241368247586282332
--- !u!114 &6695920927348029111
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
Expand All @@ -42,14 +42,17 @@ MonoBehaviour:
m_GameObject: {fileID: 776943915682426285}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ab1e76745edfc434ab8154ad27efc5fd, type: 3}
m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
m_Name:
m_EditorClassIdentifier:
m_DebugCheatsPanel: {fileID: 0}
m_EnemyPrefab: {fileID: 3713729372785093435, guid: 6cdd52f1fa2ed34469a487ae6477eded, type: 3}
m_BossPrefab: {fileID: 3688950541947916326, guid: 365e94337fd10fe4ebde1906df413ac7, type: 3}
m_OpenWindowKeyCode: 47
--- !u!114 &6695920927348029111
GlobalObjectIdHash: 951099334
AlwaysReplicateAsRoot: 0
SynchronizeTransform: 0
ActiveSceneSynchronization: 0
SceneMigrationSynchronization: 1
DontDestroyWithOwner: 0
AutoObjectParentSync: 1
--- !u!114 &7241368247586282332
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
Expand All @@ -58,13 +61,10 @@ MonoBehaviour:
m_GameObject: {fileID: 776943915682426285}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
m_Script: {fileID: 11500000, guid: ab1e76745edfc434ab8154ad27efc5fd, type: 3}
m_Name:
m_EditorClassIdentifier:
GlobalObjectIdHash: 951099334
AlwaysReplicateAsRoot: 0
SynchronizeTransform: 0
ActiveSceneSynchronization: 0
SceneMigrationSynchronization: 1
DontDestroyWithOwner: 0
AutoObjectParentSync: 1
m_DebugCheatsPanel: {fileID: 0}
m_EnemyPrefab: {fileID: 3713729372785093435, guid: 6cdd52f1fa2ed34469a487ae6477eded, type: 3}
m_BossPrefab: {fileID: 3688950541947916326, guid: 365e94337fd10fe4ebde1906df413ac7, type: 3}
m_OpenWindowKeyCode: 47
26 changes: 13 additions & 13 deletions Assets/Prefabs/LoadingProgressTracker.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 3106828016798330215}
- component: {fileID: 3106828016798330208}
- component: {fileID: 3106828016798330209}
- component: {fileID: 3106828016798330208}
m_Layer: 0
m_Name: LoadingProgressTracker
m_TagString: Untagged
Expand All @@ -25,15 +25,15 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3106828016798330210}
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_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &3106828016798330208
--- !u!114 &3106828016798330209
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
Expand All @@ -42,10 +42,17 @@ MonoBehaviour:
m_GameObject: {fileID: 3106828016798330210}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8e20ce98a70947b68f7982c1c417f88c, type: 3}
m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &3106828016798330209
GlobalObjectIdHash: 951099334
AlwaysReplicateAsRoot: 0
SynchronizeTransform: 0
ActiveSceneSynchronization: 0
SceneMigrationSynchronization: 1
DontDestroyWithOwner: 0
AutoObjectParentSync: 1
--- !u!114 &3106828016798330208
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
Expand All @@ -54,13 +61,6 @@ MonoBehaviour:
m_GameObject: {fileID: 3106828016798330210}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
m_Script: {fileID: 11500000, guid: 8e20ce98a70947b68f7982c1c417f88c, type: 3}
m_Name:
m_EditorClassIdentifier:
GlobalObjectIdHash: 951099334
AlwaysReplicateAsRoot: 0
SynchronizeTransform: 0
ActiveSceneSynchronization: 0
SceneMigrationSynchronization: 1
DontDestroyWithOwner: 0
AutoObjectParentSync: 1
42 changes: 21 additions & 21 deletions Assets/Prefabs/NetworkObjectPool.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 7944773021007068224}
- component: {fileID: 7944773021007068227}
- component: {fileID: 8707830667181757321}
- component: {fileID: 7944773021007068227}
m_Layer: 0
m_Name: NetworkObjectPool
m_TagString: Untagged
Expand All @@ -25,14 +25,33 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7944773021007068226}
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_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &8707830667181757321
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7944773021007068226}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
m_Name:
m_EditorClassIdentifier:
GlobalObjectIdHash: 951099334
AlwaysReplicateAsRoot: 0
SynchronizeTransform: 0
ActiveSceneSynchronization: 0
SceneMigrationSynchronization: 1
DontDestroyWithOwner: 0
AutoObjectParentSync: 1
--- !u!114 &7944773021007068227
MonoBehaviour:
m_ObjectHideFlags: 0
Expand All @@ -56,22 +75,3 @@ MonoBehaviour:
PrewarmCount: 5
- Prefab: {fileID: 5473352307376472481, guid: 3e5c32e5766633a4eaf9e7c393418b34, type: 3}
PrewarmCount: 5
--- !u!114 &8707830667181757321
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7944773021007068226}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
m_Name:
m_EditorClassIdentifier:
GlobalObjectIdHash: 951099334
AlwaysReplicateAsRoot: 0
SynchronizeTransform: 0
ActiveSceneSynchronization: 0
SceneMigrationSynchronization: 1
DontDestroyWithOwner: 0
AutoObjectParentSync: 1
30 changes: 15 additions & 15 deletions Assets/Prefabs/SceneLoader.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 7533068275093218427}
- component: {fileID: 2071498811241465156}
- component: {fileID: 8734696198808489477}
- component: {fileID: 2071498811241465156}
- component: {fileID: 6240023712540756099}
m_Layer: 0
m_Name: SceneLoader
Expand All @@ -26,15 +26,15 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5970766024194302363}
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_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &2071498811241465156
--- !u!114 &8734696198808489477
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
Expand All @@ -43,12 +43,17 @@ MonoBehaviour:
m_GameObject: {fileID: 5970766024194302363}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d202c9ed4a2c4a6fa83f21f1c21394ea, type: 3}
m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
m_Name:
m_EditorClassIdentifier:
m_ClientLoadingScreen: {fileID: 0}
m_LoadingProgressManager: {fileID: 6240023712540756099}
--- !u!114 &8734696198808489477
GlobalObjectIdHash: 951099334
AlwaysReplicateAsRoot: 0
SynchronizeTransform: 0
ActiveSceneSynchronization: 0
SceneMigrationSynchronization: 1
DontDestroyWithOwner: 0
AutoObjectParentSync: 1
--- !u!114 &2071498811241465156
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
Expand All @@ -57,16 +62,11 @@ MonoBehaviour:
m_GameObject: {fileID: 5970766024194302363}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
m_Script: {fileID: 11500000, guid: d202c9ed4a2c4a6fa83f21f1c21394ea, type: 3}
m_Name:
m_EditorClassIdentifier:
GlobalObjectIdHash: 951099334
AlwaysReplicateAsRoot: 0
SynchronizeTransform: 0
ActiveSceneSynchronization: 0
SceneMigrationSynchronization: 1
DontDestroyWithOwner: 0
AutoObjectParentSync: 1
m_ClientLoadingScreen: {fileID: 0}
m_LoadingProgressManager: {fileID: 6240023712540756099}
--- !u!114 &6240023712540756099
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down
4 changes: 2 additions & 2 deletions Assets/Scenes/Startup.unity
View file
Open in desktop
Git LFS file not shown
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ Additional documentation and release notes are available at [Multiplayer Documen

### Fixed
* Fixed colliders on diagonal walls to not have negative scale (#854).
* Fixed order of components in networked GameObjects (#866). NetworkObjects are now always above NetworkBehaviours in the component order in GameObjects. This fixes a bug where during scene unloading the NetworkBehaviours would be destroyed before the NetworkObject on the host, which caused these NetworkBehaviours to not have their OnNetworkDespawned invoked in that situation on the host.
* Unnecessary update requests are no longer being sent to Lobby after receiving update events from the service (#860).
* Fixed a condition where one would be unable to quit the application through OS-level quit button, nor the in-game quit button (#863)

Expand Down