From 522ff7ceb21e1e3a1970464ce320c500f99ef51d Mon Sep 17 00:00:00 2001 From: Julia Butenhoff Date: Sun, 17 Apr 2022 00:58:55 -0500 Subject: [PATCH] Fixed Persisting of Objects Past Game (COMPLETED) --- Assets/Prefabs/Network/NetPortals.prefab | 44 +++------- Assets/Prefabs/Network/ObjectCleanup.prefab | 63 ++++++++++++++ .../Prefabs/Network/ObjectCleanup.prefab.meta | 7 ++ Assets/Scenes/Game-Mountain.unity | 87 +++++++++++++++---- Assets/Scenes/Preloader.unity | 34 ++++---- Assets/Scripts/Network/ObjectCleanup.cs | 25 ++++++ Assets/Scripts/Network/ObjectCleanup.cs.meta | 11 +++ Assets/Scripts/Network/ServerGameNetPortal.cs | 16 +--- UserSettings/EditorUserSettings.asset | 28 +++--- 9 files changed, 224 insertions(+), 91 deletions(-) create mode 100644 Assets/Prefabs/Network/ObjectCleanup.prefab create mode 100644 Assets/Prefabs/Network/ObjectCleanup.prefab.meta create mode 100644 Assets/Scripts/Network/ObjectCleanup.cs create mode 100644 Assets/Scripts/Network/ObjectCleanup.cs.meta diff --git a/Assets/Prefabs/Network/NetPortals.prefab b/Assets/Prefabs/Network/NetPortals.prefab index 35379f0..7ace8a2 100644 --- a/Assets/Prefabs/Network/NetPortals.prefab +++ b/Assets/Prefabs/Network/NetPortals.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &2206362918716505385 +--- !u!1 &8851264010347475804 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,11 +8,10 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2206362918716505389} - - component: {fileID: 2206362918716505390} - - component: {fileID: 2206362918716505391} - - component: {fileID: 2206362918716505384} - - component: {fileID: 5282411128557260822} + - component: {fileID: 8851264010347475801} + - component: {fileID: 8851264010347475800} + - component: {fileID: 8851264010347475807} + - component: {fileID: 8851264010347475806} m_Layer: 0 m_Name: NetPortals m_TagString: Untagged @@ -20,13 +19,13 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &2206362918716505389 +--- !u!4 &8851264010347475801 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2206362918716505385} + m_GameObject: {fileID: 8851264010347475804} 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} @@ -34,57 +33,40 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &2206362918716505390 +--- !u!114 &8851264010347475800 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2206362918716505385} + m_GameObject: {fileID: 8851264010347475804} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 23684402616617d41882396738ac4b4a, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &2206362918716505391 +--- !u!114 &8851264010347475807 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2206362918716505385} + m_GameObject: {fileID: 8851264010347475804} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: cad92ef1e2176604f9dd215337189c78, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &2206362918716505384 +--- !u!114 &8851264010347475806 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2206362918716505385} + m_GameObject: {fileID: 8851264010347475804} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: ad94afee15264f5479af33bf240c41af, type: 3} m_Name: m_EditorClassIdentifier: maxPlayers: 3 ---- !u!114 &5282411128557260822 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2206362918716505385} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3} - m_Name: - m_EditorClassIdentifier: - NetworkInstanceId: 0 - PrefabHash: 13161512159667198939 - PrefabHashGenerator: NetPortals - AlwaysReplicateAsRoot: 0 - DontDestroyWithOwner: 0 diff --git a/Assets/Prefabs/Network/ObjectCleanup.prefab b/Assets/Prefabs/Network/ObjectCleanup.prefab new file mode 100644 index 0000000..10692db --- /dev/null +++ b/Assets/Prefabs/Network/ObjectCleanup.prefab @@ -0,0 +1,63 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &8374297646166547284 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 328999691785137753} + - component: {fileID: 3538443129747513642} + - component: {fileID: 969804403166830885} + m_Layer: 0 + m_Name: ObjectCleanup + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &328999691785137753 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8374297646166547284} + 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_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3538443129747513642 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8374297646166547284} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fa645e93121ef864da8af31cfb2aab33, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &969804403166830885 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8374297646166547284} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3} + m_Name: + m_EditorClassIdentifier: + NetworkInstanceId: 0 + PrefabHash: 10312930084966175984 + PrefabHashGenerator: ObjectCleanup + AlwaysReplicateAsRoot: 0 + DontDestroyWithOwner: 0 diff --git a/Assets/Prefabs/Network/ObjectCleanup.prefab.meta b/Assets/Prefabs/Network/ObjectCleanup.prefab.meta new file mode 100644 index 0000000..d2f1cd9 --- /dev/null +++ b/Assets/Prefabs/Network/ObjectCleanup.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 50bef3132cb37e240955458f92edd4b8 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Game-Mountain.unity b/Assets/Scenes/Game-Mountain.unity index 660bc9b..17f84e4 100644 --- a/Assets/Scenes/Game-Mountain.unity +++ b/Assets/Scenes/Game-Mountain.unity @@ -13197,7 +13197,7 @@ PrefabInstance: m_Modifications: - target: {fileID: -8679921383154817045, guid: 11af9b1083fe795428638061ce199b0e, type: 3} propertyPath: m_RootOrder - value: 2 + value: 4 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 11af9b1083fe795428638061ce199b0e, type: 3} propertyPath: m_LocalPosition.x @@ -33559,6 +33559,63 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 330154642} m_Mesh: {fileID: -6358728152654116957, guid: 2515724f3e268054f953e1a377fcc105, type: 3} +--- !u!1001 &331690516 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 328999691785137753, guid: 50bef3132cb37e240955458f92edd4b8, type: 3} + propertyPath: m_RootOrder + value: 33 + objectReference: {fileID: 0} + - target: {fileID: 328999691785137753, guid: 50bef3132cb37e240955458f92edd4b8, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 328999691785137753, guid: 50bef3132cb37e240955458f92edd4b8, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 328999691785137753, guid: 50bef3132cb37e240955458f92edd4b8, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 328999691785137753, guid: 50bef3132cb37e240955458f92edd4b8, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 328999691785137753, guid: 50bef3132cb37e240955458f92edd4b8, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 328999691785137753, guid: 50bef3132cb37e240955458f92edd4b8, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 328999691785137753, guid: 50bef3132cb37e240955458f92edd4b8, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 328999691785137753, guid: 50bef3132cb37e240955458f92edd4b8, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 328999691785137753, guid: 50bef3132cb37e240955458f92edd4b8, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 328999691785137753, guid: 50bef3132cb37e240955458f92edd4b8, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8374297646166547284, guid: 50bef3132cb37e240955458f92edd4b8, type: 3} + propertyPath: m_Name + value: ObjectCleanup + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 50bef3132cb37e240955458f92edd4b8, type: 3} --- !u!1 &333860136 GameObject: m_ObjectHideFlags: 0 @@ -39233,7 +39290,7 @@ Transform: - {fileID: 439508661} - {fileID: 1374781312} m_Father: {fileID: 0} - m_RootOrder: 24 + m_RootOrder: 26 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &397115190 PrefabInstance: @@ -45019,7 +45076,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8963418376388672338, guid: c775a23fe1db9a54cac5db161a1797f7, type: 3} propertyPath: m_RootOrder - value: 3 + value: 5 objectReference: {fileID: 0} - target: {fileID: 8963418376388672338, guid: c775a23fe1db9a54cac5db161a1797f7, type: 3} propertyPath: m_LocalScale.x @@ -65278,7 +65335,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8778111956603343862, guid: 0e50603b66fe968418894499e023ec03, type: 3} propertyPath: m_RootOrder - value: 6 + value: 8 objectReference: {fileID: 0} - target: {fileID: 8778111956603343862, guid: 0e50603b66fe968418894499e023ec03, type: 3} propertyPath: m_LocalScale.x @@ -100996,7 +101053,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8216998506892172516, guid: f78f58b71ba0c4d42a936671ac74404b, type: 3} propertyPath: m_RootOrder - value: 4 + value: 6 objectReference: {fileID: 0} - target: {fileID: 8216998506892172516, guid: f78f58b71ba0c4d42a936671ac74404b, type: 3} propertyPath: m_LocalScale.x @@ -126386,7 +126443,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8216998506892172516, guid: f78f58b71ba0c4d42a936671ac74404b, type: 3} propertyPath: m_RootOrder - value: 5 + value: 7 objectReference: {fileID: 0} - target: {fileID: 8216998506892172516, guid: f78f58b71ba0c4d42a936671ac74404b, type: 3} propertyPath: m_LocalPosition.x @@ -129905,7 +129962,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 3743575119946621719, guid: 4142abda498d7954d9472eda13249c56, type: 3} propertyPath: m_RootOrder - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 3743575119946621719, guid: 4142abda498d7954d9472eda13249c56, type: 3} propertyPath: m_LocalPosition.x @@ -150360,7 +150417,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8977215705378820474, guid: ee0e0e34e2344ec46b9ee698f50ca58a, type: 3} propertyPath: m_RootOrder - value: 25 + value: 27 objectReference: {fileID: 0} - target: {fileID: 8977215705378820474, guid: ee0e0e34e2344ec46b9ee698f50ca58a, type: 3} propertyPath: m_LocalRotation.w @@ -167194,7 +167251,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 6203645939699064127, guid: 80dc3c004ad56104f8be205abd05f0d7, type: 3} propertyPath: m_RootOrder - value: 2 + value: 3 objectReference: {fileID: 0} - target: {fileID: 6203645939699064127, guid: 80dc3c004ad56104f8be205abd05f0d7, type: 3} propertyPath: m_LocalScale.x @@ -181514,7 +181571,7 @@ Transform: m_LocalScale: {x: 25, y: 1, z: 25} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 21 + m_RootOrder: 22 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1879790685 GameObject: @@ -205037,7 +205094,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 1043847408052489032, guid: 525b7208dd4d16048808fbe0f06d219d, type: 3} propertyPath: m_RootOrder - value: 8 + value: 10 objectReference: {fileID: 0} - target: {fileID: 1043847408052489032, guid: 525b7208dd4d16048808fbe0f06d219d, type: 3} propertyPath: m_LocalPosition.x @@ -205661,7 +205718,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1578817158580045979, guid: 4a2a13b757e0fa944a5e05e10b50f380, type: 3} propertyPath: m_RootOrder - value: 22 + value: 23 objectReference: {fileID: 0} - target: {fileID: 1578817158580045979, guid: 4a2a13b757e0fa944a5e05e10b50f380, type: 3} propertyPath: m_LocalRotation.w @@ -206760,7 +206817,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 2718425332668433510, guid: 7d13147a1bcc3244dad63fb3065981c1, type: 3} propertyPath: m_RootOrder - value: 7 + value: 9 objectReference: {fileID: 0} - target: {fileID: 2718425332668433510, guid: 7d13147a1bcc3244dad63fb3065981c1, type: 3} propertyPath: m_LocalPosition.x @@ -211648,7 +211705,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 8044612620057779272, guid: 450b6dc6b2c449e4694a00bba05688d8, type: 3} propertyPath: m_RootOrder - value: 23 + value: 24 objectReference: {fileID: 0} - target: {fileID: 8044612620057779272, guid: 450b6dc6b2c449e4694a00bba05688d8, type: 3} propertyPath: m_LocalRotation.w @@ -212736,7 +212793,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 8977215705378820474, guid: ee0e0e34e2344ec46b9ee698f50ca58a, type: 3} propertyPath: m_RootOrder - value: 24 + value: 25 objectReference: {fileID: 0} - target: {fileID: 8977215705378820474, guid: ee0e0e34e2344ec46b9ee698f50ca58a, type: 3} propertyPath: m_LocalRotation.w diff --git a/Assets/Scenes/Preloader.unity b/Assets/Scenes/Preloader.unity index d09b3b0..2e580ea 100644 --- a/Assets/Scenes/Preloader.unity +++ b/Assets/Scenes/Preloader.unity @@ -332,7 +332,7 @@ MonoBehaviour: PlayerPrefab: 0 - Prefab: {fileID: 2481528670431999298, guid: 27744b51bdd10b246983d369908f08fc, type: 3} PlayerPrefab: 0 - - Prefab: {fileID: 2206362918716505385, guid: 64d85f58cbff5844cac3de94cc1d2c6a, type: 3} + - Prefab: {fileID: 8374297646166547284, guid: 50bef3132cb37e240955458f92edd4b8, type: 3} PlayerPrefab: 0 PlayerPrefabHash: id: 0 @@ -377,60 +377,60 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &2206362917158321123 +--- !u!1001 &8851264010637563756 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 2206362918716505385, guid: 64d85f58cbff5844cac3de94cc1d2c6a, type: 3} - propertyPath: m_Name - value: NetPortals - objectReference: {fileID: 0} - - target: {fileID: 2206362918716505389, guid: 64d85f58cbff5844cac3de94cc1d2c6a, type: 3} + - target: {fileID: 8851264010347475801, guid: 64d85f58cbff5844cac3de94cc1d2c6a, type: 3} propertyPath: m_RootOrder value: 1 objectReference: {fileID: 0} - - target: {fileID: 2206362918716505389, guid: 64d85f58cbff5844cac3de94cc1d2c6a, type: 3} + - target: {fileID: 8851264010347475801, guid: 64d85f58cbff5844cac3de94cc1d2c6a, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2206362918716505389, guid: 64d85f58cbff5844cac3de94cc1d2c6a, type: 3} + - target: {fileID: 8851264010347475801, guid: 64d85f58cbff5844cac3de94cc1d2c6a, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2206362918716505389, guid: 64d85f58cbff5844cac3de94cc1d2c6a, type: 3} + - target: {fileID: 8851264010347475801, guid: 64d85f58cbff5844cac3de94cc1d2c6a, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2206362918716505389, guid: 64d85f58cbff5844cac3de94cc1d2c6a, type: 3} + - target: {fileID: 8851264010347475801, guid: 64d85f58cbff5844cac3de94cc1d2c6a, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 2206362918716505389, guid: 64d85f58cbff5844cac3de94cc1d2c6a, type: 3} + - target: {fileID: 8851264010347475801, guid: 64d85f58cbff5844cac3de94cc1d2c6a, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2206362918716505389, guid: 64d85f58cbff5844cac3de94cc1d2c6a, type: 3} + - target: {fileID: 8851264010347475801, guid: 64d85f58cbff5844cac3de94cc1d2c6a, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2206362918716505389, guid: 64d85f58cbff5844cac3de94cc1d2c6a, type: 3} + - target: {fileID: 8851264010347475801, guid: 64d85f58cbff5844cac3de94cc1d2c6a, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2206362918716505389, guid: 64d85f58cbff5844cac3de94cc1d2c6a, type: 3} + - target: {fileID: 8851264010347475801, guid: 64d85f58cbff5844cac3de94cc1d2c6a, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2206362918716505389, guid: 64d85f58cbff5844cac3de94cc1d2c6a, type: 3} + - target: {fileID: 8851264010347475801, guid: 64d85f58cbff5844cac3de94cc1d2c6a, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2206362918716505389, guid: 64d85f58cbff5844cac3de94cc1d2c6a, type: 3} + - target: {fileID: 8851264010347475801, guid: 64d85f58cbff5844cac3de94cc1d2c6a, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8851264010347475804, guid: 64d85f58cbff5844cac3de94cc1d2c6a, type: 3} + propertyPath: m_Name + value: NetPortals + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 64d85f58cbff5844cac3de94cc1d2c6a, type: 3} diff --git a/Assets/Scripts/Network/ObjectCleanup.cs b/Assets/Scripts/Network/ObjectCleanup.cs new file mode 100644 index 0000000..3e705ae --- /dev/null +++ b/Assets/Scripts/Network/ObjectCleanup.cs @@ -0,0 +1,25 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using MLAPI; +using MLAPI.Messaging; + +public class ObjectCleanup : NetworkBehaviour { + + void Start() { + DontDestroyOnLoad(gameObject); + } + + [ServerRpc(RequireOwnership = false)] + public void DestroyPersistingNetObjectsServerRPC() { + NetworkObject[] networkObjects = FindObjectsOfType(); + Debug.Log("Here"); + foreach (NetworkObject nObj in networkObjects) { + GameObject netObj = nObj.gameObject; + + if (netObj == gameObject) { continue; } + + netObj.GetComponent().Despawn(true); + } + } +} diff --git a/Assets/Scripts/Network/ObjectCleanup.cs.meta b/Assets/Scripts/Network/ObjectCleanup.cs.meta new file mode 100644 index 0000000..d01bd0f --- /dev/null +++ b/Assets/Scripts/Network/ObjectCleanup.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: fa645e93121ef864da8af31cfb2aab33 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Network/ServerGameNetPortal.cs b/Assets/Scripts/Network/ServerGameNetPortal.cs index 0b52f8e..2fe94c7 100644 --- a/Assets/Scripts/Network/ServerGameNetPortal.cs +++ b/Assets/Scripts/Network/ServerGameNetPortal.cs @@ -3,13 +3,12 @@ using System.Collections; using System.Collections.Generic; using System.Text; using MLAPI; -using MLAPI.Messaging; using MLAPI.SceneManagement; using MLAPI.Spawning; using UnityEngine; using UnityEngine.SceneManagement; -public class ServerGameNetPortal : NetworkBehaviour { +public class ServerGameNetPortal : MonoBehaviour { [Header("Settings")] [SerializeField] private int maxPlayers = 3; @@ -101,22 +100,11 @@ public class ServerGameNetPortal : NetworkBehaviour { gameInProgress = false; // Remove any networked objects that might persist back to the Lobby - DestroyPersistingNetObjectsServerRPC(); + //ObjectCleanup.Instance.DestroyPersistingNetObjectsServerRPC(); NetworkSceneManager.SwitchScene("Lobby"); } - [ServerRpc(RequireOwnership = false)] - private void DestroyPersistingNetObjectsServerRPC() { - NetworkObject[] networkObjects = FindObjectsOfType(); - - foreach(NetworkObject nObj in networkObjects) { - GameObject netObj = nObj.gameObject; - - netObj.GetComponent().Despawn(true); - } - } - private void HandleNetworkReadied() { if (!NetworkManager.Singleton.IsServer) { return; } diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 28a7c48..ae740ea 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -9,32 +9,32 @@ EditorUserSettings: value: 22424703114646680e0b0227036c7b151b180b650e3a233126281f3fe7c23837e1ec25a7f234362820 flags: 0 RecentlyUsedScenePath-1: - value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb - flags: 0 - RecentlyUsedScenePath-2: value: 22424703114646680e0b0227036c7b151b180b6519016b0515163936efef2776f7e93ffdfe flags: 0 - RecentlyUsedScenePath-3: - value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb - flags: 0 - RecentlyUsedScenePath-4: + RecentlyUsedScenePath-2: value: 22424703114646680e0b0227036c7b151b180b650721283704240d14f0e12d3aedff78fce9332b25 flags: 0 - RecentlyUsedScenePath-5: + RecentlyUsedScenePath-3: value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26 flags: 0 - RecentlyUsedScenePath-6: - value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb - flags: 0 - RecentlyUsedScenePath-7: + RecentlyUsedScenePath-4: value: 22424703114646680e0b0227036c6b19021b1d192f2d2835633c133af6f9 flags: 0 - RecentlyUsedScenePath-8: + RecentlyUsedScenePath-5: value: 22424703114646680e0b0227036c731f1415016439262f2434 flags: 0 - RecentlyUsedScenePath-9: + RecentlyUsedScenePath-6: value: 22424703114646680e0b0227036c6b19021b1d192f2d2835633c133af6f9 flags: 0 + RecentlyUsedScenePath-7: + value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb + flags: 0 + RecentlyUsedScenePath-8: + value: 22424703114646680e0b0227036c6b19021b1d192f2d2835633c133af6f9 + flags: 0 + RecentlyUsedScenePath-9: + value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb + flags: 0 vcSharedLogLevel: value: 0d5e400f0650 flags: 0