From e80158e77f66287078c661df534ce12f95dddf5d Mon Sep 17 00:00:00 2001 From: Syntriax Date: Sat, 26 Feb 2022 17:39:34 +0300 Subject: [PATCH] Jump Audio Added + Anmiation Fix --- Assets/Animations/Player/Idle.anim | 37 +- Assets/Animations/Player/JumpAir.anim | 34 +- Assets/Animations/Player/JumpGround.anim | 25 +- Assets/Animations/Player/OnWall.anim | 43 +- Assets/Animations/Player/Player_0.controller | 490 +++++++++++++++++- Assets/Animations/Player/Running.anim | 49 +- Assets/Audio.meta | 8 + Assets/Audio/Audio Mixer.mixer | 173 +++++++ Assets/Audio/Audio Mixer.mixer.meta | 8 + Assets/Audio/Sound Effects.meta | 8 + Assets/Audio/Sound Effects/Jump.bfxrsound | 1 + .../Audio/Sound Effects/Jump.bfxrsound.meta | 7 + Assets/Audio/Sound Effects/Jump.wav | Bin 0 -> 15966 bytes Assets/Audio/Sound Effects/Jump.wav.meta | 22 + Assets/Resources/Playable/Player.prefab | 98 ++++ Assets/Scripts/Player/PlayerController.cs | 3 + 16 files changed, 979 insertions(+), 27 deletions(-) create mode 100644 Assets/Audio.meta create mode 100644 Assets/Audio/Audio Mixer.mixer create mode 100644 Assets/Audio/Audio Mixer.mixer.meta create mode 100644 Assets/Audio/Sound Effects.meta create mode 100644 Assets/Audio/Sound Effects/Jump.bfxrsound create mode 100644 Assets/Audio/Sound Effects/Jump.bfxrsound.meta create mode 100644 Assets/Audio/Sound Effects/Jump.wav create mode 100644 Assets/Audio/Sound Effects/Jump.wav.meta 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 0000000000000000000000000000000000000000..0b9bde423f7922e0f5f418344a2c33d8bd7a9ded GIT binary patch literal 15966 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

G*_9c?3MS*T1hMA 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 D%R=%{ literal 0 HcmV?d00001 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;