From 43a01934bc96d1e714495e7aed33fcafa3cb360c Mon Sep 17 00:00:00 2001 From: Cat Flynn Date: Fri, 5 Mar 2021 16:32:21 +0000 Subject: [PATCH] update trap prefab --- .../Assets/Prefabs/Traps/FallawayFloor.prefab | 4 +- game/Assets/Scenes/Main.unity | 199 ++---------------- 2 files changed, 25 insertions(+), 178 deletions(-) diff --git a/game/Assets/Prefabs/Traps/FallawayFloor.prefab b/game/Assets/Prefabs/Traps/FallawayFloor.prefab index c364470..7a980f1 100644 --- a/game/Assets/Prefabs/Traps/FallawayFloor.prefab +++ b/game/Assets/Prefabs/Traps/FallawayFloor.prefab @@ -42,12 +42,12 @@ Transform: m_GameObject: {fileID: 8773676356524340268} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 3.1289, y: 0.13889, z: 6.7626376} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 5244658790847279383} m_Father: {fileID: 0} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: -36.672, z: 0} --- !u!33 &980120856895548942 MeshFilter: m_ObjectHideFlags: 0 diff --git a/game/Assets/Scenes/Main.unity b/game/Assets/Scenes/Main.unity index 99ea193..7baea3f 100644 --- a/game/Assets/Scenes/Main.unity +++ b/game/Assets/Scenes/Main.unity @@ -383,7 +383,6 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1253534772} - - {fileID: 1464731100} - {fileID: 943873810} m_Father: {fileID: 0} m_RootOrder: 10 @@ -2505,11 +2504,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.w - value: 0.09839616 + value: 0.09839617 objectReference: {fileID: 0} - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.x - value: 0.0022685407 + value: 0.002268539 objectReference: {fileID: 0} - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.y @@ -2537,15 +2536,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.x - value: 0.14197029 + value: 0.1419703 objectReference: {fileID: 0} - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.y - value: 0.045199864 + value: 0.04519987 objectReference: {fileID: 0} - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.z - value: -0.0064896103 + value: -0.006489612 objectReference: {fileID: 0} - target: {fileID: 4676633831414007564, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_Name @@ -2617,31 +2616,31 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 0.00016589099 objectReference: {fileID: 0} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 0.005893066 objectReference: {fileID: 0} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: -0.00058174226 objectReference: {fileID: 0} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.w - value: 0.09839616 + value: 0.09839417 objectReference: {fileID: 0} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.x - value: 0.0022685407 + value: 0.002353779 objectReference: {fileID: 0} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.y - value: -0.9611452 + value: -0.96092147 objectReference: {fileID: 0} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.z - value: 0.257901 + value: 0.25873354 objectReference: {fileID: 0} - target: {fileID: 4676633832858914730, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_XAxis.m_InvertInput @@ -2681,15 +2680,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.x - value: 0.0033135554 + value: 0.0033135582 objectReference: {fileID: 0} - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.y - value: -0.95580196 + value: -0.95580184 objectReference: {fileID: 0} - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.z - value: 0.25646722 + value: 0.25646725 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} @@ -3177,23 +3176,11 @@ PrefabInstance: 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 + value: 5.71 objectReference: {fileID: 0} - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} propertyPath: m_LocalPosition.y @@ -3201,11 +3188,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} propertyPath: m_LocalPosition.z - value: 2.538 + value: 2 objectReference: {fileID: 0} - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} propertyPath: m_LocalRotation.w - value: 0.95283645 + value: 0.9492268 objectReference: {fileID: 0} - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} propertyPath: m_LocalRotation.x @@ -3213,24 +3200,12 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} propertyPath: m_LocalRotation.y - value: -0.30348426 + value: -0.31459284 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) @@ -4445,25 +4420,9 @@ PrefabInstance: 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 + value: 5.109 objectReference: {fileID: 0} - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} propertyPath: m_LocalPosition.y @@ -4471,11 +4430,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} propertyPath: m_LocalPosition.z - value: 4.585 + value: 5.034 objectReference: {fileID: 0} - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} propertyPath: m_LocalRotation.w - value: 0.95283645 + value: 0.95128506 objectReference: {fileID: 0} - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} propertyPath: m_LocalRotation.x @@ -4483,24 +4442,12 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} propertyPath: m_LocalRotation.y - value: -0.30348426 + value: -0.3083129 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 @@ -5361,106 +5308,6 @@ 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}