From 83cd280778454856417177aec361d0fedf008eb2 Mon Sep 17 00:00:00 2001 From: Programmer-DField Date: Wed, 24 Feb 2021 23:41:33 +0000 Subject: [PATCH 01/14] Working to get the trap system working. Added a prototype for the spike trap. Need to work on the code to get the floor to fall away under the player. --- game/Assets/FallawayFloor.cs | 12 + game/Assets/FallawayFloor.cs.meta | 11 + game/Assets/Prefabs/Player.prefab | 4 +- game/Assets/Scenes/Main.unity | 922 ++++++++++++++++-- game/Assets/Scripts/Checkpoint/SafeZone.cs | 4 +- .../Scripts/Death & Respawn/DeathZone.cs | 2 +- 6 files changed, 893 insertions(+), 62 deletions(-) create mode 100644 game/Assets/FallawayFloor.cs create mode 100644 game/Assets/FallawayFloor.cs.meta diff --git a/game/Assets/FallawayFloor.cs b/game/Assets/FallawayFloor.cs new file mode 100644 index 0000000..ad1747f --- /dev/null +++ b/game/Assets/FallawayFloor.cs @@ -0,0 +1,12 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class FallawayFloor : MonoBehaviour +{ + IEnumerator OnCollisionEnter(Collision coll) + { + yield return new WaitForSeconds(2); + Destroy(gameObject); + } +} diff --git a/game/Assets/FallawayFloor.cs.meta b/game/Assets/FallawayFloor.cs.meta new file mode 100644 index 0000000..db87b1f --- /dev/null +++ b/game/Assets/FallawayFloor.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 425c126c97ce3fb438fa3ef015d37317 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Prefabs/Player.prefab b/game/Assets/Prefabs/Player.prefab index 25cbdd5..2a5c0e6 100644 --- a/game/Assets/Prefabs/Player.prefab +++ b/game/Assets/Prefabs/Player.prefab @@ -98,7 +98,7 @@ GameObject: - component: {fileID: 3320306143821152633} m_Layer: 0 m_Name: Player - m_TagString: Untagged + m_TagString: Player m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -111,7 +111,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 13726836969441781} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0.157, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 13726837642651460} diff --git a/game/Assets/Scenes/Main.unity b/game/Assets/Scenes/Main.unity index dda3c83..c1c7432 100644 --- a/game/Assets/Scenes/Main.unity +++ b/game/Assets/Scenes/Main.unity @@ -123,6 +123,257 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &34418842 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 34418844} + - component: {fileID: 34418843} + - component: {fileID: 34418845} + m_Layer: 0 + m_Name: GameManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &34418843 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 34418842} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4a7f7dc8ddb842944abcbcbb1d4995f5, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &34418844 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 34418842} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 4.3810477, y: -1.0937972, z: 60.18017} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1509348081} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &34418845 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 34418842} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4a7f7dc8ddb842944abcbcbb1d4995f5, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &38412567 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 38412568} + - component: {fileID: 38412571} + - component: {fileID: 38412570} + - component: {fileID: 38412569} + m_Layer: 0 + m_Name: Cube (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &38412568 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 38412567} + m_LocalRotation: {x: 0.5, y: 0.5, z: 0.5, w: 0.5} + m_LocalPosition: {x: 9.936016, y: 4.1548176, z: 3.5365372} + m_LocalScale: {x: 3.1289, y: 1, z: 9.605558} + m_Children: [] + m_Father: {fileID: 2018660589} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 90} +--- !u!65 &38412569 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 38412567} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &38412570 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 38412567} + 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 &38412571 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 38412567} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &114717650 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 114717651} + - component: {fileID: 114717654} + - component: {fileID: 114717653} + - component: {fileID: 114717652} + m_Layer: 0 + m_Name: Cube (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &114717651 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 114717650} + m_LocalRotation: {x: 0.5, y: 0.5, z: 0.5, w: 0.5} + m_LocalPosition: {x: 9.936016, y: 4.1548176, z: -5.0034637} + m_LocalScale: {x: 3.1289, y: 1, z: 9.605558} + m_Children: [] + m_Father: {fileID: 2018660589} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 90} +--- !u!65 &114717652 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 114717650} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &114717653 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 114717650} + 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 &114717654 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 114717650} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &155900315 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: c05280569c267224f87de839cb102b18, type: 3} + m_PrefabInstance: {fileID: 1316034057} + m_PrefabAsset: {fileID: 0} --- !u!1 &349701919 GameObject: m_ObjectHideFlags: 0 @@ -407,6 +658,118 @@ Transform: m_Father: {fileID: 1509348081} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1 &519958730 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 519958731} + - component: {fileID: 519958735} + - component: {fileID: 519958734} + - component: {fileID: 519958732} + - component: {fileID: 519958733} + m_Layer: 0 + m_Name: Plane + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &519958731 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 519958730} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0.44, z: 0} + m_LocalScale: {x: 0.69935423, y: 1, z: 0.68767} + m_Children: [] + m_Father: {fileID: 1544718415} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &519958732 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 519958730} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f1d0f28dfb6a7245ac9ab4193aaed55, type: 3} + m_Name: + m_EditorClassIdentifier: + animator: {fileID: 1646361029} + fadeScreen: {fileID: 0} + respawnManager: {fileID: 34418843} + _playerInput: {fileID: 1646361025} +--- !u!65 &519958733 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 519958730} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 10, y: 2.220446e-16, z: 9.999999} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &519958734 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 519958730} + m_Enabled: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &519958735 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 519958730} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1148358018 GameObject: m_ObjectHideFlags: 0 @@ -550,6 +913,71 @@ Transform: m_Father: {fileID: 1509348081} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1316034057 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2018660589} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: c05280569c267224f87de839cb102b18, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c05280569c267224f87de839cb102b18, type: 3} + propertyPath: m_LocalScale.x + value: 2.4528294 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c05280569c267224f87de839cb102b18, type: 3} + propertyPath: m_LocalScale.z + value: 3.529492 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c05280569c267224f87de839cb102b18, type: 3} + propertyPath: m_LocalPosition.x + value: 9.816017 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c05280569c267224f87de839cb102b18, type: 3} + propertyPath: m_LocalPosition.y + value: 2.6648173 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c05280569c267224f87de839cb102b18, type: 3} + propertyPath: m_LocalPosition.z + value: -0.43346405 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c05280569c267224f87de839cb102b18, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c05280569c267224f87de839cb102b18, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c05280569c267224f87de839cb102b18, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c05280569c267224f87de839cb102b18, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c05280569c267224f87de839cb102b18, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c05280569c267224f87de839cb102b18, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c05280569c267224f87de839cb102b18, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: c05280569c267224f87de839cb102b18, type: 3} + propertyPath: m_Name + value: SpikeTrap_low (7) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c05280569c267224f87de839cb102b18, type: 3} --- !u!1 &1509348080 GameObject: m_ObjectHideFlags: 0 @@ -584,8 +1012,97 @@ Transform: - {fileID: 1148358022} - {fileID: 1908415563} - {fileID: 470223360} + - {fileID: 34418844} m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1528237030 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 13726836969441544, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 13726836969441544, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 13726836969441544, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} + propertyPath: m_LocalPosition.y + value: 0.157 + objectReference: {fileID: 0} + - target: {fileID: 13726836969441544, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 13726836969441544, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 13726836969441544, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 13726836969441544, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 13726836969441544, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 13726836969441544, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 13726836969441544, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 13726836969441544, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 13726836969441781, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} + propertyPath: m_Name + value: Player + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} +--- !u!1 &1544718414 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1544718415} + m_Layer: 0 + m_Name: DeathZones + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1544718415 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1544718414} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 4.95, y: 0.15, z: 65.07} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 519958731} + m_Father: {fileID: 0} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1551303224 GameObject: @@ -724,7 +1241,182 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1644003337 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1644003338} + - component: {fileID: 1644003342} + - component: {fileID: 1644003341} + - component: {fileID: 1644003340} + - component: {fileID: 1644003339} + m_Layer: 0 + m_Name: Plane + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1644003338 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1644003337} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 17.644665, y: 2.59, z: 2.562397} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1841136307} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1644003339 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1644003337} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45048530c51ef5e4196d4fa70972441c, type: 3} + m_Name: + m_EditorClassIdentifier: + _respawnManager: {fileID: 34418843} +--- !u!65 &1644003340 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1644003337} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 10, y: 2.220446e-16, z: 10} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &1644003341 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1644003337} + m_Enabled: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1644003342 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1644003337} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1646361021 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 13726836969441781, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} + m_PrefabInstance: {fileID: 1528237030} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1646361025 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 13726836969441780, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} + m_PrefabInstance: {fileID: 1528237030} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1646361021} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!95 &1646361029 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1646361021} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: bd12efafa4115114f90ba79feeb4e8b0, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &1841136306 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1841136307} + m_Layer: 0 + m_Name: SafeZones + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1841136307 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1841136306} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -2.6846654, y: -2.1454198, z: 52.347603} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1644003338} + m_Father: {fileID: 0} + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1908415559 GameObject: @@ -821,60 +1513,176 @@ Transform: m_Father: {fileID: 1509348081} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &13726837176080777 -PrefabInstance: +--- !u!1 &1995811568 +GameObject: m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1995811569} + - component: {fileID: 1995811572} + - component: {fileID: 1995811571} + - component: {fileID: 1995811570} + - component: {fileID: 1995811573} + - component: {fileID: 1995811574} + - component: {fileID: 1995811575} + m_Layer: 0 + m_Name: Floor + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1995811569 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1995811568} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 10.216017, y: 5.48, z: -0.8434677} + m_LocalScale: {x: 3.1289, y: 0.13889, z: 6.7626376} + m_Children: [] + m_Father: {fileID: 2018660589} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &1995811570 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1995811568} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 13726836969441544, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 13726836969441544, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 13726836969441544, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 13726836969441544, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 13726836969441544, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 13726836969441544, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 13726836969441544, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 13726836969441544, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 13726836969441544, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 13726836969441544, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 13726836969441544, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 13726836969441781, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} - propertyPath: m_Name - value: Player - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 1, z: 0} +--- !u!23 &1995811571 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1995811568} + 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 &1995811572 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1995811568} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!54 &1995811573 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1995811568} + 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 &1995811574 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1995811568} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 425c126c97ce3fb438fa3ef015d37317, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!65 &1995811575 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1995811568} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1.0000001, z: 0.99999994} + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &2018660588 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2018660589} + m_Layer: 0 + m_Name: Traps + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2018660589 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2018660588} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -4.8960166, y: -2.6448174, z: 65.653465} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1995811569} + - {fileID: 38412568} + - {fileID: 114717651} + - {fileID: 155900315} + m_Father: {fileID: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/game/Assets/Scripts/Checkpoint/SafeZone.cs b/game/Assets/Scripts/Checkpoint/SafeZone.cs index 5739af9..0eb198a 100644 --- a/game/Assets/Scripts/Checkpoint/SafeZone.cs +++ b/game/Assets/Scripts/Checkpoint/SafeZone.cs @@ -13,7 +13,7 @@ public class SafeZone : MonoBehaviour private void OnTriggerEnter(Collider other) { // Check to see if other collider is Player. If true set player to other game object. - if (other.gameObject.name == "Player") + if (other.gameObject.tag == "Player") { isSafe = true; player = other.gameObject; @@ -23,7 +23,7 @@ public class SafeZone : MonoBehaviour private void OnTriggerExit(Collider other) { // Check if other game object is Player. - if (other.gameObject.name == "Player") + if (other.gameObject.tag == "Player") { isSafe = false; } diff --git a/game/Assets/Scripts/Death & Respawn/DeathZone.cs b/game/Assets/Scripts/Death & Respawn/DeathZone.cs index 08f9a64..df498f0 100644 --- a/game/Assets/Scripts/Death & Respawn/DeathZone.cs +++ b/game/Assets/Scripts/Death & Respawn/DeathZone.cs @@ -14,7 +14,7 @@ public class DeathZone : MonoBehaviour private void OnTriggerEnter(Collider other) { // Checks to make sure other collider is the Player. Sets player variable as Player game object and starts the coroutine. - if (other.gameObject.name == "Player") + if (other.gameObject.tag == "Player") { player = other.gameObject; StartCoroutine(RespawnPlayer()); From 1f4c063c602d8ec42b73733bed706aa3d3f6dfb3 Mon Sep 17 00:00:00 2001 From: Programmer-DField Date: Thu, 25 Feb 2021 00:51:11 +0000 Subject: [PATCH 02/14] Updated the FallingFloor script. The floor now begins to lower, waits for a set period and then is destroyed. I plan to add a disssolve effect to make this transition look better. The player begins to slowly fall with the floor until the object is destroyed at which point the player falls with gravity hitting the sspike trap and "dying". --- game/Assets/FallawayFloor.cs | 25 ++++++++++++++++++++++--- game/Assets/Scenes/Main.unity | 9 +++++---- 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/game/Assets/FallawayFloor.cs b/game/Assets/FallawayFloor.cs index ad1747f..2780028 100644 --- a/game/Assets/FallawayFloor.cs +++ b/game/Assets/FallawayFloor.cs @@ -4,9 +4,28 @@ using UnityEngine; public class FallawayFloor : MonoBehaviour { - IEnumerator OnCollisionEnter(Collision coll) + public float speed; + Rigidbody rb; + + private void Start() { - yield return new WaitForSeconds(2); - Destroy(gameObject); + rb = GetComponent(); + } + + private void OnTriggerEnter(Collider other) + { + if (other.gameObject.tag == "Player") + { + StartCoroutine(DestroyFloor()); + } + } + + IEnumerator DestroyFloor() + { + rb.velocity = Vector3.down * speed; + yield return new WaitForSeconds(1); + + Destroy(gameObject); + yield return null; } } diff --git a/game/Assets/Scenes/Main.unity b/game/Assets/Scenes/Main.unity index c1c7432..72f17e2 100644 --- a/game/Assets/Scenes/Main.unity +++ b/game/Assets/Scenes/Main.unity @@ -1310,7 +1310,7 @@ MeshRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1644003337} - m_Enabled: 0 + m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -1543,7 +1543,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1995811568} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 10.216017, y: 5.48, z: -0.8434677} + m_LocalPosition: {x: 10.216017, y: 5.84, z: -0.8434677} m_LocalScale: {x: 3.1289, y: 0.13889, z: 6.7626376} m_Children: [] m_Father: {fileID: 2018660589} @@ -1560,8 +1560,8 @@ BoxCollider: m_IsTrigger: 1 m_Enabled: 1 serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 1, z: 0} + m_Size: {x: 1, y: 1, z: 0.63} + m_Center: {x: 0, y: 5.13, z: 0} --- !u!23 &1995811571 MeshRenderer: m_ObjectHideFlags: 0 @@ -1639,6 +1639,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 425c126c97ce3fb438fa3ef015d37317, type: 3} m_Name: m_EditorClassIdentifier: + speed: 2 --- !u!65 &1995811575 BoxCollider: m_ObjectHideFlags: 0 From 3ef56e2bc149372032cc57ad323df3029dde4f8c Mon Sep 17 00:00:00 2001 From: Programmer-DField Date: Fri, 26 Feb 2021 14:50:30 +0000 Subject: [PATCH 03/14] Added a shader with dissolve effect. Ckleaned up use of tags now using compare.tag which is more efficient. The spike trap is now functionally working however, ppolish does need to be applied to the final outcome. --- game/Assets/Materials/DeathVolume_MAt.mat | 2 +- game/Assets/Materials/Dissolve_Mat 1.mat | 113 + game/Assets/Materials/Dissolve_Mat 1.mat.meta | 8 + game/Assets/Materials/Dissolve_Mat.mat | 126 ++ game/Assets/Materials/Dissolve_Mat.mat.meta | 8 + game/Assets/NewShaderVariants.shadervariants | 478 +++++ .../NewShaderVariants.shadervariants.meta | 8 + game/Assets/Prefabs/Traps.meta | 8 + .../Assets/Prefabs/Traps/FallawayFloor.prefab | 143 ++ .../Prefabs/Traps/FallawayFloor.prefab.meta | 7 + game/Assets/Scenes/Main.unity | 112 +- game/Assets/Scripts/Checkpoint/SafeZone.cs | 4 +- .../Scripts/Death & Respawn/DeathZone.cs | 2 +- game/Assets/Scripts/Traps.meta | 8 + .../{ => Scripts/Traps}/FallawayFloor.cs | 5 +- .../{ => Scripts/Traps}/FallawayFloor.cs.meta | 0 game/Assets/Shaders.meta | 8 + game/Assets/Shaders/S_Dissolve.shadergraph | 1872 +++++++++++++++++ .../Shaders/S_Dissolve.shadergraph.meta | 10 + game/ProjectSettings/GraphicsSettings.asset | 135 +- .../PackageManagerSettings.asset | 2 +- 21 files changed, 2874 insertions(+), 185 deletions(-) create mode 100644 game/Assets/Materials/Dissolve_Mat 1.mat create mode 100644 game/Assets/Materials/Dissolve_Mat 1.mat.meta create mode 100644 game/Assets/Materials/Dissolve_Mat.mat create mode 100644 game/Assets/Materials/Dissolve_Mat.mat.meta create mode 100644 game/Assets/NewShaderVariants.shadervariants create mode 100644 game/Assets/NewShaderVariants.shadervariants.meta create mode 100644 game/Assets/Prefabs/Traps.meta create mode 100644 game/Assets/Prefabs/Traps/FallawayFloor.prefab create mode 100644 game/Assets/Prefabs/Traps/FallawayFloor.prefab.meta create mode 100644 game/Assets/Scripts/Traps.meta rename game/Assets/{ => Scripts/Traps}/FallawayFloor.cs (75%) rename game/Assets/{ => Scripts/Traps}/FallawayFloor.cs.meta (100%) create mode 100644 game/Assets/Shaders.meta create mode 100644 game/Assets/Shaders/S_Dissolve.shadergraph create mode 100644 game/Assets/Shaders/S_Dissolve.shadergraph.meta diff --git a/game/Assets/Materials/DeathVolume_MAt.mat b/game/Assets/Materials/DeathVolume_MAt.mat index c709471..ac05a72 100644 --- a/game/Assets/Materials/DeathVolume_MAt.mat +++ b/game/Assets/Materials/DeathVolume_MAt.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: DeathVolume_MAt + m_Name: DeathVolume_Mat m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_ShaderKeywords: m_LightmapFlags: 4 diff --git a/game/Assets/Materials/Dissolve_Mat 1.mat b/game/Assets/Materials/Dissolve_Mat 1.mat new file mode 100644 index 0000000..f7fda42 --- /dev/null +++ b/game/Assets/Materials/Dissolve_Mat 1.mat @@ -0,0 +1,113 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Dissolve_Mat 1 + m_Shader: {fileID: -6465566751694194690, guid: a2ce310af2093b943a51a8ca043d3d85, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - Vector1_a2c6311ab95d4bdc9e0f4181113b7cf2: 0.03 + - Vector1_d5480c5de4ff47b5b1aba387dfe598e5: 15 + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - Color_84d1885b65f4494ab6f8b394136923df: {r: 0, g: 0.1254902, b: 16, a: 0} + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/game/Assets/Materials/Dissolve_Mat 1.mat.meta b/game/Assets/Materials/Dissolve_Mat 1.mat.meta new file mode 100644 index 0000000..18a6077 --- /dev/null +++ b/game/Assets/Materials/Dissolve_Mat 1.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: da0fa728207169841b3511f4d513406f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Materials/Dissolve_Mat.mat b/game/Assets/Materials/Dissolve_Mat.mat new file mode 100644 index 0000000..d22b17b --- /dev/null +++ b/game/Assets/Materials/Dissolve_Mat.mat @@ -0,0 +1,126 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Dissolve_Mat + m_Shader: {fileID: -6465566751694194690, guid: a2ce310af2093b943a51a8ca043d3d85, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - Vector1_a2c6311ab95d4bdc9e0f4181113b7cf2: 0.03 + - Vector1_d5480c5de4ff47b5b1aba387dfe598e5: 15 + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - Color_84d1885b65f4494ab6f8b394136923df: {r: 0, g: 0.1254902, b: 16, a: 0} + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] +--- !u!114 &5327688771729586094 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 4 diff --git a/game/Assets/Materials/Dissolve_Mat.mat.meta b/game/Assets/Materials/Dissolve_Mat.mat.meta new file mode 100644 index 0000000..c8f245f --- /dev/null +++ b/game/Assets/Materials/Dissolve_Mat.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 98767dd77414bad44b23ef5332c1d8f1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/NewShaderVariants.shadervariants b/game/Assets/NewShaderVariants.shadervariants new file mode 100644 index 0000000..5de7b7a --- /dev/null +++ b/game/Assets/NewShaderVariants.shadervariants @@ -0,0 +1,478 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!200 &20000000 +ShaderVariantCollection: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: NewShaderVariants + m_Shaders: + - first: {fileID: 0} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 0} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 0} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 0} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 0} + second: + variants: + - keywords: + passType: 13 + - keywords: _ADDITIONAL_LIGHTS + passType: 13 + - keywords: _ADDITIONAL_LIGHTS _ADDITIONAL_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS + _MAIN_LIGHT_SHADOWS_CASCADE _SHADOWS_SOFT + passType: 13 + - first: {fileID: 0} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 0} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 0} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 0} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 0} + second: + variants: + - keywords: + passType: 0 + - keywords: + passType: 13 + - keywords: _ADDITIONAL_LIGHTS + passType: 13 + - keywords: _ADDITIONAL_LIGHTS _ADDITIONAL_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS + _MAIN_LIGHT_SHADOWS_CASCADE _SHADOWS_SOFT + passType: 13 + - first: {fileID: 0} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 0} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 0} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 0} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 0} + second: + variants: + - keywords: + passType: 13 + - keywords: _ADDITIONAL_LIGHTS + passType: 13 + - keywords: _ADDITIONAL_LIGHTS _ADDITIONAL_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS + _MAIN_LIGHT_SHADOWS_CASCADE _SHADOWS_SOFT + passType: 13 + - first: {fileID: 0} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 0} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 0} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 0} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 0} + second: + variants: + - keywords: + passType: 13 + - keywords: _ADDITIONAL_LIGHTS + passType: 13 + - first: {fileID: 0} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 0} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 0} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 0} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 0} + second: + variants: + - keywords: + passType: 13 + - keywords: _ADDITIONAL_LIGHTS + passType: 13 + - keywords: _ADDITIONAL_LIGHTS_VERTEX _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE + passType: 13 + - first: {fileID: 0} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 0} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 0} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 0} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 0} + second: + variants: + - keywords: + passType: 13 + - keywords: _ADDITIONAL_LIGHTS + passType: 13 + - keywords: _ADDITIONAL_LIGHTS_VERTEX _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE + passType: 13 + - first: {fileID: 0} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 0} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 0} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 0} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 0} + second: + variants: + - keywords: + passType: 13 + - keywords: _ADDITIONAL_LIGHTS + passType: 13 + - keywords: _ADDITIONAL_LIGHTS _ADDITIONAL_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS + _MAIN_LIGHT_SHADOWS_CASCADE _SHADOWS_SOFT + passType: 13 + - first: {fileID: 0} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 0} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 0} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 0} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 0} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 0} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 0} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 0} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 0} + second: + variants: + - keywords: + passType: 13 + - keywords: _ADDITIONAL_LIGHTS + passType: 13 + - keywords: _ADDITIONAL_LIGHTS _ADDITIONAL_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS + _MAIN_LIGHT_SHADOWS_CASCADE _SHADOWS_SOFT + passType: 13 + - first: {fileID: 66, guid: 0000000000000000f000000000000000, type: 0} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 106, guid: 0000000000000000f000000000000000, type: 0} + second: + variants: + - keywords: BILLBOARD_FACE_CAMERA_POS _ADDITIONAL_LIGHTS _ADDITIONAL_LIGHT_SHADOWS + _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _SHADOWS_SOFT + passType: 0 + - keywords: _SUNDISK_SIMPLE + passType: 0 + - keywords: BILLBOARD_FACE_CAMERA_POS _ADDITIONAL_LIGHTS _ADDITIONAL_LIGHT_SHADOWS + _DEPTH_NO_MSAA _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _SHADOWS_SOFT + _SUNDISK_SIMPLE + passType: 0 + - first: {fileID: 9000, guid: 0000000000000000f000000000000000, type: 0} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 9001, guid: 0000000000000000f000000000000000, type: 0} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 9002, guid: 0000000000000000f000000000000000, type: 0} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 9003, guid: 0000000000000000f000000000000000, type: 0} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 9004, guid: 0000000000000000f000000000000000, type: 0} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 9007, guid: 0000000000000000f000000000000000, type: 0} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 9101, guid: 0000000000000000f000000000000000, type: 0} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 9103, guid: 0000000000000000f000000000000000, type: 0} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 9104, guid: 0000000000000000f000000000000000, type: 0} + second: + variants: + - keywords: + passType: 0 + - keywords: BILLBOARD_FACE_CAMERA_POS _ADDITIONAL_LIGHTS _DEPTH_NO_MSAA + passType: 0 + - first: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3} + second: + variants: + - keywords: BILLBOARD_FACE_CAMERA_POS _ADDITIONAL_LIGHTS _ADDITIONAL_LIGHT_SHADOWS + _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _SHADOWS_SOFT + passType: 0 + - keywords: BILLBOARD_FACE_CAMERA_POS _ADDITIONAL_LIGHTS _ADDITIONAL_LIGHT_SHADOWS + _DEPTH_NO_MSAA _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _SHADOWS_SOFT + passType: 0 + - first: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3} + second: + variants: + - keywords: BILLBOARD_FACE_CAMERA_POS UNITY_HDR_ON _DEPTH_NO_MSAA _MAIN_LIGHT_SHADOWS + _MAIN_LIGHT_SHADOWS_CASCADE + passType: 0 + - keywords: BILLBOARD_FACE_CAMERA_POS UNITY_HDR_ON _ADDITIONAL_LIGHTS _DEPTH_NO_MSAA + _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE + passType: 0 + - keywords: BILLBOARD_FACE_CAMERA_POS UNITY_HDR_ON _ADDITIONAL_LIGHTS _ADDITIONAL_LIGHT_SHADOWS + _DEPTH_NO_MSAA _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _SHADOWS_SOFT + passType: 0 + - first: {fileID: 4800000, guid: 65df88701913c224d95fc554db28381a, type: 3} + second: + variants: + - keywords: + passType: 0 + - keywords: BILLBOARD_FACE_CAMERA_POS UNITY_HDR_ON _ADDITIONAL_LIGHTS _MAIN_LIGHT_SHADOWS + _MAIN_LIGHT_SHADOWS_CASCADE + passType: 0 + - first: {fileID: 4800000, guid: e7857e9d0c934dc4f83f270f8447b006, type: 3} + second: + variants: + - keywords: + passType: 0 + - keywords: BILLBOARD_FACE_CAMERA_POS UNITY_HDR_ON _ADDITIONAL_LIGHTS _MAIN_LIGHT_SHADOWS + _MAIN_LIGHT_SHADOWS_CASCADE + passType: 0 + - first: {fileID: 4800000, guid: 50b406436c6214c49aaaa6011b71dde8, type: 3} + second: + variants: + - keywords: + passType: 0 + - keywords: BILLBOARD_FACE_CAMERA_POS _ADDITIONAL_LIGHTS _DEPTH_NO_MSAA + passType: 0 + - first: {fileID: 4800000, guid: 911130a939bf84843bcc4211c327f579, type: 3} + second: + variants: + - keywords: + passType: 8 + - first: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + second: + variants: + - keywords: + passType: 8 + - keywords: _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A + passType: 8 + - keywords: _METALLICSPECGLOSSMAP _NORMALMAP _PARALLAXMAP _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A + passType: 8 + - keywords: BILLBOARD_FACE_CAMERA_POS UNITY_HDR_ON _ADDITIONAL_LIGHTS _METALLICSPECGLOSSMAP + _NORMALMAP _PARALLAXMAP _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A + passType: 8 + - keywords: BILLBOARD_FACE_CAMERA_POS UNITY_HDR_ON _ADDITIONAL_LIGHTS _DEPTH_NO_MSAA + _METALLICSPECGLOSSMAP _NORMALMAP _PARALLAXMAP _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A + passType: 8 + - keywords: BILLBOARD_FACE_CAMERA_POS UNITY_HDR_ON _ADDITIONAL_LIGHTS _DEPTH_NO_MSAA + passType: 13 + - keywords: BILLBOARD_FACE_CAMERA_POS UNITY_HDR_ON _ADDITIONAL_LIGHTS _MAIN_LIGHT_SHADOWS + _MAIN_LIGHT_SHADOWS_CASCADE + passType: 13 + - keywords: BILLBOARD_FACE_CAMERA_POS UNITY_HDR_ON _DEPTH_NO_MSAA _MAIN_LIGHT_SHADOWS + _MAIN_LIGHT_SHADOWS_CASCADE + passType: 13 + - keywords: BILLBOARD_FACE_CAMERA_POS UNITY_HDR_ON _ADDITIONAL_LIGHTS _DEPTH_NO_MSAA + _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE + passType: 13 + - keywords: BILLBOARD_FACE_CAMERA_POS LIGHTPROBE_SH _ADDITIONAL_LIGHTS _ADDITIONAL_LIGHT_SHADOWS + _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _SHADOWS_SOFT + passType: 13 + - keywords: BILLBOARD_FACE_CAMERA_POS _ADDITIONAL_LIGHTS _ADDITIONAL_LIGHT_SHADOWS + _DEPTH_NO_MSAA _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _SHADOWS_SOFT + passType: 13 + - keywords: BILLBOARD_FACE_CAMERA_POS UNITY_HDR_ON _ADDITIONAL_LIGHTS _ADDITIONAL_LIGHT_SHADOWS + _DEPTH_NO_MSAA _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _SHADOWS_SOFT + passType: 13 + - keywords: BILLBOARD_FACE_CAMERA_POS UNITY_HDR_ON _ADDITIONAL_LIGHTS _MAIN_LIGHT_SHADOWS + _MAIN_LIGHT_SHADOWS_CASCADE _METALLICSPECGLOSSMAP _NORMALMAP _PARALLAXMAP + _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A + passType: 13 + - keywords: BILLBOARD_FACE_CAMERA_POS UNITY_HDR_ON _DEPTH_NO_MSAA _MAIN_LIGHT_SHADOWS + _MAIN_LIGHT_SHADOWS_CASCADE _METALLICSPECGLOSSMAP _NORMALMAP _PARALLAXMAP + _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A + passType: 13 + - keywords: BILLBOARD_FACE_CAMERA_POS UNITY_HDR_ON _ADDITIONAL_LIGHTS _DEPTH_NO_MSAA + _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _METALLICSPECGLOSSMAP _NORMALMAP + _PARALLAXMAP _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A + passType: 13 + - keywords: BILLBOARD_FACE_CAMERA_POS LIGHTPROBE_SH _ADDITIONAL_LIGHTS _ADDITIONAL_LIGHT_SHADOWS + _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _METALLICSPECGLOSSMAP _NORMALMAP + _PARALLAXMAP _SHADOWS_SOFT _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A + passType: 13 + - keywords: BILLBOARD_FACE_CAMERA_POS _ADDITIONAL_LIGHTS _ADDITIONAL_LIGHT_SHADOWS + _DEPTH_NO_MSAA _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _METALLICSPECGLOSSMAP + _NORMALMAP _PARALLAXMAP _SHADOWS_SOFT _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A + passType: 13 + - keywords: BILLBOARD_FACE_CAMERA_POS UNITY_HDR_ON _ADDITIONAL_LIGHTS _ADDITIONAL_LIGHT_SHADOWS + _DEPTH_NO_MSAA _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _METALLICSPECGLOSSMAP + _NORMALMAP _PARALLAXMAP _SHADOWS_SOFT _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A + passType: 13 + - first: {fileID: 4800000, guid: 04b5dda5f278e4f56a9dbda64d90bb95, type: 3} + second: + variants: + - keywords: + passType: 4 + - first: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 4800000, guid: 5caf62d8bd7c44596ace77ef9eb8ea31, type: 3} + second: + variants: + - keywords: + passType: 0 + - keywords: BILLBOARD_FACE_CAMERA_POS _ADDITIONAL_LIGHTS _ADDITIONAL_LIGHT_SHADOWS + _DEPTH_NO_MSAA _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _SHADOWS_SOFT + passType: 0 + - first: {fileID: 4800000, guid: fe393ace9b354375a9cb14cdbbc28be4, type: 3} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: -6465566751694194690, guid: a2ce310af2093b943a51a8ca043d3d85, type: 3} + second: + variants: + - keywords: + passType: 8 + - keywords: + passType: 13 + - keywords: _ADDITIONAL_LIGHTS + passType: 13 + - keywords: _ADDITIONAL_LIGHTS _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE + passType: 13 + - keywords: _ADDITIONAL_LIGHTS _ADDITIONAL_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS + _MAIN_LIGHT_SHADOWS_CASCADE _SHADOWS_SOFT + passType: 13 + - keywords: _ADDITIONAL_LIGHTS_VERTEX _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE + passType: 13 diff --git a/game/Assets/NewShaderVariants.shadervariants.meta b/game/Assets/NewShaderVariants.shadervariants.meta new file mode 100644 index 0000000..75e2f89 --- /dev/null +++ b/game/Assets/NewShaderVariants.shadervariants.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b5ef922c92a32c341ab6ad56724547e1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 20000000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Prefabs/Traps.meta b/game/Assets/Prefabs/Traps.meta new file mode 100644 index 0000000..8f2fd5f --- /dev/null +++ b/game/Assets/Prefabs/Traps.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9f7e2117c73dffd438795e04af69799c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Prefabs/Traps/FallawayFloor.prefab b/game/Assets/Prefabs/Traps/FallawayFloor.prefab new file mode 100644 index 0000000..f1a390f --- /dev/null +++ b/game/Assets/Prefabs/Traps/FallawayFloor.prefab @@ -0,0 +1,143 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &8773676356524340268 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + 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 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8144920974147422729 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + 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_LocalScale: {x: 3.1289, y: 0.13889, z: 6.7626376} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &980120856895548942 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + 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 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8773676356524340268} + m_Material: {fileID: 0} + 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} +--- !u!114 &980120856895548939 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8773676356524340268} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 425c126c97ce3fb438fa3ef015d37317, type: 3} + m_Name: + m_EditorClassIdentifier: + speed: 3 + 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} +--- !u!54 &980120856895548943 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8773676356524340268} + 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 diff --git a/game/Assets/Prefabs/Traps/FallawayFloor.prefab.meta b/game/Assets/Prefabs/Traps/FallawayFloor.prefab.meta new file mode 100644 index 0000000..23476ee --- /dev/null +++ b/game/Assets/Prefabs/Traps/FallawayFloor.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d145f0e5906f91a4fad7f384f1b2a6ec +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Scenes/Main.unity b/game/Assets/Scenes/Main.unity index 72f17e2..9c1fd2a 100644 --- a/game/Assets/Scenes/Main.unity +++ b/game/Assets/Scenes/Main.unity @@ -1243,115 +1243,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1644003337 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1644003338} - - component: {fileID: 1644003342} - - component: {fileID: 1644003341} - - component: {fileID: 1644003340} - - component: {fileID: 1644003339} - m_Layer: 0 - m_Name: Plane - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1644003338 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1644003337} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 17.644665, y: 2.59, z: 2.562397} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1841136307} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1644003339 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1644003337} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 45048530c51ef5e4196d4fa70972441c, type: 3} - m_Name: - m_EditorClassIdentifier: - _respawnManager: {fileID: 34418843} ---- !u!65 &1644003340 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1644003337} - m_Material: {fileID: 0} - m_IsTrigger: 1 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 10, y: 2.220446e-16, z: 10} - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &1644003341 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1644003337} - 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 &1644003342 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1644003337} - m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1646361021 stripped GameObject: m_CorrespondingSourceObject: {fileID: 13726836969441781, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} @@ -1413,8 +1304,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -2.6846654, y: -2.1454198, z: 52.347603} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 1644003338} + m_Children: [] m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/game/Assets/Scripts/Checkpoint/SafeZone.cs b/game/Assets/Scripts/Checkpoint/SafeZone.cs index 0eb198a..d9fd2b2 100644 --- a/game/Assets/Scripts/Checkpoint/SafeZone.cs +++ b/game/Assets/Scripts/Checkpoint/SafeZone.cs @@ -13,7 +13,7 @@ public class SafeZone : MonoBehaviour private void OnTriggerEnter(Collider other) { // Check to see if other collider is Player. If true set player to other game object. - if (other.gameObject.tag == "Player") + if (other.gameObject.CompareTag("Player")) { isSafe = true; player = other.gameObject; @@ -23,7 +23,7 @@ public class SafeZone : MonoBehaviour private void OnTriggerExit(Collider other) { // Check if other game object is Player. - if (other.gameObject.tag == "Player") + if (other.gameObject.CompareTag("Player")) { isSafe = false; } diff --git a/game/Assets/Scripts/Death & Respawn/DeathZone.cs b/game/Assets/Scripts/Death & Respawn/DeathZone.cs index df498f0..d2a4700 100644 --- a/game/Assets/Scripts/Death & Respawn/DeathZone.cs +++ b/game/Assets/Scripts/Death & Respawn/DeathZone.cs @@ -14,7 +14,7 @@ public class DeathZone : MonoBehaviour private void OnTriggerEnter(Collider other) { // Checks to make sure other collider is the Player. Sets player variable as Player game object and starts the coroutine. - if (other.gameObject.tag == "Player") + if (other.gameObject.CompareTag("Player")) { player = other.gameObject; StartCoroutine(RespawnPlayer()); diff --git a/game/Assets/Scripts/Traps.meta b/game/Assets/Scripts/Traps.meta new file mode 100644 index 0000000..9e3109d --- /dev/null +++ b/game/Assets/Scripts/Traps.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c99891f8ed78331458109c59792a4c9e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/FallawayFloor.cs b/game/Assets/Scripts/Traps/FallawayFloor.cs similarity index 75% rename from game/Assets/FallawayFloor.cs rename to game/Assets/Scripts/Traps/FallawayFloor.cs index 2780028..dc75982 100644 --- a/game/Assets/FallawayFloor.cs +++ b/game/Assets/Scripts/Traps/FallawayFloor.cs @@ -5,6 +5,7 @@ using UnityEngine; public class FallawayFloor : MonoBehaviour { public float speed; + public Material dissolve; Rigidbody rb; private void Start() @@ -14,14 +15,16 @@ public class FallawayFloor : MonoBehaviour private void OnTriggerEnter(Collider other) { - if (other.gameObject.tag == "Player") + if (other.gameObject.CompareTag("Player")) { StartCoroutine(DestroyFloor()); + GetComponent().material = dissolve; } } IEnumerator DestroyFloor() { + yield return new WaitForSeconds(1f); rb.velocity = Vector3.down * speed; yield return new WaitForSeconds(1); diff --git a/game/Assets/FallawayFloor.cs.meta b/game/Assets/Scripts/Traps/FallawayFloor.cs.meta similarity index 100% rename from game/Assets/FallawayFloor.cs.meta rename to game/Assets/Scripts/Traps/FallawayFloor.cs.meta diff --git a/game/Assets/Shaders.meta b/game/Assets/Shaders.meta new file mode 100644 index 0000000..4a3f9f2 --- /dev/null +++ b/game/Assets/Shaders.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b236667bcaef4b4409b16a8bf33e1d72 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Shaders/S_Dissolve.shadergraph b/game/Assets/Shaders/S_Dissolve.shadergraph new file mode 100644 index 0000000..4bc8aaf --- /dev/null +++ b/game/Assets/Shaders/S_Dissolve.shadergraph @@ -0,0 +1,1872 @@ +{ + "m_SGVersion": 2, + "m_Type": "UnityEditor.ShaderGraph.GraphData", + "m_ObjectId": "09bd250f9e8e44178407f8f00a18947f", + "m_Properties": [ + { + "m_Id": "84d1885b65f4494ab6f8b394136923df" + }, + { + "m_Id": "a2c6311ab95d4bdc9e0f4181113b7cf2" + }, + { + "m_Id": "d5480c5de4ff47b5b1aba387dfe598e5" + } + ], + "m_Keywords": [], + "m_Nodes": [ + { + "m_Id": "993704c51c84492eab6e500f39c83564" + }, + { + "m_Id": "50e7a627cb05434894c35778f8d32d63" + }, + { + "m_Id": "035be93a442e4b5f9e30e558a44e961c" + }, + { + "m_Id": "8efd536a5b3848309cff2c93b21f3933" + }, + { + "m_Id": "4cf71580e3b04b168269ae1f433c8224" + }, + { + "m_Id": "894daa356b7741cfa14f954d36533bae" + }, + { + "m_Id": "b9a72eeb309f45c9850bad107778ec1e" + }, + { + "m_Id": "2c123a06e8e744b39c05f508fa072853" + }, + { + "m_Id": "d8cbb1e17d754bada653dd3c14cc4fc6" + }, + { + "m_Id": "041088a1b0c34e4f8de7cd2dd21ef6be" + }, + { + "m_Id": "dcacee2b14444809b8a118cab047c6eb" + }, + { + "m_Id": "3d617550e366444f963adab5635fb599" + }, + { + "m_Id": "a7bd15036efa4bec89e431b3eed36f6a" + }, + { + "m_Id": "77a324fa08764a8aa0ffd6d538a361a1" + }, + { + "m_Id": "c70449806d93456c966897fa2cf77a6e" + }, + { + "m_Id": "460695e9bb05439f8327901df30cbf1e" + }, + { + "m_Id": "823727d60904415db78c45e12ac0b651" + }, + { + "m_Id": "2d52599a57e54e11a400f1abc60e1d5c" + }, + { + "m_Id": "deaff6b246db4b35af83a077d25e5434" + }, + { + "m_Id": "470ad97a4e7f4c03a8bb1ed38fe6010d" + } + ], + "m_GroupDatas": [], + "m_StickyNoteDatas": [], + "m_Edges": [ + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "041088a1b0c34e4f8de7cd2dd21ef6be" + }, + "m_SlotId": 3 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "2c123a06e8e744b39c05f508fa072853" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "041088a1b0c34e4f8de7cd2dd21ef6be" + }, + "m_SlotId": 3 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "a7bd15036efa4bec89e431b3eed36f6a" + }, + "m_SlotId": 1 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "3d617550e366444f963adab5635fb599" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "4cf71580e3b04b168269ae1f433c8224" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "460695e9bb05439f8327901df30cbf1e" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "a7bd15036efa4bec89e431b3eed36f6a" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "77a324fa08764a8aa0ffd6d538a361a1" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "3d617550e366444f963adab5635fb599" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "894daa356b7741cfa14f954d36533bae" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "b9a72eeb309f45c9850bad107778ec1e" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "894daa356b7741cfa14f954d36533bae" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "dcacee2b14444809b8a118cab047c6eb" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "a7bd15036efa4bec89e431b3eed36f6a" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "dcacee2b14444809b8a118cab047c6eb" + }, + "m_SlotId": 1 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "c70449806d93456c966897fa2cf77a6e" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "894daa356b7741cfa14f954d36533bae" + }, + "m_SlotId": 1 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "d8cbb1e17d754bada653dd3c14cc4fc6" + }, + "m_SlotId": 1 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "041088a1b0c34e4f8de7cd2dd21ef6be" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "dcacee2b14444809b8a118cab047c6eb" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "3d617550e366444f963adab5635fb599" + }, + "m_SlotId": 1 + } + } + ], + "m_VertexContext": { + "m_Position": { + "x": -129.99993896484376, + "y": 8.999946594238282 + }, + "m_Blocks": [ + { + "m_Id": "993704c51c84492eab6e500f39c83564" + }, + { + "m_Id": "50e7a627cb05434894c35778f8d32d63" + }, + { + "m_Id": "035be93a442e4b5f9e30e558a44e961c" + } + ] + }, + "m_FragmentContext": { + "m_Position": { + "x": -129.99993896484376, + "y": 208.9999542236328 + }, + "m_Blocks": [ + { + "m_Id": "8efd536a5b3848309cff2c93b21f3933" + }, + { + "m_Id": "4cf71580e3b04b168269ae1f433c8224" + }, + { + "m_Id": "b9a72eeb309f45c9850bad107778ec1e" + }, + { + "m_Id": "2c123a06e8e744b39c05f508fa072853" + }, + { + "m_Id": "823727d60904415db78c45e12ac0b651" + }, + { + "m_Id": "2d52599a57e54e11a400f1abc60e1d5c" + }, + { + "m_Id": "deaff6b246db4b35af83a077d25e5434" + }, + { + "m_Id": "470ad97a4e7f4c03a8bb1ed38fe6010d" + } + ] + }, + "m_PreviewData": { + "serializedMesh": { + "m_SerializedMesh": "{\"mesh\":{\"instanceID\":0}}", + "m_Guid": "" + } + }, + "m_Path": "Shader Graphs", + "m_ConcretePrecision": 0, + "m_OutputNode": { + "m_Id": "" + }, + "m_ActiveTargets": [ + { + "m_Id": "f5b2a4c80617499ca849b7d1fad7d73d" + } + ] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "035be93a442e4b5f9e30e558a44e961c", + "m_Group": { + "m_Id": "" + }, + "m_Name": "VertexDescription.Tangent", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "ae656dc03bdb4d3aaaad6b2e01e3875d" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "VertexDescription.Tangent" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.RemapNode", + "m_ObjectId": "041088a1b0c34e4f8de7cd2dd21ef6be", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Remap", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -1197.0, + "y": 839.0, + "width": 208.0, + "height": 326.0 + } + }, + "m_Slots": [ + { + "m_Id": "50fe0c40e3774e649f7ad5b319e23d09" + }, + { + "m_Id": "948cf7dca4054fd58f7f78239e91503a" + }, + { + "m_Id": "55657ba2054646e5a4875109ca97630d" + }, + { + "m_Id": "56b9a84be63e4198bc420a703e1eda89" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "0a639edb323f4b468ac8b0322b58deb7", + "m_Id": 0, + "m_DisplayName": "Edge Colour", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot", + "m_ObjectId": "0e1f6972ef394d929ccdd4c1a6566826", + "m_Id": 0, + "m_DisplayName": "UV", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "UV", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0 + }, + "m_Labels": [], + "m_Channel": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalLitSubTarget", + "m_ObjectId": "10c6d64f8be24625b1c402ead7fde06b", + "m_WorkflowMode": 1, + "m_NormalDropOffSpace": 0, + "m_ClearCoat": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "17e169af7a0143a4b1af6c47ded577b5", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "19723a1ce5c54a88b20f858e5e2d0039", + "m_Id": 0, + "m_DisplayName": "Edge Width", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "28448b6f6bd6436dab3cf35f17335548", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "2c123a06e8e744b39c05f508fa072853", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.AlphaClipThreshold", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "f549655570654c70aee868d4d5c607de" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.AlphaClipThreshold" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "2d52599a57e54e11a400f1abc60e1d5c", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.NormalTS", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "c8b8db706dfc4379a025c7560b75c3ff" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.NormalTS" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PositionMaterialSlot", + "m_ObjectId": "3922969bc7384e989c816ccfebec6944", + "m_Id": 0, + "m_DisplayName": "Position", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Position", + "m_StageCapability": 1, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "3c28c78f9b504c90820527cab52e1d1d", + "m_Id": 0, + "m_DisplayName": "Alpha", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Alpha", + "m_StageCapability": 2, + "m_Value": 1.0, + "m_DefaultValue": 1.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "3cc94b12ec9d43ddb05a2b84e7bcc803", + "m_Id": 3, + "m_DisplayName": "Delta Time", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Delta Time", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", + "m_ObjectId": "3d617550e366444f963adab5635fb599", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Multiply", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -551.0001220703125, + "y": 25.000062942504884, + "width": 208.0, + "height": 302.0 + } + }, + "m_Slots": [ + { + "m_Id": "e3f4791b737d4e5d856473140cecb4ce" + }, + { + "m_Id": "ebc52bcaa31a4396b26cc8d066b1eb64" + }, + { + "m_Id": "17e169af7a0143a4b1af6c47ded577b5" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot", + "m_ObjectId": "3dae682dfdbb49feafdf18e509188bd7", + "m_Id": 0, + "m_DisplayName": "Emission", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Emission", + "m_StageCapability": 2, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_ColorMode": 1, + "m_DefaultColor": { + "r": 0.0, + "g": 0.0, + "b": 0.0, + "a": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "4565ee0d0c3a42f8a20cbff0449dc34e", + "m_Id": 0, + "m_DisplayName": "Time", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Time", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "460695e9bb05439f8327901df30cbf1e", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -1398.0001220703125, + "y": 588.0000610351563, + "width": 137.00001525878907, + "height": 34.0 + } + }, + "m_Slots": [ + { + "m_Id": "19723a1ce5c54a88b20f858e5e2d0039" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "a2c6311ab95d4bdc9e0f4181113b7cf2" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "470ad97a4e7f4c03a8bb1ed38fe6010d", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.Metallic", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "956a558fb76f4ee79d70fd379caa1f43" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.Metallic" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "4cf71580e3b04b168269ae1f433c8224", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.Emission", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "3dae682dfdbb49feafdf18e509188bd7" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.Emission" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "50e7a627cb05434894c35778f8d32d63", + "m_Group": { + "m_Id": "" + }, + "m_Name": "VertexDescription.Normal", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "81387f5d66ce46d0ae1d2d353a19eba9" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "VertexDescription.Normal" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "50fe0c40e3774e649f7ad5b319e23d09", + "m_Id": 0, + "m_DisplayName": "In", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "In", + "m_StageCapability": 3, + "m_Value": { + "x": -1.0, + "y": -1.0, + "z": -1.0, + "w": -1.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", + "m_ObjectId": "55657ba2054646e5a4875109ca97630d", + "m_Id": 2, + "m_DisplayName": "Out Min Max", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "OutMinMax", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 1.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "56b9a84be63e4198bc420a703e1eda89", + "m_Id": 3, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "68dfa9a1021d4c0a82d92aa029d3e695", + "m_Id": 0, + "m_DisplayName": "Ambient Occlusion", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Occlusion", + "m_StageCapability": 2, + "m_Value": 1.0, + "m_DefaultValue": 1.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "77a324fa08764a8aa0ffd6d538a361a1", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -819.0000610351563, + "y": 25.000062942504884, + "width": 208.0, + "height": 127.0 + } + }, + "m_Slots": [ + { + "m_Id": "0a639edb323f4b468ac8b0322b58deb7" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "84d1885b65f4494ab6f8b394136923df" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot", + "m_ObjectId": "81387f5d66ce46d0ae1d2d353a19eba9", + "m_Id": 0, + "m_DisplayName": "Normal", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Normal", + "m_StageCapability": 1, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "823727d60904415db78c45e12ac0b651", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.Smoothness", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "be1a2a41225045fe9ccd020ef005313f" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.Smoothness" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "8240922624954a3a8ff7ebc805c05659", + "m_Id": 2, + "m_DisplayName": "Cosine Time", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Cosine Time", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 3, + "m_Type": "UnityEditor.ShaderGraph.Internal.ColorShaderProperty", + "m_ObjectId": "84d1885b65f4494ab6f8b394136923df", + "m_Guid": { + "m_GuidSerialized": "cbd3b22d-e70a-4568-a775-c8bfc64a664c" + }, + "m_Name": "Edge Colour", + "m_DefaultReferenceName": "Color_84d1885b65f4494ab6f8b394136923df", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": { + "r": 0.0, + "g": 0.125490203499794, + "b": 16.0, + "a": 0.0 + }, + "m_ColorMode": 1 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.NoiseNode", + "m_ObjectId": "894daa356b7741cfa14f954d36533bae", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Simple Noise", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -1652.0, + "y": 463.0000305175781, + "width": 208.00001525878907, + "height": 302.0000305175781 + } + }, + "m_Slots": [ + { + "m_Id": "0e1f6972ef394d929ccdd4c1a6566826" + }, + { + "m_Id": "deeeafe363e048fcac0735658daaec1b" + }, + { + "m_Id": "9fd741ef082143a8a56ca67357ae7f21" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "8efd536a5b3848309cff2c93b21f3933", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.BaseColor", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "c7efda9b5452461eb0f86ff4ba325d0f" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.BaseColor" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", + "m_ObjectId": "948cf7dca4054fd58f7f78239e91503a", + "m_Id": 1, + "m_DisplayName": "In Min Max", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "InMinMax", + "m_StageCapability": 3, + "m_Value": { + "x": -1.0, + "y": 1.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "956a558fb76f4ee79d70fd379caa1f43", + "m_Id": 0, + "m_DisplayName": "Metallic", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Metallic", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "993704c51c84492eab6e500f39c83564", + "m_Group": { + "m_Id": "" + }, + "m_Name": "VertexDescription.Position", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "3922969bc7384e989c816ccfebec6944" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "VertexDescription.Position" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "9fd741ef082143a8a56ca67357ae7f21", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", + "m_ObjectId": "a2c6311ab95d4bdc9e0f4181113b7cf2", + "m_Guid": { + "m_GuidSerialized": "fbaa096d-267b-43b6-91e8-d7aaab15376f" + }, + "m_Name": "Edge Width", + "m_DefaultReferenceName": "Vector1_a2c6311ab95d4bdc9e0f4181113b7cf2", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": 0.029999999329447748, + "m_FloatType": 0, + "m_RangeValues": { + "x": 0.0, + "y": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "a528f162ba9c4971b2b7acead955f18e", + "m_Id": 0, + "m_DisplayName": "Noise Scale", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.AddNode", + "m_ObjectId": "a7bd15036efa4bec89e431b3eed36f6a", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Add", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -1241.0, + "y": 549.0, + "width": 126.0, + "height": 117.99999237060547 + } + }, + "m_Slots": [ + { + "m_Id": "b2493d02da3b4af1bf334de3387bef97" + }, + { + "m_Id": "b3216f8477274f30946869af9a69f5f1" + }, + { + "m_Id": "28448b6f6bd6436dab3cf35f17335548" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "aacd78b49bdd461b864d678a6d0a85b1", + "m_Id": 4, + "m_DisplayName": "Smooth Delta", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Smooth Delta", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.TangentMaterialSlot", + "m_ObjectId": "ae656dc03bdb4d3aaaad6b2e01e3875d", + "m_Id": 0, + "m_DisplayName": "Tangent", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Tangent", + "m_StageCapability": 1, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "b2493d02da3b4af1bf334de3387bef97", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": { + "x": 0.029999999329447748, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "b3216f8477274f30946869af9a69f5f1", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "b9a72eeb309f45c9850bad107778ec1e", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.Alpha", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "3c28c78f9b504c90820527cab52e1d1d" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.Alpha" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "bdca8525d42a40ba96f35d4959d85983", + "m_Id": 0, + "m_DisplayName": "Edge", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Edge", + "m_StageCapability": 3, + "m_Value": { + "x": 1.0, + "y": 1.0, + "z": 1.0, + "w": 1.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "be1a2a41225045fe9ccd020ef005313f", + "m_Id": 0, + "m_DisplayName": "Smoothness", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Smoothness", + "m_StageCapability": 2, + "m_Value": 0.5, + "m_DefaultValue": 0.5, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "bf2c6e0f380f4c7ba658c29ffddeb6f7", + "m_Id": 1, + "m_DisplayName": "Sine Time", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Sine Time", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "c70449806d93456c966897fa2cf77a6e", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -1885.0001220703125, + "y": 526.0000610351563, + "width": 137.00001525878907, + "height": 34.0 + } + }, + "m_Slots": [ + { + "m_Id": "a528f162ba9c4971b2b7acead955f18e" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "d5480c5de4ff47b5b1aba387dfe598e5" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot", + "m_ObjectId": "c7efda9b5452461eb0f86ff4ba325d0f", + "m_Id": 0, + "m_DisplayName": "Base Color", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "BaseColor", + "m_StageCapability": 2, + "m_Value": { + "x": 0.5882353186607361, + "y": 0.6549019813537598, + "z": 0.6431372761726379 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_ColorMode": 0, + "m_DefaultColor": { + "r": 0.5, + "g": 0.5, + "b": 0.5, + "a": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot", + "m_ObjectId": "c8b8db706dfc4379a025c7560b75c3ff", + "m_Id": 0, + "m_DisplayName": "Normal (Tangent Space)", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "NormalTS", + "m_StageCapability": 2, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 3 +} + +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", + "m_ObjectId": "d5480c5de4ff47b5b1aba387dfe598e5", + "m_Guid": { + "m_GuidSerialized": "328b8f37-e44c-491d-aa8d-fc04f65bceb8" + }, + "m_Name": "Noise Scale", + "m_DefaultReferenceName": "Vector1_d5480c5de4ff47b5b1aba387dfe598e5", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": 30.0, + "m_FloatType": 0, + "m_RangeValues": { + "x": 0.0, + "y": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.TimeNode", + "m_ObjectId": "d8cbb1e17d754bada653dd3c14cc4fc6", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Time", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -1462.9998779296875, + "y": 813.0, + "width": 126.0, + "height": 173.0 + } + }, + "m_Slots": [ + { + "m_Id": "4565ee0d0c3a42f8a20cbff0449dc34e" + }, + { + "m_Id": "bf2c6e0f380f4c7ba658c29ffddeb6f7" + }, + { + "m_Id": "8240922624954a3a8ff7ebc805c05659" + }, + { + "m_Id": "3cc94b12ec9d43ddb05a2b84e7bcc803" + }, + { + "m_Id": "aacd78b49bdd461b864d678a6d0a85b1" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.StepNode", + "m_ObjectId": "dcacee2b14444809b8a118cab047c6eb", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Step", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -1091.0, + "y": 51.00001907348633, + "width": 208.00001525878907, + "height": 302.0000305175781 + } + }, + "m_Slots": [ + { + "m_Id": "bdca8525d42a40ba96f35d4959d85983" + }, + { + "m_Id": "f44435d23ba84e98ae1b1277f6a46daf" + }, + { + "m_Id": "fef160df96774e3086bf335237fcad20" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "deaff6b246db4b35af83a077d25e5434", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.Occlusion", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "68dfa9a1021d4c0a82d92aa029d3e695" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.Occlusion" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "deeeafe363e048fcac0735658daaec1b", + "m_Id": 1, + "m_DisplayName": "Scale", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Scale", + "m_StageCapability": 3, + "m_Value": 30.0, + "m_DefaultValue": 500.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "e3f4791b737d4e5d856473140cecb4ce", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "ebc52bcaa31a4396b26cc8d066b1eb64", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": { + "e00": 2.0, + "e01": 2.0, + "e02": 2.0, + "e03": 2.0, + "e10": 2.0, + "e11": 2.0, + "e12": 2.0, + "e13": 2.0, + "e20": 2.0, + "e21": 2.0, + "e22": 2.0, + "e23": 2.0, + "e30": 2.0, + "e31": 2.0, + "e32": 2.0, + "e33": 2.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "f44435d23ba84e98ae1b1277f6a46daf", + "m_Id": 1, + "m_DisplayName": "In", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "In", + "m_StageCapability": 3, + "m_Value": { + "x": 0.5099999904632568, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "f549655570654c70aee868d4d5c607de", + "m_Id": 0, + "m_DisplayName": "Alpha Clip Threshold", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "AlphaClipThreshold", + "m_StageCapability": 2, + "m_Value": 0.5, + "m_DefaultValue": 0.5, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalTarget", + "m_ObjectId": "f5b2a4c80617499ca849b7d1fad7d73d", + "m_ActiveSubTarget": { + "m_Id": "10c6d64f8be24625b1c402ead7fde06b" + }, + "m_SurfaceType": 0, + "m_AlphaMode": 0, + "m_TwoSided": true, + "m_AlphaClip": true, + "m_CustomEditorGUI": "" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "fef160df96774e3086bf335237fcad20", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + diff --git a/game/Assets/Shaders/S_Dissolve.shadergraph.meta b/game/Assets/Shaders/S_Dissolve.shadergraph.meta new file mode 100644 index 0000000..5a6d42b --- /dev/null +++ b/game/Assets/Shaders/S_Dissolve.shadergraph.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: a2ce310af2093b943a51a8ca043d3d85 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3} diff --git a/game/ProjectSettings/GraphicsSettings.asset b/game/ProjectSettings/GraphicsSettings.asset index dde4d87..150f2f6 100644 --- a/game/ProjectSettings/GraphicsSettings.asset +++ b/game/ProjectSettings/GraphicsSettings.asset @@ -1,68 +1,67 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!30 &1 -GraphicsSettings: - m_ObjectHideFlags: 0 - serializedVersion: 13 - m_Deferred: - m_Mode: 1 - m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0} - m_DeferredReflections: - m_Mode: 1 - m_Shader: {fileID: 74, guid: 0000000000000000f000000000000000, type: 0} - m_ScreenSpaceShadows: - m_Mode: 1 - m_Shader: {fileID: 64, guid: 0000000000000000f000000000000000, type: 0} - m_LegacyDeferred: - m_Mode: 1 - m_Shader: {fileID: 63, guid: 0000000000000000f000000000000000, type: 0} - m_DepthNormals: - m_Mode: 1 - m_Shader: {fileID: 62, guid: 0000000000000000f000000000000000, type: 0} - m_MotionVectors: - m_Mode: 1 - m_Shader: {fileID: 75, guid: 0000000000000000f000000000000000, type: 0} - m_LightHalo: - m_Mode: 1 - m_Shader: {fileID: 105, guid: 0000000000000000f000000000000000, type: 0} - m_LensFlare: - m_Mode: 1 - m_Shader: {fileID: 102, guid: 0000000000000000f000000000000000, type: 0} - m_AlwaysIncludedShaders: - - {fileID: 7, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 15104, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 15105, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 15106, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 10783, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0} - m_PreloadedShaders: [] - m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, - type: 0} - m_CustomRenderPipeline: {fileID: 11400000, guid: 19ba41d7c0026c3459d37c2fe90c55a0, - type: 2} - m_TransparencySortMode: 0 - m_TransparencySortAxis: {x: 0, y: 0, z: 1} - m_DefaultRenderingPath: 1 - m_DefaultMobileRenderingPath: 1 - m_TierSettings: [] - m_LightmapStripping: 0 - m_FogStripping: 0 - m_InstancingStripping: 0 - m_LightmapKeepPlain: 1 - m_LightmapKeepDirCombined: 1 - m_LightmapKeepDynamicPlain: 1 - m_LightmapKeepDynamicDirCombined: 1 - m_LightmapKeepShadowMask: 1 - m_LightmapKeepSubtractive: 1 - m_FogKeepLinear: 1 - m_FogKeepExp: 1 - m_FogKeepExp2: 1 - m_AlbedoSwatchInfos: [] - m_LightsUseLinearIntensity: 1 - m_LightsUseColorTemperature: 0 - m_LogWhenShaderIsCompiled: 0 - m_AllowEnlightenSupportForUpgradedProject: 1 +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!30 &1 +GraphicsSettings: + m_ObjectHideFlags: 0 + serializedVersion: 13 + m_Deferred: + m_Mode: 1 + m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0} + m_DeferredReflections: + m_Mode: 1 + m_Shader: {fileID: 74, guid: 0000000000000000f000000000000000, type: 0} + m_ScreenSpaceShadows: + m_Mode: 1 + m_Shader: {fileID: 64, guid: 0000000000000000f000000000000000, type: 0} + m_LegacyDeferred: + m_Mode: 1 + m_Shader: {fileID: 63, guid: 0000000000000000f000000000000000, type: 0} + m_DepthNormals: + m_Mode: 1 + m_Shader: {fileID: 62, guid: 0000000000000000f000000000000000, type: 0} + m_MotionVectors: + m_Mode: 1 + m_Shader: {fileID: 75, guid: 0000000000000000f000000000000000, type: 0} + m_LightHalo: + m_Mode: 1 + m_Shader: {fileID: 105, guid: 0000000000000000f000000000000000, type: 0} + m_LensFlare: + m_Mode: 1 + m_Shader: {fileID: 102, guid: 0000000000000000f000000000000000, type: 0} + m_VideoShadersIncludeMode: 2 + m_AlwaysIncludedShaders: + - {fileID: 7, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 15104, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 15105, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 15106, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 10783, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0} + m_PreloadedShaders: [] + m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_CustomRenderPipeline: {fileID: 11400000, guid: 19ba41d7c0026c3459d37c2fe90c55a0, type: 2} + m_TransparencySortMode: 0 + m_TransparencySortAxis: {x: 0, y: 0, z: 1} + m_DefaultRenderingPath: 1 + m_DefaultMobileRenderingPath: 1 + m_TierSettings: [] + m_LightmapStripping: 0 + m_FogStripping: 0 + m_InstancingStripping: 0 + m_LightmapKeepPlain: 1 + m_LightmapKeepDirCombined: 1 + m_LightmapKeepDynamicPlain: 1 + m_LightmapKeepDynamicDirCombined: 1 + m_LightmapKeepShadowMask: 1 + m_LightmapKeepSubtractive: 1 + m_FogKeepLinear: 1 + m_FogKeepExp: 1 + m_FogKeepExp2: 1 + m_AlbedoSwatchInfos: [] + m_LightsUseLinearIntensity: 1 + m_LightsUseColorTemperature: 0 + m_DefaultRenderingLayerMask: 1 + m_LogWhenShaderIsCompiled: 0 diff --git a/game/ProjectSettings/PackageManagerSettings.asset b/game/ProjectSettings/PackageManagerSettings.asset index be4a797..b5e6832 100644 --- a/game/ProjectSettings/PackageManagerSettings.asset +++ b/game/ProjectSettings/PackageManagerSettings.asset @@ -16,7 +16,7 @@ MonoBehaviour: m_EnablePackageDependencies: 0 m_AdvancedSettingsExpanded: 1 m_ScopedRegistriesSettingsExpanded: 1 - oneTimeWarningShown: 0 + oneTimeWarningShown: 1 m_Registries: - m_Id: main m_Name: From 2773c3f95416f126c30633b3bf6845630f32a1cd Mon Sep 17 00:00:00 2001 From: Programmer-DField Date: Fri, 26 Feb 2021 15:02:33 +0000 Subject: [PATCH 04/14] Continued work on getting the respawn system working, merge has broken functionality. --- game/Assets/Materials/Dissolve_Mat 1.mat | 4 +- game/Assets/Scenes/Main.unity | 564 +++++++++++------- .../Scripts/Death & Respawn/DeathZone.cs | 8 +- game/ProjectSettings/GraphicsSettings.asset | 1 + 4 files changed, 344 insertions(+), 233 deletions(-) diff --git a/game/Assets/Materials/Dissolve_Mat 1.mat b/game/Assets/Materials/Dissolve_Mat 1.mat index f7fda42..c38cc07 100644 --- a/game/Assets/Materials/Dissolve_Mat 1.mat +++ b/game/Assets/Materials/Dissolve_Mat 1.mat @@ -77,7 +77,7 @@ Material: m_Offset: {x: 0, y: 0} m_Floats: - Vector1_a2c6311ab95d4bdc9e0f4181113b7cf2: 0.03 - - Vector1_d5480c5de4ff47b5b1aba387dfe598e5: 15 + - Vector1_d5480c5de4ff47b5b1aba387dfe598e5: 30 - _AlphaClip: 0 - _Blend: 0 - _BumpScale: 1 @@ -105,7 +105,7 @@ Material: - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - - Color_84d1885b65f4494ab6f8b394136923df: {r: 0, g: 0.1254902, b: 16, a: 0} + - Color_84d1885b65f4494ab6f8b394136923df: {r: 10.664644, g: 15.999998, b: 0, a: 0} - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/game/Assets/Scenes/Main.unity b/game/Assets/Scenes/Main.unity index 9c1fd2a..e2619d6 100644 --- a/game/Assets/Scenes/Main.unity +++ b/game/Assets/Scenes/Main.unity @@ -192,7 +192,7 @@ GameObject: - component: {fileID: 38412570} - component: {fileID: 38412569} m_Layer: 0 - m_Name: Cube (2) + m_Name: Wall m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -287,7 +287,7 @@ GameObject: - component: {fileID: 114717653} - component: {fileID: 114717652} m_Layer: 0 - m_Name: Cube (3) + m_Name: Wall(1) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -369,10 +369,84 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 114717650} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!4 &155900315 stripped +--- !u!1001 &154888098 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2018660589} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: c05280569c267224f87de839cb102b18, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c05280569c267224f87de839cb102b18, type: 3} + propertyPath: m_LocalScale.x + value: 3.4821813 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c05280569c267224f87de839cb102b18, type: 3} + propertyPath: m_LocalScale.y + value: 1.7802162 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c05280569c267224f87de839cb102b18, type: 3} + propertyPath: m_LocalScale.z + value: 3.5566318 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c05280569c267224f87de839cb102b18, type: 3} + propertyPath: m_LocalPosition.x + value: 9.626017 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c05280569c267224f87de839cb102b18, type: 3} + propertyPath: m_LocalPosition.y + value: 2.6348174 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c05280569c267224f87de839cb102b18, type: 3} + propertyPath: m_LocalPosition.z + value: -0.68346405 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c05280569c267224f87de839cb102b18, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c05280569c267224f87de839cb102b18, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c05280569c267224f87de839cb102b18, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c05280569c267224f87de839cb102b18, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c05280569c267224f87de839cb102b18, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c05280569c267224f87de839cb102b18, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c05280569c267224f87de839cb102b18, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: c05280569c267224f87de839cb102b18, type: 3} + propertyPath: m_Name + value: SpikeTrap_low + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c05280569c267224f87de839cb102b18, type: 3} +--- !u!4 &205081436 stripped Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: c05280569c267224f87de839cb102b18, type: 3} - m_PrefabInstance: {fileID: 1316034057} + m_CorrespondingSourceObject: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} + m_PrefabInstance: {fileID: 420991640} + m_PrefabAsset: {fileID: 0} +--- !u!4 &250588649 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} + m_PrefabInstance: {fileID: 980120856872764384} m_PrefabAsset: {fileID: 0} --- !u!1 &349701919 GameObject: @@ -470,6 +544,63 @@ Transform: m_Father: {fileID: 1509348081} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &420991640 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2018660589} + m_Modifications: + - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} + propertyPath: m_LocalPosition.x + value: 7.943722 + objectReference: {fileID: 0} + - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} + propertyPath: m_LocalPosition.y + value: 5.6548176 + objectReference: {fileID: 0} + - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} + propertyPath: m_LocalPosition.z + value: -0.89346313 + objectReference: {fileID: 0} + - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + 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 + 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: 0 + 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} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} --- !u!1 &470223356 GameObject: m_ObjectHideFlags: 0 @@ -686,8 +817,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 519958730} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0.44, z: 0} - m_LocalScale: {x: 0.69935423, y: 1, z: 0.68767} + m_LocalPosition: {x: 0.16, y: 0.1, z: 0} + m_LocalScale: {x: 0.9549131, y: 1, z: 0.68767} m_Children: [] m_Father: {fileID: 1544718415} m_RootOrder: 0 @@ -705,7 +836,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: animator: {fileID: 1646361029} - fadeScreen: {fileID: 0} respawnManager: {fileID: 34418843} _playerInput: {fileID: 1646361025} --- !u!65 &519958733 @@ -770,6 +900,37 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 519958730} m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &565379239 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 565379240} + m_Layer: 0 + m_Name: SafeZones + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &565379240 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 565379239} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 7.674641, y: 9.609805, z: 50.270454} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1853827073} + m_Father: {fileID: 0} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1148358018 GameObject: m_ObjectHideFlags: 0 @@ -913,71 +1074,6 @@ Transform: m_Father: {fileID: 1509348081} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &1316034057 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 2018660589} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: c05280569c267224f87de839cb102b18, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c05280569c267224f87de839cb102b18, type: 3} - propertyPath: m_LocalScale.x - value: 2.4528294 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c05280569c267224f87de839cb102b18, type: 3} - propertyPath: m_LocalScale.z - value: 3.529492 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c05280569c267224f87de839cb102b18, type: 3} - propertyPath: m_LocalPosition.x - value: 9.816017 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c05280569c267224f87de839cb102b18, type: 3} - propertyPath: m_LocalPosition.y - value: 2.6648173 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c05280569c267224f87de839cb102b18, type: 3} - propertyPath: m_LocalPosition.z - value: -0.43346405 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c05280569c267224f87de839cb102b18, type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c05280569c267224f87de839cb102b18, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c05280569c267224f87de839cb102b18, type: 3} - propertyPath: m_LocalRotation.y - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c05280569c267224f87de839cb102b18, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c05280569c267224f87de839cb102b18, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c05280569c267224f87de839cb102b18, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 90 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c05280569c267224f87de839cb102b18, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: c05280569c267224f87de839cb102b18, type: 3} - propertyPath: m_Name - value: SpikeTrap_low (7) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: c05280569c267224f87de839cb102b18, type: 3} --- !u!1 &1509348080 GameObject: m_ObjectHideFlags: 0 @@ -1014,7 +1110,7 @@ Transform: - {fileID: 470223360} - {fileID: 34418844} m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1528237030 PrefabInstance: @@ -1025,7 +1121,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 13726836969441544, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} propertyPath: m_RootOrder - value: 5 + value: 1 objectReference: {fileID: 0} - target: {fileID: 13726836969441544, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} propertyPath: m_LocalPosition.x @@ -1102,7 +1198,7 @@ Transform: m_Children: - {fileID: 519958731} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1551303224 GameObject: @@ -1278,7 +1374,19 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!1 &1841136306 +--- !u!114 &1646361030 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1646361021} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4a7f7dc8ddb842944abcbcbb1d4995f5, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &1853827072 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1286,28 +1394,107 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1841136307} + - component: {fileID: 1853827073} + - component: {fileID: 1853827077} + - component: {fileID: 1853827076} + - component: {fileID: 1853827075} + - component: {fileID: 1853827074} m_Layer: 0 - m_Name: SafeZones + m_Name: SafeZone m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1841136307 +--- !u!4 &1853827073 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1841136306} + m_GameObject: {fileID: 1853827072} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -2.6846654, y: -2.1454198, z: 52.347603} + m_LocalPosition: {x: -2.62, y: -9.48, z: 1.83} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 4 + m_Father: {fileID: 565379240} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1853827074 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1853827072} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45048530c51ef5e4196d4fa70972441c, type: 3} + m_Name: + m_EditorClassIdentifier: + _respawnManager: {fileID: 34418843} +--- !u!65 &1853827075 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1853827072} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 10, y: 2.220446e-16, z: 10} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &1853827076 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1853827072} + m_Enabled: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1853827077 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1853827072} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1908415559 GameObject: m_ObjectHideFlags: 0 @@ -1403,146 +1590,6 @@ Transform: m_Father: {fileID: 1509348081} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1995811568 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1995811569} - - component: {fileID: 1995811572} - - component: {fileID: 1995811571} - - component: {fileID: 1995811570} - - component: {fileID: 1995811573} - - component: {fileID: 1995811574} - - component: {fileID: 1995811575} - m_Layer: 0 - m_Name: Floor - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1995811569 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1995811568} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 10.216017, y: 5.84, z: -0.8434677} - m_LocalScale: {x: 3.1289, y: 0.13889, z: 6.7626376} - m_Children: [] - m_Father: {fileID: 2018660589} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &1995811570 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1995811568} - m_Material: {fileID: 0} - m_IsTrigger: 1 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 0.63} - m_Center: {x: 0, y: 5.13, z: 0} ---- !u!23 &1995811571 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1995811568} - 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 &1995811572 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1995811568} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!54 &1995811573 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1995811568} - 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 &1995811574 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1995811568} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 425c126c97ce3fb438fa3ef015d37317, type: 3} - m_Name: - m_EditorClassIdentifier: - speed: 2 ---- !u!65 &1995811575 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1995811568} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1, y: 1.0000001, z: 0.99999994} - m_Center: {x: 0, y: 0, z: 0} --- !u!1 &2018660588 GameObject: m_ObjectHideFlags: 0 @@ -1570,10 +1617,73 @@ Transform: m_LocalPosition: {x: -4.8960166, y: -2.6448174, z: 65.653465} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 1995811569} + - {fileID: 2074918567} - {fileID: 38412568} - {fileID: 114717651} - - {fileID: 155900315} + - {fileID: 250588649} + - {fileID: 205081436} m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &2074918567 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: c05280569c267224f87de839cb102b18, type: 3} + m_PrefabInstance: {fileID: 154888098} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &980120856872764384 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2018660589} + m_Modifications: + - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} + propertyPath: m_LocalPosition.x + value: 11.74 + objectReference: {fileID: 0} + - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} + propertyPath: m_LocalPosition.y + value: 5.69 + objectReference: {fileID: 0} + - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} + propertyPath: m_LocalPosition.z + value: -0.92 + objectReference: {fileID: 0} + - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + 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 + 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: 0 + 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} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} diff --git a/game/Assets/Scripts/Death & Respawn/DeathZone.cs b/game/Assets/Scripts/Death & Respawn/DeathZone.cs index d2a4700..b6cd466 100644 --- a/game/Assets/Scripts/Death & Respawn/DeathZone.cs +++ b/game/Assets/Scripts/Death & Respawn/DeathZone.cs @@ -5,7 +5,7 @@ using UnityEngine.InputSystem; public class DeathZone : MonoBehaviour { public Animator animator; - public GameObject fadeScreen; + //public GameObject fadeScreen; private GameObject player; @@ -28,11 +28,11 @@ public class DeathZone : MonoBehaviour _playerInput.enabled = false; yield return new WaitForSeconds(0.5f); - fadeScreen.GetComponent().SetTrigger("fadeToBlack"); - yield return new WaitForSeconds(1.5f); + //fadeScreen.GetComponent().SetTrigger("fadeToBlack"); + //yield return new WaitForSeconds(1.5f); player.transform.position = respawnManager.GetRespawnPoint(); - fadeScreen.GetComponent().SetTrigger("fadeToClear"); + //fadeScreen.GetComponent().SetTrigger("fadeToClear"); yield return new WaitForSeconds(0.5f); _playerInput.enabled = true; diff --git a/game/ProjectSettings/GraphicsSettings.asset b/game/ProjectSettings/GraphicsSettings.asset index 150f2f6..4dd51a9 100644 --- a/game/ProjectSettings/GraphicsSettings.asset +++ b/game/ProjectSettings/GraphicsSettings.asset @@ -40,6 +40,7 @@ GraphicsSettings: - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: -6465566751694194690, guid: a2ce310af2093b943a51a8ca043d3d85, type: 3} m_PreloadedShaders: [] m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_CustomRenderPipeline: {fileID: 11400000, guid: 19ba41d7c0026c3459d37c2fe90c55a0, type: 2} From 078e3568104a0fc42f32d653a677acfb1eee879a Mon Sep 17 00:00:00 2001 From: Programmer-DField Date: Fri, 26 Feb 2021 17:08:41 +0000 Subject: [PATCH 05/14] The respawwn system is now ppicking up the position of the player correctly. However, still not sending the player to the last known respawn point. --- game/Assets/Prefabs/Player.prefab | 20 +++++++ game/Assets/Scenes/Main.unity | 57 ++++++------------- game/Assets/Scripts/Checkpoint/SafeZone.cs | 4 +- .../Scripts/Death & Respawn/DeathZone.cs | 8 +-- .../Scripts/Death & Respawn/RespawnManager.cs | 2 +- 5 files changed, 44 insertions(+), 47 deletions(-) diff --git a/game/Assets/Prefabs/Player.prefab b/game/Assets/Prefabs/Player.prefab index 2a5c0e6..b85017a 100644 --- a/game/Assets/Prefabs/Player.prefab +++ b/game/Assets/Prefabs/Player.prefab @@ -96,6 +96,7 @@ GameObject: - component: {fileID: 13726836969441782} - component: {fileID: 13726837176080779} - component: {fileID: 3320306143821152633} + - component: {fileID: 1646361029} m_Layer: 0 m_Name: Player m_TagString: Player @@ -313,6 +314,25 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 005bf73dff204914c9e1bbd60c843451, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!95 &1646361029 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 13726836969441781} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: bd12efafa4115114f90ba79feeb4e8b0, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &13726837293638831 GameObject: m_ObjectHideFlags: 0 diff --git a/game/Assets/Scenes/Main.unity b/game/Assets/Scenes/Main.unity index e2619d6..2b18c62 100644 --- a/game/Assets/Scenes/Main.unity +++ b/game/Assets/Scenes/Main.unity @@ -174,7 +174,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 34418842} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 4a7f7dc8ddb842944abcbcbb1d4995f5, type: 3} m_Name: @@ -1163,10 +1163,18 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 13726836969441545, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 13726836969441781, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} propertyPath: m_Name value: Player objectReference: {fileID: 0} + - target: {fileID: 13726836969441783, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} --- !u!1 &1544718414 @@ -1339,53 +1347,22 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1646361021 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 13726836969441781, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} - m_PrefabInstance: {fileID: 1528237030} - m_PrefabAsset: {fileID: 0} --- !u!114 &1646361025 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 13726836969441780, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} m_PrefabInstance: {fileID: 1528237030} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1646361021} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!95 &1646361029 +--- !u!95 &1646361029 stripped Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 1646361029, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} + m_PrefabInstance: {fileID: 1528237030} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1646361021} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: bd12efafa4115114f90ba79feeb4e8b0, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!114 &1646361030 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1646361021} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4a7f7dc8ddb842944abcbcbb1d4995f5, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1853827072 GameObject: m_ObjectHideFlags: 0 @@ -1399,7 +1376,7 @@ GameObject: - component: {fileID: 1853827076} - component: {fileID: 1853827075} - component: {fileID: 1853827074} - m_Layer: 0 + m_Layer: 3 m_Name: SafeZone m_TagString: Untagged m_Icon: {fileID: 0} @@ -1414,7 +1391,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1853827072} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -2.62, y: -9.48, z: 1.83} + m_LocalPosition: {x: -7.2, y: -9.19, z: -45.53} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 565379240} @@ -1453,7 +1430,7 @@ MeshRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1853827072} - m_Enabled: 0 + m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -1465,7 +1442,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: c7c9da98e081aaa43883652afefc74b3, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/game/Assets/Scripts/Checkpoint/SafeZone.cs b/game/Assets/Scripts/Checkpoint/SafeZone.cs index d9fd2b2..c3389a7 100644 --- a/game/Assets/Scripts/Checkpoint/SafeZone.cs +++ b/game/Assets/Scripts/Checkpoint/SafeZone.cs @@ -15,15 +15,15 @@ public class SafeZone : MonoBehaviour // Check to see if other collider is Player. If true set player to other game object. if (other.gameObject.CompareTag("Player")) { - isSafe = true; player = other.gameObject; + isSafe = true; } } private void OnTriggerExit(Collider other) { // Check if other game object is Player. - if (other.gameObject.CompareTag("Player")) + if (other.gameObject.CompareTag ("Player")) { isSafe = false; } diff --git a/game/Assets/Scripts/Death & Respawn/DeathZone.cs b/game/Assets/Scripts/Death & Respawn/DeathZone.cs index b6cd466..d2a4700 100644 --- a/game/Assets/Scripts/Death & Respawn/DeathZone.cs +++ b/game/Assets/Scripts/Death & Respawn/DeathZone.cs @@ -5,7 +5,7 @@ using UnityEngine.InputSystem; public class DeathZone : MonoBehaviour { public Animator animator; - //public GameObject fadeScreen; + public GameObject fadeScreen; private GameObject player; @@ -28,11 +28,11 @@ public class DeathZone : MonoBehaviour _playerInput.enabled = false; yield return new WaitForSeconds(0.5f); - //fadeScreen.GetComponent().SetTrigger("fadeToBlack"); - //yield return new WaitForSeconds(1.5f); + fadeScreen.GetComponent().SetTrigger("fadeToBlack"); + yield return new WaitForSeconds(1.5f); player.transform.position = respawnManager.GetRespawnPoint(); - //fadeScreen.GetComponent().SetTrigger("fadeToClear"); + fadeScreen.GetComponent().SetTrigger("fadeToClear"); yield return new WaitForSeconds(0.5f); _playerInput.enabled = true; diff --git a/game/Assets/Scripts/Death & Respawn/RespawnManager.cs b/game/Assets/Scripts/Death & Respawn/RespawnManager.cs index ee3026d..eb15d82 100644 --- a/game/Assets/Scripts/Death & Respawn/RespawnManager.cs +++ b/game/Assets/Scripts/Death & Respawn/RespawnManager.cs @@ -21,6 +21,6 @@ public class RespawnManager : MonoBehaviour // Show current respawn point in log. This can be deleted at later stage. private void Update() { - Debug.Log(respawnPoint); + Debug.Log("Respawn point is: " + respawnPoint); } } From 4bead84e564a441ca7e03012d70a81e32733015e Mon Sep 17 00:00:00 2001 From: Programmer-DField Date: Sun, 28 Feb 2021 00:54:20 +0000 Subject: [PATCH 06/14] Added the falling rocks trap. The player can now trigger the rocks to fall and the death and respawn script will run when a collision is detected. Need to look at an issue where the collision is detected even when the player is not hit. Possibly the camera? --- game/Assets/Scenes/Main.unity | 2044 ++++++++++++++++- .../Scripts/Death & Respawn/DeathZone.cs | 2 +- game/Assets/Scripts/Traps/FallingRocks.cs | 33 + .../Assets/Scripts/Traps/FallingRocks.cs.meta | 11 + 4 files changed, 1983 insertions(+), 107 deletions(-) create mode 100644 game/Assets/Scripts/Traps/FallingRocks.cs create mode 100644 game/Assets/Scripts/Traps/FallingRocks.cs.meta diff --git a/game/Assets/Scenes/Main.unity b/game/Assets/Scenes/Main.unity index 2b18c62..f3758db 100644 --- a/game/Assets/Scenes/Main.unity +++ b/game/Assets/Scenes/Main.unity @@ -133,7 +133,6 @@ GameObject: m_Component: - component: {fileID: 34418844} - component: {fileID: 34418843} - - component: {fileID: 34418845} m_Layer: 0 m_Name: GameManager m_TagString: Untagged @@ -167,18 +166,6 @@ Transform: m_Father: {fileID: 1509348081} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &34418845 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 34418842} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4a7f7dc8ddb842944abcbcbb1d4995f5, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &38412567 GameObject: m_ObjectHideFlags: 0 @@ -209,8 +196,8 @@ Transform: m_LocalPosition: {x: 9.936016, y: 4.1548176, z: 3.5365372} m_LocalScale: {x: 3.1289, y: 1, z: 9.605558} m_Children: [] - m_Father: {fileID: 2018660589} - m_RootOrder: 1 + m_Father: {fileID: 684295984} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 90, z: 90} --- !u!65 &38412569 BoxCollider: @@ -274,6 +261,37 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 38412567} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &70689284 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 70689285} + m_Layer: 0 + m_Name: FallingRock + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &70689285 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 70689284} + 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: 723599527} + m_Father: {fileID: 2018660589} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &114717650 GameObject: m_ObjectHideFlags: 0 @@ -304,7 +322,7 @@ Transform: m_LocalPosition: {x: 9.936016, y: 4.1548176, z: -5.0034637} m_LocalScale: {x: 3.1289, y: 1, z: 9.605558} m_Children: [] - m_Father: {fileID: 2018660589} + m_Father: {fileID: 684295984} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 90, z: 90} --- !u!65 &114717652 @@ -374,11 +392,11 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 2018660589} + m_TransformParent: {fileID: 684295984} m_Modifications: - target: {fileID: -8679921383154817045, guid: c05280569c267224f87de839cb102b18, type: 3} propertyPath: m_RootOrder - value: 0 + value: 4 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: c05280569c267224f87de839cb102b18, type: 3} propertyPath: m_LocalScale.x @@ -443,6 +461,147 @@ Transform: m_CorrespondingSourceObject: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} m_PrefabInstance: {fileID: 420991640} m_PrefabAsset: {fileID: 0} +--- !u!1 &231896172 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 231896173} + - component: {fileID: 231896179} + - component: {fileID: 231896178} + - component: {fileID: 231896177} + - component: {fileID: 231896176} + - component: {fileID: 231896175} + - component: {fileID: 231896174} + m_Layer: 0 + m_Name: Rock (5) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &231896173 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 231896172} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 1.3950005, y: 0, z: 2.7149994} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 947634747} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &231896174 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 231896172} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: -2.68, z: 0} +--- !u!54 &231896175 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 231896172} + 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 &231896176 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 231896172} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dd465a93255c6bf4090c0f0a8897d07b, type: 3} + m_Name: + m_EditorClassIdentifier: + speed: 9 + _dz: {fileID: 519958732} +--- !u!135 &231896177 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 231896172} + 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 &231896178 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 231896172} + 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 &231896179 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 231896172} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} --- !u!4 &250588649 stripped Transform: m_CorrespondingSourceObject: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} @@ -549,11 +708,11 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 2018660589} + m_TransformParent: {fileID: 684295984} m_Modifications: - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} propertyPath: m_RootOrder - value: 4 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} propertyPath: m_LocalPosition.x @@ -601,6 +760,147 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} +--- !u!1 &436508092 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 436508093} + - component: {fileID: 436508099} + - component: {fileID: 436508098} + - component: {fileID: 436508097} + - component: {fileID: 436508096} + - component: {fileID: 436508095} + - component: {fileID: 436508094} + m_Layer: 0 + m_Name: Rock (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &436508093 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 436508092} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 1.3800001, y: 0, z: 1.3450005} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 947634747} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &436508094 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 436508092} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: -2.68, z: 0} +--- !u!54 &436508095 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 436508092} + 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 &436508096 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 436508092} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dd465a93255c6bf4090c0f0a8897d07b, type: 3} + m_Name: + m_EditorClassIdentifier: + speed: 9 + _dz: {fileID: 519958732} +--- !u!135 &436508097 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 436508092} + 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 &436508098 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 436508092} + 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 &436508099 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 436508092} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &470223356 GameObject: m_ObjectHideFlags: 0 @@ -835,9 +1135,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5f1d0f28dfb6a7245ac9ab4193aaed55, type: 3} m_Name: m_EditorClassIdentifier: - animator: {fileID: 1646361029} + animator: {fileID: 959869475} + fadeScreen: {fileID: 0} respawnManager: {fileID: 34418843} - _playerInput: {fileID: 1646361025} + _playerInput: {fileID: 13726836045578770} --- !u!65 &519958733 BoxCollider: m_ObjectHideFlags: 0 @@ -931,6 +1232,347 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &684295983 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 684295984} + m_Layer: 0 + m_Name: SpikeTrap + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &684295984 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 684295983} + 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: 205081436} + - {fileID: 250588649} + - {fileID: 114717651} + - {fileID: 38412568} + - {fileID: 2074918567} + m_Father: {fileID: 2018660589} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &723599526 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 723599527} + - component: {fileID: 723599534} + - component: {fileID: 723599533} + - component: {fileID: 723599532} + - component: {fileID: 723599530} + - component: {fileID: 723599529} + - component: {fileID: 723599528} + m_Layer: 0 + m_Name: Rock + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &723599527 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 723599526} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.6960168, y: 9.104817, z: -21.383465} + m_LocalScale: {x: 2, y: 2, z: 2} + m_Children: [] + m_Father: {fileID: 70689285} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!54 &723599528 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 723599526} + 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 &723599529 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 723599526} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dd465a93255c6bf4090c0f0a8897d07b, type: 3} + m_Name: + m_EditorClassIdentifier: + speed: 9 + _dz: {fileID: 519958732} +--- !u!65 &723599530 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 723599526} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 0.41, y: 2.77, z: 0.34} + m_Center: {x: 0, y: -1.75, z: 0} +--- !u!135 &723599532 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 723599526} + 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 &723599533 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 723599526} + 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 &723599534 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 723599526} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &947634746 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 947634747} + - component: {fileID: 947634753} + - component: {fileID: 947634752} + - component: {fileID: 947634751} + - component: {fileID: 947634750} + - component: {fileID: 947634749} + - component: {fileID: 947634748} + m_Layer: 0 + m_Name: Rock (0) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &947634747 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 947634746} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -21.88, y: 9.104817, z: -3.65} + m_LocalScale: {x: 2, y: 2, z: 2} + m_Children: + - {fileID: 2145364753} + - {fileID: 436508093} + - {fileID: 1682058944} + - {fileID: 1259226904} + - {fileID: 231896173} + m_Father: {fileID: 1967039762} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &947634748 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 947634746} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: -2.68, z: 0} +--- !u!54 &947634749 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 947634746} + 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 &947634750 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 947634746} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dd465a93255c6bf4090c0f0a8897d07b, type: 3} + m_Name: + m_EditorClassIdentifier: + speed: 9 + _dz: {fileID: 519958732} +--- !u!135 &947634751 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 947634746} + 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 &947634752 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 947634746} + 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 &947634753 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 947634746} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!95 &959869475 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 13726836045578771} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: bd12efafa4115114f90ba79feeb4e8b0, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &1148358018 GameObject: m_ObjectHideFlags: 0 @@ -1074,6 +1716,147 @@ Transform: m_Father: {fileID: 1509348081} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1259226903 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1259226904} + - component: {fileID: 1259226910} + - component: {fileID: 1259226909} + - component: {fileID: 1259226908} + - component: {fileID: 1259226907} + - component: {fileID: 1259226906} + - component: {fileID: 1259226905} + m_Layer: 0 + m_Name: Rock (4) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1259226904 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1259226903} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.020000458, y: 0, z: 2.7149994} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 947634747} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &1259226905 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1259226903} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: -2.68, z: 0} +--- !u!54 &1259226906 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1259226903} + 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 &1259226907 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1259226903} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dd465a93255c6bf4090c0f0a8897d07b, type: 3} + m_Name: + m_EditorClassIdentifier: + speed: 9 + _dz: {fileID: 519958732} +--- !u!135 &1259226908 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1259226903} + 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 &1259226909 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1259226903} + 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 &1259226910 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1259226903} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1509348080 GameObject: m_ObjectHideFlags: 0 @@ -1112,71 +1895,196 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &1528237030 -PrefabInstance: +--- !u!1 &1515892148 +GameObject: m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1515892149} + - component: {fileID: 1515892152} + - component: {fileID: 1515892151} + - component: {fileID: 1515892150} + m_Layer: 0 + m_Name: Wall(1) (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1515892149 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1515892148} + m_LocalRotation: {x: 0.7071068, y: 0.7071068, z: 0, w: 0} + m_LocalPosition: {x: -16.38, y: 4.15, z: -0.64} + m_LocalScale: {x: 3.1289, y: 1, z: 9.605558} + m_Children: [] + m_Father: {fileID: 1967039762} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 180, z: 90} +--- !u!65 &1515892150 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1515892148} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 13726836969441544, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 13726836969441544, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 13726836969441544, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} - propertyPath: m_LocalPosition.y - value: 0.157 - objectReference: {fileID: 0} - - target: {fileID: 13726836969441544, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 13726836969441544, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 13726836969441544, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 13726836969441544, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 13726836969441544, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 13726836969441544, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 13726836969441544, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 13726836969441544, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 13726836969441545, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 13726836969441781, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} - propertyPath: m_Name - value: Player - objectReference: {fileID: 0} - - target: {fileID: 13726836969441783, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &1515892151 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1515892148} + 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 &1515892152 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1515892148} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1521330835 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1521330836} + - component: {fileID: 1521330839} + - component: {fileID: 1521330838} + - component: {fileID: 1521330837} + m_Layer: 0 + m_Name: Wall(1) (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1521330836 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1521330835} + m_LocalRotation: {x: 0.7071068, y: 0.7071068, z: 0, w: 0} + m_LocalPosition: {x: -24.42, y: 4.15, z: -0.63} + m_LocalScale: {x: 3.1289, y: 1, z: 9.605558} + m_Children: [] + m_Father: {fileID: 1967039762} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 180, z: 90} +--- !u!65 &1521330837 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1521330835} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &1521330838 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1521330835} + 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 &1521330839 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1521330835} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1544718414 GameObject: m_ObjectHideFlags: 0 @@ -1347,22 +2255,147 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1646361025 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 13726836969441780, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} - m_PrefabInstance: {fileID: 1528237030} +--- !u!1 &1682058943 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1682058944} + - component: {fileID: 1682058950} + - component: {fileID: 1682058949} + - component: {fileID: 1682058948} + - component: {fileID: 1682058947} + - component: {fileID: 1682058946} + - component: {fileID: 1682058945} + m_Layer: 0 + m_Name: Rock (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1682058944 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1682058943} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.020000458, y: 0, z: 1.3450005} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 947634747} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &1682058945 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1682058943} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: -2.68, z: 0} +--- !u!54 &1682058946 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1682058943} + 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 &1682058947 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1682058943} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3} + m_Script: {fileID: 11500000, guid: dd465a93255c6bf4090c0f0a8897d07b, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!95 &1646361029 stripped -Animator: - m_CorrespondingSourceObject: {fileID: 1646361029, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} - m_PrefabInstance: {fileID: 1528237030} + speed: 9 + _dz: {fileID: 519958732} +--- !u!135 &1682058948 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1682058943} + 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 &1682058949 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1682058943} + 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 &1682058950 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1682058943} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1853827072 GameObject: m_ObjectHideFlags: 0 @@ -1567,6 +2600,39 @@ Transform: m_Father: {fileID: 1509348081} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1967039761 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1967039762} + m_Layer: 0 + m_Name: FallingRockTrap + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1967039762 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1967039761} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.33, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1521330836} + - {fileID: 1515892149} + - {fileID: 947634747} + m_Father: {fileID: 2018660589} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2018660588 GameObject: m_ObjectHideFlags: 0 @@ -1594,11 +2660,9 @@ Transform: m_LocalPosition: {x: -4.8960166, y: -2.6448174, z: 65.653465} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 2074918567} - - {fileID: 38412568} - - {fileID: 114717651} - - {fileID: 250588649} - - {fileID: 205081436} + - {fileID: 684295984} + - {fileID: 70689285} + - {fileID: 1967039762} m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1607,16 +2671,665 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: c05280569c267224f87de839cb102b18, type: 3} m_PrefabInstance: {fileID: 154888098} m_PrefabAsset: {fileID: 0} +--- !u!1 &2145364752 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2145364753} + - component: {fileID: 2145364759} + - component: {fileID: 2145364758} + - component: {fileID: 2145364757} + - component: {fileID: 2145364756} + - component: {fileID: 2145364755} + - component: {fileID: 2145364754} + m_Layer: 0 + m_Name: Rock (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2145364753 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2145364752} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 1.3800001, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 947634747} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &2145364754 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2145364752} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: -2.68, z: 0} +--- !u!54 &2145364755 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2145364752} + 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 &2145364756 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2145364752} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dd465a93255c6bf4090c0f0a8897d07b, type: 3} + m_Name: + m_EditorClassIdentifier: + speed: 9 + _dz: {fileID: 519958732} +--- !u!135 &2145364757 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2145364752} + 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 &2145364758 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2145364752} + 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 &2145364759 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2145364752} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!20 &13726835868299076 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 13726835868299081} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!114 &13726835868299078 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 13726835868299081} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 +--- !u!114 &13726835868299079 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 13726835868299081} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 805caadbe4df94a40bf7ddb70bea02f6, type: 3} + m_Name: + m_EditorClassIdentifier: + _settings: {fileID: 11400000, guid: 995f378ab762cd344b7a6d108f049191, type: 2} + _inputHandler: {fileID: 13726836045578768} +--- !u!4 &13726835868299080 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 13726835868299081} + 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: 13726836045578990} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &13726835868299081 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 13726835868299080} + - component: {fileID: 13726835868299076} + - component: {fileID: 13726835868299078} + - component: {fileID: 13726835868299079} + - component: {fileID: 9057303939444527765} + m_Layer: 0 + m_Name: Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &13726835985748589 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 13726836045578771} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0e73a47345d899f4ca1e5e08683c2b82, type: 3} + m_Name: + m_EditorClassIdentifier: + _cheatBlink: 1 + _cheatBoost: 1 + _blink: {fileID: 11400000, guid: b47ea197a7cc2ed4eb15271cef672997, type: 2} + _boost: {fileID: 11400000, guid: d5ed942937d8cca478f3ec97f6b9c8a2, type: 2} +--- !u!114 &13726836045578768 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 13726836045578771} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e12816fc78a8ca3429be019aa4e51fdd, type: 3} + m_Name: + m_EditorClassIdentifier: + _nearbyArtefactID: {fileID: 11400000, guid: caba70196fbb1c549a934f7566f7a247, type: 2} + _inputSettings: {fileID: 11400000, guid: 09b165d6ce14f86459be7213da9688a7, type: 2} +--- !u!114 &13726836045578769 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 13726836045578771} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a734b8e2d64ba604795fd5cef5d741f4, type: 3} + m_Name: + m_EditorClassIdentifier: + _movementSettings: {fileID: 11400000, guid: 0c168708f93291545b51df2eec8f4ac3, type: 2} + _inputHandler: {fileID: 13726836045578768} + _controller: {fileID: 13726836045578991} + _powers: {fileID: 13726835985748589} + _graphics: {fileID: 13726836450356386} + _renderers: + - {fileID: 13726836450356385} + - {fileID: 13726837691263918} + _groundedColor: {r: 0, g: 1, b: 0.39492488, a: 0} + _jumpColor: {r: 1, g: 0.95084643, b: 0, a: 0} + _boostColor: {r: 1, g: 0, b: 0.9173207, a: 0} + _exhaustedColor: {r: 1, g: 0, b: 0, a: 0} +--- !u!114 &13726836045578770 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 13726836045578771} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Actions: {fileID: -944628639613478452, guid: d4d9eb5db7beac84ca3cb36cfc09cd0a, type: 3} + m_NotificationBehavior: 2 + m_UIInputModule: {fileID: 0} + m_DeviceLostEvent: + m_PersistentCalls: + m_Calls: [] + m_DeviceRegainedEvent: + m_PersistentCalls: + m_Calls: [] + m_ControlsChangedEvent: + m_PersistentCalls: + m_Calls: [] + m_ActionEvents: + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 13726836045578768} + m_TargetAssemblyTypeName: PlayerInputHandler, Assembly-CSharp + m_MethodName: Move + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_ActionId: 5c440996-60ec-4084-9223-75d39638108a + m_ActionName: CoreMap/Move[/Keyboard/w,/Keyboard/s,/Keyboard/a,/Keyboard/d,/XInputControllerWindows/leftStick] + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 13726836045578768} + m_TargetAssemblyTypeName: PlayerInputHandler, Assembly-CSharp + m_MethodName: Look + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_ActionId: d271942b-8516-4550-88ae-552350feb4b1 + m_ActionName: CoreMap/Look[/Mouse/delta,/XInputControllerWindows/rightStick] + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 13726836045578768} + m_TargetAssemblyTypeName: PlayerInputHandler, Assembly-CSharp + m_MethodName: Jump + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_ActionId: da936947-fcfa-4872-a4e3-15763afe56b6 + m_ActionName: CoreMap/Jump[/Keyboard/space,/XInputControllerWindows/buttonSouth] + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 13726836045578768} + m_TargetAssemblyTypeName: PlayerInputHandler, Assembly-CSharp + m_MethodName: Use + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_ActionId: 2bbc2e93-6016-4544-8399-0c4ee222850c + m_ActionName: CoreMap/Use[/Keyboard/e,/XInputControllerWindows/buttonWest] + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 13726836045578768} + m_TargetAssemblyTypeName: PlayerInputHandler, Assembly-CSharp + m_MethodName: Blink + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_ActionId: 0eb55067-1328-4b0a-9494-b427befe049a + m_ActionName: CoreMap/New action + m_NeverAutoSwitchControlSchemes: 1 + m_DefaultControlScheme: Gamepad + m_DefaultActionMap: CoreMap + m_SplitScreenIndex: -1 + m_Camera: {fileID: 13726835868299076} +--- !u!1 &13726836045578771 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 13726836045578990} + - component: {fileID: 13726836045578991} + - component: {fileID: 13726836045578769} + - component: {fileID: 13726836045578770} + - component: {fileID: 13726836045578768} + - component: {fileID: 13726835985748589} + - component: {fileID: 3320306144543951519} + - component: {fileID: 959869475} + m_Layer: 0 + m_Name: Player + m_TagString: Player + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &13726836045578990 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 13726836045578771} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0.157, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 13726836450356386} + - {fileID: 13726835868299080} + m_Father: {fileID: 0} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!143 &13726836045578991 +CharacterController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 13726836045578771} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Height: 1.7 + m_Radius: 0.4 + m_SlopeLimit: 45 + m_StepOffset: 0.3 + m_SkinWidth: 0.01 + m_MinMoveDistance: 0.001 + m_Center: {x: 0, y: 0.85, z: 0} +--- !u!33 &13726836450356384 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 13726836450356387} + m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &13726836450356385 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 13726836450356387} + 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!4 &13726836450356386 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 13726836450356387} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0.85, z: 0} + m_LocalScale: {x: 0.8, y: 0.85, z: 0.8} + m_Children: + - {fileID: 3910566559482717375} + - {fileID: 13726837691263919} + m_Father: {fileID: 13726836045578990} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &13726836450356387 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 13726836450356386} + - component: {fileID: 13726836450356384} + - component: {fileID: 13726836450356385} + m_Layer: 0 + m_Name: Graphics + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!33 &13726837691263917 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 13726837691263952} + m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &13726837691263918 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 13726837691263952} + 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!4 &13726837691263919 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 13726837691263952} + m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0.5, z: 0.177} + m_LocalScale: {x: 0.65, y: 0.4, z: 0.5} + m_Children: [] + m_Father: {fileID: 13726836450356386} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!1 &13726837691263952 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 13726837691263919} + - component: {fileID: 13726837691263917} + - component: {fileID: 13726837691263918} + m_Layer: 0 + m_Name: Cylinder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1001 &980120856872764384 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 2018660589} + m_TransformParent: {fileID: 684295984} m_Modifications: - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} propertyPath: m_RootOrder - value: 3 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} propertyPath: m_LocalPosition.x @@ -1628,7 +3341,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} propertyPath: m_LocalPosition.z - value: -0.92 + value: -0.91999817 objectReference: {fileID: 0} - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} propertyPath: m_LocalRotation.w @@ -1636,15 +3349,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1664,3 +3377,122 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} +--- !u!1 &2625718690767118147 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3910566559482717375} + - component: {fileID: 7229600686583741808} + m_Layer: 0 + m_Name: Spot Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &3320306144543951519 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 13726836045578771} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 005bf73dff204914c9e1bbd60c843451, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &3910566559482717375 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2625718690767118147} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0.50000006, z: 0.013} + m_LocalScale: {x: 0.65, y: 0.39999998, z: 0.49999997} + m_Children: [] + m_Father: {fileID: 13726836450356386} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!108 &7229600686583741808 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2625718690767118147} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 0 + m_Shape: 0 + m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} + m_Intensity: 2 + m_Range: 10 + m_SpotAngle: 116.77128 + m_InnerSpotAngle: 41.896492 + m_CookieSize: 10 + m_Shadows: + m_Type: 2 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.02 + m_NormalBias: 0.1 + m_NearPlane: 0.1 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!114 &9057303939444527765 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 13726835868299081} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86c6556701af9e04380698b89f691b6e, type: 3} + m_Name: + m_EditorClassIdentifier: + attenuationObject: {fileID: 0} + ListenerNumber: -1 diff --git a/game/Assets/Scripts/Death & Respawn/DeathZone.cs b/game/Assets/Scripts/Death & Respawn/DeathZone.cs index d2a4700..cd7f8b8 100644 --- a/game/Assets/Scripts/Death & Respawn/DeathZone.cs +++ b/game/Assets/Scripts/Death & Respawn/DeathZone.cs @@ -22,7 +22,7 @@ public class DeathZone : MonoBehaviour } // Corountine to trigger death animation, disable player movement, play fade, respawn player at last safe position and then play fade in animation and re-enable player movement. - IEnumerator RespawnPlayer() + public IEnumerator RespawnPlayer() { animator.SetTrigger("IsDead"); _playerInput.enabled = false; diff --git a/game/Assets/Scripts/Traps/FallingRocks.cs b/game/Assets/Scripts/Traps/FallingRocks.cs new file mode 100644 index 0000000..37c87c9 --- /dev/null +++ b/game/Assets/Scripts/Traps/FallingRocks.cs @@ -0,0 +1,33 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class FallingRocks : MonoBehaviour +{ + Rigidbody rb; + public float speed; + [SerializeField] private DeathZone _dz; + + private void Start() + { + rb = GetComponent(); + } + + // Use OnTrigger to make the "rocks" fall to the ground. Rate of fall can be controlled with speed variable. + private void OnTriggerEnter(Collider other) + { + if (other.gameObject.CompareTag("Player")) + { + rb.velocity = Vector3.down * speed; + } + } + + // Use OnCollison to call respawn method from DeathZone script. + private void OnCollisionEnter(Collision collision) + { + // Check code is working in log. Can be deleted at a later stage. + Debug.Log("Dead"); + // Call respawn coroutine from DeathZone script. + StartCoroutine(_dz.RespawnPlayer()); + } +} diff --git a/game/Assets/Scripts/Traps/FallingRocks.cs.meta b/game/Assets/Scripts/Traps/FallingRocks.cs.meta new file mode 100644 index 0000000..b2af176 --- /dev/null +++ b/game/Assets/Scripts/Traps/FallingRocks.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: dd465a93255c6bf4090c0f0a8897d07b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: From a46f4ddb740a20a8c07e9a3f54c208eb02debf91 Mon Sep 17 00:00:00 2001 From: Programmer-DField Date: Mon, 1 Mar 2021 16:04:17 +0000 Subject: [PATCH 07/14] Have solved the problem where the camera seemed to be setting the player as dead. The script now checks to see if the collison was with player and only acts if true. --- game/Assets/Scenes/Main.unity | 27 ++++++++++++++++++----- game/Assets/Scripts/Traps/FallingRocks.cs | 11 +++++---- 2 files changed, 28 insertions(+), 10 deletions(-) diff --git a/game/Assets/Scenes/Main.unity b/game/Assets/Scenes/Main.unity index f3758db..7913970 100644 --- a/game/Assets/Scenes/Main.unity +++ b/game/Assets/Scenes/Main.unity @@ -1357,7 +1357,7 @@ SphereCollider: m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 2 - m_Radius: 0.5 + m_Radius: 0.52 m_Center: {x: 0, y: 0, z: 0} --- !u!23 &723599533 MeshRenderer: @@ -2835,8 +2835,8 @@ Camera: y: 0 width: 1 height: 1 - near clip plane: 0.3 - far clip plane: 1000 + near clip plane: 0.1 + far clip plane: 5000 field of view: 60 orthographic: 0 orthographic size: 5 @@ -2908,8 +2908,8 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 13726835868299081} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0.12625737, y: -0.000000037322824, z: 0.0000000047502957, w: 0.99199754} + m_LocalPosition: {x: 0, y: 2.096951, z: -3.0069473} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 13726836045578990} @@ -3115,6 +3115,7 @@ GameObject: - component: {fileID: 13726835985748589} - component: {fileID: 3320306144543951519} - component: {fileID: 959869475} + - component: {fileID: 13726836045578772} m_Layer: 0 m_Name: Player m_TagString: Player @@ -3122,6 +3123,20 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!136 &13726836045578772 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 13726836045578771} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + m_Radius: 0.4 + m_Height: 1.8 + m_Direction: 1 + m_Center: {x: 0, y: 0.85, z: 0} --- !u!4 &13726836045578990 Transform: m_ObjectHideFlags: 0 @@ -3495,4 +3510,4 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: attenuationObject: {fileID: 0} - ListenerNumber: -1 + ListenerNumber: 0 diff --git a/game/Assets/Scripts/Traps/FallingRocks.cs b/game/Assets/Scripts/Traps/FallingRocks.cs index 37c87c9..7181e88 100644 --- a/game/Assets/Scripts/Traps/FallingRocks.cs +++ b/game/Assets/Scripts/Traps/FallingRocks.cs @@ -25,9 +25,12 @@ public class FallingRocks : MonoBehaviour // Use OnCollison to call respawn method from DeathZone script. private void OnCollisionEnter(Collision collision) { - // Check code is working in log. Can be deleted at a later stage. - Debug.Log("Dead"); - // Call respawn coroutine from DeathZone script. - StartCoroutine(_dz.RespawnPlayer()); + if (collision.gameObject.CompareTag("Player")) + { + // Check code is working in log. Can be deleted at a later stage. + Debug.Log("Dead"); + // Call respawn coroutine from DeathZone script. + StartCoroutine(_dz.RespawnPlayer()); + } } } From 0e6d9f2a8b8aad9289849c48ca858c89fa1b16a7 Mon Sep 17 00:00:00 2001 From: Programmer-DField Date: Mon, 1 Mar 2021 18:10:11 +0000 Subject: [PATCH 08/14] See below --- game/Assets/Materials/DeathVolume_MAt.mat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game/Assets/Materials/DeathVolume_MAt.mat b/game/Assets/Materials/DeathVolume_MAt.mat index ac05a72..c709471 100644 --- a/game/Assets/Materials/DeathVolume_MAt.mat +++ b/game/Assets/Materials/DeathVolume_MAt.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: DeathVolume_Mat + m_Name: DeathVolume_MAt m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_ShaderKeywords: m_LightmapFlags: 4 From be850a3795a08f022cea0043d28fe8e28e5441ef Mon Sep 17 00:00:00 2001 From: Programmer-DField Date: Tue, 2 Mar 2021 19:47:28 +0000 Subject: [PATCH 09/14] Changes made as per code review. --- game/Assets/Scenes/Main.unity | 16 ++++++++++++++++ game/Assets/Scripts/Traps/FallawayFloor.cs | 13 ++++++++++--- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/game/Assets/Scenes/Main.unity b/game/Assets/Scenes/Main.unity index 7913970..72297ce 100644 --- a/game/Assets/Scenes/Main.unity +++ b/game/Assets/Scenes/Main.unity @@ -710,6 +710,14 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 684295984} m_Modifications: + - target: {fileID: 980120856895548939, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} + propertyPath: fallAwayTime + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 980120856895548939, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} + propertyPath: destroyObjectTime + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} propertyPath: m_RootOrder value: 0 @@ -3342,6 +3350,14 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 684295984} m_Modifications: + - target: {fileID: 980120856895548939, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} + propertyPath: fallAwayTime + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 980120856895548939, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} + propertyPath: destroyObjectTime + value: 5 + objectReference: {fileID: 0} - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3} propertyPath: m_RootOrder value: 1 diff --git a/game/Assets/Scripts/Traps/FallawayFloor.cs b/game/Assets/Scripts/Traps/FallawayFloor.cs index dc75982..c9412e2 100644 --- a/game/Assets/Scripts/Traps/FallawayFloor.cs +++ b/game/Assets/Scripts/Traps/FallawayFloor.cs @@ -4,12 +4,18 @@ using UnityEngine; public class FallawayFloor : MonoBehaviour { + // Speed at which the object moves towards the ground. public float speed; + // Time it takes for ogjecct to begin moving towards the ground. + public float fallAwayTime; + // Time taken for object to be destroyed. + public float destroyObjectTime; public Material dissolve; Rigidbody rb; private void Start() { + // Get Rigidbody component. rb = GetComponent(); } @@ -17,6 +23,7 @@ public class FallawayFloor : MonoBehaviour { if (other.gameObject.CompareTag("Player")) { + // Start the Destroy floor coroutine and switch to the dissolve material. StartCoroutine(DestroyFloor()); GetComponent().material = dissolve; } @@ -24,11 +31,11 @@ public class FallawayFloor : MonoBehaviour IEnumerator DestroyFloor() { - yield return new WaitForSeconds(1f); + // Take fallAwayTime, speed, and destroyObjectTime from editor and apply + yield return new WaitForSeconds(fallAwayTime); rb.velocity = Vector3.down * speed; - yield return new WaitForSeconds(1); + yield return new WaitForSeconds(destroyObjectTime); Destroy(gameObject); - yield return null; } } From 27e512a780181d9dd1f7bde8e6602bc8118502fc Mon Sep 17 00:00:00 2001 From: Cat Flynn Date: Fri, 5 Mar 2021 12:49:44 +0000 Subject: [PATCH 10/14] delete unused script --- .../Scripts/Death & Respawn/RespawnManager.cs | 26 ------------------- 1 file changed, 26 deletions(-) delete mode 100644 game/Assets/Scripts/Death & Respawn/RespawnManager.cs diff --git a/game/Assets/Scripts/Death & Respawn/RespawnManager.cs b/game/Assets/Scripts/Death & Respawn/RespawnManager.cs deleted file mode 100644 index eb15d82..0000000 --- a/game/Assets/Scripts/Death & Respawn/RespawnManager.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class RespawnManager : MonoBehaviour -{ - private Vector3 respawnPoint; - - // Set respawn point in Respawn Manager. - public void SetRespawnPoint(Vector3 _respawnPoint) - { - respawnPoint = _respawnPoint; - } - - // Return the respawn point. - public Vector3 GetRespawnPoint() - { - return respawnPoint; - } - - // Show current respawn point in log. This can be deleted at later stage. - private void Update() - { - Debug.Log("Respawn point is: " + respawnPoint); - } -} From 1978a691d111dffe2e767b4d5df58eb2c59aed7b Mon Sep 17 00:00:00 2001 From: Cat Flynn Date: Fri, 5 Mar 2021 12:52:28 +0000 Subject: [PATCH 11/14] development build on ci --- ci/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/build.sh b/ci/build.sh index 4ceffc0..7827da7 100644 --- a/ci/build.sh +++ b/ci/build.sh @@ -17,6 +17,7 @@ open -g $editorpath --args \ -batchmode \ -quit \ -nographics \ + -developmentBuild \ -executeMethod "Ktyl.Util.BuildCommand.Run" \ -logFile $editorlogpath \ -projectPath "$(pwd)/game" From b64e4e30af8b5def6643d619bcfc5e0daa7823ce Mon Sep 17 00:00:00 2001 From: Cat Flynn Date: Fri, 5 Mar 2021 12:52:40 +0000 Subject: [PATCH 12/14] update fmod meta file apparently --- .../FMOD/lib/win/x86_64/fmodstudio.dll.meta | 191 +++++++++++------- 1 file changed, 113 insertions(+), 78 deletions(-) diff --git a/game/Assets/Plugins/FMOD/lib/win/x86_64/fmodstudio.dll.meta b/game/Assets/Plugins/FMOD/lib/win/x86_64/fmodstudio.dll.meta index 2059acb..d5376b2 100644 --- a/game/Assets/Plugins/FMOD/lib/win/x86_64/fmodstudio.dll.meta +++ b/game/Assets/Plugins/FMOD/lib/win/x86_64/fmodstudio.dll.meta @@ -1,78 +1,113 @@ -fileFormatVersion: 2 -guid: 684d4d47a018ed14080e15f4c99b8e86 -PluginImporter: - serializedVersion: 1 - iconMap: {} - executionOrder: {} - isPreloaded: 0 - platformData: - Android: - enabled: 0 - settings: - CPU: AnyCPU - Any: - enabled: 0 - settings: {} - Editor: - enabled: 1 - settings: - CPU: x86_64 - DefaultValueInitialized: true - OS: Windows - Linux: - enabled: 1 - settings: - CPU: None - Linux64: - enabled: 1 - settings: - CPU: x86_64 - LinuxUniversal: - enabled: 1 - settings: - CPU: AnyCPU - OSXIntel: - enabled: 1 - settings: - CPU: None - OSXIntel64: - enabled: 1 - settings: - CPU: AnyCPU - OSXUniversal: - enabled: 1 - settings: - CPU: AnyCPU - SamsungTV: - enabled: 0 - settings: - STV_MODEL: STANDARD_13 - WP8: - enabled: 0 - settings: - CPU: AnyCPU - DontProcess: False - PlaceholderPath: - Win: - enabled: 0 - settings: - CPU: None - Win64: - enabled: 1 - settings: - CPU: AnyCPU - WindowsStoreApps: - enabled: 0 - settings: - CPU: AnyCPU - DontProcess: False - PlaceholderPath: - SDK: AnySDK - iOS: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 684d4d47a018ed14080e15f4c99b8e86 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + : Linux + second: + enabled: 1 + settings: + CPU: None + - first: + : LinuxUniversal + second: + enabled: 1 + settings: + CPU: AnyCPU + - first: + : OSXIntel + second: + enabled: 1 + settings: + CPU: None + - first: + : OSXIntel64 + second: + enabled: 1 + settings: + CPU: AnyCPU + - first: + : SamsungTV + second: + enabled: 0 + settings: + STV_MODEL: STANDARD_13 + - first: + : WP8 + second: + enabled: 0 + settings: + CPU: AnyCPU + DontProcess: False + PlaceholderPath: + - first: + Android: Android + second: + enabled: 0 + settings: + CPU: AnyCPU + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 1 + settings: + CPU: x86_64 + DefaultValueInitialized: true + OS: Windows + - first: + Standalone: Linux64 + second: + enabled: 1 + settings: + CPU: AnyCPU + - first: + Standalone: OSXUniversal + second: + enabled: 1 + settings: + CPU: AnyCPU + - first: + Standalone: Win + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win64 + second: + enabled: 0 + settings: + CPU: AnyCPU + - first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU + DontProcess: False + PlaceholderPath: + SDK: AnySDK + - first: + iPhone: iOS + second: + enabled: 0 + settings: + CompileFlags: + FrameworkDependencies: + userData: + assetBundleName: + assetBundleVariant: From 1aee232cb677ec444326c533162394026da6e75a Mon Sep 17 00:00:00 2001 From: Cat Flynn Date: Fri, 5 Mar 2021 13:26:15 +0000 Subject: [PATCH 13/14] artefact registration, register event listeners after awake event --- .../Data/Artefacts/Artefact System.asset | 1 + ...efactID.asset => Nearby Artefact ID.asset} | 2 +- ...set.meta => Nearby Artefact ID.asset.meta} | 0 game/Assets/Scenes/Main.unity | 25 ++++++------ .../Scripts/Artefacts/ArtefactControl.cs | 10 +++-- .../Scripts/Artefacts/ArtefactSystem.cs | 38 +++++++++++++++++++ game/Assets/Scripts/Artefacts/EventHandler.cs | 6 +-- .../Assets/Scripts/Artefacts/PickUpDisplay.cs | 25 ++++-------- 8 files changed, 67 insertions(+), 40 deletions(-) rename game/Assets/Data/Artefacts/{nearbyArtefactID.asset => Nearby Artefact ID.asset} (93%) rename game/Assets/Data/Artefacts/{nearbyArtefactID.asset.meta => Nearby Artefact ID.asset.meta} (100%) diff --git a/game/Assets/Data/Artefacts/Artefact System.asset b/game/Assets/Data/Artefacts/Artefact System.asset index 2db9f80..1ca3357 100644 --- a/game/Assets/Data/Artefacts/Artefact System.asset +++ b/game/Assets/Data/Artefacts/Artefact System.asset @@ -14,3 +14,4 @@ MonoBehaviour: m_EditorClassIdentifier: _dialogue: {fileID: 11400000, guid: 56369c4e83cc59e44bf55cd16fafc4e8, type: 2} _inventory: {fileID: 11400000, guid: 1a9441435aa1fc649a84169f689c7f53, type: 2} + _nearbyArtefactId: {fileID: 11400000, guid: caba70196fbb1c549a934f7566f7a247, type: 2} diff --git a/game/Assets/Data/Artefacts/nearbyArtefactID.asset b/game/Assets/Data/Artefacts/Nearby Artefact ID.asset similarity index 93% rename from game/Assets/Data/Artefacts/nearbyArtefactID.asset rename to game/Assets/Data/Artefacts/Nearby Artefact ID.asset index 2138e16..7cbd4b0 100644 --- a/game/Assets/Data/Artefacts/nearbyArtefactID.asset +++ b/game/Assets/Data/Artefacts/Nearby Artefact ID.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: cc38ab5b9e594a344a8eb1635487d5eb, type: 3} - m_Name: nearbyArtefactID + m_Name: Nearby Artefact ID m_EditorClassIdentifier: _initialValue: -1 _readOnly: 0 diff --git a/game/Assets/Data/Artefacts/nearbyArtefactID.asset.meta b/game/Assets/Data/Artefacts/Nearby Artefact ID.asset.meta similarity index 100% rename from game/Assets/Data/Artefacts/nearbyArtefactID.asset.meta rename to game/Assets/Data/Artefacts/Nearby Artefact ID.asset.meta diff --git a/game/Assets/Scenes/Main.unity b/game/Assets/Scenes/Main.unity index 17d673f..24301b6 100644 --- a/game/Assets/Scenes/Main.unity +++ b/game/Assets/Scenes/Main.unity @@ -2476,15 +2476,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.x - value: 0.14211853 + value: 0.14211854 objectReference: {fileID: 0} - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.y - value: -2.2566488e-22 + value: 1.1133053e-25 objectReference: {fileID: 0} - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.z - value: 2.3205715e-23 + value: -4.9127595e-24 objectReference: {fileID: 0} - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalPosition.x @@ -2504,15 +2504,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.x - value: 0.1419703 + value: 0.14197029 objectReference: {fileID: 0} - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.y - value: 0.04519987 + value: 0.045199864 objectReference: {fileID: 0} - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.z - value: -0.0064896117 + value: -0.0064896103 objectReference: {fileID: 0} - target: {fileID: 4676633831414007564, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_Name @@ -2600,15 +2600,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.x - value: 0.14211851 + value: 0.14211854 objectReference: {fileID: 0} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.y - value: -7.529077e-16 + value: -0.0000000034819871 objectReference: {fileID: 0} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.z - value: 4.582889e-18 + value: 4.999292e-10 objectReference: {fileID: 0} - target: {fileID: 4676633832858914730, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_XAxis.m_InvertInput @@ -2636,11 +2636,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.y - value: 0.04519986 + value: 0.045199856 objectReference: {fileID: 0} - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.z - value: -0.006489608 + value: -0.006489607 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} @@ -7128,12 +7128,11 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: artefactUI: {fileID: 483749937} - nearbyArtefactID: {fileID: 11400000, guid: caba70196fbb1c549a934f7566f7a247, type: 2} Player: {fileID: 1239556274} artefactText: {fileID: 59318657} - Artefacts: {fileID: 1112305613} inputSettings: {fileID: 11400000, guid: 87faf39b6f22e524984c1680a88045ac, type: 2} dialogue: {fileID: 11400000, guid: 56369c4e83cc59e44bf55cd16fafc4e8, type: 2} + artefacts: {fileID: 11400000, guid: f523ac0d77530064b8b41c627b13fae0, type: 2} --- !u!114 &2070784759 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/game/Assets/Scripts/Artefacts/ArtefactControl.cs b/game/Assets/Scripts/Artefacts/ArtefactControl.cs index 3a1ec10..5d4e716 100644 --- a/game/Assets/Scripts/Artefacts/ArtefactControl.cs +++ b/game/Assets/Scripts/Artefacts/ArtefactControl.cs @@ -1,3 +1,4 @@ +using System; using System.Collections; using System.Collections.Generic; using UnityEngine; @@ -6,8 +7,6 @@ using UnityEngine.Events; public class ArtefactControl : MonoBehaviour { - - private bool _show; protected bool _canInteract; @@ -20,7 +19,12 @@ public class ArtefactControl : MonoBehaviour [SerializeField] private SerialInt _nearbyArtefactID; [SerializeField] private ArtefactSystem _artefacts; - + + private void OnEnable() + { + _artefacts.RegisterArtefact(_data); + } + protected virtual void Start() { _artefactID = data.artefactID; diff --git a/game/Assets/Scripts/Artefacts/ArtefactSystem.cs b/game/Assets/Scripts/Artefacts/ArtefactSystem.cs index 860534e..c30cae2 100644 --- a/game/Assets/Scripts/Artefacts/ArtefactSystem.cs +++ b/game/Assets/Scripts/Artefacts/ArtefactSystem.cs @@ -1,5 +1,8 @@ +using System; using System.Collections; using System.Collections.Generic; +using System.Runtime.InteropServices; +using Ktyl.Util; using UnityEngine; [CreateAssetMenu(menuName = "KernelPanic/Artefacts/Artefact System")] @@ -7,6 +10,36 @@ public class ArtefactSystem : ScriptableObject { [SerializeField] private DialogueSystem _dialogue; [SerializeField] private ArtefactInventory _inventory; + [SerializeField] private SerialInt _nearbyArtefactId; + + private readonly List _artefacts = new List(); + + public Artefact GetNearbyArtefact() + { + return _nearbyArtefactId == -1 ? null : GetArtefact(_nearbyArtefactId); + } + + private Artefact GetArtefact(int id) + { + for (int i = 0; i < _artefacts.Count; i++) + { + if (_artefacts[i].artefactID == id) return _artefacts[i]; + } + + Debug.LogError($"no registered artefact with id {id}"); + return null; + } + + public void RegisterArtefact(Artefact artefact) + { + if (_artefacts.Contains(artefact)) + { + Debug.LogError($"{artefact} already registered", this); + return; + } + + _artefacts.Add(artefact); + } public void FindArtefact(Artefact artefact) { @@ -14,4 +47,9 @@ public class ArtefactSystem : ScriptableObject // _dialogue.PlayLine(artefact.dialogueKey); } + + private void OnDisable() + { + _artefacts.Clear(); + } } diff --git a/game/Assets/Scripts/Artefacts/EventHandler.cs b/game/Assets/Scripts/Artefacts/EventHandler.cs index dba71a1..2800cd4 100644 --- a/game/Assets/Scripts/Artefacts/EventHandler.cs +++ b/game/Assets/Scripts/Artefacts/EventHandler.cs @@ -6,7 +6,6 @@ using UnityEngine; public class EventHandler : MonoBehaviour { - //[SerializeField] private SerialInt nearbyArtefactID; public static EventHandler current; private void Awake() @@ -39,10 +38,7 @@ public class EventHandler : MonoBehaviour { if (onArtefactPickUp != null) { - //if(nearbyArtefactID != -1) - // { - onArtefactPickUp(id); - //} + onArtefactPickUp(id); } } diff --git a/game/Assets/Scripts/Artefacts/PickUpDisplay.cs b/game/Assets/Scripts/Artefacts/PickUpDisplay.cs index c52610b..34781be 100644 --- a/game/Assets/Scripts/Artefacts/PickUpDisplay.cs +++ b/game/Assets/Scripts/Artefacts/PickUpDisplay.cs @@ -11,40 +11,29 @@ public class PickUpDisplay : MonoBehaviour [SerializeField] private static bool _paused; [SerializeField] private GameObject artefactUI; - [SerializeField] private SerialInt nearbyArtefactID; [SerializeField] private GameObject Player; [SerializeField] private Text artefactText; - [SerializeField] private GameObject Artefacts; [SerializeField] private InputSettings inputSettings; [SerializeField] private DialogueSystem dialogue; + [SerializeField] private ArtefactSystem artefacts; private Artefact chosenArtefact; - private static List completeList = new List(); - private void Awake() + private void Start() { EventHandler.current.onArtefactUI += PopUpOn; - int i; - - for(i=0; i().data); - - } } - private void FixedUpdate() + private void Update() { - foreach(Artefact arte in completeList) - { - if (nearbyArtefactID != -1 && arte.artefactID == nearbyArtefactID) - chosenArtefact = arte; - } + var artefact = artefacts.GetNearbyArtefact(); + if (!artefact) return; + + chosenArtefact = artefact; } public void PopUpOn() { - ; _paused = true; artefactUI.SetActive(true); Player.GetComponent().enabled = false; From 6100035289815332ef5becb53b0f75290dc65df0 Mon Sep 17 00:00:00 2001 From: Cat Flynn Date: Fri, 5 Mar 2021 13:26:45 +0000 Subject: [PATCH 14/14] banks weren't tracked? --- game/Assets/StreamingAssets.meta | 8 ++++++++ game/Assets/StreamingAssets/Dialogue_CN.bank | 3 +++ game/Assets/StreamingAssets/Dialogue_CN.bank.meta | 9 +++++++++ game/Assets/StreamingAssets/Dialogue_EN.bank | 3 +++ game/Assets/StreamingAssets/Dialogue_EN.bank.meta | 9 +++++++++ game/Assets/StreamingAssets/Dialogue_JP.bank | 3 +++ game/Assets/StreamingAssets/Dialogue_JP.bank.meta | 9 +++++++++ game/Assets/StreamingAssets/Master.bank | 3 +++ game/Assets/StreamingAssets/Master.bank.meta | 9 +++++++++ game/Assets/StreamingAssets/Master.strings.bank | 3 +++ game/Assets/StreamingAssets/Master.strings.bank.meta | 9 +++++++++ game/Assets/StreamingAssets/Music.bank | 3 +++ game/Assets/StreamingAssets/Music.bank.meta | 9 +++++++++ game/Assets/StreamingAssets/SFX.bank | 3 +++ game/Assets/StreamingAssets/SFX.bank.meta | 9 +++++++++ game/Assets/StreamingAssets/VO.bank | 3 +++ game/Assets/StreamingAssets/VO.bank.meta | 9 +++++++++ game/Assets/StreamingAssets/Vehicles.bank | 3 +++ game/Assets/StreamingAssets/Vehicles.bank.meta | 9 +++++++++ 19 files changed, 116 insertions(+) create mode 100644 game/Assets/StreamingAssets.meta create mode 100644 game/Assets/StreamingAssets/Dialogue_CN.bank create mode 100644 game/Assets/StreamingAssets/Dialogue_CN.bank.meta create mode 100644 game/Assets/StreamingAssets/Dialogue_EN.bank create mode 100644 game/Assets/StreamingAssets/Dialogue_EN.bank.meta create mode 100644 game/Assets/StreamingAssets/Dialogue_JP.bank create mode 100644 game/Assets/StreamingAssets/Dialogue_JP.bank.meta create mode 100644 game/Assets/StreamingAssets/Master.bank create mode 100644 game/Assets/StreamingAssets/Master.bank.meta create mode 100644 game/Assets/StreamingAssets/Master.strings.bank create mode 100644 game/Assets/StreamingAssets/Master.strings.bank.meta create mode 100644 game/Assets/StreamingAssets/Music.bank create mode 100644 game/Assets/StreamingAssets/Music.bank.meta create mode 100644 game/Assets/StreamingAssets/SFX.bank create mode 100644 game/Assets/StreamingAssets/SFX.bank.meta create mode 100644 game/Assets/StreamingAssets/VO.bank create mode 100644 game/Assets/StreamingAssets/VO.bank.meta create mode 100644 game/Assets/StreamingAssets/Vehicles.bank create mode 100644 game/Assets/StreamingAssets/Vehicles.bank.meta diff --git a/game/Assets/StreamingAssets.meta b/game/Assets/StreamingAssets.meta new file mode 100644 index 0000000..111e8f1 --- /dev/null +++ b/game/Assets/StreamingAssets.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2eb77a34cb5c3a2499e426bfb7aca165 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/StreamingAssets/Dialogue_CN.bank b/game/Assets/StreamingAssets/Dialogue_CN.bank new file mode 100644 index 0000000..14ea068 --- /dev/null +++ b/game/Assets/StreamingAssets/Dialogue_CN.bank @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a3fe27c582bb487b8570e626b8cd9eb4c6c5e3348fe93b7a5eb3b7519bccf18b +size 52416 diff --git a/game/Assets/StreamingAssets/Dialogue_CN.bank.meta b/game/Assets/StreamingAssets/Dialogue_CN.bank.meta new file mode 100644 index 0000000..86732ef --- /dev/null +++ b/game/Assets/StreamingAssets/Dialogue_CN.bank.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 90356c5beb272664687199ea3e14fa86 +labels: +- FMOD +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/StreamingAssets/Dialogue_EN.bank b/game/Assets/StreamingAssets/Dialogue_EN.bank new file mode 100644 index 0000000..1b30357 --- /dev/null +++ b/game/Assets/StreamingAssets/Dialogue_EN.bank @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a2b0d4a2eec6338af088a34f6c933de2ac8c2e162844d43df771beb72a9331bd +size 61120 diff --git a/game/Assets/StreamingAssets/Dialogue_EN.bank.meta b/game/Assets/StreamingAssets/Dialogue_EN.bank.meta new file mode 100644 index 0000000..fe82bc0 --- /dev/null +++ b/game/Assets/StreamingAssets/Dialogue_EN.bank.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: f6b5fef480e45f3458dbe489b0583f75 +labels: +- FMOD +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/StreamingAssets/Dialogue_JP.bank b/game/Assets/StreamingAssets/Dialogue_JP.bank new file mode 100644 index 0000000..e52b197 --- /dev/null +++ b/game/Assets/StreamingAssets/Dialogue_JP.bank @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c57478e0db9db0781b3fa4ea2c0195b9d7921510132f7ea0823c0f02157de630 +size 66560 diff --git a/game/Assets/StreamingAssets/Dialogue_JP.bank.meta b/game/Assets/StreamingAssets/Dialogue_JP.bank.meta new file mode 100644 index 0000000..ec4dae2 --- /dev/null +++ b/game/Assets/StreamingAssets/Dialogue_JP.bank.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: a9b7aec0dbd482f489b727b6c3ab3fd3 +labels: +- FMOD +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/StreamingAssets/Master.bank b/game/Assets/StreamingAssets/Master.bank new file mode 100644 index 0000000..ca11f2f --- /dev/null +++ b/game/Assets/StreamingAssets/Master.bank @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:907c63f41682ff345ba4fc1263568d4666f91ac33b9206761f18390fc73037f4 +size 15340 diff --git a/game/Assets/StreamingAssets/Master.bank.meta b/game/Assets/StreamingAssets/Master.bank.meta new file mode 100644 index 0000000..1bc4f7f --- /dev/null +++ b/game/Assets/StreamingAssets/Master.bank.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 7f91c2a4d80b21a43abbde2b94674471 +labels: +- FMOD +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/StreamingAssets/Master.strings.bank b/game/Assets/StreamingAssets/Master.strings.bank new file mode 100644 index 0000000..2da32b3 --- /dev/null +++ b/game/Assets/StreamingAssets/Master.strings.bank @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:239af724ad25825fa2f496456ed2404d9d4c1af860446f5bc12157295df9c661 +size 4002 diff --git a/game/Assets/StreamingAssets/Master.strings.bank.meta b/game/Assets/StreamingAssets/Master.strings.bank.meta new file mode 100644 index 0000000..2a158d3 --- /dev/null +++ b/game/Assets/StreamingAssets/Master.strings.bank.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 6cdac34c226618e4aa6807660280989b +labels: +- FMOD +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/StreamingAssets/Music.bank b/game/Assets/StreamingAssets/Music.bank new file mode 100644 index 0000000..e8053fb --- /dev/null +++ b/game/Assets/StreamingAssets/Music.bank @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:91c7db69b3e41214e6f5812d33bc21f7df04aecf771c0ddc5a12969f9a4e91e2 +size 10454080 diff --git a/game/Assets/StreamingAssets/Music.bank.meta b/game/Assets/StreamingAssets/Music.bank.meta new file mode 100644 index 0000000..13881a3 --- /dev/null +++ b/game/Assets/StreamingAssets/Music.bank.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 72ba6873e27408642a2a1dcb70d89708 +labels: +- FMOD +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/StreamingAssets/SFX.bank b/game/Assets/StreamingAssets/SFX.bank new file mode 100644 index 0000000..6abdaf8 --- /dev/null +++ b/game/Assets/StreamingAssets/SFX.bank @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0b01dc3f6f73328b411b4904b1a3da22d5f131540a4a883c2a77c4809cf92171 +size 21579328 diff --git a/game/Assets/StreamingAssets/SFX.bank.meta b/game/Assets/StreamingAssets/SFX.bank.meta new file mode 100644 index 0000000..8df015c --- /dev/null +++ b/game/Assets/StreamingAssets/SFX.bank.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 4d435d34707c1814d8c4468be808e847 +labels: +- FMOD +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/StreamingAssets/VO.bank b/game/Assets/StreamingAssets/VO.bank new file mode 100644 index 0000000..d32d68b --- /dev/null +++ b/game/Assets/StreamingAssets/VO.bank @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:553cbe6458299621dc61777d11cb1be37b01fd360e42daa736335f48eca7a464 +size 38560 diff --git a/game/Assets/StreamingAssets/VO.bank.meta b/game/Assets/StreamingAssets/VO.bank.meta new file mode 100644 index 0000000..d0825d3 --- /dev/null +++ b/game/Assets/StreamingAssets/VO.bank.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 701b4f629f263dd49a2c6eb4bace07bc +labels: +- FMOD +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/StreamingAssets/Vehicles.bank b/game/Assets/StreamingAssets/Vehicles.bank new file mode 100644 index 0000000..b619052 --- /dev/null +++ b/game/Assets/StreamingAssets/Vehicles.bank @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:08ecd9f32730dd3789426fc6e1745f1b3997c6ad98e2eca31002ec94948726ca +size 222368 diff --git a/game/Assets/StreamingAssets/Vehicles.bank.meta b/game/Assets/StreamingAssets/Vehicles.bank.meta new file mode 100644 index 0000000..1ff681a --- /dev/null +++ b/game/Assets/StreamingAssets/Vehicles.bank.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 173ac73c679d2224aa381238b45d2cf5 +labels: +- FMOD +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: