From e59b2cd7084930d8b96ebfddf619ea45e6f2ffef Mon Sep 17 00:00:00 2001 From: Alain Abboud Date: Fri, 28 Oct 2022 17:59:25 -0400 Subject: [PATCH] Level1 changed --- Assets/Prefabs/Level1.prefab | 248 ++++---------------------------- Assets/Scenes/LevelDesign.unity | 13 +- 2 files changed, 35 insertions(+), 226 deletions(-) diff --git a/Assets/Prefabs/Level1.prefab b/Assets/Prefabs/Level1.prefab index 78395fd..539765a 100644 --- a/Assets/Prefabs/Level1.prefab +++ b/Assets/Prefabs/Level1.prefab @@ -195,7 +195,7 @@ Transform: - {fileID: 511157372685728889} - {fileID: 5226806889195986664} m_Father: {fileID: 5226806889211552816} - m_RootOrder: 29 + m_RootOrder: 27 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &5226806888114484224 GameObject: @@ -520,7 +520,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5226806889211552816} - m_RootOrder: 27 + m_RootOrder: 25 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &5226806888370939473 MeshFilter: @@ -908,7 +908,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5226806889211552816} - m_RootOrder: 26 + m_RootOrder: 24 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &5226806888720867193 MeshFilter: @@ -1005,7 +1005,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5226806889211552816} - m_RootOrder: 22 + m_RootOrder: 20 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &5226806888790352507 MeshFilter: @@ -1296,7 +1296,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5226806889211552816} - m_RootOrder: 28 + m_RootOrder: 26 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &5226806888897337146 MeshFilter: @@ -1633,8 +1633,6 @@ Transform: - {fileID: 5226806890131599440} - {fileID: 5226806889509007336} - {fileID: 5226806889938620157} - - {fileID: 5226806889365046453} - - {fileID: 5226806890144557965} - {fileID: 5226806890110966495} - {fileID: 5226806888790352508} - {fileID: 5226806890103719896} @@ -1779,7 +1777,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5226806889211552816} - m_RootOrder: 30 + m_RootOrder: 28 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &5226806889297984095 MeshFilter: @@ -1844,103 +1842,6 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} ---- !u!1 &5226806889365046452 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5226806889365046453} - - component: {fileID: 5226806889365046448} - - component: {fileID: 5226806889365046451} - - component: {fileID: 5226806889365046450} - m_Layer: 3 - m_Name: Floor_29 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5226806889365046453 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5226806889365046452} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 21.3, y: 66.829994, z: 0} - m_LocalScale: {x: 2.8042, y: 2.8042, z: 6.9} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 5226806889211552816} - m_RootOrder: 19 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &5226806889365046448 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5226806889365046452} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &5226806889365046451 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5226806889365046452} - m_Enabled: 1 - 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: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!65 &5226806889365046450 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5226806889365046452} - 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 &5226806889375245930 GameObject: m_ObjectHideFlags: 0 @@ -2264,7 +2165,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5226806889211552816} - m_RootOrder: 25 + m_RootOrder: 23 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &5226806889558987474 MeshFilter: @@ -2361,7 +2262,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5226806889211552816} - m_RootOrder: 24 + m_RootOrder: 22 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &5226806889727655564 MeshFilter: @@ -2846,7 +2747,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5226806889211552816} - m_RootOrder: 23 + m_RootOrder: 21 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &5226806890103719895 MeshFilter: @@ -2938,12 +2839,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5226806890110966494} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 21.3, y: 96.99, z: 0} + m_LocalPosition: {x: 36.1, y: 101.8, z: 0} m_LocalScale: {x: 2.8042, y: 2.8042, z: 6.9} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5226806889211552816} - m_RootOrder: 21 + m_RootOrder: 19 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &5226806890110966490 MeshFilter: @@ -3105,103 +3006,6 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} ---- !u!1 &5226806890144557964 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5226806890144557965} - - component: {fileID: 5226806890144557960} - - component: {fileID: 5226806890144557963} - - component: {fileID: 5226806890144557962} - m_Layer: 3 - m_Name: Floor_30 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5226806890144557965 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5226806890144557964} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 21.3, y: 82.549995, z: 0} - m_LocalScale: {x: 2.8042, y: 2.8042, z: 6.9} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 5226806889211552816} - m_RootOrder: 20 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &5226806890144557960 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5226806890144557964} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &5226806890144557963 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5226806890144557964} - m_Enabled: 1 - 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: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!65 &5226806890144557962 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5226806890144557964} - 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 &5226806890190928014 GameObject: m_ObjectHideFlags: 0 @@ -3234,7 +3038,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5226806889211552816} - m_RootOrder: 31 + m_RootOrder: 29 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &5226806890190928010 MeshFilter: @@ -3314,32 +3118,32 @@ PrefabInstance: - target: {fileID: 8185732859686289158, guid: 3aef9205067d34c46bee46559d8e90dd, type: 3} propertyPath: m_RootOrder - value: 32 + value: 30 objectReference: {fileID: 0} - target: {fileID: 8185732859686289158, guid: 3aef9205067d34c46bee46559d8e90dd, type: 3} propertyPath: m_LocalScale.x - value: 3.6 + value: 2 objectReference: {fileID: 0} - target: {fileID: 8185732859686289158, guid: 3aef9205067d34c46bee46559d8e90dd, type: 3} propertyPath: m_LocalScale.y - value: 3.6 + value: 2 objectReference: {fileID: 0} - target: {fileID: 8185732859686289158, guid: 3aef9205067d34c46bee46559d8e90dd, type: 3} propertyPath: m_LocalScale.z - value: 3.6 + value: 2 objectReference: {fileID: 0} - target: {fileID: 8185732859686289158, guid: 3aef9205067d34c46bee46559d8e90dd, type: 3} propertyPath: m_LocalPosition.x - value: 201.7 + value: 19.49 objectReference: {fileID: 0} - target: {fileID: 8185732859686289158, guid: 3aef9205067d34c46bee46559d8e90dd, type: 3} propertyPath: m_LocalPosition.y - value: 126 + value: 80.45 objectReference: {fileID: 0} - target: {fileID: 8185732859686289158, guid: 3aef9205067d34c46bee46559d8e90dd, type: 3} @@ -3349,22 +3153,22 @@ PrefabInstance: - target: {fileID: 8185732859686289158, guid: 3aef9205067d34c46bee46559d8e90dd, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8185732859686289158, guid: 3aef9205067d34c46bee46559d8e90dd, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8185732859686289158, guid: 3aef9205067d34c46bee46559d8e90dd, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8185732859686289158, guid: 3aef9205067d34c46bee46559d8e90dd, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8185732859686289158, guid: 3aef9205067d34c46bee46559d8e90dd, type: 3} @@ -3374,7 +3178,7 @@ PrefabInstance: - target: {fileID: 8185732859686289158, guid: 3aef9205067d34c46bee46559d8e90dd, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 0 + value: 180 objectReference: {fileID: 0} - target: {fileID: 8185732859686289158, guid: 3aef9205067d34c46bee46559d8e90dd, type: 3} @@ -3419,7 +3223,7 @@ Rigidbody: m_IsKinematic: 1 m_Interpolate: 0 m_Constraints: 0 - m_CollisionDetection: 1 + m_CollisionDetection: 2 --- !u!4 &9019939779232626648 stripped Transform: m_CorrespondingSourceObject: {fileID: 8185732859686289158, guid: 3aef9205067d34c46bee46559d8e90dd, @@ -3447,7 +3251,7 @@ Rigidbody: m_IsKinematic: 1 m_Interpolate: 0 m_Constraints: 0 - m_CollisionDetection: 1 + m_CollisionDetection: 2 --- !u!1 &9019939780613231656 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8185732858306452726, guid: 3aef9205067d34c46bee46559d8e90dd, @@ -3491,4 +3295,4 @@ Rigidbody: m_IsKinematic: 1 m_Interpolate: 0 m_Constraints: 0 - m_CollisionDetection: 1 + m_CollisionDetection: 2 diff --git a/Assets/Scenes/LevelDesign.unity b/Assets/Scenes/LevelDesign.unity index 6d68935..7118584 100644 --- a/Assets/Scenes/LevelDesign.unity +++ b/Assets/Scenes/LevelDesign.unity @@ -568,7 +568,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1530935835} m_LocalRotation: {x: 0.03457181, y: -0.0000000021495121, z: 7.435697e-11, w: 0.9994022} - m_LocalPosition: {x: 4.54, y: 11.24, z: -22.81} + m_LocalPosition: {x: 69, y: 56.38, z: -22.81} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -772,7 +772,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2129712287} m_LocalRotation: {x: 0.03457181, y: -0.0000000021495121, z: 7.435697e-11, w: 0.9994022} - m_LocalPosition: {x: 4.54, y: 11.24, z: -22.81} + m_LocalPosition: {x: 69, y: 56.38, z: -22.81} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -899,12 +899,12 @@ PrefabInstance: - target: {fileID: 1772573266731274175, guid: 4dbf735f9da7b9f43b69f1577e4e5763, type: 3} propertyPath: m_LocalPosition.x - value: 4.54 + value: 69 objectReference: {fileID: 0} - target: {fileID: 1772573266731274175, guid: 4dbf735f9da7b9f43b69f1577e4e5763, type: 3} propertyPath: m_LocalPosition.y - value: 5.06 + value: 50.2 objectReference: {fileID: 0} - target: {fileID: 1772573266731274175, guid: 4dbf735f9da7b9f43b69f1577e4e5763, type: 3} @@ -1020,5 +1020,10 @@ PrefabInstance: propertyPath: m_Name value: Level1 objectReference: {fileID: 0} + - target: {fileID: 5226806890144557965, guid: 6e2252abf9e32e3449e05af1d0f83116, + type: 3} + propertyPath: m_LocalPosition.y + value: 81.6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6e2252abf9e32e3449e05af1d0f83116, type: 3}