From f049b972972f186be32406d80f44aed2d99e576b Mon Sep 17 00:00:00 2001 From: Programmer-DField Date: Wed, 17 Mar 2021 20:50:08 +0000 Subject: [PATCH 1/6] Added the a RollingBoulder script as well as a boulder (sphere) and ramp (plane). Visual studio decided it wanted to update so saving work at this point. --- game/Assets/RollingBoulder.cs | 18 ++ game/Assets/RollingBoulder.cs.meta | 11 + game/Assets/Scenes/Main.unity | 319 +++++++++++++++++++++++++++++ 3 files changed, 348 insertions(+) create mode 100644 game/Assets/RollingBoulder.cs create mode 100644 game/Assets/RollingBoulder.cs.meta diff --git a/game/Assets/RollingBoulder.cs b/game/Assets/RollingBoulder.cs new file mode 100644 index 0000000..bfcd5c8 --- /dev/null +++ b/game/Assets/RollingBoulder.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class RollingBoulder : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/game/Assets/RollingBoulder.cs.meta b/game/Assets/RollingBoulder.cs.meta new file mode 100644 index 0000000..b3c6556 --- /dev/null +++ b/game/Assets/RollingBoulder.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: bc988e5ddd582e443b8e078aa3518654 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Scenes/Main.unity b/game/Assets/Scenes/Main.unity index 6365416..3bc5dc0 100644 --- a/game/Assets/Scenes/Main.unity +++ b/game/Assets/Scenes/Main.unity @@ -1855,6 +1855,131 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: f73d020fede261d4bac919488c8a778d, type: 3} m_PrefabInstance: {fileID: 3060674077838058149} m_PrefabAsset: {fileID: 0} +--- !u!1 &653333807 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 653333811} + - component: {fileID: 653333810} + - component: {fileID: 653333809} + - component: {fileID: 653333808} + - component: {fileID: 653333812} + - component: {fileID: 653333813} + m_Layer: 0 + m_Name: Sphere + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!135 &653333808 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 653333807} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.5 + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &653333809 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 653333807} + 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: 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 &653333810 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 653333807} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &653333811 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 653333807} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -39.49, y: 4.43, z: 83.16} + m_LocalScale: {x: 2.1579, y: 2.1579, z: 2.1579} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 15 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!54 &653333812 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 653333807} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!114 &653333813 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 653333807} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bc988e5ddd582e443b8e078aa3518654, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!4 &656405661 stripped Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e20114b5c13a067488940c5cc8e13b60, type: 3} @@ -2285,6 +2410,30 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalRotation.x + value: 0.000000005587936 + objectReference: {fileID: 0} + - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalRotation.z + value: -0.001504234 + objectReference: {fileID: 0} + - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9979446 + objectReference: {fileID: 0} + - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalRotation.x + value: -0.018160641 + objectReference: {fileID: 0} + - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalRotation.y + value: 0.061445504 + objectReference: {fileID: 0} + - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalRotation.z + value: 0.001118188 + objectReference: {fileID: 0} - target: {fileID: 4676633831414007564, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_Name value: PlayerObjects @@ -2333,6 +2482,50 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalRotation.w + value: 0.99914503 + objectReference: {fileID: 0} + - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalRotation.x + value: 0.000000005587936 + objectReference: {fileID: 0} + - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalRotation.y + value: -0.041315872 + objectReference: {fileID: 0} + - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalRotation.z + value: -0.001504234 + objectReference: {fileID: 0} + - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9995819 + objectReference: {fileID: 0} + - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalRotation.x + value: 0.000000007450581 + objectReference: {fileID: 0} + - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalRotation.y + value: 0.028896395 + objectReference: {fileID: 0} + - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalRotation.z + value: 0.001052064 + objectReference: {fileID: 0} - target: {fileID: 9122906920607805875, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_Enabled value: 0 @@ -3911,6 +4104,36 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: ca1dca8e56ef35c49b9fadf3beb9c424, type: 3} m_PrefabInstance: {fileID: 3060674078318120336} m_PrefabAsset: {fileID: 0} +--- !u!1 &1260887581 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1260887582} + m_Layer: 0 + m_Name: RollingBoulder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1260887582 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1260887581} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -52.093056, y: 0.91722655, z: 81.8881} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 13 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1261543556 stripped GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: ca1dca8e56ef35c49b9fadf3beb9c424, type: 3} @@ -5603,6 +5826,102 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: ef7a51de2c5c5c5438ce6fea733533b2, type: 3} m_PrefabInstance: {fileID: 3060674077618432072} m_PrefabAsset: {fileID: 0} +--- !u!1 &1751315287 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1751315291} + - component: {fileID: 1751315290} + - component: {fileID: 1751315289} + - component: {fileID: 1751315288} + m_Layer: 0 + m_Name: Plane + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!64 &1751315288 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1751315287} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &1751315289 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1751315287} + 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: 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 &1751315290 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1751315287} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &1751315291 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1751315287} + m_LocalRotation: {x: -0, y: -0, z: -0.2118744, w: 0.97729695} + m_LocalPosition: {x: -37.81, y: 2.35, z: 83.21} + m_LocalScale: {x: 1, y: 1, z: 0.29492} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 14 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -24.464} --- !u!1 &1752348112 stripped GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e20114b5c13a067488940c5cc8e13b60, type: 3} From 1b02a15353a2cf43fe5d023d18b902b05f230b73 Mon Sep 17 00:00:00 2001 From: Programmer-DField Date: Wed, 17 Mar 2021 22:07:33 +0000 Subject: [PATCH 2/6] Made changes to the RollingBoulder script. The trap now works much more simply. The player enters a trigger and this sets the rigidbody to use gravity setting the boulder on its journey down the ramp. Player death works as with other traps. I need to speak with Cat as he mentioned using physics may not be the best, by this I assume he means gravity, so I need some advice on a different solution. --- .../Prefabs/Traps/RollingBoulder.prefab | 271 +++++++++++++++ .../Prefabs/Traps/RollingBoulder.prefab.meta | 7 + game/Assets/RollingBoulder.cs | 46 ++- game/Assets/Scenes/Main.unity | 328 ++++-------------- 4 files changed, 390 insertions(+), 262 deletions(-) create mode 100644 game/Assets/Prefabs/Traps/RollingBoulder.prefab create mode 100644 game/Assets/Prefabs/Traps/RollingBoulder.prefab.meta diff --git a/game/Assets/Prefabs/Traps/RollingBoulder.prefab b/game/Assets/Prefabs/Traps/RollingBoulder.prefab new file mode 100644 index 0000000..4d6f58a --- /dev/null +++ b/game/Assets/Prefabs/Traps/RollingBoulder.prefab @@ -0,0 +1,271 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &6536764240838670287 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6536764240838670284} + m_Layer: 0 + m_Name: RollingBoulder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6536764240838670284 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6536764240838670287} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -52.4, y: 0.91722655, z: 81.8881} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 6536764241329740425} + - {fileID: 6536764242362416353} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &6536764241329740421 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6536764241329740425} + - component: {fileID: 6536764241329740424} + - component: {fileID: 6536764241329740427} + - component: {fileID: 6536764241329740426} + m_Layer: 0 + m_Name: Plane + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6536764241329740425 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6536764241329740421} + m_LocalRotation: {x: -0, y: -0, z: -0.2118744, w: 0.97729695} + m_LocalPosition: {x: 14.21, y: 1.29, z: 1.3218994} + m_LocalScale: {x: 1, y: 1, z: 0.29492} + m_Children: [] + m_Father: {fileID: 6536764240838670284} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -24.464} +--- !u!33 &6536764241329740424 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6536764241329740421} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &6536764241329740427 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6536764241329740421} + 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: 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!64 &6536764241329740426 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6536764241329740421} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &6536764242362416381 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6536764242362416353} + - component: {fileID: 6536764242362416352} + - component: {fileID: 6536764242362416355} + - component: {fileID: 6536764242362416354} + - component: {fileID: 6536764242362416358} + - component: {fileID: 6536764242362416359} + - component: {fileID: 6536764242362416356} + m_Layer: 0 + m_Name: Sphere + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6536764242362416353 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6536764242362416381} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 10.92, y: 4.15, z: 1.271904} + m_LocalScale: {x: 2.1579, y: 2.1579, z: 2.1579} + m_Children: [] + m_Father: {fileID: 6536764240838670284} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &6536764242362416352 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6536764242362416381} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &6536764242362416355 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6536764242362416381} + 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: 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!135 &6536764242362416354 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6536764242362416381} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.5 + m_Center: {x: 0, y: 0, z: 0} +--- !u!54 &6536764242362416358 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6536764242362416381} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!114 &6536764242362416359 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6536764242362416381} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bc988e5ddd582e443b8e078aa3518654, type: 3} + m_Name: + m_EditorClassIdentifier: + speed: 1 + waitToDestroy: 10 +--- !u!65 &6536764242362416356 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6536764242362416381} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1.3} + m_Center: {x: 4.1, y: -1.6, z: 0.03} diff --git a/game/Assets/Prefabs/Traps/RollingBoulder.prefab.meta b/game/Assets/Prefabs/Traps/RollingBoulder.prefab.meta new file mode 100644 index 0000000..c5279a8 --- /dev/null +++ b/game/Assets/Prefabs/Traps/RollingBoulder.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: baf177258b70ed448964e62915be41ee +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/RollingBoulder.cs b/game/Assets/RollingBoulder.cs index bfcd5c8..a389f01 100644 --- a/game/Assets/RollingBoulder.cs +++ b/game/Assets/RollingBoulder.cs @@ -4,15 +4,49 @@ using UnityEngine; public class RollingBoulder : MonoBehaviour { - // Start is called before the first frame update - void Start() + Rigidbody rb; + // Float for speed of the arrow. + [SerializeField] private float speed; + // Float for time in seconds to wait to destroy the arrow on contact with any other gameobject that is no the player. + [SerializeField] private float waitToDestroy; + // Vector3 to set direction of travel for the arrow once the trigger is activated. + //[SerializeField] private Vector3 direction; + + private void Start() { - + rb = GetComponent(); } - // Update is called once per frame - void Update() + private void OnTriggerEnter(Collider other) { - + // Checks to make sure other collider is the Player using tag. + if (other.gameObject.CompareTag("Player")) + { + rb.useGravity = true; + } + } + + private void OnCollisionEnter(Collision collision) + { + if (collision.gameObject.TryGetComponent(out PlayerDeath playerDeath)) + { + // Start Respawn coroutine. + playerDeath.Respawn(); + // Destroy arrow on contact with player. + Destroy(gameObject); + } + else + { + // If arrow makes contact with any other gameobject start DestroyArrow corountine. + StartCoroutine(DestoryBoulder()); + } + } + + public IEnumerator DestoryBoulder() + { + // set boulder velocity to zero wait for destory time and then destory the boulder. + rb.velocity = Vector3.zero; + yield return new WaitForSeconds(waitToDestroy); + Destroy(gameObject); } } diff --git a/game/Assets/Scenes/Main.unity b/game/Assets/Scenes/Main.unity index 3bc5dc0..9e82937 100644 --- a/game/Assets/Scenes/Main.unity +++ b/game/Assets/Scenes/Main.unity @@ -246,6 +246,63 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 985763be016f1d6408a7112ccc290bea, type: 3} m_PrefabInstance: {fileID: 3060674079532454555} m_PrefabAsset: {fileID: 0} +--- !u!1001 &51159030 +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: -51.36 + objectReference: {fileID: 0} + - target: {fileID: 6536764240838670284, guid: baf177258b70ed448964e62915be41ee, type: 3} + propertyPath: m_LocalPosition.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6536764240838670284, guid: baf177258b70ed448964e62915be41ee, type: 3} + propertyPath: m_LocalPosition.z + value: 82.94 + 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!1 &52807941 stripped GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: fc2b5b7551ec86542b748c3a88b39485, type: 3} @@ -1855,131 +1912,6 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: f73d020fede261d4bac919488c8a778d, type: 3} m_PrefabInstance: {fileID: 3060674077838058149} m_PrefabAsset: {fileID: 0} ---- !u!1 &653333807 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 653333811} - - component: {fileID: 653333810} - - component: {fileID: 653333809} - - component: {fileID: 653333808} - - component: {fileID: 653333812} - - component: {fileID: 653333813} - m_Layer: 0 - m_Name: Sphere - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!135 &653333808 -SphereCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 653333807} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Radius: 0.5 - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &653333809 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 653333807} - 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: 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 &653333810 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 653333807} - m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} ---- !u!4 &653333811 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 653333807} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -39.49, y: 4.43, z: 83.16} - m_LocalScale: {x: 2.1579, y: 2.1579, z: 2.1579} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 15 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!54 &653333812 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 653333807} - serializedVersion: 2 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_UseGravity: 0 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 ---- !u!114 &653333813 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 653333807} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bc988e5ddd582e443b8e078aa3518654, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!4 &656405661 stripped Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e20114b5c13a067488940c5cc8e13b60, type: 3} @@ -2238,6 +2170,11 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e73358a549de9664fa0a48ccdea07e1c, type: 3} m_PrefabInstance: {fileID: 3060674078233281437} m_PrefabAsset: {fileID: 0} +--- !u!4 &753966644 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6536764240838670284, guid: baf177258b70ed448964e62915be41ee, type: 3} + m_PrefabInstance: {fileID: 51159030} + m_PrefabAsset: {fileID: 0} --- !u!1 &754935927 stripped GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e20114b5c13a067488940c5cc8e13b60, type: 3} @@ -2414,6 +2351,10 @@ PrefabInstance: propertyPath: m_LocalRotation.x value: 0.000000005587936 objectReference: {fileID: 0} + - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalRotation.y + value: -0.041315872 + objectReference: {fileID: 0} - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.z value: -0.001504234 @@ -4104,36 +4045,6 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: ca1dca8e56ef35c49b9fadf3beb9c424, type: 3} m_PrefabInstance: {fileID: 3060674078318120336} m_PrefabAsset: {fileID: 0} ---- !u!1 &1260887581 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1260887582} - m_Layer: 0 - m_Name: RollingBoulder - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1260887582 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1260887581} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -52.093056, y: 0.91722655, z: 81.8881} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 13 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1261543556 stripped GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: ca1dca8e56ef35c49b9fadf3beb9c424, type: 3} @@ -4861,7 +4772,7 @@ Transform: m_Children: - {fileID: 1112305614} m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1511725762 PrefabInstance: @@ -5140,7 +5051,7 @@ GameObject: m_Component: - component: {fileID: 1571618361} m_Layer: 0 - m_Name: Trap + m_Name: Traps m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -5159,8 +5070,9 @@ Transform: m_Children: - {fileID: 300150933} - {fileID: 1511725763} + - {fileID: 753966644} m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1575274760 stripped GameObject: @@ -5826,102 +5738,6 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: ef7a51de2c5c5c5438ce6fea733533b2, type: 3} m_PrefabInstance: {fileID: 3060674077618432072} m_PrefabAsset: {fileID: 0} ---- !u!1 &1751315287 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1751315291} - - component: {fileID: 1751315290} - - component: {fileID: 1751315289} - - component: {fileID: 1751315288} - m_Layer: 0 - m_Name: Plane - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!64 &1751315288 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1751315287} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &1751315289 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1751315287} - 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: 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 &1751315290 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1751315287} - m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} ---- !u!4 &1751315291 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1751315287} - m_LocalRotation: {x: -0, y: -0, z: -0.2118744, w: 0.97729695} - m_LocalPosition: {x: -37.81, y: 2.35, z: 83.21} - m_LocalScale: {x: 1, y: 1, z: 0.29492} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 14 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: -24.464} --- !u!1 &1752348112 stripped GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e20114b5c13a067488940c5cc8e13b60, type: 3} @@ -58349,7 +58165,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6808448287154422776, guid: 8a3f2b3b16275e540b349897292a42ac, type: 3} propertyPath: m_RootOrder - value: 3 + value: 2 objectReference: {fileID: 0} - target: {fileID: 6808448287154422776, guid: 8a3f2b3b16275e540b349897292a42ac, type: 3} propertyPath: m_AnchorMax.x @@ -58438,7 +58254,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8182946073398961947, guid: e6d7cef5acc5fa648b624bfc6d857e8b, type: 3} propertyPath: m_RootOrder - value: 11 + value: 10 objectReference: {fileID: 0} - target: {fileID: 8182946073398961947, guid: e6d7cef5acc5fa648b624bfc6d857e8b, type: 3} propertyPath: m_LocalPosition.x From b0b5c09c547e980a3aafa71de0f920cb8013d80e Mon Sep 17 00:00:00 2001 From: Programmer-DField Date: Thu, 18 Mar 2021 12:34:08 +0000 Subject: [PATCH 3/6] Cleaned up the script so it now works independant of gravity. Added a second Mover script that controls the speed and direction the boulder moves once triggered. Added a target to the prefab as this is the point at which the boulder moves towards. --- .../Prefabs/Traps/RollingBoulder.prefab | 96 ++++++++++++++++++ game/Assets/Scenes/Main.unity | 98 +++++++++++++++---- game/Assets/Scripts/Traps/Mover.cs | 24 +++++ game/Assets/Scripts/Traps/Mover.cs.meta | 11 +++ .../{ => Scripts/Traps}/RollingBoulder.cs | 10 +- .../Traps}/RollingBoulder.cs.meta | 0 6 files changed, 217 insertions(+), 22 deletions(-) create mode 100644 game/Assets/Scripts/Traps/Mover.cs create mode 100644 game/Assets/Scripts/Traps/Mover.cs.meta rename game/Assets/{ => Scripts/Traps}/RollingBoulder.cs (84%) rename game/Assets/{ => Scripts/Traps}/RollingBoulder.cs.meta (100%) diff --git a/game/Assets/Prefabs/Traps/RollingBoulder.prefab b/game/Assets/Prefabs/Traps/RollingBoulder.prefab index 4d6f58a..c3e21c1 100644 --- a/game/Assets/Prefabs/Traps/RollingBoulder.prefab +++ b/game/Assets/Prefabs/Traps/RollingBoulder.prefab @@ -1,5 +1,100 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &1157356545022895102 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3284889540147964939} + - component: {fileID: 1767268791732459175} + - component: {fileID: 6231901549469343104} + - component: {fileID: 6896559390184638598} + m_Layer: 0 + m_Name: Target + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3284889540147964939 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1157356545022895102} + 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: [] + m_Father: {fileID: 6536764240838670284} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &1767268791732459175 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1157356545022895102} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &6231901549469343104 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1157356545022895102} + 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: 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 &6896559390184638598 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1157356545022895102} + 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 &6536764240838670287 GameObject: m_ObjectHideFlags: 0 @@ -29,6 +124,7 @@ Transform: m_Children: - {fileID: 6536764241329740425} - {fileID: 6536764242362416353} + - {fileID: 3284889540147964939} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/game/Assets/Scenes/Main.unity b/game/Assets/Scenes/Main.unity index 9e82937..c00eb60 100644 --- a/game/Assets/Scenes/Main.unity +++ b/game/Assets/Scenes/Main.unity @@ -253,6 +253,34 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1571618361} m_Modifications: + - target: {fileID: 3284889540147964939, guid: baf177258b70ed448964e62915be41ee, type: 3} + propertyPath: m_LocalScale.x + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: 3284889540147964939, guid: baf177258b70ed448964e62915be41ee, type: 3} + propertyPath: m_LocalScale.y + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: 3284889540147964939, guid: baf177258b70ed448964e62915be41ee, type: 3} + propertyPath: m_LocalScale.z + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: 3284889540147964939, guid: baf177258b70ed448964e62915be41ee, type: 3} + propertyPath: m_LocalPosition.x + value: 18.726 + objectReference: {fileID: 0} + - target: {fileID: 3284889540147964939, guid: baf177258b70ed448964e62915be41ee, type: 3} + propertyPath: m_LocalPosition.y + value: -0.718 + objectReference: {fileID: 0} + - target: {fileID: 3284889540147964939, guid: baf177258b70ed448964e62915be41ee, type: 3} + propertyPath: m_LocalPosition.z + value: 1.238 + objectReference: {fileID: 0} + - target: {fileID: 6231901549469343104, guid: baf177258b70ed448964e62915be41ee, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6536764240838670284, guid: baf177258b70ed448964e62915be41ee, type: 3} propertyPath: m_RootOrder value: 2 @@ -301,6 +329,18 @@ PrefabInstance: propertyPath: m_Name value: RollingBoulder objectReference: {fileID: 0} + - target: {fileID: 6536764242362416359, guid: baf177258b70ed448964e62915be41ee, type: 3} + propertyPath: speed + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6536764242362416359, guid: baf177258b70ed448964e62915be41ee, type: 3} + propertyPath: target + value: + objectReference: {fileID: 478980238} + - target: {fileID: 6536764242362416359, guid: baf177258b70ed448964e62915be41ee, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: baf177258b70ed448964e62915be41ee, type: 3} --- !u!1 &52807941 stripped @@ -1051,6 +1091,25 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e20114b5c13a067488940c5cc8e13b60, type: 3} m_PrefabInstance: {fileID: 3060674077756111689} m_PrefabAsset: {fileID: 0} +--- !u!1 &325333170 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6536764242362416381, guid: baf177258b70ed448964e62915be41ee, type: 3} + m_PrefabInstance: {fileID: 51159030} + m_PrefabAsset: {fileID: 0} +--- !u!114 &325333178 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 325333170} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 364f9139f6e39a244a53d33f7eca4c65, type: 3} + m_Name: + m_EditorClassIdentifier: + speed: 2 + target: {fileID: 478980238} --- !u!1 &332132158 stripped GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: f73d020fede261d4bac919488c8a778d, type: 3} @@ -1415,6 +1474,11 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: ef7a51de2c5c5c5438ce6fea733533b2, type: 3} m_PrefabInstance: {fileID: 3060674077686378536} m_PrefabAsset: {fileID: 0} +--- !u!1 &478980238 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1157356545022895102, guid: baf177258b70ed448964e62915be41ee, type: 3} + m_PrefabInstance: {fileID: 51159030} + m_PrefabAsset: {fileID: 0} --- !u!1 &480152489 stripped GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 3ea432459c1408040880f4c027fab559, type: 3} @@ -2349,7 +2413,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.x - value: 0.000000005587936 + value: -0.000000011175871 objectReference: {fileID: 0} - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.y @@ -2357,23 +2421,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.z - value: -0.001504234 + value: -0.001504235 objectReference: {fileID: 0} - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.w - value: 0.9979446 + value: 0.9979251 objectReference: {fileID: 0} - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.x - value: -0.018160641 + value: -0.018160317 objectReference: {fileID: 0} - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.y - value: 0.061445504 + value: 0.061761502 objectReference: {fileID: 0} - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.z - value: 0.001118188 + value: 0.0011239406 objectReference: {fileID: 0} - target: {fileID: 4676633831414007564, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_Name @@ -2425,47 +2489,47 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 0.021596579 objectReference: {fileID: 0} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 0.73940504 objectReference: {fileID: 0} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: -0.30432126 objectReference: {fileID: 0} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.w - value: 0.99914503 + value: 0.9791332 objectReference: {fileID: 0} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.x - value: 0.000000005587936 + value: 0.19930515 objectReference: {fileID: 0} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.y - value: -0.041315872 + value: -0.039160818 objectReference: {fileID: 0} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.z - value: -0.001504234 + value: 0.0064973626 objectReference: {fileID: 0} - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.w - value: 0.9995819 + value: 0.9995727 objectReference: {fileID: 0} - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.x - value: 0.000000007450581 + value: -0.000000016763806 objectReference: {fileID: 0} - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.y - value: 0.028896395 + value: 0.029212706 objectReference: {fileID: 0} - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.z - value: 0.001052064 + value: 0.0010635803 objectReference: {fileID: 0} - target: {fileID: 9122906920607805875, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_Enabled diff --git a/game/Assets/Scripts/Traps/Mover.cs b/game/Assets/Scripts/Traps/Mover.cs new file mode 100644 index 0000000..82853f1 --- /dev/null +++ b/game/Assets/Scripts/Traps/Mover.cs @@ -0,0 +1,24 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Mover : MonoBehaviour +{ + [SerializeField] private float speed; + [SerializeField] private GameObject target; + + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void FixedUpdate() + { + //transform.LookAt(player.transform); + Quaternion targetRotation = Quaternion.LookRotation(target.transform.position - transform.position); + transform.rotation = Quaternion.Slerp(transform.rotation, targetRotation, 1 * Time.deltaTime); + transform.position += transform.forward * speed * Time.deltaTime; + } +} diff --git a/game/Assets/Scripts/Traps/Mover.cs.meta b/game/Assets/Scripts/Traps/Mover.cs.meta new file mode 100644 index 0000000..2c901f1 --- /dev/null +++ b/game/Assets/Scripts/Traps/Mover.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 364f9139f6e39a244a53d33f7eca4c65 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/RollingBoulder.cs b/game/Assets/Scripts/Traps/RollingBoulder.cs similarity index 84% rename from game/Assets/RollingBoulder.cs rename to game/Assets/Scripts/Traps/RollingBoulder.cs index a389f01..e959fbb 100644 --- a/game/Assets/RollingBoulder.cs +++ b/game/Assets/Scripts/Traps/RollingBoulder.cs @@ -5,12 +5,10 @@ using UnityEngine; public class RollingBoulder : MonoBehaviour { Rigidbody rb; - // Float for speed of the arrow. - [SerializeField] private float speed; // Float for time in seconds to wait to destroy the arrow on contact with any other gameobject that is no the player. [SerializeField] private float waitToDestroy; - // Vector3 to set direction of travel for the arrow once the trigger is activated. - //[SerializeField] private Vector3 direction; + + public GameObject target; private void Start() { @@ -22,7 +20,9 @@ public class RollingBoulder : MonoBehaviour // Checks to make sure other collider is the Player using tag. if (other.gameObject.CompareTag("Player")) { - rb.useGravity = true; + Mover mover = + gameObject.GetComponent(); + mover.enabled = true; } } diff --git a/game/Assets/RollingBoulder.cs.meta b/game/Assets/Scripts/Traps/RollingBoulder.cs.meta similarity index 100% rename from game/Assets/RollingBoulder.cs.meta rename to game/Assets/Scripts/Traps/RollingBoulder.cs.meta From 914f7e584b78c356b912d7b7d2a8fe72f3c6ab5f Mon Sep 17 00:00:00 2001 From: Programmer-DField Date: Thu, 18 Mar 2021 12:48:09 +0000 Subject: [PATCH 4/6] Further cleaning of code in both scripts. --- game/Assets/Scripts/Traps/Mover.cs | 6 ------ game/Assets/Scripts/Traps/RollingBoulder.cs | 4 +--- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/game/Assets/Scripts/Traps/Mover.cs b/game/Assets/Scripts/Traps/Mover.cs index 82853f1..b3c2d30 100644 --- a/game/Assets/Scripts/Traps/Mover.cs +++ b/game/Assets/Scripts/Traps/Mover.cs @@ -7,12 +7,6 @@ public class Mover : MonoBehaviour [SerializeField] private float speed; [SerializeField] private GameObject target; - // Start is called before the first frame update - void Start() - { - - } - // Update is called once per frame void FixedUpdate() { diff --git a/game/Assets/Scripts/Traps/RollingBoulder.cs b/game/Assets/Scripts/Traps/RollingBoulder.cs index e959fbb..85a7cd0 100644 --- a/game/Assets/Scripts/Traps/RollingBoulder.cs +++ b/game/Assets/Scripts/Traps/RollingBoulder.cs @@ -7,8 +7,6 @@ public class RollingBoulder : MonoBehaviour Rigidbody rb; // Float for time in seconds to wait to destroy the arrow on contact with any other gameobject that is no the player. [SerializeField] private float waitToDestroy; - - public GameObject target; private void Start() { @@ -37,7 +35,7 @@ public class RollingBoulder : MonoBehaviour } else { - // If arrow makes contact with any other gameobject start DestroyArrow corountine. + // If boulder makes contact with any other gameobject start DestroyBoulder corountine. StartCoroutine(DestoryBoulder()); } } From 49d1fc481a66e5e3d1256b8ac1a0d9961d9ebd5f Mon Sep 17 00:00:00 2001 From: Programmer-DField Date: Thu, 18 Mar 2021 12:54:32 +0000 Subject: [PATCH 5/6] Disabled mesh renderer and box collider on target for rolling boulder prefab. Also added the Mover script to the prefab. --- .../Prefabs/Traps/RollingBoulder.prefab | 16 +++++- game/Assets/Scenes/Main.unity | 53 +++++++------------ 2 files changed, 34 insertions(+), 35 deletions(-) diff --git a/game/Assets/Prefabs/Traps/RollingBoulder.prefab b/game/Assets/Prefabs/Traps/RollingBoulder.prefab index c3e21c1..6c3b059 100644 --- a/game/Assets/Prefabs/Traps/RollingBoulder.prefab +++ b/game/Assets/Prefabs/Traps/RollingBoulder.prefab @@ -239,6 +239,7 @@ GameObject: - component: {fileID: 6536764242362416358} - component: {fileID: 6536764242362416359} - component: {fileID: 6536764242362416356} + - component: {fileID: 8693320603023675547} m_Layer: 0 m_Name: Sphere m_TagString: Untagged @@ -350,7 +351,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bc988e5ddd582e443b8e078aa3518654, type: 3} m_Name: m_EditorClassIdentifier: - speed: 1 waitToDestroy: 10 --- !u!65 &6536764242362416356 BoxCollider: @@ -365,3 +365,17 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 1, y: 1, z: 1.3} m_Center: {x: 4.1, y: -1.6, z: 0.03} +--- !u!114 &8693320603023675547 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6536764242362416381} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 364f9139f6e39a244a53d33f7eca4c65, type: 3} + m_Name: + m_EditorClassIdentifier: + speed: 2 + target: {fileID: 1157356545022895102} diff --git a/game/Assets/Scenes/Main.unity b/game/Assets/Scenes/Main.unity index c00eb60..46ca675 100644 --- a/game/Assets/Scenes/Main.unity +++ b/game/Assets/Scenes/Main.unity @@ -341,6 +341,10 @@ PrefabInstance: propertyPath: m_Enabled value: 1 objectReference: {fileID: 0} + - target: {fileID: 6896559390184638598, guid: baf177258b70ed448964e62915be41ee, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: baf177258b70ed448964e62915be41ee, type: 3} --- !u!1 &52807941 stripped @@ -1091,25 +1095,6 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e20114b5c13a067488940c5cc8e13b60, type: 3} m_PrefabInstance: {fileID: 3060674077756111689} m_PrefabAsset: {fileID: 0} ---- !u!1 &325333170 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6536764242362416381, guid: baf177258b70ed448964e62915be41ee, type: 3} - m_PrefabInstance: {fileID: 51159030} - m_PrefabAsset: {fileID: 0} ---- !u!114 &325333178 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 325333170} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 364f9139f6e39a244a53d33f7eca4c65, type: 3} - m_Name: - m_EditorClassIdentifier: - speed: 2 - target: {fileID: 478980238} --- !u!1 &332132158 stripped GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: f73d020fede261d4bac919488c8a778d, type: 3} @@ -2413,7 +2398,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.x - value: -0.000000011175871 + value: 0.000000005587936 objectReference: {fileID: 0} - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.y @@ -2421,7 +2406,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.z - value: -0.001504235 + value: -0.001504234 objectReference: {fileID: 0} - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.w @@ -2429,15 +2414,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.x - value: -0.018160317 + value: -0.018160312 objectReference: {fileID: 0} - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.y - value: 0.061761502 + value: 0.06176151 objectReference: {fileID: 0} - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.z - value: 0.0011239406 + value: 0.0011239403 objectReference: {fileID: 0} - target: {fileID: 4676633831414007564, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_Name @@ -2489,31 +2474,31 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalPosition.x - value: 0.021596579 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalPosition.y - value: 0.73940504 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalPosition.z - value: -0.30432126 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.w - value: 0.9791332 + value: 0.99914503 objectReference: {fileID: 0} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.x - value: 0.19930515 + value: 0.000000018626453 objectReference: {fileID: 0} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.y - value: -0.039160818 + value: -0.041315872 objectReference: {fileID: 0} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.z - value: 0.0064973626 + value: -0.0015042337 objectReference: {fileID: 0} - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.w @@ -2521,15 +2506,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.x - value: -0.000000016763806 + value: -0.000000007450581 objectReference: {fileID: 0} - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.y - value: 0.029212706 + value: 0.029212713 objectReference: {fileID: 0} - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.z - value: 0.0010635803 + value: 0.0010635813 objectReference: {fileID: 0} - target: {fileID: 9122906920607805875, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_Enabled From 6e74da102ca3d669b187cd22b91b2df6519b9201 Mon Sep 17 00:00:00 2001 From: cyndrdev Date: Thu, 25 Mar 2021 19:00:13 +0000 Subject: [PATCH 6/6] minor fixes --- .../Prefabs/Traps/RollingBoulder.prefab | 8 +-- game/Assets/Scenes/Main.unity | 63 +++++++++++++++++++ game/Assets/Scripts/Traps/Mover.cs | 14 +++-- 3 files changed, 77 insertions(+), 8 deletions(-) diff --git a/game/Assets/Prefabs/Traps/RollingBoulder.prefab b/game/Assets/Prefabs/Traps/RollingBoulder.prefab index 6c3b059..fa12fb1 100644 --- a/game/Assets/Prefabs/Traps/RollingBoulder.prefab +++ b/game/Assets/Prefabs/Traps/RollingBoulder.prefab @@ -27,7 +27,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1157356545022895102} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 5.47, y: -0.91722655, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6536764240838670284} @@ -48,7 +48,7 @@ MeshRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1157356545022895102} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -155,7 +155,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6536764241329740421} m_LocalRotation: {x: -0, y: -0, z: -0.2118744, w: 0.97729695} - m_LocalPosition: {x: 14.21, y: 1.29, z: 1.3218994} + m_LocalPosition: {x: 0, y: 1.29, z: 0} m_LocalScale: {x: 1, y: 1, z: 0.29492} m_Children: [] m_Father: {fileID: 6536764240838670284} @@ -255,7 +255,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6536764242362416381} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 10.92, y: 4.15, z: 1.271904} + m_LocalPosition: {x: -2.5, y: 3.5827737, z: 0} m_LocalScale: {x: 2.1579, y: 2.1579, z: 2.1579} m_Children: [] m_Father: {fileID: 6536764240838670284} diff --git a/game/Assets/Scenes/Main.unity b/game/Assets/Scenes/Main.unity index cfd5b10..dd8883e 100644 --- a/game/Assets/Scenes/Main.unity +++ b/game/Assets/Scenes/Main.unity @@ -4624,6 +4624,68 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e20114b5c13a067488940c5cc8e13b60, type: 3} m_PrefabInstance: {fileID: 3060674077961207736} m_PrefabAsset: {fileID: 0} +--- !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!4 &1464700863 stripped Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 584f9522dd055c543863c0c60d13776e, type: 3} @@ -5056,6 +5118,7 @@ Transform: m_Children: - {fileID: 300150933} - {fileID: 1511725763} + - {fileID: 1462391826} m_Father: {fileID: 0} m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/game/Assets/Scripts/Traps/Mover.cs b/game/Assets/Scripts/Traps/Mover.cs index b3c2d30..39c930a 100644 --- a/game/Assets/Scripts/Traps/Mover.cs +++ b/game/Assets/Scripts/Traps/Mover.cs @@ -1,3 +1,4 @@ +using System; using System.Collections; using System.Collections.Generic; using UnityEngine; @@ -7,12 +8,17 @@ public class Mover : MonoBehaviour [SerializeField] private float speed; [SerializeField] private GameObject target; + private void OnEnable() + { + float dt = Time.fixedDeltaTime; + Quaternion targetRotation = Quaternion.LookRotation(target.transform.position - transform.position); + transform.rotation = targetRotation; + } + // Update is called once per frame void FixedUpdate() { - //transform.LookAt(player.transform); - Quaternion targetRotation = Quaternion.LookRotation(target.transform.position - transform.position); - transform.rotation = Quaternion.Slerp(transform.rotation, targetRotation, 1 * Time.deltaTime); - transform.position += transform.forward * speed * Time.deltaTime; + float dt = Time.fixedDeltaTime; + transform.position += transform.forward * speed * dt; } }