From e016e2b1229c6328bacde0f8fc6b9cf27a6f7f2c Mon Sep 17 00:00:00 2001 From: Cat Flynn Date: Fri, 5 Mar 2021 16:24:50 +0000 Subject: [PATCH] clean up trap floor prefab --- game/Assets/Prefabs/Player.prefab | 2 +- .../Assets/Prefabs/Traps/FallawayFloor.prefab | 173 ++++++--- game/Assets/Scenes/Main.unity | 349 +++++++++++++++++- game/Assets/Scripts/Traps/FallawayFloor.cs | 8 +- 4 files changed, 457 insertions(+), 75 deletions(-) diff --git a/game/Assets/Prefabs/Player.prefab b/game/Assets/Prefabs/Player.prefab index 3478db8..115a7db 100644 --- a/game/Assets/Prefabs/Player.prefab +++ b/game/Assets/Prefabs/Player.prefab @@ -100,7 +100,7 @@ GameObject: - component: {fileID: 2167937473989734407} m_Layer: 0 m_Name: Player - m_TagString: Untagged + m_TagString: Player m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/game/Assets/Prefabs/Traps/FallawayFloor.prefab b/game/Assets/Prefabs/Traps/FallawayFloor.prefab index f1a390f..c364470 100644 --- a/game/Assets/Prefabs/Traps/FallawayFloor.prefab +++ b/game/Assets/Prefabs/Traps/FallawayFloor.prefab @@ -1,5 +1,18 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!65 &9034355455690887775 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4864755999650917293} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1.7892379, y: 0.100711815, z: 1.7912163} + m_Center: {x: -0.88613075, y: 0.043598715, z: -0.895608} --- !u!1 &8773676356524340268 GameObject: m_ObjectHideFlags: 0 @@ -10,10 +23,8 @@ GameObject: m_Component: - component: {fileID: 8144920974147422729} - component: {fileID: 980120856895548942} - - component: {fileID: 980120856895548941} - component: {fileID: 980120856895548940} - component: {fileID: 980120856895548939} - - component: {fileID: 980120856895548938} - component: {fileID: 980120856895548943} m_Layer: 0 m_Name: FallawayFloor @@ -30,9 +41,10 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8773676356524340268} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 11.74, y: 5.69, z: -0.92} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 3.1289, y: 0.13889, z: 6.7626376} - m_Children: [] + m_Children: + - {fileID: 5244658790847279383} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -44,47 +56,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8773676356524340268} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &980120856895548941 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8773676356524340268} - m_Enabled: 1 - 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: 9f4d5da5d97ffda4a92ff6400046453f, 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 &980120856895548940 BoxCollider: m_ObjectHideFlags: 0 @@ -96,8 +67,8 @@ BoxCollider: m_IsTrigger: 1 m_Enabled: 1 serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 0.6} - m_Center: {x: 0, y: 5, z: 0} + m_Size: {x: 2, y: 1, z: 2} + m_Center: {x: 0, y: 0.63, z: 0} --- !u!114 &980120856895548939 MonoBehaviour: m_ObjectHideFlags: 0 @@ -111,20 +82,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: speed: 3 + fallAwayTime: 1 + destroyObjectTime: 0 dissolve: {fileID: 2100000, guid: 98767dd77414bad44b23ef5332c1d8f1, type: 2} ---- !u!65 &980120856895548938 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8773676356524340268} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1.0000001} - m_Center: {x: 0, y: 0.0000009536743, z: 0.00000047683716} + _renderer: {fileID: 6378198502367496824} --- !u!54 &980120856895548943 Rigidbody: m_ObjectHideFlags: 0 @@ -141,3 +102,95 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 0 +--- !u!1001 &5711263752094586620 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 8144920974147422729} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 803c82d4ce9f809448a55cba1adec183, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 803c82d4ce9f809448a55cba1adec183, type: 3} + propertyPath: m_LocalScale.x + value: 1.0634918 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 803c82d4ce9f809448a55cba1adec183, type: 3} + propertyPath: m_LocalScale.y + value: 1.3920045 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 803c82d4ce9f809448a55cba1adec183, type: 3} + propertyPath: m_LocalScale.z + value: 1.0634918 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 803c82d4ce9f809448a55cba1adec183, type: 3} + propertyPath: m_LocalPosition.x + value: 0.958 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 803c82d4ce9f809448a55cba1adec183, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 803c82d4ce9f809448a55cba1adec183, type: 3} + propertyPath: m_LocalPosition.z + value: 0.974 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 803c82d4ce9f809448a55cba1adec183, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 803c82d4ce9f809448a55cba1adec183, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 803c82d4ce9f809448a55cba1adec183, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 803c82d4ce9f809448a55cba1adec183, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 803c82d4ce9f809448a55cba1adec183, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 803c82d4ce9f809448a55cba1adec183, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 803c82d4ce9f809448a55cba1adec183, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 803c82d4ce9f809448a55cba1adec183, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 22a733893c7f0bc48b61d6a462964442, type: 2} + - target: {fileID: 919132149155446097, guid: 803c82d4ce9f809448a55cba1adec183, type: 3} + propertyPath: m_Name + value: Floor_B (13) + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 803c82d4ce9f809448a55cba1adec183, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 803c82d4ce9f809448a55cba1adec183, type: 3} +--- !u!1 &4864755999650917293 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 803c82d4ce9f809448a55cba1adec183, type: 3} + m_PrefabInstance: {fileID: 5711263752094586620} + m_PrefabAsset: {fileID: 0} +--- !u!4 &5244658790847279383 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 803c82d4ce9f809448a55cba1adec183, type: 3} + m_PrefabInstance: {fileID: 5711263752094586620} + m_PrefabAsset: {fileID: 0} +--- !u!23 &6378198502367496824 stripped +MeshRenderer: + m_CorrespondingSourceObject: {fileID: -7511558181221131132, guid: 803c82d4ce9f809448a55cba1adec183, type: 3} + m_PrefabInstance: {fileID: 5711263752094586620} + m_PrefabAsset: {fileID: 0} diff --git a/game/Assets/Scenes/Main.unity b/game/Assets/Scenes/Main.unity index 24301b6..99ea193 100644 --- a/game/Assets/Scenes/Main.unity +++ b/game/Assets/Scenes/Main.unity @@ -355,6 +355,39 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 59318655} m_CullTransparentMesh: 1 +--- !u!1 &62788885 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 62788886} + m_Layer: 0 + m_Name: Traps + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &62788886 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 62788885} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1253534772} + - {fileID: 1464731100} + - {fileID: 943873810} + m_Father: {fileID: 0} + m_RootOrder: 10 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &63319662 stripped Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: ef7a51de2c5c5c5438ce6fea733533b2, type: 3} @@ -2472,19 +2505,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.w - value: 0.9898497 + value: 0.09839616 objectReference: {fileID: 0} - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.x - value: 0.14211854 + value: 0.0022685407 objectReference: {fileID: 0} - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.y - value: 1.1133053e-25 + value: -0.9611452 objectReference: {fileID: 0} - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.z - value: -4.9127595e-24 + value: 0.257901 objectReference: {fileID: 0} - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalPosition.x @@ -2596,19 +2629,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.w - value: 0.9898497 + value: 0.09839616 objectReference: {fileID: 0} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.x - value: 0.14211854 + value: 0.0022685407 objectReference: {fileID: 0} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.y - value: -0.0000000034819871 + value: -0.9611452 objectReference: {fileID: 0} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.z - value: 4.999292e-10 + value: 0.257901 objectReference: {fileID: 0} - target: {fileID: 4676633832858914730, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_XAxis.m_InvertInput @@ -2626,21 +2659,37 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: -3.720001 objectReference: {fileID: 0} + - target: {fileID: 4676633832858914731, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalRotation.w + value: 0.09771981 + objectReference: {fileID: 0} + - target: {fileID: 4676633832858914731, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalRotation.x + value: 0.011738406 + objectReference: {fileID: 0} + - target: {fileID: 4676633832858914731, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalRotation.y + value: 0.98804176 + objectReference: {fileID: 0} + - target: {fileID: 4676633832858914731, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalRotation.z + value: -0.11868665 + objectReference: {fileID: 0} - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.w - value: 0.98881716 + value: 0.1437231 objectReference: {fileID: 0} - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.x - value: 0.14197028 + value: 0.0033135554 objectReference: {fileID: 0} - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.y - value: 0.045199856 + value: -0.95580196 objectReference: {fileID: 0} - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.z - value: -0.006489607 + value: 0.25646722 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} @@ -3115,6 +3164,88 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: ef7a51de2c5c5c5438ce6fea733533b2, type: 3} m_PrefabInstance: {fileID: 3060674078945920345} m_PrefabAsset: {fileID: 0} +--- !u!1001 &943873809 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 62788886} + m_Modifications: + - target: {fileID: 4864755999650917293, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} + propertyPath: m_Name + value: Floor + objectReference: {fileID: 0} + - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} + propertyPath: m_LocalPosition.x + value: 6.094 + objectReference: {fileID: 0} + - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} + propertyPath: m_LocalPosition.y + value: 3.34 + objectReference: {fileID: 0} + - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} + propertyPath: m_LocalPosition.z + value: 2.538 + objectReference: {fileID: 0} + - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} + propertyPath: m_LocalRotation.w + value: 0.95283645 + objectReference: {fileID: 0} + - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} + propertyPath: m_LocalRotation.y + value: -0.30348426 + objectReference: {fileID: 0} + - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -35.334 + objectReference: {fileID: 0} + - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8773676356524340268, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} + propertyPath: m_Name + value: FallawayFloor (1) + objectReference: {fileID: 0} + - target: {fileID: 8773676356524340268, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} +--- !u!4 &943873810 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} + m_PrefabInstance: {fileID: 943873809} + m_PrefabAsset: {fileID: 0} --- !u!1 &949461034 stripped GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 2784d88b6334dc143a910f3d252aa5df, type: 3} @@ -4303,6 +4434,88 @@ GameObject: m_CorrespondingSourceObject: {fileID: 7268975836957126310, guid: 84d1abd228b21df47af6e0f4750ab193, type: 3} m_PrefabInstance: {fileID: 3060674078680416267} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1253534771 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 62788886} + m_Modifications: + - target: {fileID: 4864755999650917293, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} + propertyPath: m_Name + value: Floor + objectReference: {fileID: 0} + - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} + propertyPath: m_LocalPosition.x + value: 4.643 + objectReference: {fileID: 0} + - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} + propertyPath: m_LocalPosition.y + value: 2.987 + objectReference: {fileID: 0} + - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} + propertyPath: m_LocalPosition.z + value: 4.585 + objectReference: {fileID: 0} + - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} + propertyPath: m_LocalRotation.w + value: 0.95283645 + objectReference: {fileID: 0} + - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} + propertyPath: m_LocalRotation.y + value: -0.30348426 + objectReference: {fileID: 0} + - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -35.334 + objectReference: {fileID: 0} + - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8773676356524340268, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} + propertyPath: m_Name + value: FallawayFloor + objectReference: {fileID: 0} + - target: {fileID: 8773676356524340268, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} +--- !u!4 &1253534772 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} + m_PrefabInstance: {fileID: 1253534771} + m_PrefabAsset: {fileID: 0} --- !u!1 &1256217231 stripped GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 985763be016f1d6408a7112ccc290bea, type: 3} @@ -5148,6 +5361,106 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 584f9522dd055c543863c0c60d13776e, type: 3} m_PrefabInstance: {fileID: 3060674078316550787} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1464731099 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 62788886} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 803c82d4ce9f809448a55cba1adec183, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 803c82d4ce9f809448a55cba1adec183, type: 3} + propertyPath: m_LocalScale.x + value: 1.0634918 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 803c82d4ce9f809448a55cba1adec183, type: 3} + propertyPath: m_LocalScale.y + value: 1.3920045 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 803c82d4ce9f809448a55cba1adec183, type: 3} + propertyPath: m_LocalScale.z + value: 1.0634918 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 803c82d4ce9f809448a55cba1adec183, type: 3} + propertyPath: m_LocalPosition.x + value: 2.74 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 803c82d4ce9f809448a55cba1adec183, type: 3} + propertyPath: m_LocalPosition.y + value: 3.08 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 803c82d4ce9f809448a55cba1adec183, type: 3} + propertyPath: m_LocalPosition.z + value: 5.61 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 803c82d4ce9f809448a55cba1adec183, type: 3} + propertyPath: m_LocalRotation.w + value: -0.45285088 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 803c82d4ce9f809448a55cba1adec183, type: 3} + propertyPath: m_LocalRotation.x + value: 8.232304e-17 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 803c82d4ce9f809448a55cba1adec183, type: 3} + propertyPath: m_LocalRotation.y + value: 0.8915863 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 803c82d4ce9f809448a55cba1adec183, type: 3} + propertyPath: m_LocalRotation.z + value: -2.6864793e-17 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 803c82d4ce9f809448a55cba1adec183, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 803c82d4ce9f809448a55cba1adec183, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -126.147 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 803c82d4ce9f809448a55cba1adec183, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 803c82d4ce9f809448a55cba1adec183, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 22a733893c7f0bc48b61d6a462964442, type: 2} + - target: {fileID: 919132149155446097, guid: 803c82d4ce9f809448a55cba1adec183, type: 3} + propertyPath: m_Name + value: Floor_B (13) + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 803c82d4ce9f809448a55cba1adec183, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 803c82d4ce9f809448a55cba1adec183, type: 3} +--- !u!4 &1464731100 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 803c82d4ce9f809448a55cba1adec183, type: 3} + m_PrefabInstance: {fileID: 1464731099} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1464731101 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 803c82d4ce9f809448a55cba1adec183, type: 3} + m_PrefabInstance: {fileID: 1464731099} + m_PrefabAsset: {fileID: 0} +--- !u!65 &1464731102 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1464731101} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1.7892379, y: 0.100711815, z: 1.7912163} + m_Center: {x: -0.88613075, y: 0.043598715, z: -0.895608} --- !u!4 &1479658267 stripped Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: c05280569c267224f87de839cb102b18, type: 3} @@ -9792,6 +10105,10 @@ PrefabInstance: propertyPath: m_Name value: Floor_B (4) objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 803c82d4ce9f809448a55cba1adec183, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 803c82d4ce9f809448a55cba1adec183, type: 3} --- !u!65 &3060674077691964099 @@ -41902,6 +42219,10 @@ PrefabInstance: propertyPath: m_Name value: Floor_B (5) objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 803c82d4ce9f809448a55cba1adec183, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 803c82d4ce9f809448a55cba1adec183, type: 3} --- !u!136 &3060674078979980220 @@ -56631,6 +56952,10 @@ PrefabInstance: propertyPath: m_Name value: Floor_B (6) objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 803c82d4ce9f809448a55cba1adec183, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 803c82d4ce9f809448a55cba1adec183, type: 3} --- !u!65 &3060674079624820716 diff --git a/game/Assets/Scripts/Traps/FallawayFloor.cs b/game/Assets/Scripts/Traps/FallawayFloor.cs index c9412e2..bef9840 100644 --- a/game/Assets/Scripts/Traps/FallawayFloor.cs +++ b/game/Assets/Scripts/Traps/FallawayFloor.cs @@ -1,3 +1,4 @@ +using System; using System.Collections; using System.Collections.Generic; using UnityEngine; @@ -11,6 +12,9 @@ public class FallawayFloor : MonoBehaviour // Time taken for object to be destroyed. public float destroyObjectTime; public Material dissolve; + + [SerializeField] private Renderer _renderer; + Rigidbody rb; private void Start() @@ -21,11 +25,11 @@ public class FallawayFloor : MonoBehaviour private void OnTriggerEnter(Collider other) { - if (other.gameObject.CompareTag("Player")) + if (other.CompareTag("Player")) { // Start the Destroy floor coroutine and switch to the dissolve material. StartCoroutine(DestroyFloor()); - GetComponent().material = dissolve; + _renderer.material = dissolve; } }