From dac0c37621de803c89cbc7a453de4efd7c9ca2e2 Mon Sep 17 00:00:00 2001 From: Oscar Date: Thu, 21 Mar 2024 15:16:40 +0300 Subject: [PATCH] Testing your playback sound --- Assets/Prefabs/Procedural/Room.prefab | 78 +++++++++---------- Assets/Prefabs/Procedural/Room_1.prefab | 24 +++--- Assets/Prefabs/Procedural/Room_2.prefab | 6 +- Assets/Prefabs/Procedural/Room_3.prefab | 56 +++++++++++++ Assets/Prefabs/Procedural/Room_4.prefab | 26 +++---- Assets/Prefabs/Procedural/Room_5.prefab | 6 +- Assets/Scenes/NewMenu.unity | 10 +-- .../Level/BuildModules/ProceduralPrefabs.cs | 13 +--- .../Scripts/Network/CustomNetworkManager.cs | 24 ++++-- 9 files changed, 149 insertions(+), 94 deletions(-) diff --git a/Assets/Prefabs/Procedural/Room.prefab b/Assets/Prefabs/Procedural/Room.prefab index d4c7459..4b39331 100644 --- a/Assets/Prefabs/Procedural/Room.prefab +++ b/Assets/Prefabs/Procedural/Room.prefab @@ -14,13 +14,13 @@ GameObject: - component: {fileID: 7005080718198834357} - component: {fileID: 4822851902742051790} - component: {fileID: 8203218961067133613} - - component: {fileID: 6469056431908107288} + - component: {fileID: 7383154516038426028} m_Layer: 0 m_Name: Room m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 + m_StaticEditorFlags: 0 m_IsActive: 1 --- !u!4 &8105026293294623414 Transform: @@ -169,7 +169,7 @@ MonoBehaviour: syncMode: 0 syncInterval: 0.1 prefab: {fileID: 6830579541325509221, guid: 6a3d7d21ac1b5f14683645eb9e411130, type: 3} ---- !u!114 &6469056431908107288 +--- !u!114 &7383154516038426028 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -184,12 +184,12 @@ MonoBehaviour: syncMode: 0 syncInterval: 0.1 clientAuthority: 0 - sendInterval: 0.019 + sendInterval: 0.05 syncPosition: 1 - syncRotation: 0 + syncRotation: 1 syncScale: 0 - interpolatePosition: 0 - interpolateRotation: 0 + interpolatePosition: 1 + interpolateRotation: 1 interpolateScale: 0 bufferTimeMultiplier: 1 bufferSizeLimit: 64 @@ -260,7 +260,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8730245854331329977, guid: b2452a5c2cd649a4db9eebcd16f7b155, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b2452a5c2cd649a4db9eebcd16f7b155, type: 3} @@ -347,7 +347,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2481634258350380217, guid: eb4b38db67a56dc469a2c2aafcc36add, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: eb4b38db67a56dc469a2c2aafcc36add, type: 3} @@ -413,7 +413,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8730245854331329977, guid: b2452a5c2cd649a4db9eebcd16f7b155, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b2452a5c2cd649a4db9eebcd16f7b155, type: 3} @@ -500,7 +500,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2481634258350380217, guid: eb4b38db67a56dc469a2c2aafcc36add, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: eb4b38db67a56dc469a2c2aafcc36add, type: 3} @@ -566,7 +566,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2481634258350380217, guid: eb4b38db67a56dc469a2c2aafcc36add, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: eb4b38db67a56dc469a2c2aafcc36add, type: 3} @@ -632,7 +632,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8730245854331329977, guid: b2452a5c2cd649a4db9eebcd16f7b155, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b2452a5c2cd649a4db9eebcd16f7b155, type: 3} @@ -675,7 +675,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6257800485735965347, guid: cf8443763fc34314490f8a3e2f94dd37, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6954531691785998512, guid: cf8443763fc34314490f8a3e2f94dd37, type: 3} propertyPath: m_RootOrder @@ -742,7 +742,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6257800485735965347, guid: cf8443763fc34314490f8a3e2f94dd37, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6954531691785998512, guid: cf8443763fc34314490f8a3e2f94dd37, type: 3} propertyPath: m_RootOrder @@ -809,7 +809,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6257800485735965347, guid: cf8443763fc34314490f8a3e2f94dd37, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6954531691785998512, guid: cf8443763fc34314490f8a3e2f94dd37, type: 3} propertyPath: m_RootOrder @@ -876,7 +876,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6257800485735965347, guid: cf8443763fc34314490f8a3e2f94dd37, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6954531691785998512, guid: cf8443763fc34314490f8a3e2f94dd37, type: 3} propertyPath: m_RootOrder @@ -987,7 +987,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2481634258350380217, guid: eb4b38db67a56dc469a2c2aafcc36add, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: eb4b38db67a56dc469a2c2aafcc36add, type: 3} @@ -1053,7 +1053,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8730245854331329977, guid: b2452a5c2cd649a4db9eebcd16f7b155, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b2452a5c2cd649a4db9eebcd16f7b155, type: 3} @@ -1096,7 +1096,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6257800485735965347, guid: cf8443763fc34314490f8a3e2f94dd37, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6954531691785998512, guid: cf8443763fc34314490f8a3e2f94dd37, type: 3} propertyPath: m_RootOrder @@ -1207,7 +1207,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8730245854331329977, guid: b2452a5c2cd649a4db9eebcd16f7b155, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b2452a5c2cd649a4db9eebcd16f7b155, type: 3} @@ -1294,7 +1294,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8730245854331329977, guid: b2452a5c2cd649a4db9eebcd16f7b155, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b2452a5c2cd649a4db9eebcd16f7b155, type: 3} @@ -1381,7 +1381,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8730245854331329977, guid: b2452a5c2cd649a4db9eebcd16f7b155, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b2452a5c2cd649a4db9eebcd16f7b155, type: 3} @@ -1468,7 +1468,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8730245854331329977, guid: b2452a5c2cd649a4db9eebcd16f7b155, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b2452a5c2cd649a4db9eebcd16f7b155, type: 3} @@ -1555,7 +1555,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8730245854331329977, guid: b2452a5c2cd649a4db9eebcd16f7b155, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b2452a5c2cd649a4db9eebcd16f7b155, type: 3} @@ -1598,7 +1598,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6257800485735965347, guid: cf8443763fc34314490f8a3e2f94dd37, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6954531691785998512, guid: cf8443763fc34314490f8a3e2f94dd37, type: 3} propertyPath: m_RootOrder @@ -1665,7 +1665,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6257800485735965347, guid: cf8443763fc34314490f8a3e2f94dd37, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6954531691785998512, guid: cf8443763fc34314490f8a3e2f94dd37, type: 3} propertyPath: m_RootOrder @@ -1776,7 +1776,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2481634258350380217, guid: eb4b38db67a56dc469a2c2aafcc36add, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: eb4b38db67a56dc469a2c2aafcc36add, type: 3} @@ -1798,7 +1798,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6257800485735965347, guid: cf8443763fc34314490f8a3e2f94dd37, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6954531691785998512, guid: cf8443763fc34314490f8a3e2f94dd37, type: 3} propertyPath: m_RootOrder @@ -1909,7 +1909,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2481634258350380217, guid: eb4b38db67a56dc469a2c2aafcc36add, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: eb4b38db67a56dc469a2c2aafcc36add, type: 3} @@ -1927,7 +1927,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 87431465960102018, guid: 407e4e65456601c4ba66e0697b1c325c, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1505956034637721244, guid: 407e4e65456601c4ba66e0697b1c325c, type: 3} propertyPath: m_RootOrder @@ -1979,11 +1979,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2503265614260935823, guid: 407e4e65456601c4ba66e0697b1c325c, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3389875338750933123, guid: 407e4e65456601c4ba66e0697b1c325c, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 407e4e65456601c4ba66e0697b1c325c, type: 3} @@ -2049,7 +2049,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8730245854331329977, guid: b2452a5c2cd649a4db9eebcd16f7b155, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b2452a5c2cd649a4db9eebcd16f7b155, type: 3} @@ -2092,7 +2092,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6257800485735965347, guid: cf8443763fc34314490f8a3e2f94dd37, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6954531691785998512, guid: cf8443763fc34314490f8a3e2f94dd37, type: 3} propertyPath: m_RootOrder @@ -2203,7 +2203,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2481634258350380217, guid: eb4b38db67a56dc469a2c2aafcc36add, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: eb4b38db67a56dc469a2c2aafcc36add, type: 3} @@ -2273,7 +2273,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8730245854331329977, guid: b2452a5c2cd649a4db9eebcd16f7b155, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b2452a5c2cd649a4db9eebcd16f7b155, type: 3} @@ -2360,7 +2360,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8730245854331329977, guid: b2452a5c2cd649a4db9eebcd16f7b155, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b2452a5c2cd649a4db9eebcd16f7b155, type: 3} @@ -2447,7 +2447,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2481634258350380217, guid: eb4b38db67a56dc469a2c2aafcc36add, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: eb4b38db67a56dc469a2c2aafcc36add, type: 3} diff --git a/Assets/Prefabs/Procedural/Room_1.prefab b/Assets/Prefabs/Procedural/Room_1.prefab index dc4f3b2..05c9645 100644 --- a/Assets/Prefabs/Procedural/Room_1.prefab +++ b/Assets/Prefabs/Procedural/Room_1.prefab @@ -13,7 +13,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5213729776819953798, guid: ab69daf48f5bdc74fa067080f34bd815, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9079743121380348565, guid: ab69daf48f5bdc74fa067080f34bd815, type: 3} propertyPath: m_RootOrder @@ -118,7 +118,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8616474985601507132, guid: a1c3fdb86a0adcd46ab019295d74504c, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a1c3fdb86a0adcd46ab019295d74504c, type: 3} @@ -179,7 +179,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4551697137065323032, guid: 68b56f98a24210a4e82f6c092adcd68e, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 68b56f98a24210a4e82f6c092adcd68e, type: 3} @@ -196,7 +196,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4910352700272845603, guid: b76f846b3379607468a593969b575654, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8250113047921840432, guid: b76f846b3379607468a593969b575654, type: 3} propertyPath: m_RootOrder @@ -257,7 +257,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4910352700272845603, guid: b76f846b3379607468a593969b575654, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8250113047921840432, guid: b76f846b3379607468a593969b575654, type: 3} propertyPath: m_RootOrder @@ -318,7 +318,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4910352700272845603, guid: b76f846b3379607468a593969b575654, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8250113047921840432, guid: b76f846b3379607468a593969b575654, type: 3} propertyPath: m_RootOrder @@ -379,7 +379,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4910352700272845603, guid: b76f846b3379607468a593969b575654, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8250113047921840432, guid: b76f846b3379607468a593969b575654, type: 3} propertyPath: m_RootOrder @@ -440,7 +440,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4910352700272845603, guid: b76f846b3379607468a593969b575654, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8250113047921840432, guid: b76f846b3379607468a593969b575654, type: 3} propertyPath: m_RootOrder @@ -567,19 +567,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5548154041111978480, guid: 63d248e67db58c04aa37512e19848568, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5548154041111978482, guid: 63d248e67db58c04aa37512e19848568, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5548154041111978484, guid: 63d248e67db58c04aa37512e19848568, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5548154041111978486, guid: 63d248e67db58c04aa37512e19848568, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5548154041112411600, guid: 63d248e67db58c04aa37512e19848568, type: 3} propertyPath: m_RootOrder diff --git a/Assets/Prefabs/Procedural/Room_2.prefab b/Assets/Prefabs/Procedural/Room_2.prefab index f9f92e0..91d10d0 100644 --- a/Assets/Prefabs/Procedural/Room_2.prefab +++ b/Assets/Prefabs/Procedural/Room_2.prefab @@ -13,7 +13,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1835881230559808018, guid: 207f61281715ab24f9899fdfa960ca48, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3396001746467026945, guid: 207f61281715ab24f9899fdfa960ca48, type: 3} propertyPath: m_RootOrder @@ -74,7 +74,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1835881230559808018, guid: 207f61281715ab24f9899fdfa960ca48, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3396001746467026945, guid: 207f61281715ab24f9899fdfa960ca48, type: 3} propertyPath: m_RootOrder @@ -135,7 +135,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1835881230559808018, guid: 207f61281715ab24f9899fdfa960ca48, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3396001746467026945, guid: 207f61281715ab24f9899fdfa960ca48, type: 3} propertyPath: m_RootOrder diff --git a/Assets/Prefabs/Procedural/Room_3.prefab b/Assets/Prefabs/Procedural/Room_3.prefab index 1f4d4f0..7848f25 100644 --- a/Assets/Prefabs/Procedural/Room_3.prefab +++ b/Assets/Prefabs/Procedural/Room_3.prefab @@ -59,6 +59,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4379192404056611112, guid: 207f61281715ab24f9899fdfa960ca48, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 6767183387969885259, guid: 207f61281715ab24f9899fdfa960ca48, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 207f61281715ab24f9899fdfa960ca48, type: 3} --- !u!1001 &1100911955862952572 @@ -68,6 +76,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 4454339116668905263} m_Modifications: + - target: {fileID: 5471734309729208620, guid: 63d248e67db58c04aa37512e19848568, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} - target: {fileID: 5548154041111978480, guid: 63d248e67db58c04aa37512e19848568, type: 3} propertyPath: m_Name value: CatWalk Stairs Wide (1) @@ -132,6 +144,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5757740802340635105, guid: 63d248e67db58c04aa37512e19848568, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 8293897056650551903, guid: 63d248e67db58c04aa37512e19848568, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 63d248e67db58c04aa37512e19848568, type: 3} --- !u!1001 &3012083948346658722 @@ -193,6 +213,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4379192404056611112, guid: 207f61281715ab24f9899fdfa960ca48, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 6767183387969885259, guid: 207f61281715ab24f9899fdfa960ca48, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 207f61281715ab24f9899fdfa960ca48, type: 3} --- !u!1001 &5596333501024275865 @@ -268,6 +296,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 4454339116668905263} m_Modifications: + - target: {fileID: 5471734309729208620, guid: 63d248e67db58c04aa37512e19848568, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} - target: {fileID: 5548154041111978480, guid: 63d248e67db58c04aa37512e19848568, type: 3} propertyPath: m_Name value: CatWalk Stairs Wide @@ -332,6 +364,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5757740802340635105, guid: 63d248e67db58c04aa37512e19848568, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 8293897056650551903, guid: 63d248e67db58c04aa37512e19848568, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 63d248e67db58c04aa37512e19848568, type: 3} --- !u!1001 &6638637474120354178 @@ -462,6 +502,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4379192404056611112, guid: 207f61281715ab24f9899fdfa960ca48, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 6767183387969885259, guid: 207f61281715ab24f9899fdfa960ca48, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 207f61281715ab24f9899fdfa960ca48, type: 3} --- !u!1001 &8472828440129396456 @@ -523,5 +571,13 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4379192404056611112, guid: 207f61281715ab24f9899fdfa960ca48, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 6767183387969885259, guid: 207f61281715ab24f9899fdfa960ca48, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 207f61281715ab24f9899fdfa960ca48, type: 3} diff --git a/Assets/Prefabs/Procedural/Room_4.prefab b/Assets/Prefabs/Procedural/Room_4.prefab index 5ab8249..f8f71d5 100644 --- a/Assets/Prefabs/Procedural/Room_4.prefab +++ b/Assets/Prefabs/Procedural/Room_4.prefab @@ -57,7 +57,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3773941223442343427, guid: f3666c4739f55c24eb42ed8d7b508700, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f3666c4739f55c24eb42ed8d7b508700, type: 3} @@ -74,7 +74,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4910352700272845603, guid: b76f846b3379607468a593969b575654, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8250113047921840432, guid: b76f846b3379607468a593969b575654, type: 3} propertyPath: m_RootOrder @@ -179,7 +179,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3773941223442343427, guid: f3666c4739f55c24eb42ed8d7b508700, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f3666c4739f55c24eb42ed8d7b508700, type: 3} @@ -196,7 +196,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4910352700272845603, guid: b76f846b3379607468a593969b575654, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8250113047921840432, guid: b76f846b3379607468a593969b575654, type: 3} propertyPath: m_RootOrder @@ -257,7 +257,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4910352700272845603, guid: b76f846b3379607468a593969b575654, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8250113047921840432, guid: b76f846b3379607468a593969b575654, type: 3} propertyPath: m_RootOrder @@ -318,7 +318,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4910352700272845603, guid: b76f846b3379607468a593969b575654, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8250113047921840432, guid: b76f846b3379607468a593969b575654, type: 3} propertyPath: m_RootOrder @@ -379,7 +379,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4910352700272845603, guid: b76f846b3379607468a593969b575654, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8250113047921840432, guid: b76f846b3379607468a593969b575654, type: 3} propertyPath: m_RootOrder @@ -440,7 +440,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4910352700272845603, guid: b76f846b3379607468a593969b575654, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8250113047921840432, guid: b76f846b3379607468a593969b575654, type: 3} propertyPath: m_RootOrder @@ -545,7 +545,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3773941223442343427, guid: f3666c4739f55c24eb42ed8d7b508700, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f3666c4739f55c24eb42ed8d7b508700, type: 3} @@ -562,7 +562,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4910352700272845603, guid: b76f846b3379607468a593969b575654, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8250113047921840432, guid: b76f846b3379607468a593969b575654, type: 3} propertyPath: m_RootOrder @@ -667,7 +667,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3773941223442343427, guid: f3666c4739f55c24eb42ed8d7b508700, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f3666c4739f55c24eb42ed8d7b508700, type: 3} @@ -728,7 +728,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4381963800603582958, guid: 52c51744944b30b4395badb88a68a18b, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 52c51744944b30b4395badb88a68a18b, type: 3} @@ -811,7 +811,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4910352700272845603, guid: b76f846b3379607468a593969b575654, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8250113047921840432, guid: b76f846b3379607468a593969b575654, type: 3} propertyPath: m_RootOrder diff --git a/Assets/Prefabs/Procedural/Room_5.prefab b/Assets/Prefabs/Procedural/Room_5.prefab index 1c07e0b..b6ca908 100644 --- a/Assets/Prefabs/Procedural/Room_5.prefab +++ b/Assets/Prefabs/Procedural/Room_5.prefab @@ -13,7 +13,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1835881230559808018, guid: 207f61281715ab24f9899fdfa960ca48, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3396001746467026945, guid: 207f61281715ab24f9899fdfa960ca48, type: 3} propertyPath: m_RootOrder @@ -74,7 +74,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1835881230559808018, guid: 207f61281715ab24f9899fdfa960ca48, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3396001746467026945, guid: 207f61281715ab24f9899fdfa960ca48, type: 3} propertyPath: m_RootOrder @@ -201,7 +201,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1835881230559808018, guid: 207f61281715ab24f9899fdfa960ca48, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3396001746467026945, guid: 207f61281715ab24f9899fdfa960ca48, type: 3} propertyPath: m_RootOrder diff --git a/Assets/Scenes/NewMenu.unity b/Assets/Scenes/NewMenu.unity index 15ff53c..8d1499c 100644 --- a/Assets/Scenes/NewMenu.unity +++ b/Assets/Scenes/NewMenu.unity @@ -2308,7 +2308,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &488838373 stripped Transform: @@ -2766,7 +2766,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &569350723 GameObject: @@ -8130,7 +8130,7 @@ Transform: m_Children: - {fileID: 5229544965318186443} m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 3, y: 0, z: 0} --- !u!1 &1495648932 GameObject: @@ -10774,7 +10774,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1978125998 GameObject: @@ -31882,7 +31882,7 @@ Transform: m_Children: - {fileID: 7537891071950466464} m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} --- !u!1 &4725783423928672993 GameObject: diff --git a/Assets/Scripts/Level/BuildModules/ProceduralPrefabs.cs b/Assets/Scripts/Level/BuildModules/ProceduralPrefabs.cs index 1d20f2a..dbe14fd 100644 --- a/Assets/Scripts/Level/BuildModules/ProceduralPrefabs.cs +++ b/Assets/Scripts/Level/BuildModules/ProceduralPrefabs.cs @@ -32,8 +32,6 @@ namespace Level.BuildModules private List _enemySpawnPoses = new(); public List enemyList = new(); - private bool _nasral = false; - private IEnumerator Start() { if(!isServer) yield break; @@ -49,6 +47,7 @@ namespace Level.BuildModules { yield return new WaitForSecondsRealtime(0.1f); } + yield return new WaitForSecondsRealtime(1f); PlaceOneRoom(); } @@ -63,18 +62,10 @@ namespace Level.BuildModules networkManager.OnPlayerSpawned += OnPlayerSpawned; - // if (isServer) - // { - // OnPlayerSpawned(); - // } } private void OnPlayerSpawned() { - if (_nasral) return; - - _nasral = true; - print("OnPlayerSpawned"); if (enemyList.Count == networkManager.maxMonsters) return; @@ -130,7 +121,7 @@ namespace Level.BuildModules Room newRoom = Instantiate(roomPrefabs[Random.Range(0, roomPrefabs.Length)]); NetworkServer.Spawn(newRoom.gameObject); - + int limit = 500; while (limit-- > 0) { diff --git a/Assets/Scripts/Network/CustomNetworkManager.cs b/Assets/Scripts/Network/CustomNetworkManager.cs index 0202523..68e5d57 100644 --- a/Assets/Scripts/Network/CustomNetworkManager.cs +++ b/Assets/Scripts/Network/CustomNetworkManager.cs @@ -119,20 +119,28 @@ public class CustomNetworkManager : NetworkManager { StartCoroutine(RestartTimer()); } + + string getLevelById(Int32 id) + { + switch (id) + { + case 0 : + return "Assets/Scenes/Space.unity"; + case 1 : + return "Assets/Scenes/Procedural.unity"; + default: + return "Assets/Scenes/Space.unity"; + } + } + // ReSharper disable Unity.PerformanceAnalysis IEnumerator RestartTimer() { yield return new WaitForSeconds(_restartTime); - print(networkSceneName); + print(PlayerPrefs.GetInt("Level")); - this.ServerChangeScene(NetworkManager.networkSceneName); + ServerChangeScene( getLevelById(PlayerPrefs.GetInt("Level"))); StopCoroutine(RestartTimer()); } - - // private List alive2 { - // get { - // return players.FindAll(player => player.GetComponent().Alive == true).ConvertAll(); - // } - // } }