From 9e559e8fed8e583bcc0fb0355d054cef1ed10da3 Mon Sep 17 00:00:00 2001 From: Oscar Date: Wed, 20 Mar 2024 18:03:21 +0300 Subject: [PATCH] fix --- .../Catwalk/CatWalk Stairs Wide.prefab | 125 +++- .../Structures/Catwalk/Catwalk Corner.prefab | 198 ++++- .../Catwalk/Catwalk Long Rails.prefab | 100 ++- .../Structures/Catwalk/Catwalk Long.prefab | 54 +- .../Structures/Catwalk/Catwalk Short.prefab | 54 +- .../Structures/Catwalk/Catwalk Stairs.prefab | 123 +++- .../Structures/Walls/Wall BayDoor.prefab | 18 + .../Structures/Walls/Wall DoorClosed.prefab | 18 + .../Prefabs/Structures/Walls/Wall Fan.prefab | 18 + .../Structures/Walls/Wall Plain.prefab | 18 + .../Structures/Walls/Wall Window.prefab | 18 + Assets/Prefabs/Procedural/Room.prefab | 52 +- Assets/Prefabs/Procedural/Room_2.prefab | 61 -- Assets/Prefabs/Procedural/Room_5.prefab | 251 +++++++ Assets/Prefabs/Procedural/Room_5.prefab.meta | 7 + Assets/Prefabs/Procedural/Room_6.prefab | 695 ++++++++++++++++++ Assets/Prefabs/Procedural/Room_6.prefab.meta | 7 + .../Characters/Enemy/States/PatrolState.cs | 7 +- .../Level/BuildModules/ProceduralPrefabs.cs | 43 +- .../Scripts/Network/CustomNetworkManager.cs | 12 + Assets/Scripts/Network/NetworkGameManager.cs | 2 +- 21 files changed, 1756 insertions(+), 125 deletions(-) create mode 100644 Assets/Prefabs/Procedural/Room_5.prefab create mode 100644 Assets/Prefabs/Procedural/Room_5.prefab.meta create mode 100644 Assets/Prefabs/Procedural/Room_6.prefab create mode 100644 Assets/Prefabs/Procedural/Room_6.prefab.meta diff --git a/Assets/Environment/SciFi Warehouse Kit/Prefabs/Structures/Catwalk/CatWalk Stairs Wide.prefab b/Assets/Environment/SciFi Warehouse Kit/Prefabs/Structures/Catwalk/CatWalk Stairs Wide.prefab index 49cd889..a47c697 100644 --- a/Assets/Environment/SciFi Warehouse Kit/Prefabs/Structures/Catwalk/CatWalk Stairs Wide.prefab +++ b/Assets/Environment/SciFi Warehouse Kit/Prefabs/Structures/Catwalk/CatWalk Stairs Wide.prefab @@ -1,5 +1,50 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &5471734309729208620 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5910955290905813950} + - component: {fileID: 5366795691238961973} + m_Layer: 0 + m_Name: collider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5910955290905813950 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5471734309729208620} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1.002, y: 4.25, z: 3.007} + m_LocalScale: {x: 2.0164, y: 0.52, z: 6.0696} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5548154041112411600} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &5366795691238961973 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5471734309729208620} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &5548154041111978480 GameObject: m_ObjectHideFlags: 0 @@ -24,12 +69,15 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5548154041111978480} m_LocalRotation: {x: -0, y: 0.70710576, z: -0, w: 0.70710784} - m_LocalPosition: {x: 30, y: -0, z: 27.800001} + m_LocalPosition: {x: 0, y: -0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5548154041112411602} - {fileID: 5548154041112411606} - {fileID: 5548154041112411604} + - {fileID: 5910955290905813950} + - {fileID: 4109190533743521814} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 90.00001, z: 0} @@ -62,6 +110,7 @@ Transform: m_LocalRotation: {x: 0.000000021855694, 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: 5548154041112411600} m_RootOrder: 0 @@ -85,9 +134,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -99,6 +151,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -111,6 +164,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!64 &8703344745830050819 MeshCollider: m_ObjectHideFlags: 0 @@ -121,9 +175,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 - m_CookingOptions: 14 + m_CookingOptions: 30 m_Mesh: {fileID: 4300002, guid: f166f60cc0fa7d344b41aa4d7a0c6cd7, type: 3} --- !u!1 &5548154041111978484 GameObject: @@ -154,6 +208,7 @@ Transform: m_LocalRotation: {x: 0.000000021855694, 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: 5548154041112411600} m_RootOrder: 2 @@ -177,9 +232,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -191,6 +249,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -203,6 +262,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!64 &8129798193583784660 MeshCollider: m_ObjectHideFlags: 0 @@ -213,9 +273,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 - m_CookingOptions: 14 + m_CookingOptions: 30 m_Mesh: {fileID: 4300000, guid: f166f60cc0fa7d344b41aa4d7a0c6cd7, type: 3} --- !u!1 &5548154041111978486 GameObject: @@ -246,6 +306,7 @@ Transform: m_LocalRotation: {x: 0.000000021855694, 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: 5548154041112411600} m_RootOrder: 1 @@ -269,9 +330,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -283,6 +347,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -295,6 +360,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!64 &2587354516725314905 MeshCollider: m_ObjectHideFlags: 0 @@ -305,7 +371,52 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 - m_CookingOptions: 14 + m_CookingOptions: 30 m_Mesh: {fileID: 4300004, guid: f166f60cc0fa7d344b41aa4d7a0c6cd7, type: 3} +--- !u!1 &5757740802340635105 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4109190533743521814} + - component: {fileID: 3309169911290430101} + m_Layer: 0 + m_Name: collider (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4109190533743521814 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5757740802340635105} + m_LocalRotation: {x: -0.0000010132787, y: -0.00000011920926, z: -0.2798177, w: 0.96005315} + m_LocalPosition: {x: 5.38, y: 2.18, z: 3.01} + m_LocalScale: {x: 8.218444, y: 0.28, z: 3.8690665} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5548154041112411600} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -32.499} +--- !u!65 &3309169911290430101 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5757740802340635105} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Environment/SciFi Warehouse Kit/Prefabs/Structures/Catwalk/Catwalk Corner.prefab b/Assets/Environment/SciFi Warehouse Kit/Prefabs/Structures/Catwalk/Catwalk Corner.prefab index 69c52c3..fe4ebf6 100644 --- a/Assets/Environment/SciFi Warehouse Kit/Prefabs/Structures/Catwalk/Catwalk Corner.prefab +++ b/Assets/Environment/SciFi Warehouse Kit/Prefabs/Structures/Catwalk/Catwalk Corner.prefab @@ -1,5 +1,50 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &2330794612132242033 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8910885185409332419} + - component: {fileID: 1481141759597981396} + m_Layer: 0 + m_Name: collider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8910885185409332419 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2330794612132242033} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1, y: 4.149, z: 3.004} + m_LocalScale: {x: 2.1155248, y: 0.72, z: 6.017167} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 145489941708477456} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &1481141759597981396 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2330794612132242033} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &3773941223442343427 GameObject: m_ObjectHideFlags: 0 @@ -29,7 +74,12 @@ Transform: m_LocalRotation: {x: 0.000000021855694, 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8910885185409332419} + - {fileID: 7129730897617714453} + - {fileID: 2400355790426131345} + - {fileID: 8372989897248244642} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -52,9 +102,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -66,6 +119,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -78,6 +132,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!64 &8822811066928360500 MeshCollider: m_ObjectHideFlags: 0 @@ -87,8 +142,143 @@ MeshCollider: m_GameObject: {fileID: 3773941223442343427} m_Material: {fileID: 0} m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 3 + m_Enabled: 0 + serializedVersion: 4 m_Convex: 0 - m_CookingOptions: 14 + m_CookingOptions: 30 m_Mesh: {fileID: 4300002, guid: 8dafe4d8ed6a7ee45b9201a1ddabedb9, type: 3} +--- !u!1 &5457659311561603978 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2400355790426131345} + - component: {fileID: 683757861659701161} + m_Layer: 0 + m_Name: collider (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2400355790426131345 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5457659311561603978} + m_LocalRotation: {x: -1.7763568e-15, y: -0.70710576, z: 0.000000030908577, w: 0.70710784} + m_LocalPosition: {x: 3.987, y: 5.152, z: 3.997} + m_LocalScale: {x: 0.15044801, y: 0.6455968, z: 3.9417338} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 145489941708477456} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} +--- !u!65 &683757861659701161 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5457659311561603978} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &7939872512117547143 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7129730897617714453} + - component: {fileID: 1603319079133252578} + m_Layer: 0 + m_Name: collider (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7129730897617714453 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7939872512117547143} + m_LocalRotation: {x: -1.7763568e-15, y: -0.70710576, z: 0.000000030908577, w: 0.70710784} + m_LocalPosition: {x: 3.01, y: 4.15, z: 4.93} + m_LocalScale: {x: 2.1155248, y: 0.72, z: 6.017167} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 145489941708477456} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} +--- !u!65 &1603319079133252578 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7939872512117547143} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &8536826470531168035 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8372989897248244642} + - component: {fileID: 2634786170817368014} + m_Layer: 0 + m_Name: collider (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8372989897248244642 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8536826470531168035} + m_LocalRotation: {x: 3.5527137e-15, y: 0.000000014901159, z: 1.4506814e-15, w: 1} + m_LocalPosition: {x: 2.027, y: 5.152, z: 2.036} + m_LocalScale: {x: 0.15044801, y: 0.6455968, z: 3.9417338} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 145489941708477456} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &2634786170817368014 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8536826470531168035} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Environment/SciFi Warehouse Kit/Prefabs/Structures/Catwalk/Catwalk Long Rails.prefab b/Assets/Environment/SciFi Warehouse Kit/Prefabs/Structures/Catwalk/Catwalk Long Rails.prefab index 0756ce2..a2b74bc 100644 --- a/Assets/Environment/SciFi Warehouse Kit/Prefabs/Structures/Catwalk/Catwalk Long Rails.prefab +++ b/Assets/Environment/SciFi Warehouse Kit/Prefabs/Structures/Catwalk/Catwalk Long Rails.prefab @@ -31,7 +31,10 @@ Transform: m_LocalRotation: {x: 0.000000021855694, 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3876438208893206793} + - {fileID: 850650427596208384} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -54,9 +57,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -68,6 +74,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -80,6 +87,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &2503307386289838559 BoxCollider: m_ObjectHideFlags: 0 @@ -119,3 +127,93 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 0.23000002, y: 4.828757, z: 0.2800002} m_Center: {x: 2.01, y: 2.3943784, z: 3.0000253} +--- !u!1 &4379192404056611112 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3876438208893206793} + - component: {fileID: 5673543005430682347} + m_Layer: 0 + m_Name: collider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3876438208893206793 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4379192404056611112} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 1, y: 4.149, z: 3.004} + m_LocalScale: {x: 2.11552, y: 0.71999997, z: 6.01717} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3396001746467026945} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &5673543005430682347 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4379192404056611112} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &6767183387969885259 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 850650427596208384} + - component: {fileID: 573729936977685551} + m_Layer: 0 + m_Name: collider (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &850650427596208384 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6767183387969885259} + m_LocalRotation: {x: 3.5527137e-15, y: 0.000000014901159, z: 1.4506814e-15, w: 1} + m_LocalPosition: {x: 2.027, y: 5.152, z: 3.004} + m_LocalScale: {x: 0.15044999, y: 0.64559996, z: 6.031635} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3396001746467026945} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &573729936977685551 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6767183387969885259} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Environment/SciFi Warehouse Kit/Prefabs/Structures/Catwalk/Catwalk Long.prefab b/Assets/Environment/SciFi Warehouse Kit/Prefabs/Structures/Catwalk/Catwalk Long.prefab index a417967..78950a1 100644 --- a/Assets/Environment/SciFi Warehouse Kit/Prefabs/Structures/Catwalk/Catwalk Long.prefab +++ b/Assets/Environment/SciFi Warehouse Kit/Prefabs/Structures/Catwalk/Catwalk Long.prefab @@ -1,5 +1,50 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &3738180933100417353 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 93665720134984657} + - component: {fileID: 6804604469011554763} + m_Layer: 0 + m_Name: collider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &93665720134984657 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3738180933100417353} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 1, y: 4.149, z: 3.004} + m_LocalScale: {x: 2.11552, y: 0.71999997, z: 6.01717} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8250113047921840432} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &6804604469011554763 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3738180933100417353} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &4910352700272845603 GameObject: m_ObjectHideFlags: 0 @@ -29,7 +74,9 @@ Transform: m_LocalRotation: {x: 0.000000021855694, 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 93665720134984657} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -52,9 +99,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -66,6 +116,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -78,6 +129,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &2406652174324685773 BoxCollider: m_ObjectHideFlags: 0 diff --git a/Assets/Environment/SciFi Warehouse Kit/Prefabs/Structures/Catwalk/Catwalk Short.prefab b/Assets/Environment/SciFi Warehouse Kit/Prefabs/Structures/Catwalk/Catwalk Short.prefab index 8f90cad..8579b79 100644 --- a/Assets/Environment/SciFi Warehouse Kit/Prefabs/Structures/Catwalk/Catwalk Short.prefab +++ b/Assets/Environment/SciFi Warehouse Kit/Prefabs/Structures/Catwalk/Catwalk Short.prefab @@ -29,7 +29,9 @@ Transform: m_LocalRotation: {x: 0.000000021855694, 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8803421496805673845} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -52,9 +54,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -66,6 +71,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -78,6 +84,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &7255465686677728436 BoxCollider: m_ObjectHideFlags: 0 @@ -91,3 +98,48 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 2.0000074, y: 0.4770875, z: 2.0000467} m_Center: {x: 0.99999726, y: 4.2614727, z: 0.9999964} +--- !u!1 &7948009247657197647 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8803421496805673845} + - component: {fileID: 8352746831547608631} + m_Layer: 0 + m_Name: collider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8803421496805673845 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7948009247657197647} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 1, y: 4.149, z: 1} + m_LocalScale: {x: 2.11552, y: 0.71999997, z: 2.11552} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 762380492481631229} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &8352746831547608631 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7948009247657197647} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Environment/SciFi Warehouse Kit/Prefabs/Structures/Catwalk/Catwalk Stairs.prefab b/Assets/Environment/SciFi Warehouse Kit/Prefabs/Structures/Catwalk/Catwalk Stairs.prefab index 7920e3e..b4b1cf3 100644 --- a/Assets/Environment/SciFi Warehouse Kit/Prefabs/Structures/Catwalk/Catwalk Stairs.prefab +++ b/Assets/Environment/SciFi Warehouse Kit/Prefabs/Structures/Catwalk/Catwalk Stairs.prefab @@ -1,5 +1,50 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &1773930768010908049 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3522318549388432330} + - component: {fileID: 7548310595780118894} + m_Layer: 0 + m_Name: collider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3522318549388432330 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1773930768010908049} + m_LocalRotation: {x: -0, y: -0.000000014901161, z: -0, w: 1} + m_LocalPosition: {x: 0.98199964, y: 4.25, z: 3.0169964} + m_LocalScale: {x: 2.0163999, y: 0.52, z: 6.0695996} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7515332717815086903} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &7548310595780118894 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1773930768010908049} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &1987996098089819764 GameObject: m_ObjectHideFlags: 0 @@ -29,6 +74,7 @@ Transform: m_LocalRotation: {x: 0.000000021855694, 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: 7515332717815086903} m_RootOrder: 0 @@ -52,9 +98,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -66,6 +115,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -78,6 +128,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!64 &4607632864002001462 MeshCollider: m_ObjectHideFlags: 0 @@ -88,9 +139,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 - m_CookingOptions: 14 + m_CookingOptions: 30 m_Mesh: {fileID: 4300008, guid: 3c5ecca38b8a52643ac5b38d00d57155, type: 3} --- !u!1 &3016890299694482539 GameObject: @@ -121,6 +172,7 @@ Transform: m_LocalRotation: {x: 0.000000021855694, 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: 7515332717815086903} m_RootOrder: 1 @@ -144,9 +196,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -158,6 +213,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -170,6 +226,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!64 &1492634529499274641 MeshCollider: m_ObjectHideFlags: 0 @@ -180,10 +237,55 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 - m_CookingOptions: 14 + m_CookingOptions: 30 m_Mesh: {fileID: 4300010, guid: 3c5ecca38b8a52643ac5b38d00d57155, type: 3} +--- !u!1 &4415105065568715147 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6344560399686966151} + - component: {fileID: 2187430057211987541} + m_Layer: 0 + m_Name: collider (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6344560399686966151 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4415105065568715147} + m_LocalRotation: {x: -0.0000010207294, y: -0.00000008195638, z: -0.27981773, w: 0.96005315} + m_LocalPosition: {x: 5.36, y: 2.18, z: 3.02} + m_LocalScale: {x: 8.21845, y: 0.28, z: 2.2369802} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7515332717815086903} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -32.499} +--- !u!65 &2187430057211987541 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4415105065568715147} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &4764849679883809638 GameObject: m_ObjectHideFlags: 0 @@ -213,6 +315,7 @@ Transform: m_LocalRotation: {x: 0.000000021855694, 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: 7515332717815086903} m_RootOrder: 2 @@ -236,9 +339,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -250,6 +356,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -262,6 +369,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!64 &8030912691935189497 MeshCollider: m_ObjectHideFlags: 0 @@ -272,9 +380,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 - m_CookingOptions: 14 + m_CookingOptions: 30 m_Mesh: {fileID: 4300006, guid: 3c5ecca38b8a52643ac5b38d00d57155, type: 3} --- !u!1 &6778069794998177060 GameObject: @@ -302,10 +410,13 @@ Transform: 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: - {fileID: 7907886098266949546} - {fileID: 2896641647402417047} - {fileID: 3127370351060509642} + - {fileID: 3522318549388432330} + - {fileID: 6344560399686966151} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Environment/SciFi Warehouse Kit/Prefabs/Structures/Walls/Wall BayDoor.prefab b/Assets/Environment/SciFi Warehouse Kit/Prefabs/Structures/Walls/Wall BayDoor.prefab index 5531f39..d82f454 100644 --- a/Assets/Environment/SciFi Warehouse Kit/Prefabs/Structures/Walls/Wall BayDoor.prefab +++ b/Assets/Environment/SciFi Warehouse Kit/Prefabs/Structures/Walls/Wall BayDoor.prefab @@ -218,6 +218,7 @@ GameObject: m_Component: - component: {fileID: 1430841697005043554} - component: {fileID: -6005780487161741481} + - component: {fileID: -3750882967056258944} m_Layer: 0 m_Name: Wall BayDoor m_TagString: Untagged @@ -257,6 +258,23 @@ MonoBehaviour: m_EditorClassIdentifier: moduleType: 1 dimensions: {x: 6, y: 0, z: 6} + offset: {x: 0, y: 0, z: 0} +--- !u!114 &-3750882967056258944 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2702167651921923441} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 35e95dc5ff2b64380880dd7ac5922847, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Size: {x: 0.5, y: 10, z: 6} + m_Center: {x: 0, y: 4, z: 3} + m_Area: 1 + m_AffectedAgents: ffffffff --- !u!1 &4975399993979019661 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Environment/SciFi Warehouse Kit/Prefabs/Structures/Walls/Wall DoorClosed.prefab b/Assets/Environment/SciFi Warehouse Kit/Prefabs/Structures/Walls/Wall DoorClosed.prefab index 946148d..329d260 100644 --- a/Assets/Environment/SciFi Warehouse Kit/Prefabs/Structures/Walls/Wall DoorClosed.prefab +++ b/Assets/Environment/SciFi Warehouse Kit/Prefabs/Structures/Walls/Wall DoorClosed.prefab @@ -176,6 +176,7 @@ GameObject: m_Component: - component: {fileID: 972244189732658583} - component: {fileID: -8903466091177721056} + - component: {fileID: -6909553299755992788} m_Layer: 0 m_Name: Wall DoorClosed m_TagString: Untagged @@ -215,6 +216,23 @@ MonoBehaviour: m_EditorClassIdentifier: moduleType: 1 dimensions: {x: 6, y: 0, z: 6} + offset: {x: 0, y: 0, z: 0} +--- !u!114 &-6909553299755992788 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4261886463943454596} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 35e95dc5ff2b64380880dd7ac5922847, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Size: {x: 0.5, y: 10, z: 6} + m_Center: {x: 0, y: 4, z: 3} + m_Area: 1 + m_AffectedAgents: ffffffff --- !u!1 &6194237580895595712 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Environment/SciFi Warehouse Kit/Prefabs/Structures/Walls/Wall Fan.prefab b/Assets/Environment/SciFi Warehouse Kit/Prefabs/Structures/Walls/Wall Fan.prefab index 624dbcc..bcd9965 100644 --- a/Assets/Environment/SciFi Warehouse Kit/Prefabs/Structures/Walls/Wall Fan.prefab +++ b/Assets/Environment/SciFi Warehouse Kit/Prefabs/Structures/Walls/Wall Fan.prefab @@ -198,6 +198,7 @@ GameObject: - component: {fileID: 7748243253754154586} - component: {fileID: 7748243252877624316} - component: {fileID: -3587914730421507702} + - component: {fileID: 9004689033385537486} m_Layer: 0 m_Name: Wall Fan m_TagString: Untagged @@ -351,6 +352,23 @@ MonoBehaviour: m_EditorClassIdentifier: moduleType: 1 dimensions: {x: 6, y: 0, z: 6} + offset: {x: 0, y: 0, z: 0} +--- !u!114 &9004689033385537486 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7748243253765183380} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 35e95dc5ff2b64380880dd7ac5922847, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Size: {x: 0.5, y: 10, z: 6} + m_Center: {x: 0, y: 4, z: 3} + m_Area: 1 + m_AffectedAgents: ffffffff --- !u!1 &7748243253765183382 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Environment/SciFi Warehouse Kit/Prefabs/Structures/Walls/Wall Plain.prefab b/Assets/Environment/SciFi Warehouse Kit/Prefabs/Structures/Walls/Wall Plain.prefab index 88f9e37..149a3b7 100644 --- a/Assets/Environment/SciFi Warehouse Kit/Prefabs/Structures/Walls/Wall Plain.prefab +++ b/Assets/Environment/SciFi Warehouse Kit/Prefabs/Structures/Walls/Wall Plain.prefab @@ -13,6 +13,7 @@ GameObject: - component: {fileID: 6995434190404381029} - component: {fileID: 8106614039543784782} - component: {fileID: -138033621901601647} + - component: {fileID: 7652966152851320853} m_Layer: 0 m_Name: Wall Plain m_TagString: Untagged @@ -112,3 +113,20 @@ MonoBehaviour: m_EditorClassIdentifier: moduleType: 1 dimensions: {x: 6, y: 0, z: 6} + offset: {x: 0, y: 0, z: 0} +--- !u!114 &7652966152851320853 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8730245854331329977} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 35e95dc5ff2b64380880dd7ac5922847, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Size: {x: 0.5, y: 10, z: 6} + m_Center: {x: 0, y: 4, z: 3} + m_Area: 1 + m_AffectedAgents: ffffffff diff --git a/Assets/Environment/SciFi Warehouse Kit/Prefabs/Structures/Walls/Wall Window.prefab b/Assets/Environment/SciFi Warehouse Kit/Prefabs/Structures/Walls/Wall Window.prefab index 5d1cd1a..cc04266 100644 --- a/Assets/Environment/SciFi Warehouse Kit/Prefabs/Structures/Walls/Wall Window.prefab +++ b/Assets/Environment/SciFi Warehouse Kit/Prefabs/Structures/Walls/Wall Window.prefab @@ -273,6 +273,7 @@ GameObject: m_Component: - component: {fileID: 6269635625250689571} - component: {fileID: 5337484439019400857} + - component: {fileID: 5989637213293520637} m_Layer: 0 m_Name: Wall Window m_TagString: Untagged @@ -312,3 +313,20 @@ MonoBehaviour: m_EditorClassIdentifier: moduleType: 1 dimensions: {x: 6, y: 0, z: 6} + offset: {x: 0, y: 0, z: 0} +--- !u!114 &5989637213293520637 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7014745350219325488} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 35e95dc5ff2b64380880dd7ac5922847, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Size: {x: 0.5, y: 10, z: 6} + m_Center: {x: 0, y: 4, z: 3} + m_Area: 1 + m_AffectedAgents: ffffffff diff --git a/Assets/Prefabs/Procedural/Room.prefab b/Assets/Prefabs/Procedural/Room.prefab index af1c7eb..fd3fbcc 100644 --- a/Assets/Prefabs/Procedural/Room.prefab +++ b/Assets/Prefabs/Procedural/Room.prefab @@ -167,7 +167,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5725000371507048362, guid: b2452a5c2cd649a4db9eebcd16f7b155, type: 3} propertyPath: m_LocalPosition.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5725000371507048362, guid: b2452a5c2cd649a4db9eebcd16f7b155, type: 3} propertyPath: m_LocalPosition.z @@ -228,7 +228,7 @@ NavMeshObstacle: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8981463295867416060} - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 3 m_Shape: 1 m_Extents: {x: 0.15, y: 5, z: 3.0000002} @@ -320,7 +320,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5725000371507048362, guid: b2452a5c2cd649a4db9eebcd16f7b155, type: 3} propertyPath: m_LocalPosition.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5725000371507048362, guid: b2452a5c2cd649a4db9eebcd16f7b155, type: 3} propertyPath: m_LocalPosition.z @@ -381,7 +381,7 @@ NavMeshObstacle: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8425836963606984228} - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 3 m_Shape: 1 m_Extents: {x: 0.15, y: 5, z: 3.0000002} @@ -539,7 +539,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5725000371507048362, guid: b2452a5c2cd649a4db9eebcd16f7b155, type: 3} propertyPath: m_LocalPosition.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5725000371507048362, guid: b2452a5c2cd649a4db9eebcd16f7b155, type: 3} propertyPath: m_LocalPosition.z @@ -600,7 +600,7 @@ NavMeshObstacle: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7973264456216980425} - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 3 m_Shape: 1 m_Extents: {x: 0.15, y: 5, z: 3.0000002} @@ -960,7 +960,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5725000371507048362, guid: b2452a5c2cd649a4db9eebcd16f7b155, type: 3} propertyPath: m_LocalPosition.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5725000371507048362, guid: b2452a5c2cd649a4db9eebcd16f7b155, type: 3} propertyPath: m_LocalPosition.z @@ -1016,7 +1016,7 @@ NavMeshObstacle: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6115607114144909299} - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 3 m_Shape: 1 m_Extents: {x: 0.15, y: 5, z: 3.0000002} @@ -1114,7 +1114,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5725000371507048362, guid: b2452a5c2cd649a4db9eebcd16f7b155, type: 3} propertyPath: m_LocalPosition.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5725000371507048362, guid: b2452a5c2cd649a4db9eebcd16f7b155, type: 3} propertyPath: m_LocalPosition.z @@ -1170,7 +1170,7 @@ NavMeshObstacle: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6324753523186399175} - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 3 m_Shape: 1 m_Extents: {x: 0.15, y: 5, z: 3.0000002} @@ -1201,7 +1201,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5725000371507048362, guid: b2452a5c2cd649a4db9eebcd16f7b155, type: 3} propertyPath: m_LocalPosition.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5725000371507048362, guid: b2452a5c2cd649a4db9eebcd16f7b155, type: 3} propertyPath: m_LocalPosition.z @@ -1257,7 +1257,7 @@ NavMeshObstacle: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5500669953639149534} - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 3 m_Shape: 1 m_Extents: {x: 0.15, y: 5, z: 3.0000002} @@ -1288,7 +1288,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5725000371507048362, guid: b2452a5c2cd649a4db9eebcd16f7b155, type: 3} propertyPath: m_LocalPosition.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5725000371507048362, guid: b2452a5c2cd649a4db9eebcd16f7b155, type: 3} propertyPath: m_LocalPosition.z @@ -1344,7 +1344,7 @@ NavMeshObstacle: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4630401247181087312} - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 3 m_Shape: 1 m_Extents: {x: 0.15, y: 5, z: 3.0000002} @@ -1375,7 +1375,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5725000371507048362, guid: b2452a5c2cd649a4db9eebcd16f7b155, type: 3} propertyPath: m_LocalPosition.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5725000371507048362, guid: b2452a5c2cd649a4db9eebcd16f7b155, type: 3} propertyPath: m_LocalPosition.z @@ -1431,7 +1431,7 @@ NavMeshObstacle: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4649051499082820909} - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 3 m_Shape: 1 m_Extents: {x: 0.15, y: 5, z: 3.0000002} @@ -1462,7 +1462,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5725000371507048362, guid: b2452a5c2cd649a4db9eebcd16f7b155, type: 3} propertyPath: m_LocalPosition.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5725000371507048362, guid: b2452a5c2cd649a4db9eebcd16f7b155, type: 3} propertyPath: m_LocalPosition.z @@ -1518,7 +1518,7 @@ NavMeshObstacle: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4770883815275743607} - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 3 m_Shape: 1 m_Extents: {x: 0.15, y: 5, z: 3.0000002} @@ -1956,7 +1956,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5725000371507048362, guid: b2452a5c2cd649a4db9eebcd16f7b155, type: 3} propertyPath: m_LocalPosition.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5725000371507048362, guid: b2452a5c2cd649a4db9eebcd16f7b155, type: 3} propertyPath: m_LocalPosition.z @@ -2017,7 +2017,7 @@ NavMeshObstacle: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3156727864873862853} - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 3 m_Shape: 1 m_Extents: {x: 0.15, y: 5, z: 3.0000002} @@ -2176,7 +2176,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5725000371507048362, guid: b2452a5c2cd649a4db9eebcd16f7b155, type: 3} propertyPath: m_LocalPosition.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5725000371507048362, guid: b2452a5c2cd649a4db9eebcd16f7b155, type: 3} propertyPath: m_LocalPosition.z @@ -2214,6 +2214,10 @@ PrefabInstance: propertyPath: m_Name value: Wall Plain objectReference: {fileID: 0} + - target: {fileID: 8730245854331329977, guid: b2452a5c2cd649a4db9eebcd16f7b155, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8730245854331329977, guid: b2452a5c2cd649a4db9eebcd16f7b155, type: 3} propertyPath: m_StaticEditorFlags value: 2147483647 @@ -2232,7 +2236,7 @@ NavMeshObstacle: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1249132147940060944} - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 3 m_Shape: 1 m_Extents: {x: 0.15, y: 5, z: 3.0000002} @@ -2263,7 +2267,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5725000371507048362, guid: b2452a5c2cd649a4db9eebcd16f7b155, type: 3} propertyPath: m_LocalPosition.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5725000371507048362, guid: b2452a5c2cd649a4db9eebcd16f7b155, type: 3} propertyPath: m_LocalPosition.z @@ -2319,7 +2323,7 @@ NavMeshObstacle: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1638496904158388514} - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 3 m_Shape: 1 m_Extents: {x: 0.15, y: 5, z: 3.0000002} diff --git a/Assets/Prefabs/Procedural/Room_2.prefab b/Assets/Prefabs/Procedural/Room_2.prefab index c2bb748..f9f92e0 100644 --- a/Assets/Prefabs/Procedural/Room_2.prefab +++ b/Assets/Prefabs/Procedural/Room_2.prefab @@ -183,67 +183,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 207f61281715ab24f9899fdfa960ca48, type: 3} ---- !u!1001 &7518077815197519253 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 2284485546379234} - m_Modifications: - - target: {fileID: 5819337804145458440, guid: f533d3129260fec48aa145b87c3c9da9, type: 3} - propertyPath: m_Name - value: Catwalk Pillar Rails - objectReference: {fileID: 0} - - target: {fileID: 5819337804145458440, guid: f533d3129260fec48aa145b87c3c9da9, type: 3} - propertyPath: m_StaticEditorFlags - value: 2147483647 - objectReference: {fileID: 0} - - target: {fileID: 7392985611642179355, guid: f533d3129260fec48aa145b87c3c9da9, type: 3} - propertyPath: m_RootOrder - value: 33 - objectReference: {fileID: 0} - - target: {fileID: 7392985611642179355, guid: f533d3129260fec48aa145b87c3c9da9, type: 3} - propertyPath: m_LocalPosition.x - value: -2.8246617 - objectReference: {fileID: 0} - - target: {fileID: 7392985611642179355, guid: f533d3129260fec48aa145b87c3c9da9, type: 3} - propertyPath: m_LocalPosition.y - value: 0.0000000037309595 - objectReference: {fileID: 0} - - target: {fileID: 7392985611642179355, guid: f533d3129260fec48aa145b87c3c9da9, type: 3} - propertyPath: m_LocalPosition.z - value: -5.849537 - objectReference: {fileID: 0} - - target: {fileID: 7392985611642179355, guid: f533d3129260fec48aa145b87c3c9da9, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7392985611642179355, guid: f533d3129260fec48aa145b87c3c9da9, type: 3} - propertyPath: m_LocalRotation.x - value: 0.000000021855694 - objectReference: {fileID: 0} - - target: {fileID: 7392985611642179355, guid: f533d3129260fec48aa145b87c3c9da9, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7392985611642179355, guid: f533d3129260fec48aa145b87c3c9da9, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7392985611642179355, guid: f533d3129260fec48aa145b87c3c9da9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7392985611642179355, guid: f533d3129260fec48aa145b87c3c9da9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7392985611642179355, guid: f533d3129260fec48aa145b87c3c9da9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: f533d3129260fec48aa145b87c3c9da9, type: 3} --- !u!1001 &8102762716067425620 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Procedural/Room_5.prefab b/Assets/Prefabs/Procedural/Room_5.prefab new file mode 100644 index 0000000..1c07e0b --- /dev/null +++ b/Assets/Prefabs/Procedural/Room_5.prefab @@ -0,0 +1,251 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &179048167961573619 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 5294530104480773884} + m_Modifications: + - target: {fileID: 1835881230559808018, guid: 207f61281715ab24f9899fdfa960ca48, type: 3} + propertyPath: m_Name + value: Catwalk Long Rails + objectReference: {fileID: 0} + - target: {fileID: 1835881230559808018, guid: 207f61281715ab24f9899fdfa960ca48, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 3396001746467026945, guid: 207f61281715ab24f9899fdfa960ca48, type: 3} + propertyPath: m_RootOrder + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 3396001746467026945, guid: 207f61281715ab24f9899fdfa960ca48, type: 3} + propertyPath: m_LocalPosition.x + value: 5.0624743 + objectReference: {fileID: 0} + - target: {fileID: 3396001746467026945, guid: 207f61281715ab24f9899fdfa960ca48, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3396001746467026945, guid: 207f61281715ab24f9899fdfa960ca48, type: 3} + propertyPath: m_LocalPosition.z + value: 0.062518835 + objectReference: {fileID: 0} + - target: {fileID: 3396001746467026945, guid: 207f61281715ab24f9899fdfa960ca48, type: 3} + propertyPath: m_LocalRotation.w + value: 0.0000029504295 + objectReference: {fileID: 0} + - target: {fileID: 3396001746467026945, guid: 207f61281715ab24f9899fdfa960ca48, type: 3} + propertyPath: m_LocalRotation.x + value: 6.261657e-14 + objectReference: {fileID: 0} + - target: {fileID: 3396001746467026945, guid: 207f61281715ab24f9899fdfa960ca48, type: 3} + propertyPath: m_LocalRotation.y + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 3396001746467026945, guid: 207f61281715ab24f9899fdfa960ca48, type: 3} + propertyPath: m_LocalRotation.z + value: 0.000000021855701 + objectReference: {fileID: 0} + - target: {fileID: 3396001746467026945, guid: 207f61281715ab24f9899fdfa960ca48, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3396001746467026945, guid: 207f61281715ab24f9899fdfa960ca48, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -180 + objectReference: {fileID: 0} + - target: {fileID: 3396001746467026945, guid: 207f61281715ab24f9899fdfa960ca48, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 207f61281715ab24f9899fdfa960ca48, type: 3} +--- !u!1001 &3759421076797491020 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 5294530104480773884} + m_Modifications: + - target: {fileID: 1835881230559808018, guid: 207f61281715ab24f9899fdfa960ca48, type: 3} + propertyPath: m_Name + value: Catwalk Long Rails (1) + objectReference: {fileID: 0} + - target: {fileID: 1835881230559808018, guid: 207f61281715ab24f9899fdfa960ca48, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 3396001746467026945, guid: 207f61281715ab24f9899fdfa960ca48, type: 3} + propertyPath: m_RootOrder + value: 31 + objectReference: {fileID: 0} + - target: {fileID: 3396001746467026945, guid: 207f61281715ab24f9899fdfa960ca48, type: 3} + propertyPath: m_LocalPosition.x + value: 5.062488 + objectReference: {fileID: 0} + - target: {fileID: 3396001746467026945, guid: 207f61281715ab24f9899fdfa960ca48, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3396001746467026945, guid: 207f61281715ab24f9899fdfa960ca48, type: 3} + propertyPath: m_LocalPosition.z + value: 6.0625196 + objectReference: {fileID: 0} + - target: {fileID: 3396001746467026945, guid: 207f61281715ab24f9899fdfa960ca48, type: 3} + propertyPath: m_LocalRotation.w + value: 0.0000029504295 + objectReference: {fileID: 0} + - target: {fileID: 3396001746467026945, guid: 207f61281715ab24f9899fdfa960ca48, type: 3} + propertyPath: m_LocalRotation.x + value: 6.261657e-14 + objectReference: {fileID: 0} + - target: {fileID: 3396001746467026945, guid: 207f61281715ab24f9899fdfa960ca48, type: 3} + propertyPath: m_LocalRotation.y + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 3396001746467026945, guid: 207f61281715ab24f9899fdfa960ca48, type: 3} + propertyPath: m_LocalRotation.z + value: 0.000000021855701 + objectReference: {fileID: 0} + - target: {fileID: 3396001746467026945, guid: 207f61281715ab24f9899fdfa960ca48, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3396001746467026945, guid: 207f61281715ab24f9899fdfa960ca48, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -180 + objectReference: {fileID: 0} + - target: {fileID: 3396001746467026945, guid: 207f61281715ab24f9899fdfa960ca48, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 207f61281715ab24f9899fdfa960ca48, type: 3} +--- !u!1001 &4108168433583447114 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3642525324054568589, guid: ef77c701b7af7b54a8b002554a3cea5d, type: 3} + propertyPath: m_Name + value: Room_5 + objectReference: {fileID: 0} + - target: {fileID: 8105026293294623414, guid: ef77c701b7af7b54a8b002554a3cea5d, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8105026293294623414, guid: ef77c701b7af7b54a8b002554a3cea5d, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8105026293294623414, guid: ef77c701b7af7b54a8b002554a3cea5d, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8105026293294623414, guid: ef77c701b7af7b54a8b002554a3cea5d, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8105026293294623414, guid: ef77c701b7af7b54a8b002554a3cea5d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8105026293294623414, guid: ef77c701b7af7b54a8b002554a3cea5d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8105026293294623414, guid: ef77c701b7af7b54a8b002554a3cea5d, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8105026293294623414, guid: ef77c701b7af7b54a8b002554a3cea5d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8105026293294623414, guid: ef77c701b7af7b54a8b002554a3cea5d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8105026293294623414, guid: ef77c701b7af7b54a8b002554a3cea5d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8105026293294623414, guid: ef77c701b7af7b54a8b002554a3cea5d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8759162998728815380, guid: ef77c701b7af7b54a8b002554a3cea5d, type: 3} + propertyPath: m_AssetId + value: e8ebefe0d40887a4789f7f2f5b457ac1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ef77c701b7af7b54a8b002554a3cea5d, type: 3} +--- !u!4 &5294530104480773884 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8105026293294623414, guid: ef77c701b7af7b54a8b002554a3cea5d, type: 3} + m_PrefabInstance: {fileID: 4108168433583447114} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &8171175276443482464 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 5294530104480773884} + m_Modifications: + - target: {fileID: 1835881230559808018, guid: 207f61281715ab24f9899fdfa960ca48, type: 3} + propertyPath: m_Name + value: Catwalk Long Rails (2) + objectReference: {fileID: 0} + - target: {fileID: 1835881230559808018, guid: 207f61281715ab24f9899fdfa960ca48, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 3396001746467026945, guid: 207f61281715ab24f9899fdfa960ca48, type: 3} + propertyPath: m_RootOrder + value: 32 + objectReference: {fileID: 0} + - target: {fileID: 3396001746467026945, guid: 207f61281715ab24f9899fdfa960ca48, type: 3} + propertyPath: m_LocalPosition.x + value: 5.062501 + objectReference: {fileID: 0} + - target: {fileID: 3396001746467026945, guid: 207f61281715ab24f9899fdfa960ca48, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3396001746467026945, guid: 207f61281715ab24f9899fdfa960ca48, type: 3} + propertyPath: m_LocalPosition.z + value: 12.062519 + objectReference: {fileID: 0} + - target: {fileID: 3396001746467026945, guid: 207f61281715ab24f9899fdfa960ca48, type: 3} + propertyPath: m_LocalRotation.w + value: 0.0000029504295 + objectReference: {fileID: 0} + - target: {fileID: 3396001746467026945, guid: 207f61281715ab24f9899fdfa960ca48, type: 3} + propertyPath: m_LocalRotation.x + value: 6.261657e-14 + objectReference: {fileID: 0} + - target: {fileID: 3396001746467026945, guid: 207f61281715ab24f9899fdfa960ca48, type: 3} + propertyPath: m_LocalRotation.y + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 3396001746467026945, guid: 207f61281715ab24f9899fdfa960ca48, type: 3} + propertyPath: m_LocalRotation.z + value: 0.000000021855701 + objectReference: {fileID: 0} + - target: {fileID: 3396001746467026945, guid: 207f61281715ab24f9899fdfa960ca48, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3396001746467026945, guid: 207f61281715ab24f9899fdfa960ca48, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -180 + objectReference: {fileID: 0} + - target: {fileID: 3396001746467026945, guid: 207f61281715ab24f9899fdfa960ca48, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 207f61281715ab24f9899fdfa960ca48, type: 3} diff --git a/Assets/Prefabs/Procedural/Room_5.prefab.meta b/Assets/Prefabs/Procedural/Room_5.prefab.meta new file mode 100644 index 0000000..de01150 --- /dev/null +++ b/Assets/Prefabs/Procedural/Room_5.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e8ebefe0d40887a4789f7f2f5b457ac1 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Procedural/Room_6.prefab b/Assets/Prefabs/Procedural/Room_6.prefab new file mode 100644 index 0000000..7e16f6b --- /dev/null +++ b/Assets/Prefabs/Procedural/Room_6.prefab @@ -0,0 +1,695 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &964209677420513240 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 3773854368997118995} + m_Modifications: + - target: {fileID: 762380492481631229, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_RootOrder + value: 34 + objectReference: {fileID: 0} + - target: {fileID: 762380492481631229, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_LocalPosition.x + value: -3 + objectReference: {fileID: 0} + - target: {fileID: 762380492481631229, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_LocalPosition.y + value: -3 + objectReference: {fileID: 0} + - target: {fileID: 762380492481631229, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_LocalPosition.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 762380492481631229, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 762380492481631229, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 762380492481631229, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 762380492481631229, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 762380492481631229, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 762380492481631229, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 762380492481631229, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4381963800603582958, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_Name + value: Catwalk Short (2) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 52c51744944b30b4395badb88a68a18b, type: 3} +--- !u!1001 &3234457752583154552 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 3773854368997118995} + m_Modifications: + - target: {fileID: 1024725969411930292, guid: 251977d85f345b94c805b990d722732f, type: 3} + propertyPath: m_RootOrder + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 1024725969411930292, guid: 251977d85f345b94c805b990d722732f, type: 3} + propertyPath: m_LocalPosition.x + value: -8.048961 + objectReference: {fileID: 0} + - target: {fileID: 1024725969411930292, guid: 251977d85f345b94c805b990d722732f, type: 3} + propertyPath: m_LocalPosition.y + value: 2.738 + objectReference: {fileID: 0} + - target: {fileID: 1024725969411930292, guid: 251977d85f345b94c805b990d722732f, type: 3} + propertyPath: m_LocalPosition.z + value: 5.558 + objectReference: {fileID: 0} + - target: {fileID: 1024725969411930292, guid: 251977d85f345b94c805b990d722732f, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071079 + objectReference: {fileID: 0} + - target: {fileID: 1024725969411930292, guid: 251977d85f345b94c805b990d722732f, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1024725969411930292, guid: 251977d85f345b94c805b990d722732f, type: 3} + propertyPath: m_LocalRotation.y + value: 0.70710576 + objectReference: {fileID: 0} + - target: {fileID: 1024725969411930292, guid: 251977d85f345b94c805b990d722732f, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1024725969411930292, guid: 251977d85f345b94c805b990d722732f, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1024725969411930292, guid: 251977d85f345b94c805b990d722732f, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 1024725969411930292, guid: 251977d85f345b94c805b990d722732f, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1024725969412154516, guid: 251977d85f345b94c805b990d722732f, type: 3} + propertyPath: m_Name + value: Short Stairs (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 251977d85f345b94c805b990d722732f, type: 3} +--- !u!1001 &3508129316346729009 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 3773854368997118995} + m_Modifications: + - target: {fileID: 4910352700272845603, guid: b76f846b3379607468a593969b575654, type: 3} + propertyPath: m_Name + value: Catwalk Long + objectReference: {fileID: 0} + - target: {fileID: 8250113047921840432, guid: b76f846b3379607468a593969b575654, type: 3} + propertyPath: m_RootOrder + value: 37 + objectReference: {fileID: 0} + - target: {fileID: 8250113047921840432, guid: b76f846b3379607468a593969b575654, type: 3} + propertyPath: m_LocalPosition.x + value: -6 + objectReference: {fileID: 0} + - target: {fileID: 8250113047921840432, guid: b76f846b3379607468a593969b575654, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8250113047921840432, guid: b76f846b3379607468a593969b575654, type: 3} + propertyPath: m_LocalPosition.z + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 8250113047921840432, guid: b76f846b3379607468a593969b575654, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8250113047921840432, guid: b76f846b3379607468a593969b575654, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8250113047921840432, guid: b76f846b3379607468a593969b575654, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8250113047921840432, guid: b76f846b3379607468a593969b575654, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8250113047921840432, guid: b76f846b3379607468a593969b575654, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8250113047921840432, guid: b76f846b3379607468a593969b575654, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8250113047921840432, guid: b76f846b3379607468a593969b575654, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b76f846b3379607468a593969b575654, type: 3} +--- !u!1001 &3697749511999848895 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 3773854368997118995} + m_Modifications: + - target: {fileID: 4410478108093735952, guid: 7e3f523375a441341abd337ac986d569, type: 3} + propertyPath: m_Name + value: Short Stairs Wide (1) + objectReference: {fileID: 0} + - target: {fileID: 4410478108094232624, guid: 7e3f523375a441341abd337ac986d569, type: 3} + propertyPath: m_RootOrder + value: 36 + objectReference: {fileID: 0} + - target: {fileID: 4410478108094232624, guid: 7e3f523375a441341abd337ac986d569, type: 3} + propertyPath: m_LocalPosition.x + value: -4.171 + objectReference: {fileID: 0} + - target: {fileID: 4410478108094232624, guid: 7e3f523375a441341abd337ac986d569, type: 3} + propertyPath: m_LocalPosition.y + value: 1.3 + objectReference: {fileID: 0} + - target: {fileID: 4410478108094232624, guid: 7e3f523375a441341abd337ac986d569, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4410478108094232624, guid: 7e3f523375a441341abd337ac986d569, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4410478108094232624, guid: 7e3f523375a441341abd337ac986d569, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4410478108094232624, guid: 7e3f523375a441341abd337ac986d569, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4410478108094232624, guid: 7e3f523375a441341abd337ac986d569, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4410478108094232624, guid: 7e3f523375a441341abd337ac986d569, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4410478108094232624, guid: 7e3f523375a441341abd337ac986d569, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4410478108094232624, guid: 7e3f523375a441341abd337ac986d569, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7e3f523375a441341abd337ac986d569, type: 3} +--- !u!1001 &4243494884823727558 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 3773854368997118995} + m_Modifications: + - target: {fileID: 762380492481631229, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_RootOrder + value: 31 + objectReference: {fileID: 0} + - target: {fileID: 762380492481631229, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_LocalPosition.x + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 762380492481631229, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_LocalPosition.y + value: -3 + objectReference: {fileID: 0} + - target: {fileID: 762380492481631229, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_LocalPosition.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 762380492481631229, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 762380492481631229, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 762380492481631229, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 762380492481631229, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 762380492481631229, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 762380492481631229, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 762380492481631229, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4381963800603582958, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_Name + value: Catwalk Short + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 52c51744944b30b4395badb88a68a18b, type: 3} +--- !u!1001 &4880134993276604433 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 3773854368997118995} + m_Modifications: + - target: {fileID: 762380492481631229, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_RootOrder + value: 39 + objectReference: {fileID: 0} + - target: {fileID: 762380492481631229, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_LocalPosition.x + value: -6 + objectReference: {fileID: 0} + - target: {fileID: 762380492481631229, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_LocalPosition.y + value: -1.715 + objectReference: {fileID: 0} + - target: {fileID: 762380492481631229, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_LocalPosition.z + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 762380492481631229, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 762380492481631229, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 762380492481631229, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 762380492481631229, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 762380492481631229, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 762380492481631229, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 762380492481631229, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4381963800603582958, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_Name + value: Catwalk Short (5) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 52c51744944b30b4395badb88a68a18b, type: 3} +--- !u!1001 &4910536532179812005 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3642525324054568589, guid: ef77c701b7af7b54a8b002554a3cea5d, type: 3} + propertyPath: m_Name + value: Room_6 + objectReference: {fileID: 0} + - target: {fileID: 8105026293294623414, guid: ef77c701b7af7b54a8b002554a3cea5d, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8105026293294623414, guid: ef77c701b7af7b54a8b002554a3cea5d, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8105026293294623414, guid: ef77c701b7af7b54a8b002554a3cea5d, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8105026293294623414, guid: ef77c701b7af7b54a8b002554a3cea5d, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8105026293294623414, guid: ef77c701b7af7b54a8b002554a3cea5d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8105026293294623414, guid: ef77c701b7af7b54a8b002554a3cea5d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8105026293294623414, guid: ef77c701b7af7b54a8b002554a3cea5d, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8105026293294623414, guid: ef77c701b7af7b54a8b002554a3cea5d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8105026293294623414, guid: ef77c701b7af7b54a8b002554a3cea5d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8105026293294623414, guid: ef77c701b7af7b54a8b002554a3cea5d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8105026293294623414, guid: ef77c701b7af7b54a8b002554a3cea5d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8759162998728815380, guid: ef77c701b7af7b54a8b002554a3cea5d, type: 3} + propertyPath: m_AssetId + value: ede9b2918d7a5ab4d84e9e4db64a593d + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ef77c701b7af7b54a8b002554a3cea5d, type: 3} +--- !u!4 &3773854368997118995 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8105026293294623414, guid: ef77c701b7af7b54a8b002554a3cea5d, type: 3} + m_PrefabInstance: {fileID: 4910536532179812005} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &5219118523798610283 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 3773854368997118995} + m_Modifications: + - target: {fileID: 762380492481631229, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_RootOrder + value: 35 + objectReference: {fileID: 0} + - target: {fileID: 762380492481631229, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_LocalPosition.x + value: -3 + objectReference: {fileID: 0} + - target: {fileID: 762380492481631229, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_LocalPosition.y + value: -3 + objectReference: {fileID: 0} + - target: {fileID: 762380492481631229, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_LocalPosition.z + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 762380492481631229, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 762380492481631229, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 762380492481631229, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 762380492481631229, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 762380492481631229, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 762380492481631229, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 762380492481631229, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4381963800603582958, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_Name + value: Catwalk Short (3) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 52c51744944b30b4395badb88a68a18b, type: 3} +--- !u!1001 &6198862640826503149 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 3773854368997118995} + m_Modifications: + - target: {fileID: 762380492481631229, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_RootOrder + value: 38 + objectReference: {fileID: 0} + - target: {fileID: 762380492481631229, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_LocalPosition.x + value: -6 + objectReference: {fileID: 0} + - target: {fileID: 762380492481631229, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_LocalPosition.y + value: -1.715 + objectReference: {fileID: 0} + - target: {fileID: 762380492481631229, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_LocalPosition.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 762380492481631229, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 762380492481631229, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 762380492481631229, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 762380492481631229, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 762380492481631229, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 762380492481631229, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 762380492481631229, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4381963800603582958, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_Name + value: Catwalk Short (4) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 52c51744944b30b4395badb88a68a18b, type: 3} +--- !u!1001 &6565594955563471982 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 3773854368997118995} + m_Modifications: + - target: {fileID: 4410478108093735952, guid: 7e3f523375a441341abd337ac986d569, type: 3} + propertyPath: m_Name + value: Short Stairs Wide + objectReference: {fileID: 0} + - target: {fileID: 4410478108094232624, guid: 7e3f523375a441341abd337ac986d569, type: 3} + propertyPath: m_RootOrder + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 4410478108094232624, guid: 7e3f523375a441341abd337ac986d569, type: 3} + propertyPath: m_LocalPosition.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4410478108094232624, guid: 7e3f523375a441341abd337ac986d569, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4410478108094232624, guid: 7e3f523375a441341abd337ac986d569, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4410478108094232624, guid: 7e3f523375a441341abd337ac986d569, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4410478108094232624, guid: 7e3f523375a441341abd337ac986d569, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4410478108094232624, guid: 7e3f523375a441341abd337ac986d569, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4410478108094232624, guid: 7e3f523375a441341abd337ac986d569, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4410478108094232624, guid: 7e3f523375a441341abd337ac986d569, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4410478108094232624, guid: 7e3f523375a441341abd337ac986d569, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4410478108094232624, guid: 7e3f523375a441341abd337ac986d569, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7e3f523375a441341abd337ac986d569, type: 3} +--- !u!1001 &7024524749271222077 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 3773854368997118995} + m_Modifications: + - target: {fileID: 1024725969411930292, guid: 251977d85f345b94c805b990d722732f, type: 3} + propertyPath: m_RootOrder + value: 33 + objectReference: {fileID: 0} + - target: {fileID: 1024725969411930292, guid: 251977d85f345b94c805b990d722732f, type: 3} + propertyPath: m_LocalPosition.x + value: -8.048961 + objectReference: {fileID: 0} + - target: {fileID: 1024725969411930292, guid: 251977d85f345b94c805b990d722732f, type: 3} + propertyPath: m_LocalPosition.y + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1024725969411930292, guid: 251977d85f345b94c805b990d722732f, type: 3} + propertyPath: m_LocalPosition.z + value: 5.96063 + objectReference: {fileID: 0} + - target: {fileID: 1024725969411930292, guid: 251977d85f345b94c805b990d722732f, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071079 + objectReference: {fileID: 0} + - target: {fileID: 1024725969411930292, guid: 251977d85f345b94c805b990d722732f, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1024725969411930292, guid: 251977d85f345b94c805b990d722732f, type: 3} + propertyPath: m_LocalRotation.y + value: 0.70710576 + objectReference: {fileID: 0} + - target: {fileID: 1024725969411930292, guid: 251977d85f345b94c805b990d722732f, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1024725969411930292, guid: 251977d85f345b94c805b990d722732f, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1024725969411930292, guid: 251977d85f345b94c805b990d722732f, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 1024725969411930292, guid: 251977d85f345b94c805b990d722732f, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1024725969412154516, guid: 251977d85f345b94c805b990d722732f, type: 3} + propertyPath: m_Name + value: Short Stairs + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 251977d85f345b94c805b990d722732f, type: 3} +--- !u!1001 &8324036073871136938 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 3773854368997118995} + m_Modifications: + - target: {fileID: 762380492481631229, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_RootOrder + value: 32 + objectReference: {fileID: 0} + - target: {fileID: 762380492481631229, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_LocalPosition.x + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 762380492481631229, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_LocalPosition.y + value: -3 + objectReference: {fileID: 0} + - target: {fileID: 762380492481631229, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_LocalPosition.z + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 762380492481631229, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 762380492481631229, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 762380492481631229, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 762380492481631229, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 762380492481631229, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 762380492481631229, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 762380492481631229, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4381963800603582958, guid: 52c51744944b30b4395badb88a68a18b, type: 3} + propertyPath: m_Name + value: Catwalk Short (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 52c51744944b30b4395badb88a68a18b, type: 3} diff --git a/Assets/Prefabs/Procedural/Room_6.prefab.meta b/Assets/Prefabs/Procedural/Room_6.prefab.meta new file mode 100644 index 0000000..d4a9663 --- /dev/null +++ b/Assets/Prefabs/Procedural/Room_6.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ede9b2918d7a5ab4d84e9e4db64a593d +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Characters/Enemy/States/PatrolState.cs b/Assets/Scripts/Characters/Enemy/States/PatrolState.cs index 41b8d40..8ffa747 100644 --- a/Assets/Scripts/Characters/Enemy/States/PatrolState.cs +++ b/Assets/Scripts/Characters/Enemy/States/PatrolState.cs @@ -13,7 +13,8 @@ namespace Characters.Enemy.States public PatrolState(Enemy enemy) : base(EnemyState.Patrol) { _enemy = enemy; - _navMeshData = NavMeshTriangulator.Data; + _navMeshData = NavMesh.CalculateTriangulation(); + //NavMeshTriangulator.Data; } [ServerCallback] @@ -54,8 +55,8 @@ namespace Characters.Enemy.States [Server] Vector3 GetRandomLocation() { - NavMeshTriangulation navMeshData = NavMesh.CalculateTriangulation(); - return navMeshData.vertices[navMeshData.indices[Random.Range(0, navMeshData.indices.Length - 3)]]; + // NavMeshTriangulation navMeshData = NavMesh.CalculateTriangulation(); + return _navMeshData.vertices[_navMeshData.indices[Random.Range(0, _navMeshData.indices.Length - 3)]]; } } } \ No newline at end of file diff --git a/Assets/Scripts/Level/BuildModules/ProceduralPrefabs.cs b/Assets/Scripts/Level/BuildModules/ProceduralPrefabs.cs index 1f246dd..05feda8 100644 --- a/Assets/Scripts/Level/BuildModules/ProceduralPrefabs.cs +++ b/Assets/Scripts/Level/BuildModules/ProceduralPrefabs.cs @@ -12,11 +12,11 @@ namespace Level.BuildModules { public class ProceduralPrefabs : NetworkBehaviour { - [FormerlySerializedAs("roomPrefabs")] public Room[] roomPrefabs; - [FormerlySerializedAs("StartingRoom")] public Room startingRoom; + public Room[] roomPrefabs; + public Room startingRoom; private Room[,] _spawnedRooms; - private List _flattenSpawnedRooms = new(); + public List flattenSpawnedRooms = new(); private int _size; @@ -30,9 +30,9 @@ namespace Level.BuildModules private List _enemySpawnPoses = new(); public List enemyList = new(); - private void Start() + private IEnumerator Start() { - if(!isServer) return; + if(!isServer) yield break; _size = PlayerPrefs.GetInt("LevelSize"); _spawnedRooms = new Room[_size, _size]; @@ -41,18 +41,27 @@ namespace Level.BuildModules for (int i = 0; i < _size; i++) { - // yield return new WaitForSecondsRealtime(0.1f); + if (_size > 200) + { + yield return new WaitForSecondsRealtime(0.1f); + } PlaceOneRoom(); } - - foreach (var room in _flattenSpawnedRooms) - { - room.GetComponent().BuildNavMesh(); - } - if (enemyList.Count == networkManager.maxMonsters) return; - + print("<---Rooms Spawned--->"); + + flattenSpawnedRooms[0].GetComponent().BuildNavMesh(); + + print("<---Surface builded--->"); + + networkManager.OnPlayerSpawned += OnPlayerSpawned; + print("pizda"); + } + + private void OnPlayerSpawned() + { + print("SASALKASUKABLYAT"); if (networkManager.players.Count == networkManager.maxConnections) { for (int i = 0; i < networkManager.maxMonsters; i++) @@ -64,6 +73,8 @@ namespace Level.BuildModules enemyList.Add(go); } } + + print("<---Monster spawned--->"); } private void PlaceOneRoom() @@ -87,8 +98,7 @@ namespace Level.BuildModules Room newRoom = Instantiate(roomPrefabs[Random.Range(0, roomPrefabs.Length)]); NetworkServer.Spawn(newRoom.gameObject); - _enemySpawnPoses.Add(newRoom.transform.position); - + int limit = 500; while (limit-- > 0) { @@ -99,7 +109,8 @@ namespace Level.BuildModules { newRoom.transform.position = new Vector3(position.x - _startCellX, 0, position.y - _startCellY) * newRoom.roomSize; _spawnedRooms[position.x, position.y] = newRoom; - _flattenSpawnedRooms.Add(newRoom); + flattenSpawnedRooms.Add(newRoom); + _enemySpawnPoses.Add(newRoom.transform.position); return; } } diff --git a/Assets/Scripts/Network/CustomNetworkManager.cs b/Assets/Scripts/Network/CustomNetworkManager.cs index 1030684..98b053a 100644 --- a/Assets/Scripts/Network/CustomNetworkManager.cs +++ b/Assets/Scripts/Network/CustomNetworkManager.cs @@ -16,6 +16,7 @@ public class CustomNetworkManager : NetworkManager public event Action OnSceneChanged; public event Action OnLiveStateCallback; + public event Action OnPlayerSpawned; private float _restartTime = 5f; public int maxMonsters; @@ -47,6 +48,15 @@ public class CustomNetworkManager : NetworkManager OnSceneChanged?.Invoke(); } + public void OnConnectedToServer() + { + print("OnConnectedToServer"); + if (players.Count == maxConnections) + { + + } + } + public override void OnServerAddPlayer(NetworkConnectionToClient conn) { base.OnServerAddPlayer(conn); @@ -55,6 +65,8 @@ public class CustomNetworkManager : NetworkManager Pawn player = conn.identity.GetComponent(); player.OnLiveState += OnLiveState; + print("OnPlayerSpawned?.Invoke"); + OnPlayerSpawned?.Invoke(); } public override void OnServerDisconnect(NetworkConnectionToClient conn) diff --git a/Assets/Scripts/Network/NetworkGameManager.cs b/Assets/Scripts/Network/NetworkGameManager.cs index 9f03e3e..326a457 100644 --- a/Assets/Scripts/Network/NetworkGameManager.cs +++ b/Assets/Scripts/Network/NetworkGameManager.cs @@ -83,7 +83,7 @@ public class NetworkGameManager : NetworkBehaviour private void FixedUpdate() { - if (enemyList.Count == networkManager.maxMonsters && _level != 0) return; + if (enemyList.Count == networkManager.maxMonsters || _level != 0) return; if (networkManager.players.Count == networkManager.maxConnections ) {