From 2773c3f95416f126c30633b3bf6845630f32a1cd Mon Sep 17 00:00:00 2001 From: Programmer-DField Date: Fri, 26 Feb 2021 15:02:33 +0000 Subject: [PATCH] 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}