From cc7dcba69af7d2adeb845826abcdc275ea839fca Mon Sep 17 00:00:00 2001 From: jreason Date: Sun, 30 Jan 2022 16:26:12 +1100 Subject: [PATCH] Added post to camera prefab --- .../Art Assets/Animations/Player/Death.anim | 52 ++- Assets/Art Assets/Animations/Player/Jump.anim | 2 +- Assets/Art Assets/Animations/Player/Land.anim | 31 +- .../Art Assets/Animations/Player/Respawn.anim | 2 +- .../Player/char_dude_sheet_0.controller | 414 ++++++++++++++++-- Assets/Prefabs/2D Camera.prefab | 173 +++++++- Assets/Scenes/Level 1_Profiles.meta | 8 + .../Level 1_Profiles/PostVolume Profile.asset | 3 + .../PostVolume Profile.asset.meta | 8 + Assets/Scenes/Official Levels/Level 1.unity | 4 +- ProjectSettings/TagManager.asset | 4 +- 11 files changed, 659 insertions(+), 42 deletions(-) create mode 100644 Assets/Scenes/Level 1_Profiles.meta create mode 100644 Assets/Scenes/Level 1_Profiles/PostVolume Profile.asset create mode 100644 Assets/Scenes/Level 1_Profiles/PostVolume Profile.asset.meta diff --git a/Assets/Art Assets/Animations/Player/Death.anim b/Assets/Art Assets/Animations/Player/Death.anim index b45b930..bd64947 100644 --- a/Assets/Art Assets/Animations/Player/Death.anim +++ b/Assets/Art Assets/Animations/Player/Death.anim @@ -17,15 +17,57 @@ AnimationClip: m_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: [] - m_PPtrCurves: [] - m_SampleRate: 60 + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: -1130990168749118884, guid: aa8c58dcbc4c4a44891bacb2bc1e3480, type: 3} + - time: 0.1 + value: {fileID: -6506353862313380523, guid: aa8c58dcbc4c4a44891bacb2bc1e3480, type: 3} + - time: 0.2 + value: {fileID: 4754544157503018000, guid: aa8c58dcbc4c4a44891bacb2bc1e3480, type: 3} + - time: 0.3 + value: {fileID: 2094434571209798077, guid: aa8c58dcbc4c4a44891bacb2bc1e3480, type: 3} + - time: 0.4 + value: {fileID: -863411553096456362, guid: aa8c58dcbc4c4a44891bacb2bc1e3480, type: 3} + - time: 0.5 + value: {fileID: 1413998266429176388, guid: aa8c58dcbc4c4a44891bacb2bc1e3480, type: 3} + - time: 0.6 + value: {fileID: 3947605904683458874, guid: aa8c58dcbc4c4a44891bacb2bc1e3480, type: 3} + - time: 0.7 + value: {fileID: 4793578342869019371, guid: aa8c58dcbc4c4a44891bacb2bc1e3480, type: 3} + - time: 0.8 + value: {fileID: -543680488146147476, guid: aa8c58dcbc4c4a44891bacb2bc1e3480, type: 3} + - time: 0.9 + value: {fileID: -6848117525730282599, guid: aa8c58dcbc4c4a44891bacb2bc1e3480, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 10 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: - genericBindings: [] - pptrCurveMapping: [] + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: -1130990168749118884, guid: aa8c58dcbc4c4a44891bacb2bc1e3480, type: 3} + - {fileID: -6506353862313380523, guid: aa8c58dcbc4c4a44891bacb2bc1e3480, type: 3} + - {fileID: 4754544157503018000, guid: aa8c58dcbc4c4a44891bacb2bc1e3480, type: 3} + - {fileID: 2094434571209798077, guid: aa8c58dcbc4c4a44891bacb2bc1e3480, type: 3} + - {fileID: -863411553096456362, guid: aa8c58dcbc4c4a44891bacb2bc1e3480, type: 3} + - {fileID: 1413998266429176388, guid: aa8c58dcbc4c4a44891bacb2bc1e3480, type: 3} + - {fileID: 3947605904683458874, guid: aa8c58dcbc4c4a44891bacb2bc1e3480, type: 3} + - {fileID: 4793578342869019371, guid: aa8c58dcbc4c4a44891bacb2bc1e3480, type: 3} + - {fileID: -543680488146147476, guid: aa8c58dcbc4c4a44891bacb2bc1e3480, type: 3} + - {fileID: -6848117525730282599, guid: aa8c58dcbc4c4a44891bacb2bc1e3480, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} @@ -36,7 +78,7 @@ AnimationClip: m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 + m_LoopTime: 0 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 diff --git a/Assets/Art Assets/Animations/Player/Jump.anim b/Assets/Art Assets/Animations/Player/Jump.anim index 968c0d0..59a519c 100644 --- a/Assets/Art Assets/Animations/Player/Jump.anim +++ b/Assets/Art Assets/Animations/Player/Jump.anim @@ -57,7 +57,7 @@ AnimationClip: m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 + m_LoopTime: 0 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 diff --git a/Assets/Art Assets/Animations/Player/Land.anim b/Assets/Art Assets/Animations/Player/Land.anim index 00bed87..99250ee 100644 --- a/Assets/Art Assets/Animations/Player/Land.anim +++ b/Assets/Art Assets/Animations/Player/Land.anim @@ -17,21 +17,42 @@ AnimationClip: m_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: [] - m_PPtrCurves: [] - m_SampleRate: 60 + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: -5829088028203451469, guid: aa8c58dcbc4c4a44891bacb2bc1e3480, type: 3} + - time: 0.2 + value: {fileID: -6106978915562255304, guid: aa8c58dcbc4c4a44891bacb2bc1e3480, type: 3} + - time: 0.4 + value: {fileID: -1731233919740330482, guid: aa8c58dcbc4c4a44891bacb2bc1e3480, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 5 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: - genericBindings: [] - pptrCurveMapping: [] + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: -5829088028203451469, guid: aa8c58dcbc4c4a44891bacb2bc1e3480, type: 3} + - {fileID: -6106978915562255304, guid: aa8c58dcbc4c4a44891bacb2bc1e3480, type: 3} + - {fileID: -1731233919740330482, guid: aa8c58dcbc4c4a44891bacb2bc1e3480, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1 + m_StopTime: 0.6 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Art Assets/Animations/Player/Respawn.anim b/Assets/Art Assets/Animations/Player/Respawn.anim index 6a4867b..fd6cd43 100644 --- a/Assets/Art Assets/Animations/Player/Respawn.anim +++ b/Assets/Art Assets/Animations/Player/Respawn.anim @@ -18,7 +18,7 @@ AnimationClip: m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: [] - m_SampleRate: 60 + m_SampleRate: 5 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Art Assets/Animations/Player/char_dude_sheet_0.controller b/Assets/Art Assets/Animations/Player/char_dude_sheet_0.controller index a4a6d74..837ca2c 100644 --- a/Assets/Art Assets/Animations/Player/char_dude_sheet_0.controller +++ b/Assets/Art Assets/Animations/Player/char_dude_sheet_0.controller @@ -9,32 +9,88 @@ AnimatorStateMachine: m_PrefabAsset: {fileID: 0} m_Name: Base Layer m_ChildStates: - - serializedVersion: 1 - m_State: {fileID: 7362820289311233603} - m_Position: {x: 250, y: 50, z: 0} - serializedVersion: 1 m_State: {fileID: -7295105259923327763} - m_Position: {x: 220, y: 160, z: 0} + m_Position: {x: 230, y: 160, z: 0} - serializedVersion: 1 m_State: {fileID: -1015753534130550811} - m_Position: {x: 520, y: 170, z: 0} + m_Position: {x: 540, y: 160, z: 0} - serializedVersion: 1 m_State: {fileID: 8877498876689208193} - m_Position: {x: 210, y: 270, z: 0} + m_Position: {x: 230, y: 250, z: 0} - serializedVersion: 1 m_State: {fileID: -1036971301840670232} - m_Position: {x: 240, y: -130, z: 0} + m_Position: {x: 210, y: -80, z: 0} + - serializedVersion: 1 + m_State: {fileID: -4821384715217836966} + m_Position: {x: 230, y: 70, z: 0} + - serializedVersion: 1 + m_State: {fileID: -7587031297624985361} + m_Position: {x: -130, y: -70, z: 0} + - serializedVersion: 1 + m_State: {fileID: 73646322052683359} + m_Position: {x: 530, y: 270, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: - {fileID: 4013896018886709174} + - {fileID: 7586304787077706890} + - {fileID: -1884254647595299453} m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} - m_EntryPosition: {x: 50, y: 120, z: 0} + m_AnyStatePosition: {x: -110, y: 80, z: 0} + m_EntryPosition: {x: -120, y: 230, z: 0} m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: 8877498876689208193} + m_DefaultState: {fileID: -7295105259923327763} +--- !u!1101 &-8559341710400309498 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -7295105259923327763} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.1273385 + m_TransitionOffset: 0.53841525 + m_ExitTime: 1.2434974 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &-7587031297624985361 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Death + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: de457e59ca99d9440a3e448860144a88, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &-7295105259923327763 AnimatorState: serializedVersion: 6 @@ -45,7 +101,9 @@ AnimatorState: m_Name: Idle m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: 1548136287311106506} + - {fileID: -6598409021805069031} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -61,6 +119,133 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &-6598409021805069031 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: isMoving + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 8877498876689208193} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.015555531 + m_TransitionOffset: 0 + m_ExitTime: 0.5833334 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &-4821384715217836966 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Respawn + m_Speed: -1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 5550286818186606828} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: de457e59ca99d9440a3e448860144a88, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &-3990766927130502963 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Land + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 73646322052683359} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.005813837 + m_TransitionOffset: 0.8139535 + m_ExitTime: 0.9903104 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-3169577178935437770 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Jump + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -1015753534130550811} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.0112403035 + m_TransitionOffset: 0 + m_ExitTime: 0.68750006 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-1884254647595299453 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Death + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -7587031297624985361} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.010826945 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &-1036971301840670232 AnimatorState: serializedVersion: 6 @@ -97,7 +282,8 @@ AnimatorState: m_Name: Jump m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: -3990766927130502963} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -113,6 +299,31 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &-187383330418473904 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: isMoving + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 8877498876689208193} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.022687316 + m_TransitionOffset: 0.27732557 + m_ExitTime: 0.90620196 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -128,6 +339,36 @@ AnimatorController: m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 0} + - m_Name: Respawn + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + - m_Name: Death + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + - m_Name: Land + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + - m_Name: Jump + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + - m_Name: isMoving + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -141,42 +382,41 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} ---- !u!1101 &4013896018886709174 +--- !u!1101 &41124097821849125 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: - m_Conditions: - - m_ConditionMode: 1 - m_ConditionEvent: Victory - m_EventTreshold: 0 + m_Conditions: [] m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: -1036971301840670232} + m_DstState: {fileID: -7295105259923327763} m_Solo: 0 m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.014670372 + m_TransitionDuration: 0.25 m_TransitionOffset: 0 m_ExitTime: 0.75 - m_HasExitTime: 0 + m_HasExitTime: 1 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1102 &7362820289311233603 +--- !u!1102 &73646322052683359 AnimatorState: serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Animation + m_Name: Land m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: -8559341710400309498} + - {fileID: -187383330418473904} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -186,12 +426,134 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: cd5df9c8c1e3ab545897a334aba61fd3, type: 2} + m_Motion: {fileID: 7400000, guid: 5a26a046d2fbfac4fb272dfb1eaf4773, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &1548136287311106506 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Jump + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -1015753534130550811} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.01186043 + m_TransitionOffset: 0 + m_ExitTime: 0.5833334 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &4013896018886709174 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Victory + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -1036971301840670232} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.014670372 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &5550286818186606828 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -7295105259923327763} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &6054287335756161440 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: isMoving + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -7295105259923327763} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.6875 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &7586304787077706890 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Respawn + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -4821384715217836966} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.01351428 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &8877498876689208193 AnimatorState: serializedVersion: 6 @@ -202,7 +564,9 @@ AnimatorState: m_Name: Run m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: -3169577178935437770} + - {fileID: 6054287335756161440} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 diff --git a/Assets/Prefabs/2D Camera.prefab b/Assets/Prefabs/2D Camera.prefab index 345a1ad..70ba2e6 100644 --- a/Assets/Prefabs/2D Camera.prefab +++ b/Assets/Prefabs/2D Camera.prefab @@ -509,6 +509,54 @@ MonoBehaviour: cam: {fileID: 2742648452306802123} parallaxEffect_x: 0.38 parallaxEffect_y: 0.65 +--- !u!1 &2135817262 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2135817263} + - component: {fileID: 2135817264} + m_Layer: 10 + m_Name: PostProcessing + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2135817263 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2135817262} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2742648452306802124} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2135817264 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2135817262} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8b9a305e18de0c04dbd257a21cd47087, type: 3} + m_Name: + m_EditorClassIdentifier: + sharedProfile: {fileID: 11400000, guid: 521284d0610c165468bc6e758ccd3170, type: 2} + isGlobal: 1 + blendDistance: 0 + weight: 1 + priority: 0 --- !u!1 &2742648450655999644 GameObject: m_ObjectHideFlags: 0 @@ -521,6 +569,7 @@ GameObject: - component: {fileID: 2742648450655999840} - component: {fileID: 2742648450655999646} - component: {fileID: 2742648450655999841} + - component: {fileID: 1188007456} m_Layer: 0 m_Name: Camera Mask m_TagString: Untagged @@ -619,6 +668,66 @@ MonoBehaviour: m_CropFrameX: 0 m_CropFrameY: 0 m_StretchFill: 0 +--- !u!114 &1188007456 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2742648450655999644} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 948f4100a11a5c24981795d21301da5c, type: 3} + m_Name: + m_EditorClassIdentifier: + volumeTrigger: {fileID: 2742648450655999647} + volumeLayer: + serializedVersion: 2 + m_Bits: 1025 + stopNaNPropagation: 1 + finalBlitToCameraTarget: 0 + antialiasingMode: 0 + temporalAntialiasing: + jitterSpread: 0.75 + sharpness: 0.25 + stationaryBlending: 0.95 + motionBlending: 0.85 + subpixelMorphologicalAntialiasing: + quality: 2 + fastApproximateAntialiasing: + fastMode: 0 + keepAlpha: 0 + fog: + enabled: 1 + excludeSkybox: 1 + debugLayer: + lightMeter: + width: 512 + height: 256 + showCurves: 1 + histogram: + width: 512 + height: 256 + channel: 3 + waveform: + exposure: 0.12 + height: 256 + vectorscope: + size: 256 + exposure: 0.12 + overlaySettings: + linearDepth: 0 + motionColorIntensity: 4 + motionGridSize: 64 + colorBlindnessType: 0 + colorBlindnessStrength: 1 + m_Resources: {fileID: 11400000, guid: d82512f9c8e5d4a4d938b575d47f88d4, type: 2} + m_ShowToolkit: 0 + m_ShowCustomSorter: 0 + breakBeforeColorGrading: 0 + m_BeforeTransparentBundles: [] + m_BeforeStackBundles: [] + m_AfterStackBundles: [] --- !u!1 &2742648452306802123 GameObject: m_ObjectHideFlags: 0 @@ -633,6 +742,7 @@ GameObject: - component: {fileID: 2742648452306802127} - component: {fileID: 2742648452306802129} - component: {fileID: 7035977061392704193} + - component: {fileID: 515301201} m_Layer: 0 m_Name: 2D Camera m_TagString: Untagged @@ -653,6 +763,7 @@ Transform: m_Children: - {fileID: 2742648450655999647} - {fileID: 1980583001} + - {fileID: 2135817263} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -755,7 +866,67 @@ MonoBehaviour: m_EditorClassIdentifier: Player: {fileID: 0} m_FollowStrength: 3 - m_FollowX: 1 + m_FollowX: 0 m_FollowY: 0 m_OffsetX: 0 m_OffsetY: 2 +--- !u!114 &515301201 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2742648452306802123} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 948f4100a11a5c24981795d21301da5c, type: 3} + m_Name: + m_EditorClassIdentifier: + volumeTrigger: {fileID: 2742648452306802124} + volumeLayer: + serializedVersion: 2 + m_Bits: 1025 + stopNaNPropagation: 1 + finalBlitToCameraTarget: 0 + antialiasingMode: 0 + temporalAntialiasing: + jitterSpread: 0.75 + sharpness: 0.25 + stationaryBlending: 0.95 + motionBlending: 0.85 + subpixelMorphologicalAntialiasing: + quality: 2 + fastApproximateAntialiasing: + fastMode: 0 + keepAlpha: 0 + fog: + enabled: 1 + excludeSkybox: 1 + debugLayer: + lightMeter: + width: 512 + height: 256 + showCurves: 1 + histogram: + width: 512 + height: 256 + channel: 3 + waveform: + exposure: 0.12 + height: 256 + vectorscope: + size: 256 + exposure: 0.12 + overlaySettings: + linearDepth: 0 + motionColorIntensity: 4 + motionGridSize: 64 + colorBlindnessType: 0 + colorBlindnessStrength: 1 + m_Resources: {fileID: 11400000, guid: d82512f9c8e5d4a4d938b575d47f88d4, type: 2} + m_ShowToolkit: 0 + m_ShowCustomSorter: 0 + breakBeforeColorGrading: 0 + m_BeforeTransparentBundles: [] + m_BeforeStackBundles: [] + m_AfterStackBundles: [] diff --git a/Assets/Scenes/Level 1_Profiles.meta b/Assets/Scenes/Level 1_Profiles.meta new file mode 100644 index 0000000..825926e --- /dev/null +++ b/Assets/Scenes/Level 1_Profiles.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6f045fde4dcdb27428020b1bf5d9d5e0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Level 1_Profiles/PostVolume Profile.asset b/Assets/Scenes/Level 1_Profiles/PostVolume Profile.asset new file mode 100644 index 0000000..75be7e2 --- /dev/null +++ b/Assets/Scenes/Level 1_Profiles/PostVolume Profile.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:42777b1cdc258dc5a3fb8eedcc5977304f052f3d1af68bfdafa444f8eee85f2f +size 1163 diff --git a/Assets/Scenes/Level 1_Profiles/PostVolume Profile.asset.meta b/Assets/Scenes/Level 1_Profiles/PostVolume Profile.asset.meta new file mode 100644 index 0000000..327608f --- /dev/null +++ b/Assets/Scenes/Level 1_Profiles/PostVolume Profile.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 521284d0610c165468bc6e758ccd3170 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Official Levels/Level 1.unity b/Assets/Scenes/Official Levels/Level 1.unity index dabd8bc..a75a365 100644 --- a/Assets/Scenes/Official Levels/Level 1.unity +++ b/Assets/Scenes/Official Levels/Level 1.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9fb0e1bc7b30c3f3142173c049d247b636f99714d9f89f1645cff5f034778790 -size 173708 +oid sha256:48909cfdfdff4b6287c7302b6941ef885d2326cc8afa0d8b890c102a66d84f45 +size 173901 diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 999df3f..96228b4 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:170d75d8589198c2ec9e7c49772909246e461436a53ffc1d47f9dce1897b6571 -size 588 +oid sha256:f0e68e02b5e44c76ed92cf558d116b4e2cd2c777fcb8d2048025a02f41a45b78 +size 603