From fe1e69fa94a22c016f9895cdbd99f62798d9514b Mon Sep 17 00:00:00 2001 From: Cat Flynn Date: Thu, 4 Mar 2021 16:55:29 +0000 Subject: [PATCH] add safe and kill planes --- game/Assets/Prefabs/UI.meta | 8 + .../{Dialogue => UI}/Dialogue UI.prefab | 0 .../{Dialogue => UI}/Dialogue UI.prefab.meta | 0 game/Assets/Prefabs/UI/Fade.prefab | 152 +++ game/Assets/Prefabs/UI/Fade.prefab.meta | 7 + game/Assets/Prefabs/Zones/Kill Plane.prefab | 4 +- game/Assets/Prefabs/Zones/Safe Zone.prefab | 2 +- game/Assets/Scenes/Checkpoints.unity | 213 +++-- game/Assets/Scenes/Main.unity | 898 +++++++++++++++++- .../Scripts/Death & Respawn/DeathZone.cs | 11 +- .../Player/PlayerMovementSettings.asset | 6 +- 11 files changed, 1161 insertions(+), 140 deletions(-) create mode 100644 game/Assets/Prefabs/UI.meta rename game/Assets/Prefabs/{Dialogue => UI}/Dialogue UI.prefab (100%) rename game/Assets/Prefabs/{Dialogue => UI}/Dialogue UI.prefab.meta (100%) create mode 100644 game/Assets/Prefabs/UI/Fade.prefab create mode 100644 game/Assets/Prefabs/UI/Fade.prefab.meta diff --git a/game/Assets/Prefabs/UI.meta b/game/Assets/Prefabs/UI.meta new file mode 100644 index 0000000..9f21825 --- /dev/null +++ b/game/Assets/Prefabs/UI.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 45fccad9d1697e34cacd0a6bb2c3c939 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Prefabs/Dialogue/Dialogue UI.prefab b/game/Assets/Prefabs/UI/Dialogue UI.prefab similarity index 100% rename from game/Assets/Prefabs/Dialogue/Dialogue UI.prefab rename to game/Assets/Prefabs/UI/Dialogue UI.prefab diff --git a/game/Assets/Prefabs/Dialogue/Dialogue UI.prefab.meta b/game/Assets/Prefabs/UI/Dialogue UI.prefab.meta similarity index 100% rename from game/Assets/Prefabs/Dialogue/Dialogue UI.prefab.meta rename to game/Assets/Prefabs/UI/Dialogue UI.prefab.meta diff --git a/game/Assets/Prefabs/UI/Fade.prefab b/game/Assets/Prefabs/UI/Fade.prefab new file mode 100644 index 0000000..12ead3a --- /dev/null +++ b/game/Assets/Prefabs/UI/Fade.prefab @@ -0,0 +1,152 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &8951021900398560348 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8951021900398560347} + - component: {fileID: 8951021900398560344} + - component: {fileID: 8951021900398560345} + - component: {fileID: 8951021900398560346} + - component: {fileID: 7572760177369383703} + - component: {fileID: 3170141718708155343} + m_Layer: 5 + m_Name: Fade + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8951021900398560347 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8951021900398560348} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 20.357876, y: 11.155, z: 11.155} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8951021900398560344 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8951021900398560348} + m_CullTransparentMesh: 1 +--- !u!114 &8951021900398560345 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8951021900398560348} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 0} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!95 &8951021900398560346 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8951021900398560348} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 7c0792564e8a1bb45a90af39ed7b2a70, 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 &7572760177369383703 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8951021900398560348} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0a5de09a27d949d4db67034f55c57e6b, type: 3} + m_Name: + m_EditorClassIdentifier: + _event: {fileID: 11400000, guid: 22fd384aef0d08146831d35c2ab7f983, type: 2} + _response: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 8951021900398560346} + m_TargetAssemblyTypeName: UnityEngine.Animator, UnityEngine + m_MethodName: SetTrigger + m_Mode: 5 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: fadeToBlack + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &3170141718708155343 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8951021900398560348} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0a5de09a27d949d4db67034f55c57e6b, type: 3} + m_Name: + m_EditorClassIdentifier: + _event: {fileID: 11400000, guid: 6e31084a96bb93a44a85563a6208d0da, type: 2} + _response: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 8951021900398560346} + m_TargetAssemblyTypeName: UnityEngine.Animator, UnityEngine + m_MethodName: SetTrigger + m_Mode: 5 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: fadeToClear + m_BoolArgument: 0 + m_CallState: 2 diff --git a/game/Assets/Prefabs/UI/Fade.prefab.meta b/game/Assets/Prefabs/UI/Fade.prefab.meta new file mode 100644 index 0000000..b20e3a4 --- /dev/null +++ b/game/Assets/Prefabs/UI/Fade.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8b2275700cf2cc5448873b7f1aa592b6 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Prefabs/Zones/Kill Plane.prefab b/game/Assets/Prefabs/Zones/Kill Plane.prefab index 0b3ca54..b601013 100644 --- a/game/Assets/Prefabs/Zones/Kill Plane.prefab +++ b/game/Assets/Prefabs/Zones/Kill Plane.prefab @@ -50,7 +50,7 @@ MeshRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3340651998927408401} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -123,8 +123,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5f1d0f28dfb6a7245ac9ab4193aaed55, type: 3} m_Name: m_EditorClassIdentifier: - animator: {fileID: 0} - fadeScreen: {fileID: 0} _respawnPosition: {fileID: 11400000, guid: 20fad56702134eb469a652ba680b48b2, type: 2} _playerDeath: {fileID: 11400000, guid: 22fd384aef0d08146831d35c2ab7f983, type: 2} _playerRespawn: {fileID: 11400000, guid: 6e31084a96bb93a44a85563a6208d0da, type: 2} diff --git a/game/Assets/Prefabs/Zones/Safe Zone.prefab b/game/Assets/Prefabs/Zones/Safe Zone.prefab index 1680a12..0ea0ce1 100644 --- a/game/Assets/Prefabs/Zones/Safe Zone.prefab +++ b/game/Assets/Prefabs/Zones/Safe Zone.prefab @@ -50,7 +50,7 @@ MeshRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4449396798674854612} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 diff --git a/game/Assets/Scenes/Checkpoints.unity b/game/Assets/Scenes/Checkpoints.unity index 6806675..d54f52c 100644 --- a/game/Assets/Scenes/Checkpoints.unity +++ b/game/Assets/Scenes/Checkpoints.unity @@ -164,19 +164,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.w - value: 0.99128854 + value: 0.99163824 objectReference: {fileID: 0} - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.x - value: 0.12065752 + value: 0.12070008 objectReference: {fileID: 0} - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.y - value: 0.05242257 + value: 0.04532883 objectReference: {fileID: 0} - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.z - value: -0.006380763 + value: -0.0055173277 objectReference: {fileID: 0} - target: {fileID: 4676633831414007564, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_Name @@ -244,15 +244,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.x - value: -0.000000007450581 + value: -0.000000022351742 objectReference: {fileID: 0} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.y - value: -0.051267557 + value: -0.051267527 objectReference: {fileID: 0} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.z - value: 0.012668034 + value: 0.012668027 objectReference: {fileID: 0} - target: {fileID: 4676633832858914731, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalPosition.x @@ -280,19 +280,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.9999745 objectReference: {fileID: 0} - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.x - value: -0.000000007450581 + value: -0.000000014901161 objectReference: {fileID: 0} - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.y - value: -0.000000007450581 + value: -0.0069458336 objectReference: {fileID: 0} - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.z - value: 0.000000003259629 + value: 0.0017162915 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} @@ -2664,98 +2664,16 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!1 &2047982323 +--- !u!1 &2047982323 stripped GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 8951021900398560348, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3} + m_PrefabInstance: {fileID: 8951021898954587823} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2047982324} - - component: {fileID: 2047982327} - - component: {fileID: 2047982326} - - component: {fileID: 2047982325} - m_Layer: 5 - m_Name: RawImage - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2047982324 +--- !u!224 &2047982324 stripped RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 8951021900398560347, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3} + m_PrefabInstance: {fileID: 8951021898954587823} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2047982323} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 20.357876, y: 11.155, z: 11.155} - m_Children: [] - m_Father: {fileID: 161044966} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!95 &2047982325 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2047982323} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 7c0792564e8a1bb45a90af39ed7b2a70, 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 &2047982326 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2047982323} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 0} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Texture: {fileID: 0} - m_UVRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 ---- !u!222 &2047982327 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2047982323} - m_CullTransparentMesh: 1 --- !u!1001 &3340651998638801630 PrefabInstance: m_ObjectHideFlags: 0 @@ -2878,3 +2796,100 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 373acc46f7fa7eb4b9cfba9c3e17b6ca, type: 3} +--- !u!1001 &8951021898954587823 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 161044966} + m_Modifications: + - target: {fileID: 8951021900398560347, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8951021900398560347, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8951021900398560347, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8951021900398560347, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8951021900398560347, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8951021900398560347, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8951021900398560347, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8951021900398560347, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 8951021900398560347, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 8951021900398560347, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8951021900398560347, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8951021900398560347, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8951021900398560347, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8951021900398560347, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8951021900398560347, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8951021900398560347, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8951021900398560347, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8951021900398560347, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8951021900398560347, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8951021900398560347, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8951021900398560347, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8951021900398560348, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3} + propertyPath: m_Name + value: Fade + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3} diff --git a/game/Assets/Scenes/Main.unity b/game/Assets/Scenes/Main.unity index 148f7af..e9fc697 100644 --- a/game/Assets/Scenes/Main.unity +++ b/game/Assets/Scenes/Main.unity @@ -698,6 +698,231 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e20114b5c13a067488940c5cc8e13b60, type: 3} m_PrefabInstance: {fileID: 3060674078258596646} m_PrefabAsset: {fileID: 0} +--- !u!1001 &229186781 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4676633830999923161, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalScale.x + value: 0.7 + objectReference: {fileID: 0} + - target: {fileID: 4676633830999923161, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalScale.y + value: 0.75 + objectReference: {fileID: 0} + - target: {fileID: 4676633830999923161, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalScale.z + value: 0.7 + objectReference: {fileID: 0} + - target: {fileID: 4676633830999923161, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalPosition.y + value: 0.75 + objectReference: {fileID: 0} + - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalPosition.x + value: 0.000001120028 + objectReference: {fileID: 0} + - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalPosition.y + value: 0.0000009719159 + objectReference: {fileID: 0} + - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalPosition.z + value: 0.0000033149042 + objectReference: {fileID: 0} + - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalRotation.w + value: 0.079581365 + objectReference: {fileID: 0} + - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalRotation.x + value: 0.00053729676 + objectReference: {fileID: 0} + - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalRotation.y + value: -0.95464575 + objectReference: {fileID: 0} + - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalRotation.z + value: 0.2869113 + objectReference: {fileID: 0} + - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalPosition.x + value: 0.70443296 + objectReference: {fileID: 0} + - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalPosition.y + value: 0.110108614 + objectReference: {fileID: 0} + - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalPosition.z + value: 2.0126235 + objectReference: {fileID: 0} + - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalRotation.w + value: 0.16829872 + objectReference: {fileID: 0} + - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalRotation.x + value: 0.02532445 + objectReference: {fileID: 0} + - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalRotation.y + value: -0.97444075 + objectReference: {fileID: 0} + - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalRotation.z + value: 0.14662722 + objectReference: {fileID: 0} + - target: {fileID: 4676633831414007564, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_Name + value: PlayerObjects (1) + objectReference: {fileID: 0} + - target: {fileID: 4676633831414007565, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_RootOrder + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 4676633831414007565, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalPosition.x + value: -8.04 + objectReference: {fileID: 0} + - target: {fileID: 4676633831414007565, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalPosition.y + value: 3.07 + objectReference: {fileID: 0} + - target: {fileID: 4676633831414007565, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalPosition.z + value: 27.94 + objectReference: {fileID: 0} + - target: {fileID: 4676633831414007565, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalRotation.w + value: 0.20485069 + objectReference: {fileID: 0} + - target: {fileID: 4676633831414007565, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4676633831414007565, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalRotation.y + value: 0.97879326 + objectReference: {fileID: 0} + - target: {fileID: 4676633831414007565, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4676633831414007565, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4676633831414007565, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 156.358 + objectReference: {fileID: 0} + - target: {fileID: 4676633831414007565, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4676633831945762708, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_Height + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 4676633831945762708, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_Center.y + value: 0.75 + objectReference: {fileID: 0} + - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalPosition.x + value: 0.0000017770028 + objectReference: {fileID: 0} + - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalPosition.y + value: 0.0000015277335 + objectReference: {fileID: 0} + - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalPosition.z + value: 0.000005210626 + objectReference: {fileID: 0} + - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalRotation.w + value: 0.079581365 + objectReference: {fileID: 0} + - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalRotation.x + value: 0.00053729676 + objectReference: {fileID: 0} + - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalRotation.y + value: -0.95464575 + objectReference: {fileID: 0} + - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalRotation.z + value: 0.2869113 + objectReference: {fileID: 0} + - target: {fileID: 4676633832858914730, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_XAxis.m_InvertInput + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4676633832858914731, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalPosition.x + value: 1.2030389 + objectReference: {fileID: 0} + - target: {fileID: 4676633832858914731, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalPosition.y + value: 0.109997034 + objectReference: {fileID: 0} + - target: {fileID: 4676633832858914731, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalPosition.z + value: 2.0282166 + objectReference: {fileID: 0} + - target: {fileID: 4676633832858914731, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalRotation.w + value: 0.98881716 + objectReference: {fileID: 0} + - target: {fileID: 4676633832858914731, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalRotation.x + value: 0.1419703 + objectReference: {fileID: 0} + - target: {fileID: 4676633832858914731, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalRotation.y + value: 0.04519987 + objectReference: {fileID: 0} + - target: {fileID: 4676633832858914731, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalRotation.z + value: -0.0064896117 + objectReference: {fileID: 0} + - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalPosition.x + value: 0.000001120028 + objectReference: {fileID: 0} + - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalPosition.y + value: 0.0000009719159 + objectReference: {fileID: 0} + - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalPosition.z + value: 0.0000033149042 + objectReference: {fileID: 0} + - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalRotation.w + value: 0.12501584 + objectReference: {fileID: 0} + - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalRotation.x + value: 0.0008440389 + objectReference: {fileID: 0} + - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalRotation.y + value: -0.9501696 + objectReference: {fileID: 0} + - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalRotation.z + value: 0.285566 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} --- !u!1 &229197011 stripped GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: ef7a51de2c5c5c5438ce6fea733533b2, type: 3} @@ -751,6 +976,11 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e73358a549de9664fa0a48ccdea07e1c, type: 3} m_PrefabInstance: {fileID: 3060674077949712666} m_PrefabAsset: {fileID: 0} +--- !u!4 &240228307 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4449396798674854634, guid: 373acc46f7fa7eb4b9cfba9c3e17b6ca, type: 3} + m_PrefabInstance: {fileID: 1860849560} + m_PrefabAsset: {fileID: 0} --- !u!1 &242240792 stripped GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: fc2b5b7551ec86542b748c3a88b39485, type: 3} @@ -836,6 +1066,11 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e20114b5c13a067488940c5cc8e13b60, type: 3} m_PrefabInstance: {fileID: 3060674078638285865} m_PrefabAsset: {fileID: 0} +--- !u!4 &269427853 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4449396798674854634, guid: 373acc46f7fa7eb4b9cfba9c3e17b6ca, type: 3} + m_PrefabInstance: {fileID: 1095622175} + m_PrefabAsset: {fileID: 0} --- !u!4 &274383064 stripped Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: f73d020fede261d4bac919488c8a778d, type: 3} @@ -896,6 +1131,76 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e20114b5c13a067488940c5cc8e13b60, type: 3} m_PrefabInstance: {fileID: 3060674079278638191} m_PrefabAsset: {fileID: 0} +--- !u!1001 &299274214 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1020287979} + m_Modifications: + - target: {fileID: 3340651998927408397, guid: e182e6daf2f187b45a07e7c89e3f1b55, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3340651998927408397, guid: e182e6daf2f187b45a07e7c89e3f1b55, type: 3} + propertyPath: m_LocalScale.x + value: 1.1735799 + objectReference: {fileID: 0} + - target: {fileID: 3340651998927408397, guid: e182e6daf2f187b45a07e7c89e3f1b55, type: 3} + propertyPath: m_LocalScale.z + value: 1.0887479 + objectReference: {fileID: 0} + - target: {fileID: 3340651998927408397, guid: e182e6daf2f187b45a07e7c89e3f1b55, type: 3} + propertyPath: m_LocalPosition.x + value: 5.19 + objectReference: {fileID: 0} + - target: {fileID: 3340651998927408397, guid: e182e6daf2f187b45a07e7c89e3f1b55, type: 3} + propertyPath: m_LocalPosition.y + value: 1.053 + objectReference: {fileID: 0} + - target: {fileID: 3340651998927408397, guid: e182e6daf2f187b45a07e7c89e3f1b55, type: 3} + propertyPath: m_LocalPosition.z + value: 3.25 + objectReference: {fileID: 0} + - target: {fileID: 3340651998927408397, guid: e182e6daf2f187b45a07e7c89e3f1b55, type: 3} + propertyPath: m_LocalRotation.w + value: 0.4405837 + objectReference: {fileID: 0} + - target: {fileID: 3340651998927408397, guid: e182e6daf2f187b45a07e7c89e3f1b55, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3340651998927408397, guid: e182e6daf2f187b45a07e7c89e3f1b55, type: 3} + propertyPath: m_LocalRotation.y + value: -0.8977116 + objectReference: {fileID: 0} + - target: {fileID: 3340651998927408397, guid: e182e6daf2f187b45a07e7c89e3f1b55, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3340651998927408397, guid: e182e6daf2f187b45a07e7c89e3f1b55, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3340651998927408397, guid: e182e6daf2f187b45a07e7c89e3f1b55, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -127.718 + objectReference: {fileID: 0} + - target: {fileID: 3340651998927408397, guid: e182e6daf2f187b45a07e7c89e3f1b55, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3340651998927408401, guid: e182e6daf2f187b45a07e7c89e3f1b55, type: 3} + propertyPath: m_Name + value: Kill Plane (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e182e6daf2f187b45a07e7c89e3f1b55, type: 3} +--- !u!4 &299274215 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3340651998927408397, guid: e182e6daf2f187b45a07e7c89e3f1b55, type: 3} + m_PrefabInstance: {fileID: 299274214} + m_PrefabAsset: {fileID: 0} --- !u!1 &299651858 stripped GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e20114b5c13a067488940c5cc8e13b60, type: 3} @@ -1278,6 +1583,11 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 84d1abd228b21df47af6e0f4750ab193, type: 3} m_PrefabInstance: {fileID: 3060674079214717604} m_PrefabAsset: {fileID: 0} +--- !u!4 &465134271 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4449396798674854634, guid: 373acc46f7fa7eb4b9cfba9c3e17b6ca, type: 3} + m_PrefabInstance: {fileID: 1301489115} + m_PrefabAsset: {fileID: 0} --- !u!4 &469513296 stripped Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 4a31c57c3ca869448a5849436b526efa, type: 3} @@ -1515,6 +1825,76 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e20114b5c13a067488940c5cc8e13b60, type: 3} m_PrefabInstance: {fileID: 3060674077909123609} m_PrefabAsset: {fileID: 0} +--- !u!1001 &489969879 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1020287979} + m_Modifications: + - target: {fileID: 3340651998927408397, guid: e182e6daf2f187b45a07e7c89e3f1b55, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3340651998927408397, guid: e182e6daf2f187b45a07e7c89e3f1b55, type: 3} + propertyPath: m_LocalScale.x + value: 1.1735799 + objectReference: {fileID: 0} + - target: {fileID: 3340651998927408397, guid: e182e6daf2f187b45a07e7c89e3f1b55, type: 3} + propertyPath: m_LocalScale.z + value: 1.0887479 + objectReference: {fileID: 0} + - target: {fileID: 3340651998927408397, guid: e182e6daf2f187b45a07e7c89e3f1b55, type: 3} + propertyPath: m_LocalPosition.x + value: -2.963 + objectReference: {fileID: 0} + - target: {fileID: 3340651998927408397, guid: e182e6daf2f187b45a07e7c89e3f1b55, type: 3} + propertyPath: m_LocalPosition.y + value: 1.813 + objectReference: {fileID: 0} + - target: {fileID: 3340651998927408397, guid: e182e6daf2f187b45a07e7c89e3f1b55, type: 3} + propertyPath: m_LocalPosition.z + value: 17.589 + objectReference: {fileID: 0} + - target: {fileID: 3340651998927408397, guid: e182e6daf2f187b45a07e7c89e3f1b55, type: 3} + propertyPath: m_LocalRotation.w + value: 0.5318899 + objectReference: {fileID: 0} + - target: {fileID: 3340651998927408397, guid: e182e6daf2f187b45a07e7c89e3f1b55, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3340651998927408397, guid: e182e6daf2f187b45a07e7c89e3f1b55, type: 3} + propertyPath: m_LocalRotation.y + value: -0.84681356 + objectReference: {fileID: 0} + - target: {fileID: 3340651998927408397, guid: e182e6daf2f187b45a07e7c89e3f1b55, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3340651998927408397, guid: e182e6daf2f187b45a07e7c89e3f1b55, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3340651998927408397, guid: e182e6daf2f187b45a07e7c89e3f1b55, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -115.734 + objectReference: {fileID: 0} + - target: {fileID: 3340651998927408397, guid: e182e6daf2f187b45a07e7c89e3f1b55, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3340651998927408401, guid: e182e6daf2f187b45a07e7c89e3f1b55, type: 3} + propertyPath: m_Name + value: Kill Plane + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e182e6daf2f187b45a07e7c89e3f1b55, type: 3} +--- !u!4 &489969880 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3340651998927408397, guid: e182e6daf2f187b45a07e7c89e3f1b55, type: 3} + m_PrefabInstance: {fileID: 489969879} + m_PrefabAsset: {fileID: 0} --- !u!1 &493198196 stripped GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e20114b5c13a067488940c5cc8e13b60, type: 3} @@ -2342,21 +2722,37 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 4676633830999923161, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalScale.x + value: 0.7 + objectReference: {fileID: 0} + - target: {fileID: 4676633830999923161, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalScale.y + value: 0.75 + objectReference: {fileID: 0} + - target: {fileID: 4676633830999923161, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalScale.z + value: 0.7 + objectReference: {fileID: 0} + - target: {fileID: 4676633830999923161, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalPosition.y + value: 0.75 + objectReference: {fileID: 0} - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.w - value: 0.9926737 + value: 0.9898497 objectReference: {fileID: 0} - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.x - value: 0.120826006 + value: 0.14211853 objectReference: {fileID: 0} - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.y - value: -6.5070663e-18 + value: -1e-45 objectReference: {fileID: 0} - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.z - value: 5.9218396e-17 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalPosition.x @@ -2372,24 +2768,28 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.w - value: 0.9913249 + value: 0.98881716 objectReference: {fileID: 0} - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.x - value: 0.12066184 + value: 0.14197029 objectReference: {fileID: 0} - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.y - value: 0.05173079 + value: 0.045199864 objectReference: {fileID: 0} - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.z - value: -0.006296556 + value: -0.0064896103 objectReference: {fileID: 0} - target: {fileID: 4676633831414007564, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_Name value: PlayerObjects objectReference: {fileID: 0} + - target: {fileID: 4676633831414007564, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4676633831414007565, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_RootOrder value: 1 @@ -2434,6 +2834,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4676633831945762708, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_Height + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 4676633831945762708, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_Center.y + value: 0.75 + objectReference: {fileID: 0} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -2448,19 +2856,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.w - value: 0.9926737 + value: 0.9898497 objectReference: {fileID: 0} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.x - value: 0.120826006 + value: 0.14211853 objectReference: {fileID: 0} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.y - value: -6.5070663e-18 + value: -1e-45 objectReference: {fileID: 0} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.z - value: 5.9218396e-17 + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4676633832858914730, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_XAxis.m_InvertInput + value: 0 objectReference: {fileID: 0} - target: {fileID: 4676633832858914731, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalPosition.x @@ -2476,19 +2888,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.w - value: 0.9913249 + value: 0.98881716 objectReference: {fileID: 0} - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.x - value: 0.12066183 + value: 0.14197028 objectReference: {fileID: 0} - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.y - value: 0.05173078 + value: 0.04519986 objectReference: {fileID: 0} - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.z - value: -0.006296554 + value: -0.006489608 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} @@ -2844,6 +3256,71 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: ca1dca8e56ef35c49b9fadf3beb9c424, type: 3} m_PrefabInstance: {fileID: 3060674079048346191} m_PrefabAsset: {fileID: 0} +--- !u!1001 &919460851 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1198040323} + m_Modifications: + - target: {fileID: 4449396798674854612, guid: 373acc46f7fa7eb4b9cfba9c3e17b6ca, type: 3} + propertyPath: m_Name + value: Safe Zone (3) + objectReference: {fileID: 0} + - target: {fileID: 4449396798674854634, guid: 373acc46f7fa7eb4b9cfba9c3e17b6ca, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4449396798674854634, guid: 373acc46f7fa7eb4b9cfba9c3e17b6ca, type: 3} + propertyPath: m_LocalScale.x + value: 0.32097137 + objectReference: {fileID: 0} + - target: {fileID: 4449396798674854634, guid: 373acc46f7fa7eb4b9cfba9c3e17b6ca, type: 3} + propertyPath: m_LocalScale.z + value: 0.15426409 + objectReference: {fileID: 0} + - target: {fileID: 4449396798674854634, guid: 373acc46f7fa7eb4b9cfba9c3e17b6ca, type: 3} + propertyPath: m_LocalPosition.x + value: 8.435 + objectReference: {fileID: 0} + - target: {fileID: 4449396798674854634, guid: 373acc46f7fa7eb4b9cfba9c3e17b6ca, type: 3} + propertyPath: m_LocalPosition.y + value: 4.237 + objectReference: {fileID: 0} + - target: {fileID: 4449396798674854634, guid: 373acc46f7fa7eb4b9cfba9c3e17b6ca, type: 3} + propertyPath: m_LocalPosition.z + value: -0.523 + objectReference: {fileID: 0} + - target: {fileID: 4449396798674854634, guid: 373acc46f7fa7eb4b9cfba9c3e17b6ca, type: 3} + propertyPath: m_LocalRotation.w + value: 0.947914 + objectReference: {fileID: 0} + - target: {fileID: 4449396798674854634, guid: 373acc46f7fa7eb4b9cfba9c3e17b6ca, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4449396798674854634, guid: 373acc46f7fa7eb4b9cfba9c3e17b6ca, type: 3} + propertyPath: m_LocalRotation.y + value: -0.3185263 + objectReference: {fileID: 0} + - target: {fileID: 4449396798674854634, guid: 373acc46f7fa7eb4b9cfba9c3e17b6ca, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4449396798674854634, guid: 373acc46f7fa7eb4b9cfba9c3e17b6ca, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4449396798674854634, guid: 373acc46f7fa7eb4b9cfba9c3e17b6ca, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -37.148 + objectReference: {fileID: 0} + - target: {fileID: 4449396798674854634, guid: 373acc46f7fa7eb4b9cfba9c3e17b6ca, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 373acc46f7fa7eb4b9cfba9c3e17b6ca, type: 3} --- !u!1 &920396230 stripped GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 2784d88b6334dc143a910f3d252aa5df, type: 3} @@ -3156,6 +3633,38 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 393a1d5e7bff81843bcfe90fa71494e2, type: 3} m_PrefabInstance: {fileID: 3060674078056130210} m_PrefabAsset: {fileID: 0} +--- !u!1 &1020287978 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1020287979} + m_Layer: 0 + m_Name: Kill Planes + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1020287979 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1020287978} + 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: 489969880} + - {fileID: 299274215} + m_Father: {fileID: 0} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1020523470 stripped GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e20114b5c13a067488940c5cc8e13b60, type: 3} @@ -3336,6 +3845,71 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: a3943167b6b50f34294c6a0efd56b89d, type: 3} m_PrefabInstance: {fileID: 3060674078964110089} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1095622175 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1198040323} + m_Modifications: + - target: {fileID: 4449396798674854612, guid: 373acc46f7fa7eb4b9cfba9c3e17b6ca, type: 3} + propertyPath: m_Name + value: Safe Zone (2) + objectReference: {fileID: 0} + - target: {fileID: 4449396798674854634, guid: 373acc46f7fa7eb4b9cfba9c3e17b6ca, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4449396798674854634, guid: 373acc46f7fa7eb4b9cfba9c3e17b6ca, type: 3} + propertyPath: m_LocalScale.x + value: 0.32097137 + objectReference: {fileID: 0} + - target: {fileID: 4449396798674854634, guid: 373acc46f7fa7eb4b9cfba9c3e17b6ca, type: 3} + propertyPath: m_LocalScale.z + value: 0.09717957 + objectReference: {fileID: 0} + - target: {fileID: 4449396798674854634, guid: 373acc46f7fa7eb4b9cfba9c3e17b6ca, type: 3} + propertyPath: m_LocalPosition.x + value: 2.677 + objectReference: {fileID: 0} + - target: {fileID: 4449396798674854634, guid: 373acc46f7fa7eb4b9cfba9c3e17b6ca, type: 3} + propertyPath: m_LocalPosition.y + value: 3.195 + objectReference: {fileID: 0} + - target: {fileID: 4449396798674854634, guid: 373acc46f7fa7eb4b9cfba9c3e17b6ca, type: 3} + propertyPath: m_LocalPosition.z + value: 7.077 + objectReference: {fileID: 0} + - target: {fileID: 4449396798674854634, guid: 373acc46f7fa7eb4b9cfba9c3e17b6ca, type: 3} + propertyPath: m_LocalRotation.w + value: 0.947914 + objectReference: {fileID: 0} + - target: {fileID: 4449396798674854634, guid: 373acc46f7fa7eb4b9cfba9c3e17b6ca, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4449396798674854634, guid: 373acc46f7fa7eb4b9cfba9c3e17b6ca, type: 3} + propertyPath: m_LocalRotation.y + value: -0.3185263 + objectReference: {fileID: 0} + - target: {fileID: 4449396798674854634, guid: 373acc46f7fa7eb4b9cfba9c3e17b6ca, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4449396798674854634, guid: 373acc46f7fa7eb4b9cfba9c3e17b6ca, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4449396798674854634, guid: 373acc46f7fa7eb4b9cfba9c3e17b6ca, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -37.148 + objectReference: {fileID: 0} + - target: {fileID: 4449396798674854634, guid: 373acc46f7fa7eb4b9cfba9c3e17b6ca, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 373acc46f7fa7eb4b9cfba9c3e17b6ca, type: 3} --- !u!4 &1095793779 stripped Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: a3943167b6b50f34294c6a0efd56b89d, type: 3} @@ -3656,6 +4230,40 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e73358a549de9664fa0a48ccdea07e1c, type: 3} m_PrefabInstance: {fileID: 3060674078881491384} m_PrefabAsset: {fileID: 0} +--- !u!1 &1198040322 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1198040323} + m_Layer: 0 + m_Name: Safe Zones + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1198040323 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1198040322} + 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: 465134271} + - {fileID: 240228307} + - {fileID: 269427853} + - {fileID: 2088394316} + m_Father: {fileID: 0} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1199129739 stripped GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e20114b5c13a067488940c5cc8e13b60, type: 3} @@ -3985,6 +4593,71 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 7b6c80936da89a0488c79b8f1ca951e7, type: 3} m_PrefabInstance: {fileID: 3060674079468279007} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1301489115 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1198040323} + m_Modifications: + - target: {fileID: 4449396798674854612, guid: 373acc46f7fa7eb4b9cfba9c3e17b6ca, type: 3} + propertyPath: m_Name + value: Safe Zone + objectReference: {fileID: 0} + - target: {fileID: 4449396798674854634, guid: 373acc46f7fa7eb4b9cfba9c3e17b6ca, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4449396798674854634, guid: 373acc46f7fa7eb4b9cfba9c3e17b6ca, type: 3} + propertyPath: m_LocalScale.x + value: 0.1499977 + objectReference: {fileID: 0} + - target: {fileID: 4449396798674854634, guid: 373acc46f7fa7eb4b9cfba9c3e17b6ca, type: 3} + propertyPath: m_LocalScale.z + value: 0.37136212 + objectReference: {fileID: 0} + - target: {fileID: 4449396798674854634, guid: 373acc46f7fa7eb4b9cfba9c3e17b6ca, type: 3} + propertyPath: m_LocalPosition.x + value: -5.143 + objectReference: {fileID: 0} + - target: {fileID: 4449396798674854634, guid: 373acc46f7fa7eb4b9cfba9c3e17b6ca, type: 3} + propertyPath: m_LocalPosition.y + value: 3.159 + objectReference: {fileID: 0} + - target: {fileID: 4449396798674854634, guid: 373acc46f7fa7eb4b9cfba9c3e17b6ca, type: 3} + propertyPath: m_LocalPosition.z + value: 22.181 + objectReference: {fileID: 0} + - target: {fileID: 4449396798674854634, guid: 373acc46f7fa7eb4b9cfba9c3e17b6ca, type: 3} + propertyPath: m_LocalRotation.w + value: 0.97503316 + objectReference: {fileID: 0} + - target: {fileID: 4449396798674854634, guid: 373acc46f7fa7eb4b9cfba9c3e17b6ca, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4449396798674854634, guid: 373acc46f7fa7eb4b9cfba9c3e17b6ca, type: 3} + propertyPath: m_LocalRotation.y + value: -0.22205947 + objectReference: {fileID: 0} + - target: {fileID: 4449396798674854634, guid: 373acc46f7fa7eb4b9cfba9c3e17b6ca, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4449396798674854634, guid: 373acc46f7fa7eb4b9cfba9c3e17b6ca, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4449396798674854634, guid: 373acc46f7fa7eb4b9cfba9c3e17b6ca, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -25.66 + objectReference: {fileID: 0} + - target: {fileID: 4449396798674854634, guid: 373acc46f7fa7eb4b9cfba9c3e17b6ca, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 373acc46f7fa7eb4b9cfba9c3e17b6ca, type: 3} --- !u!4 &1302017121 stripped Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 584f9522dd055c543863c0c60d13776e, type: 3} @@ -4075,6 +4748,108 @@ GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e20114b5c13a067488940c5cc8e13b60, type: 3} m_PrefabInstance: {fileID: 3060674077971317335} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1356834190 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2070784762} + m_Modifications: + - target: {fileID: 8951021900398560347, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8951021900398560347, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8951021900398560347, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8951021900398560347, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8951021900398560347, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8951021900398560347, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8951021900398560347, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8951021900398560347, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 8951021900398560347, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 8951021900398560347, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8951021900398560347, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8951021900398560347, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8951021900398560347, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8951021900398560347, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8951021900398560347, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8951021900398560347, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8951021900398560347, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8951021900398560347, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8951021900398560347, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8951021900398560347, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8951021900398560347, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8951021900398560348, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3} + propertyPath: m_Name + value: Fade + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3} +--- !u!224 &1356834191 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8951021900398560347, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3} + m_PrefabInstance: {fileID: 1356834190} + m_PrefabAsset: {fileID: 0} --- !u!1 &1361646743 GameObject: m_ObjectHideFlags: 0 @@ -5656,6 +6431,71 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e20114b5c13a067488940c5cc8e13b60, type: 3} m_PrefabInstance: {fileID: 3060674079724686693} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1860849560 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1198040323} + m_Modifications: + - target: {fileID: 4449396798674854612, guid: 373acc46f7fa7eb4b9cfba9c3e17b6ca, type: 3} + propertyPath: m_Name + value: Safe Zone (1) + objectReference: {fileID: 0} + - target: {fileID: 4449396798674854634, guid: 373acc46f7fa7eb4b9cfba9c3e17b6ca, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4449396798674854634, guid: 373acc46f7fa7eb4b9cfba9c3e17b6ca, type: 3} + propertyPath: m_LocalScale.x + value: 0.149289 + objectReference: {fileID: 0} + - target: {fileID: 4449396798674854634, guid: 373acc46f7fa7eb4b9cfba9c3e17b6ca, type: 3} + propertyPath: m_LocalScale.z + value: 0.37136212 + objectReference: {fileID: 0} + - target: {fileID: 4449396798674854634, guid: 373acc46f7fa7eb4b9cfba9c3e17b6ca, type: 3} + propertyPath: m_LocalPosition.x + value: -1.25 + objectReference: {fileID: 0} + - target: {fileID: 4449396798674854634, guid: 373acc46f7fa7eb4b9cfba9c3e17b6ca, type: 3} + propertyPath: m_LocalPosition.y + value: 3.023 + objectReference: {fileID: 0} + - target: {fileID: 4449396798674854634, guid: 373acc46f7fa7eb4b9cfba9c3e17b6ca, type: 3} + propertyPath: m_LocalPosition.z + value: 13.88 + objectReference: {fileID: 0} + - target: {fileID: 4449396798674854634, guid: 373acc46f7fa7eb4b9cfba9c3e17b6ca, type: 3} + propertyPath: m_LocalRotation.w + value: 0.97503316 + objectReference: {fileID: 0} + - target: {fileID: 4449396798674854634, guid: 373acc46f7fa7eb4b9cfba9c3e17b6ca, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4449396798674854634, guid: 373acc46f7fa7eb4b9cfba9c3e17b6ca, type: 3} + propertyPath: m_LocalRotation.y + value: -0.22205947 + objectReference: {fileID: 0} + - target: {fileID: 4449396798674854634, guid: 373acc46f7fa7eb4b9cfba9c3e17b6ca, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4449396798674854634, guid: 373acc46f7fa7eb4b9cfba9c3e17b6ca, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4449396798674854634, guid: 373acc46f7fa7eb4b9cfba9c3e17b6ca, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -25.66 + objectReference: {fileID: 0} + - target: {fileID: 4449396798674854634, guid: 373acc46f7fa7eb4b9cfba9c3e17b6ca, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 373acc46f7fa7eb4b9cfba9c3e17b6ca, type: 3} --- !u!1 &1861060931 stripped GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e20114b5c13a067488940c5cc8e13b60, type: 3} @@ -6386,6 +7226,7 @@ RectTransform: m_Children: - {fileID: 483749938} - {fileID: 982982466} + - {fileID: 1356834191} m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -6409,6 +7250,11 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e20114b5c13a067488940c5cc8e13b60, type: 3} m_PrefabInstance: {fileID: 3060674078877779138} m_PrefabAsset: {fileID: 0} +--- !u!4 &2088394316 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4449396798674854634, guid: 373acc46f7fa7eb4b9cfba9c3e17b6ca, type: 3} + m_PrefabInstance: {fileID: 919460851} + m_PrefabAsset: {fileID: 0} --- !u!1 &2094558010 stripped GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 4a31c57c3ca869448a5849436b526efa, type: 3} @@ -8166,7 +9012,7 @@ BoxCollider: m_Enabled: 1 serializedVersion: 2 m_Size: {x: 2.963444, y: 1.4717453, z: 1.9756303} - m_Center: {x: 0, y: 0.61299324, z: 0.0000009536743} + m_Center: {x: 0, y: -0.3, z: 0.0000009536743} --- !u!65 &3060674077665601814 BoxCollider: m_ObjectHideFlags: 0 @@ -11796,7 +12642,7 @@ BoxCollider: m_Enabled: 1 serializedVersion: 2 m_Size: {x: 2.963444, y: 1.4717453, z: 1.9756303} - m_Center: {x: 0, y: 0.61299324, z: 0.0000009536743} + m_Center: {x: 0, y: -0.3, z: 0.0000009536743} --- !u!65 &3060674077801997887 BoxCollider: m_ObjectHideFlags: 0 @@ -15250,7 +16096,7 @@ BoxCollider: m_Enabled: 1 serializedVersion: 2 m_Size: {x: 2.963444, y: 1.4717453, z: 1.9756303} - m_Center: {x: 0, y: 0.61299324, z: 0} + m_Center: {x: 0, y: -0.3, z: 0} --- !u!65 &3060674077906298992 BoxCollider: m_ObjectHideFlags: 0 @@ -15479,7 +16325,7 @@ BoxCollider: m_Enabled: 1 serializedVersion: 2 m_Size: {x: 2.963444, y: 1.4717453, z: 1.9756303} - m_Center: {x: 0.00000047683716, y: 0.61299324, z: 0.0000009536743} + m_Center: {x: 0.00000047683716, y: -0.3, z: 0.0000009536743} --- !u!65 &3060674077913818034 BoxCollider: m_ObjectHideFlags: 0 @@ -15604,7 +16450,7 @@ BoxCollider: m_Enabled: 1 serializedVersion: 2 m_Size: {x: 2.963444, y: 1.4717453, z: 1.9756304} - m_Center: {x: 0, y: 0.61299324, z: 0.0000009536743} + m_Center: {x: 0, y: -0.3, z: 0.0000009536743} --- !u!65 &3060674077916308204 BoxCollider: m_ObjectHideFlags: 0 @@ -21194,7 +22040,7 @@ BoxCollider: m_Enabled: 1 serializedVersion: 2 m_Size: {x: 2.963444, y: 1.4717453, z: 1.9756303} - m_Center: {x: 0.00000047683716, y: 0.61299324, z: 0.0000009536743} + m_Center: {x: 0.00000047683716, y: -0.3, z: 0.0000009536743} --- !u!65 &3060674078135411874 BoxCollider: m_ObjectHideFlags: 0 @@ -22809,7 +23655,7 @@ BoxCollider: m_Enabled: 1 serializedVersion: 2 m_Size: {x: 2.963444, y: 1.4717453, z: 1.9756303} - m_Center: {x: 0.00000047683716, y: 0.61299324, z: 0} + m_Center: {x: 0.00000047683716, y: -0.3, z: 0} --- !u!1001 &3060674078226151897 PrefabInstance: m_ObjectHideFlags: 0 @@ -37310,7 +38156,7 @@ BoxCollider: m_Enabled: 1 serializedVersion: 2 m_Size: {x: 2.963444, y: 1.4717453, z: 1.9756303} - m_Center: {x: 0.00000047683716, y: 0.61299324, z: 0} + m_Center: {x: 0.00000047683716, y: -0.3, z: 0} --- !u!1001 &3060674078850893960 PrefabInstance: m_ObjectHideFlags: 0 @@ -37453,7 +38299,7 @@ BoxCollider: m_Enabled: 1 serializedVersion: 2 m_Size: {x: 2.963444, y: 1.4717453, z: 1.9756303} - m_Center: {x: 0.00000047683716, y: 0.61299324, z: 0} + m_Center: {x: 0.00000047683716, y: -0.3, z: 0} --- !u!1001 &3060674078856729541 PrefabInstance: m_ObjectHideFlags: 0 @@ -42824,7 +43670,7 @@ BoxCollider: m_Enabled: 1 serializedVersion: 2 m_Size: {x: 2.963444, y: 1.4717453, z: 1.9756303} - m_Center: {x: 0, y: 0.61299324, z: 0} + m_Center: {x: 0, y: -0.3, z: 0} --- !u!1001 &3060674079073791610 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/game/Assets/Scripts/Death & Respawn/DeathZone.cs b/game/Assets/Scripts/Death & Respawn/DeathZone.cs index 8de7679..65e76aa 100644 --- a/game/Assets/Scripts/Death & Respawn/DeathZone.cs +++ b/game/Assets/Scripts/Death & Respawn/DeathZone.cs @@ -6,9 +6,6 @@ using UnityEngine; using UnityEngine.InputSystem; public class DeathZone : MonoBehaviour { - public Animator animator; - public GameObject fadeScreen; - private GameObject player; [SerializeField] private SerialVector3 _respawnPosition; @@ -28,19 +25,17 @@ 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() { - animator.SetTrigger("IsDead"); - _playerDeath.Raise(); - yield return new WaitForSeconds(0.5f); + // yield return new WaitForSeconds(0.5f); - fadeScreen.GetComponent().SetTrigger("fadeToBlack"); + // fadeScreen.GetComponent().SetTrigger("fadeToBlack"); yield return new WaitForSeconds(1.5f); // move player to respawn position player.transform.position = _respawnPosition; - fadeScreen.GetComponent().SetTrigger("fadeToClear"); + // fadeScreen.GetComponent().SetTrigger("fadeToClear"); yield return new WaitForSeconds(0.5f); _playerRespawn.Raise(); diff --git a/game/Assets/Settings/Player/PlayerMovementSettings.asset b/game/Assets/Settings/Player/PlayerMovementSettings.asset index fb24000..3183b97 100644 --- a/game/Assets/Settings/Player/PlayerMovementSettings.asset +++ b/game/Assets/Settings/Player/PlayerMovementSettings.asset @@ -16,14 +16,14 @@ MonoBehaviour: _upGravity: 15 _downGravity: 40 _groundedYVelocity: -1 - _baseMovementForce: 50 + _baseMovementForce: 30 _jumpHeight: 1.5 _coyoteTime: 0.15 _boostForce: 45 _boostTime: 0.75 _minBoostVelocity: 0 - _blinkDistance: 2 - _blinkVelocity: 50 + _blinkDistance: 0.5 + _blinkVelocity: 20 _dragCoefficient: 7 _boostDragCoefficient: 15 _airDragCoefficient: 7