From 3a2296e1bfb7e5731a57b7949668abdb2b67b7b4 Mon Sep 17 00:00:00 2001 From: Cat Flynn Date: Fri, 16 Apr 2021 20:42:10 +0100 Subject: [PATCH] remove trap from opening courtyard and add floor --- game/Assets/Scenes/Main.unity | 167 ++++++++++++++++++++-------------- 1 file changed, 100 insertions(+), 67 deletions(-) diff --git a/game/Assets/Scenes/Main.unity b/game/Assets/Scenes/Main.unity index 0e9ca69..b383c2c 100644 --- a/game/Assets/Scenes/Main.unity +++ b/game/Assets/Scenes/Main.unity @@ -1329,11 +1329,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.w - value: 0.028300386 + value: 0.028300352 objectReference: {fileID: 0} - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.x - value: 0.0010792749 + value: 0.0010792735 objectReference: {fileID: 0} - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.y @@ -1445,11 +1445,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.w - value: 0.028300352 + value: 0.028300386 objectReference: {fileID: 0} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.x - value: 0.0010792735 + value: 0.0010792749 objectReference: {fileID: 0} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.y @@ -4310,6 +4310,101 @@ GameObject: m_CorrespondingSourceObject: {fileID: 6068618978370505175, guid: c05280569c267224f87de839cb102b18, type: 3} m_PrefabInstance: {fileID: 3060674078329643206} m_PrefabAsset: {fileID: 0} +--- !u!1 &1047937898 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1047937899} + - component: {fileID: 1047937902} + - component: {fileID: 1047937901} + - component: {fileID: 1047937900} + m_Layer: 0 + m_Name: Cube + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1047937899 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1047937898} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -2.03, y: -3.43, z: 13.72} + m_LocalScale: {x: 31.513, y: 1, z: 53.230965} + m_Children: [] + m_Father: {fileID: 3060674079221835677} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &1047937900 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1047937898} + 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!23 &1047937901 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1047937898} + m_Enabled: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + 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!33 &1047937902 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1047937898} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1048254818 stripped GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 584f9522dd055c543863c0c60d13776e, type: 3} @@ -6671,68 +6766,6 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 0.009995612, y: 0.04649781, z: 0.010708006} m_Center: {x: 0.002017343, y: 0.023248905, z: -0.005354004} ---- !u!1001 &1462391825 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1571618361} - m_Modifications: - - target: {fileID: 6536764240838670284, guid: baf177258b70ed448964e62915be41ee, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 6536764240838670284, guid: baf177258b70ed448964e62915be41ee, type: 3} - propertyPath: m_LocalPosition.x - value: -40 - objectReference: {fileID: 0} - - target: {fileID: 6536764240838670284, guid: baf177258b70ed448964e62915be41ee, type: 3} - propertyPath: m_LocalPosition.y - value: 0.91722655 - objectReference: {fileID: 0} - - target: {fileID: 6536764240838670284, guid: baf177258b70ed448964e62915be41ee, type: 3} - propertyPath: m_LocalPosition.z - value: 83.5 - objectReference: {fileID: 0} - - target: {fileID: 6536764240838670284, guid: baf177258b70ed448964e62915be41ee, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6536764240838670284, guid: baf177258b70ed448964e62915be41ee, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6536764240838670284, guid: baf177258b70ed448964e62915be41ee, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6536764240838670284, guid: baf177258b70ed448964e62915be41ee, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6536764240838670284, guid: baf177258b70ed448964e62915be41ee, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6536764240838670284, guid: baf177258b70ed448964e62915be41ee, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6536764240838670284, guid: baf177258b70ed448964e62915be41ee, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6536764240838670287, guid: baf177258b70ed448964e62915be41ee, type: 3} - propertyPath: m_Name - value: RollingBoulder - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: baf177258b70ed448964e62915be41ee, type: 3} ---- !u!4 &1462391826 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6536764240838670284, guid: baf177258b70ed448964e62915be41ee, type: 3} - m_PrefabInstance: {fileID: 1462391825} - m_PrefabAsset: {fileID: 0} --- !u!1001 &1463122436 PrefabInstance: m_ObjectHideFlags: 0 @@ -7351,7 +7384,6 @@ Transform: m_Children: - {fileID: 300150933} - {fileID: 1511725763} - - {fileID: 1462391826} m_Father: {fileID: 0} m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -49377,6 +49409,7 @@ Transform: - {fileID: 1422220784} - {fileID: 1568011104} - {fileID: 3060674078723830672} + - {fileID: 1047937899} m_Father: {fileID: 3060674078936265690} m_RootOrder: 66 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}