diff --git a/Assets/Animations/Player/Idle.anim b/Assets/Animations/Player/Idle.anim index a5394fa..23320ab 100644 --- a/Assets/Animations/Player/Idle.anim +++ b/Assets/Animations/Player/Idle.anim @@ -17,21 +17,48 @@ AnimationClip: m_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: [] - m_PPtrCurves: [] - m_SampleRate: 60 + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 1298688296, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - time: 0.083333336 + value: {fileID: -1592093818, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - time: 0.16666667 + value: {fileID: -1841721584, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - time: 0.25 + value: {fileID: -526475696, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - time: 0.33333334 + value: {fileID: 825225972, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 12 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: 1298688296, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - {fileID: -1592093818, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - {fileID: -1841721584, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - {fileID: -526475696, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - {fileID: 825225972, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1 + m_StopTime: 0.4166667 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Animations/Player/JumpAir.anim b/Assets/Animations/Player/JumpAir.anim index 24a5abf..b7d4ac4 100644 --- a/Assets/Animations/Player/JumpAir.anim +++ b/Assets/Animations/Player/JumpAir.anim @@ -17,21 +17,45 @@ AnimationClip: m_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: [] - m_PPtrCurves: [] - m_SampleRate: 60 + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 1293344572, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - time: 0.083333336 + value: {fileID: 118679525, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - time: 0.16666667 + value: {fileID: 1291750529, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - time: 0.25 + value: {fileID: 2143467853, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 12 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: 1293344572, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - {fileID: 118679525, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - {fileID: 1291750529, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - {fileID: 2143467853, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1 + m_StopTime: 0.33333334 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Animations/Player/JumpGround.anim b/Assets/Animations/Player/JumpGround.anim index fd9d652..9aa09ca 100644 --- a/Assets/Animations/Player/JumpGround.anim +++ b/Assets/Animations/Player/JumpGround.anim @@ -17,21 +17,36 @@ AnimationClip: m_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: [] - m_PPtrCurves: [] - m_SampleRate: 60 + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 180603488, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 12 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: 180603488, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1 + m_StopTime: 0.083333336 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Animations/Player/OnWall.anim b/Assets/Animations/Player/OnWall.anim index 143f087..e7e82fb 100644 --- a/Assets/Animations/Player/OnWall.anim +++ b/Assets/Animations/Player/OnWall.anim @@ -17,21 +17,54 @@ AnimationClip: m_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: [] - m_PPtrCurves: [] - m_SampleRate: 60 + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: -2109353353, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - time: 0.083333336 + value: {fileID: -932523871, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - time: 0.16666667 + value: {fileID: 2059507875, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - time: 0.25 + value: {fileID: -724040594, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - time: 0.33333334 + value: {fileID: -1692090074, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - time: 0.41666666 + value: {fileID: -2100026830, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - time: 0.5 + value: {fileID: 231691911, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 12 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: -2109353353, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - {fileID: -932523871, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - {fileID: 2059507875, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - {fileID: -724040594, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - {fileID: -1692090074, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - {fileID: -2100026830, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - {fileID: 231691911, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1 + m_StopTime: 0.5833333 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Animations/Player/Player_0.controller b/Assets/Animations/Player/Player_0.controller index 321967d..01fbfdb 100644 --- a/Assets/Animations/Player/Player_0.controller +++ b/Assets/Animations/Player/Player_0.controller @@ -1,5 +1,198 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-8613436459369443590 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Running + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -1798893594530744804} + - {fileID: 8982759075538510720} + 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: c22f1d967a219344794e3c79ae1b58db, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-7542654066399577077 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: OnWall + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 8640300907456473062} + - {fileID: -6298589679011570278} + 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: b40c9e52b72cda847a456f33b2c9cccf, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &-6298589679011570278 +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: IsGrounded + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 8841932906669489095} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.57142854 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1107 &-2216743789181273551 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -1525671331961030051} + m_Position: {x: 250, y: 110, z: 0} + - serializedVersion: 1 + m_State: {fileID: -8613436459369443590} + m_Position: {x: 250, y: 20, z: 0} + - serializedVersion: 1 + m_State: {fileID: 7974611625089174929} + m_Position: {x: 520, y: 20, z: 0} + - serializedVersion: 1 + m_State: {fileID: 8841932906669489095} + m_Position: {x: 520, y: 110, z: 0} + - serializedVersion: 1 + m_State: {fileID: -7542654066399577077} + m_Position: {x: 520, y: 190, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -1525671331961030051} +--- !u!1101 &-1798893594530744804 +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: -1525671331961030051} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.6666666 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &-1525671331961030051 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Idle + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 1488931661999545412} + - {fileID: 2972019993004144147} + 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: 3dcac57792de99b42af886a58c114b87, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &-437303800614401744 +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: IsWalled + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -7542654066399577077} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.25 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -8,5 +201,298 @@ AnimatorController: m_PrefabAsset: {fileID: 0} m_Name: Player_0 serializedVersion: 5 - m_AnimatorParameters: [] - m_AnimatorLayers: [] + m_AnimatorParameters: + - m_Name: IsMoving + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + - m_Name: IsGrounded + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + - m_Name: IsWalled + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -2216743789181273551} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1101 &1300809511730035479 +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: IsGrounded + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 7974611625089174929} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.25 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &1488931661999545412 +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: -8613436459369443590} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.5 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &2972019993004144147 +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: IsGrounded + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 7974611625089174929} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.40000004 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &6028671517645131491 +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: IsGrounded + m_EventTreshold: 0 + - m_ConditionMode: 2 + m_ConditionEvent: IsMoving + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -1525671331961030051} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &7260839726499541870 +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: IsGrounded + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 8841932906669489095} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &7974611625089174929 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: JumpGround + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 8593646280528163568} + - {fileID: 6028671517645131491} + - {fileID: 7260839726499541870} + 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: 8a1902a8ce16cab4b9308fe4c5dd948c, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &8593646280528163568 +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: IsGrounded + m_EventTreshold: 0 + - m_ConditionMode: 1 + m_ConditionEvent: IsMoving + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -8613436459369443590} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &8640300907456473062 +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: IsWalled + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 8841932906669489095} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.57142854 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &8841932906669489095 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: JumpAir + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 1300809511730035479} + - {fileID: -437303800614401744} + 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: f30e36d57252aa742ac4dfa3795d2514, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &8982759075538510720 +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: IsGrounded + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 7974611625089174929} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 diff --git a/Assets/Animations/Player/Running.anim b/Assets/Animations/Player/Running.anim index 813ed4c..f0dcfdf 100644 --- a/Assets/Animations/Player/Running.anim +++ b/Assets/Animations/Player/Running.anim @@ -17,21 +17,60 @@ AnimationClip: m_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: [] - m_PPtrCurves: [] - m_SampleRate: 60 + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: -1414671332, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - time: 0.083333336 + value: {fileID: 1107039308, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - time: 0.16666667 + value: {fileID: 1791482633, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - time: 0.25 + value: {fileID: 839540401, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - time: 0.33333334 + value: {fileID: 1146259828, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - time: 0.41666666 + value: {fileID: -375057873, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - time: 0.5 + value: {fileID: -284386636, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - time: 0.5833333 + value: {fileID: 1394398855, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - time: 0.6666667 + value: {fileID: -2011013116, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 12 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: -1414671332, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - {fileID: 1107039308, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - {fileID: 1791482633, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - {fileID: 839540401, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - {fileID: 1146259828, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - {fileID: -375057873, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - {fileID: -284386636, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - {fileID: 1394398855, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - {fileID: -2011013116, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1 + m_StopTime: 0.75 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Audio.meta b/Assets/Audio.meta new file mode 100644 index 0000000..d8351df --- /dev/null +++ b/Assets/Audio.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ee0c3e4862980f34aa05eea70b87ae18 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Audio Mixer.mixer b/Assets/Audio/Audio Mixer.mixer new file mode 100644 index 0000000..260be48 --- /dev/null +++ b/Assets/Audio/Audio Mixer.mixer @@ -0,0 +1,173 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!244 &-7037003476990620901 +AudioMixerEffectController: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_EffectID: 7d3a5eeccceda45448eda2628e42ea7a + m_EffectName: Attenuation + m_MixLevel: c2d1bdd8f0d38af40a5f240180713495 + m_Parameters: [] + m_SendTarget: {fileID: 0} + m_EnableWetMix: 0 + m_Bypass: 0 +--- !u!244 &-6685938579179752856 +AudioMixerEffectController: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_EffectID: ceb5e6875cdbb48469f261a8f82b9108 + m_EffectName: Attenuation + m_MixLevel: 03a0a2975562f604e9015f77384f0b1b + m_Parameters: [] + m_SendTarget: {fileID: 0} + m_EnableWetMix: 0 + m_Bypass: 0 +--- !u!243 &-2600467795151966735 +AudioMixerGroupController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Jump + m_AudioMixer: {fileID: 24100000} + m_GroupID: 5c6c050f48fa1cf418601041c7d6c16f + m_Children: [] + m_Volume: a1af4b69dd3ea7f45ae1c3192eb02717 + m_Pitch: 94afc4d15d9d74b429d2920237994c2b + m_Send: 00000000000000000000000000000000 + m_Effects: + - {fileID: -6685938579179752856} + m_UserColorIndex: 0 + m_Mute: 0 + m_Solo: 0 + m_BypassEffects: 0 +--- !u!241 &24100000 +AudioMixerController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Audio Mixer + m_OutputGroup: {fileID: 0} + m_MasterGroup: {fileID: 24300002} + m_Snapshots: + - {fileID: 24500006} + m_StartSnapshot: {fileID: 24500006} + m_SuspendThreshold: -80 + m_EnableSuspend: 1 + m_UpdateMode: 0 + m_ExposedParameters: [] + m_AudioMixerGroupViews: + - guids: + - 71b61959ea8c5ee43b5f1913df7278f4 + - 5c6c050f48fa1cf418601041c7d6c16f + - aec3f58549ce7b4478c453c40c434318 + - 88391c573bd80364c916040d855538c8 + name: View + m_CurrentViewIndex: 0 + m_TargetSnapshot: {fileID: 24500006} +--- !u!243 &24300002 +AudioMixerGroupController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Master + m_AudioMixer: {fileID: 24100000} + m_GroupID: 71b61959ea8c5ee43b5f1913df7278f4 + m_Children: + - {fileID: -2600467795151966735} + - {fileID: 8913006207396984383} + - {fileID: 8377903610078173799} + m_Volume: c8ed3e32c19202b4daadc5c4fb90bf76 + m_Pitch: d51ab31c176e6894b94b24c01f74415f + m_Send: 00000000000000000000000000000000 + m_Effects: + - {fileID: 24400004} + m_UserColorIndex: 0 + m_Mute: 0 + m_Solo: 0 + m_BypassEffects: 0 +--- !u!244 &24400004 +AudioMixerEffectController: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_EffectID: 89efd163d580f8043a2f697a1ef8009b + m_EffectName: Attenuation + m_MixLevel: 160dfd00e45f3db469fc0bec25b297ae + m_Parameters: [] + m_SendTarget: {fileID: 0} + m_EnableWetMix: 0 + m_Bypass: 0 +--- !u!245 &24500006 +AudioMixerSnapshotController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Snapshot + m_AudioMixer: {fileID: 24100000} + m_SnapshotID: 7b03920a55d36f54bac08488dc018422 + m_FloatValues: {} + m_TransitionOverrides: {} +--- !u!244 &6357565719084711451 +AudioMixerEffectController: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_EffectID: 6547f870e7dafe34a8af79345a076e0f + m_EffectName: Attenuation + m_MixLevel: d36c0b9885263dd4db97b729dbf82021 + m_Parameters: [] + m_SendTarget: {fileID: 0} + m_EnableWetMix: 0 + m_Bypass: 0 +--- !u!243 &8377903610078173799 +AudioMixerGroupController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Projectile + m_AudioMixer: {fileID: 24100000} + m_GroupID: 88391c573bd80364c916040d855538c8 + m_Children: [] + m_Volume: 2c4223d0669e7fa4a9bcd208d65d7586 + m_Pitch: 204d50d8b21017e41b743bceefd553b6 + m_Send: 00000000000000000000000000000000 + m_Effects: + - {fileID: -7037003476990620901} + m_UserColorIndex: 0 + m_Mute: 0 + m_Solo: 0 + m_BypassEffects: 0 +--- !u!243 &8913006207396984383 +AudioMixerGroupController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Music + m_AudioMixer: {fileID: 24100000} + m_GroupID: aec3f58549ce7b4478c453c40c434318 + m_Children: [] + m_Volume: a449b5dff9f05be428c783227ba1ebfb + m_Pitch: fae96bdf79988494787e666372f8ef2e + m_Send: 00000000000000000000000000000000 + m_Effects: + - {fileID: 6357565719084711451} + m_UserColorIndex: 0 + m_Mute: 0 + m_Solo: 0 + m_BypassEffects: 0 diff --git a/Assets/Audio/Audio Mixer.mixer.meta b/Assets/Audio/Audio Mixer.mixer.meta new file mode 100644 index 0000000..1f0e86f --- /dev/null +++ b/Assets/Audio/Audio Mixer.mixer.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 55dad93ba7816e44c83798006fa0a277 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 24100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Sound Effects.meta b/Assets/Audio/Sound Effects.meta new file mode 100644 index 0000000..b97826c --- /dev/null +++ b/Assets/Audio/Sound Effects.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 548dfd7daaf387244998fc1ae1ff0687 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Sound Effects/Jump.bfxrsound b/Assets/Audio/Sound Effects/Jump.bfxrsound new file mode 100644 index 0000000..f8df804 --- /dev/null +++ b/Assets/Audio/Sound Effects/Jump.bfxrsound @@ -0,0 +1 @@ +,0.5,,0.2439,,,0.2,0.29,,0.2099,0.2649,,,,,,0.01,,,,0.2963,,,,,0.11,,,,,,,masterVolume \ No newline at end of file diff --git a/Assets/Audio/Sound Effects/Jump.bfxrsound.meta b/Assets/Audio/Sound Effects/Jump.bfxrsound.meta new file mode 100644 index 0000000..fead5d8 --- /dev/null +++ b/Assets/Audio/Sound Effects/Jump.bfxrsound.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 43ffa6979badfe841b831bebf4dcb21c +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Sound Effects/Jump.wav b/Assets/Audio/Sound Effects/Jump.wav new file mode 100644 index 0000000..0b9bde4 Binary files /dev/null and b/Assets/Audio/Sound Effects/Jump.wav differ diff --git a/Assets/Audio/Sound Effects/Jump.wav.meta b/Assets/Audio/Sound Effects/Jump.wav.meta new file mode 100644 index 0000000..d6d9cfd --- /dev/null +++ b/Assets/Audio/Sound Effects/Jump.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: c366515880a212d45aad5408ce027da3 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 1 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Playable/Player.prefab b/Assets/Resources/Playable/Player.prefab index e9a82de..b7f9e6f 100644 --- a/Assets/Resources/Playable/Player.prefab +++ b/Assets/Resources/Playable/Player.prefab @@ -108,6 +108,7 @@ GameObject: - component: {fileID: 7008207192594766309} - component: {fileID: 7008207192594766308} - component: {fileID: 4083120737150353938} + - component: {fileID: 2092414857397911188} m_Layer: 6 m_Name: Player m_TagString: Player @@ -197,6 +198,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1e9f5de2199c4784abce74247804ce87, type: 3} m_Name: m_EditorClassIdentifier: + jumpAudioClip: {fileID: 8300000, guid: c366515880a212d45aad5408ce027da3, type: 3} --- !u!50 &7008207192594766309 Rigidbody2D: serializedVersion: 4 @@ -264,6 +266,102 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!82 &2092414857397911188 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7008207192594766305} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: -2600467795151966735, guid: 55dad93ba7816e44c83798006fa0a277, type: 2} + m_audioClip: {fileID: 8300000, guid: c366515880a212d45aad5408ce027da3, type: 3} + m_PlayOnAwake: 0 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1 &7008207193600475141 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Player/PlayerController.cs b/Assets/Scripts/Player/PlayerController.cs index 0a6575b..6e9fb1f 100644 --- a/Assets/Scripts/Player/PlayerController.cs +++ b/Assets/Scripts/Player/PlayerController.cs @@ -28,6 +28,7 @@ namespace Player private PlayerInput _controls; private Rigidbody2D _playerRigidbody2D; private SpriteRenderer _playerSpriteRenderer; + private AudioSource audioSource = null; private CollisionChecker _playerGroundTrigger; private CollisionChecker _playerWallTriggerLeft; @@ -73,6 +74,7 @@ namespace Player _canJump = true; animator = GetComponent(); + audioSource = GetComponent(); BaseSpeed = 0.0f; } @@ -220,6 +222,7 @@ namespace Player private void Jump() { + audioSource.Play(); BaseSpeed = MaxAirSpeed; _playerRigidbody2D.velocity = new Vector2(_playerRigidbody2D.velocity.x, DefaultJumpForce); _canJump = false;