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 new file mode 100644 index 0000000..b7d4ac4 --- /dev/null +++ b/Assets/Animations/Player/JumpAir.anim @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: JumpAir + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + 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: + - 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: 0.33333334 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Animations/Player/JumpAir.anim.meta b/Assets/Animations/Player/JumpAir.anim.meta new file mode 100644 index 0000000..7e83e45 --- /dev/null +++ b/Assets/Animations/Player/JumpAir.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f30e36d57252aa742ac4dfa3795d2514 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Player/JumpGround.anim b/Assets/Animations/Player/JumpGround.anim new file mode 100644 index 0000000..9aa09ca --- /dev/null +++ b/Assets/Animations/Player/JumpGround.anim @@ -0,0 +1,68 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: JumpGround + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + 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: + - 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: 0.083333336 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Animations/Player/JumpGround.anim.meta b/Assets/Animations/Player/JumpGround.anim.meta new file mode 100644 index 0000000..380a5f4 --- /dev/null +++ b/Assets/Animations/Player/JumpGround.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8a1902a8ce16cab4b9308fe4c5dd948c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Player/OnWall.anim b/Assets/Animations/Player/OnWall.anim new file mode 100644 index 0000000..e7e82fb --- /dev/null +++ b/Assets/Animations/Player/OnWall.anim @@ -0,0 +1,86 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: OnWall + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + 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: + - 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: 0.5833333 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Animations/Player/OnWall.anim.meta b/Assets/Animations/Player/OnWall.anim.meta new file mode 100644 index 0000000..b0afc00 --- /dev/null +++ b/Assets/Animations/Player/OnWall.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b40c9e52b72cda847a456f33b2c9cccf +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: 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..4033f3b --- /dev/null +++ b/Assets/Audio/Audio Mixer.mixer @@ -0,0 +1,243 @@ +%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!244 &-5232129410300169738 +AudioMixerEffectController: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_EffectID: 8ac3a9269f49f264abc2b0c5013e1aa5 + m_EffectName: Attenuation + m_MixLevel: b1610f56bf7cf4543915d51c413eb143 + 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!244 &-671410346139079125 +AudioMixerEffectController: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_EffectID: 34608f7a4d3499e4bb4747a42c281232 + m_EffectName: Attenuation + m_MixLevel: 2dc88c31b1b16cf4a91c0e7082919ee3 + m_Parameters: [] + m_SendTarget: {fileID: 0} + m_EnableWetMix: 0 + m_Bypass: 0 +--- !u!243 &-329335723480019797 +AudioMixerGroupController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Projectile Hit + m_AudioMixer: {fileID: 24100000} + m_GroupID: dd1cda19a45ef294d8789a2af47afcf7 + m_Children: [] + m_Volume: 2cd261abac4698e4698da002d6c5a44a + m_Pitch: 1c7ec7a4f840018488827068ccd5f583 + m_Send: 00000000000000000000000000000000 + m_Effects: + - {fileID: -671410346139079125} + 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 + - 08116dbf9979b7b4d8fcce772ec5ebfc + - dd1cda19a45ef294d8789a2af47afcf7 + 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} + - {fileID: 6090405236815604520} + 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!243 &6090405236815604520 +AudioMixerGroupController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Death + m_AudioMixer: {fileID: 24100000} + m_GroupID: 08116dbf9979b7b4d8fcce772ec5ebfc + m_Children: [] + m_Volume: 23a0004fa1be74144ad5d7029d584609 + m_Pitch: 43f3175ec3407354bb8c0e63d6d1dde9 + m_Send: 00000000000000000000000000000000 + m_Effects: + - {fileID: -5232129410300169738} + m_UserColorIndex: 0 + m_Mute: 0 + m_Solo: 0 + m_BypassEffects: 0 +--- !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 Shot + m_AudioMixer: {fileID: 24100000} + m_GroupID: 88391c573bd80364c916040d855538c8 + m_Children: + - {fileID: -329335723480019797} + 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/Death.bfxrsound b/Assets/Audio/Sound Effects/Death.bfxrsound new file mode 100644 index 0000000..e790a9d --- /dev/null +++ b/Assets/Audio/Sound Effects/Death.bfxrsound @@ -0,0 +1 @@ +1,0.5,,0.0341,,0.1644,0.3,0.7778,,-0.3023,,,,,,,,,,,,,,,,1,,,,,,,masterVolume \ No newline at end of file diff --git a/Assets/Audio/Sound Effects/Death.bfxrsound.meta b/Assets/Audio/Sound Effects/Death.bfxrsound.meta new file mode 100644 index 0000000..35ab150 --- /dev/null +++ b/Assets/Audio/Sound Effects/Death.bfxrsound.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: fb45fa637e425ff4c800134e68f9a646 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Sound Effects/Death.wav b/Assets/Audio/Sound Effects/Death.wav new file mode 100644 index 0000000..db43afd Binary files /dev/null and b/Assets/Audio/Sound Effects/Death.wav differ diff --git a/Assets/Audio/Sound Effects/Death.wav.meta b/Assets/Audio/Sound Effects/Death.wav.meta new file mode 100644 index 0000000..e25f1f7 --- /dev/null +++ b/Assets/Audio/Sound Effects/Death.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 45157062ea57f1f4fb2271380bb846e4 +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: 0 + ambisonic: 0 + 3D: 1 + 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/Audio/Sound Effects/Projectile Hit.bfxrsound b/Assets/Audio/Sound Effects/Projectile Hit.bfxrsound new file mode 100644 index 0000000..bfc472c --- /dev/null +++ b/Assets/Audio/Sound Effects/Projectile Hit.bfxrsound @@ -0,0 +1 @@ +3,0.5,,0.2297,0.6172,0.1934,0.3,0.0275,,0.1354,,,,,,,,,,,,,,,,1,,,,,,,masterVolume \ No newline at end of file diff --git a/Assets/Audio/Sound Effects/Projectile Hit.bfxrsound.meta b/Assets/Audio/Sound Effects/Projectile Hit.bfxrsound.meta new file mode 100644 index 0000000..ac9cb6f --- /dev/null +++ b/Assets/Audio/Sound Effects/Projectile Hit.bfxrsound.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4aa857170acca284b9ce4bc83d44dd99 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Sound Effects/Projectile Hit.wav b/Assets/Audio/Sound Effects/Projectile Hit.wav new file mode 100644 index 0000000..d917e7f Binary files /dev/null and b/Assets/Audio/Sound Effects/Projectile Hit.wav differ diff --git a/Assets/Audio/Sound Effects/Projectile Hit.wav.meta b/Assets/Audio/Sound Effects/Projectile Hit.wav.meta new file mode 100644 index 0000000..4cff908 --- /dev/null +++ b/Assets/Audio/Sound Effects/Projectile Hit.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 59d0430fe628a2a4da8634f4c1e01c9b +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: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Sound Effects/Projectile Shot.bfxrsound b/Assets/Audio/Sound Effects/Projectile Shot.bfxrsound new file mode 100644 index 0000000..96d1340 --- /dev/null +++ b/Assets/Audio/Sound Effects/Projectile Shot.bfxrsound @@ -0,0 +1 @@ +1,0.5,,0.1319,,0.1193,0.3,0.4149,0.0348,-0.552,,,,,,,,,,,0.6014,-0.5053,,,,1,,,0.2598,,,,masterVolume \ No newline at end of file diff --git a/Assets/Audio/Sound Effects/Projectile Shot.bfxrsound.meta b/Assets/Audio/Sound Effects/Projectile Shot.bfxrsound.meta new file mode 100644 index 0000000..8c7ac2b --- /dev/null +++ b/Assets/Audio/Sound Effects/Projectile Shot.bfxrsound.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 82a5f8733e6ab5b42b342641ccdb06e1 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Sound Effects/Projectile Shot.wav b/Assets/Audio/Sound Effects/Projectile Shot.wav new file mode 100644 index 0000000..6dcb1bc Binary files /dev/null and b/Assets/Audio/Sound Effects/Projectile Shot.wav differ diff --git a/Assets/Audio/Sound Effects/Projectile Shot.wav.meta b/Assets/Audio/Sound Effects/Projectile Shot.wav.meta new file mode 100644 index 0000000..837380b --- /dev/null +++ b/Assets/Audio/Sound Effects/Projectile Shot.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 1c6fb63523573864db38a1638bd01635 +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: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Enemies/Basic Patrolling Enemy.prefab b/Assets/Prefabs/Enemies/Basic Patrolling Enemy.prefab index 49b3880..e394987 100644 --- a/Assets/Prefabs/Enemies/Basic Patrolling Enemy.prefab +++ b/Assets/Prefabs/Enemies/Basic Patrolling Enemy.prefab @@ -290,7 +290,7 @@ Rigidbody2D: m_Material: {fileID: 0} m_Interpolate: 0 m_SleepingMode: 1 - m_CollisionDetection: 0 + m_CollisionDetection: 1 m_Constraints: 4 --- !u!114 &8503951513957676288 MonoBehaviour: diff --git a/Assets/Prefabs/Enemies/Basic Shooting Patrolling Enemy Variant.prefab b/Assets/Prefabs/Enemies/Basic Shooting Patrolling Enemy Variant.prefab index 58fa5c7..648d520 100644 --- a/Assets/Prefabs/Enemies/Basic Shooting Patrolling Enemy Variant.prefab +++ b/Assets/Prefabs/Enemies/Basic Shooting Patrolling Enemy Variant.prefab @@ -150,3 +150,104 @@ Transform: m_CorrespondingSourceObject: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} m_PrefabInstance: {fileID: 3612889356597698756} m_PrefabAsset: {fileID: 0} +--- !u!1 &6102515708334491356 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7391517555913877016, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + m_PrefabInstance: {fileID: 3612889356597698756} + m_PrefabAsset: {fileID: 0} +--- !u!82 &-1472554968350166213 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6102515708334491356} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 8377903610078173799, guid: 55dad93ba7816e44c83798006fa0a277, type: 2} + m_audioClip: {fileID: 8300000, guid: 1c6fb63523573864db38a1638bd01635, 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 diff --git a/Assets/Resources/Playable/Player.prefab b/Assets/Resources/Playable/Player.prefab index e9a82de..ba7e2eb 100644 --- a/Assets/Resources/Playable/Player.prefab +++ b/Assets/Resources/Playable/Player.prefab @@ -46,7 +46,7 @@ MonoBehaviour: m_EditorClassIdentifier: layerMask: serializedVersion: 2 - m_Bits: 4294967103 + m_Bits: 4294966335 --- !u!1 &2083070160 GameObject: m_ObjectHideFlags: 0 @@ -93,7 +93,54 @@ MonoBehaviour: m_EditorClassIdentifier: layerMask: serializedVersion: 2 - m_Bits: 4294967103 + m_Bits: 4294966335 +--- !u!1 &2460162872455742730 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5380164631756810673} + - component: {fileID: 3193203585355150635} + m_Layer: 6 + m_Name: Enemy Trigger + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5380164631756810673 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2460162872455742730} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -0.25, z: 0} + m_LocalScale: {x: 1.6, y: 1.6, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7008207192594766311} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3193203585355150635 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2460162872455742730} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7000c8c0eb91b2d4cb9a0e3ee1b609a7, type: 3} + m_Name: + m_EditorClassIdentifier: + layerMask: + serializedVersion: 2 + m_Bits: 4294966912 --- !u!1 &7008207192594766305 GameObject: m_ObjectHideFlags: 0 @@ -108,6 +155,8 @@ GameObject: - component: {fileID: 7008207192594766309} - component: {fileID: 7008207192594766308} - component: {fileID: 4083120737150353938} + - component: {fileID: 2092414857397911188} + - component: {fileID: 7892559024328115078} m_Layer: 6 m_Name: Player m_TagString: Player @@ -130,6 +179,8 @@ Transform: - {fileID: 7008207193600475140} - {fileID: 698768805} - {fileID: 2083070161} + - {fileID: 5380164631756810673} + - {fileID: 5932034958742124507} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -264,6 +315,114 @@ 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!114 &7892559024328115078 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7008207192594766305} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7c16e6ed26e877e42ba1955f39094ddf, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &7008207193600475141 GameObject: m_ObjectHideFlags: 0 @@ -310,4 +469,145 @@ MonoBehaviour: m_EditorClassIdentifier: layerMask: serializedVersion: 2 - m_Bits: 4294967048 + m_Bits: 4294966280 +--- !u!1 &7718275112619760423 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5932034958742124507} + - component: {fileID: 341567328791663827} + - component: {fileID: 8364197196962726582} + m_Layer: 6 + m_Name: Death + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5932034958742124507 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7718275112619760423} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7008207192594766311} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &341567328791663827 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7718275112619760423} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7c16e6ed26e877e42ba1955f39094ddf, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!82 &8364197196962726582 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7718275112619760423} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 6090405236815604520, guid: 55dad93ba7816e44c83798006fa0a277, type: 2} + m_audioClip: {fileID: 8300000, guid: 45157062ea57f1f4fb2271380bb846e4, 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 diff --git a/Assets/Resources/Projectiles/Basic Projectile.prefab b/Assets/Resources/Projectiles/Basic Projectile.prefab index 6fdd225..f482768 100644 --- a/Assets/Resources/Projectiles/Basic Projectile.prefab +++ b/Assets/Resources/Projectiles/Basic Projectile.prefab @@ -14,6 +14,7 @@ GameObject: - component: {fileID: 5084819958108693599} - component: {fileID: 6837629660644296000} - component: {fileID: 2154021251853475818} + - component: {fileID: 4197101675176415021} m_Layer: 9 m_Name: Basic Projectile m_TagString: Untagged @@ -137,7 +138,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1451960c367cc30478631b32ba4f8356, type: 3} m_Name: m_EditorClassIdentifier: - damageOnContact: 50 --- !u!95 &2154021251853475818 Animator: serializedVersion: 4 @@ -158,3 +158,99 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!82 &4197101675176415021 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2196707779812385060} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: -329335723480019797, guid: 55dad93ba7816e44c83798006fa0a277, type: 2} + m_audioClip: {fileID: 8300000, guid: 59d0430fe628a2a4da8634f4c1e01c9b, 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 diff --git a/Assets/Scripts/AI/Projectile.cs b/Assets/Scripts/AI/Projectile.cs index e747a7e..02508da 100644 --- a/Assets/Scripts/AI/Projectile.cs +++ b/Assets/Scripts/AI/Projectile.cs @@ -6,22 +6,27 @@ namespace AI [RequireComponent(typeof(Rigidbody2D))] public class Projectile : MonoBehaviour, IPausable { - [SerializeField] protected float damageOnContact = 50f; - private Rigidbody2D _rigidbody = null; + public Rigidbody2D Rigidbody { get; private set; } = null; + private AudioSource audioSource = null; private void Awake() { - _rigidbody = GetComponent(); + Rigidbody = GetComponent(); + audioSource = GetComponent(); } public void SetVelocity(Vector2 velocity) { - _rigidbody.velocity = velocity; + Rigidbody.velocity = velocity; } private void OnCollisionEnter2D(Collision2D other) { ProjectilePool.Instance.Return(this); + audioSource.Play(); + + if (other.transform.CompareTag("Player")) + other.gameObject.GetComponent().Die(); } public bool IsPaused { get; protected set; } = false; @@ -39,7 +44,7 @@ namespace AI private void UpdateRigidbody() { - _rigidbody.simulated = !IsPaused; + Rigidbody.simulated = !IsPaused; } } } diff --git a/Assets/Scripts/AI/ProjectilePool.cs b/Assets/Scripts/AI/ProjectilePool.cs index 500fc7b..35b95e1 100644 --- a/Assets/Scripts/AI/ProjectilePool.cs +++ b/Assets/Scripts/AI/ProjectilePool.cs @@ -42,14 +42,16 @@ namespace AI if (projectile == null) projectile = Instantiate(prefab).GetComponent(); - projectile.gameObject.SetActive(true); + projectile.transform.position = Vector3.left * 10000; + projectile.Rigidbody.simulated = true; return projectile; } public void Return(Projectile projectile) { - projectile.gameObject.SetActive(false); + projectile.Rigidbody.simulated = false; + projectile.transform.position = Vector3.right * 10000; pool.Push(projectile); } } diff --git a/Assets/Scripts/AI/ShootingEnemyAI.cs b/Assets/Scripts/AI/ShootingEnemyAI.cs index ff25773..b957925 100644 --- a/Assets/Scripts/AI/ShootingEnemyAI.cs +++ b/Assets/Scripts/AI/ShootingEnemyAI.cs @@ -21,6 +21,7 @@ namespace AI protected bool isShooting = false; protected IMovement movement = null; protected Animator animator = null; + protected AudioSource audioSource = null; protected int layerMask = ~(1 << 9); protected bool canShoot => target != null && (target.transform.position - transform.position).sqrMagnitude < attackRangeSquared; @@ -44,6 +45,7 @@ namespace AI { movement = transform.GetComponentInParent(); animator = transform.GetComponentInParent(); + audioSource = transform.GetComponentInParent(); UpdateTarget(FindObjectOfType()?.transform); } @@ -90,6 +92,7 @@ namespace AI projectile.SetVelocity(velocity); remainingCooldown = cooldownPerShoot; + audioSource.Play(); OnShoot?.Invoke(); } diff --git a/Assets/Scripts/Player/Death.cs b/Assets/Scripts/Player/Death.cs new file mode 100644 index 0000000..1f58b99 --- /dev/null +++ b/Assets/Scripts/Player/Death.cs @@ -0,0 +1,19 @@ +using Level; +using UnityEngine; + +namespace Player +{ + public class Death : MonoBehaviour + { + private AudioSource audioSource = null; + + private void Start() => audioSource = GetComponent(); + + public void Die() + { + LevelManager.Instance.CurrentLevel.Restart(); + // Playing it after the restart because when the player gets deactivated the sound stops so it doesn't play the sound at all + audioSource.Play(); + } + } +} diff --git a/Assets/Scripts/Player/Death.cs.meta b/Assets/Scripts/Player/Death.cs.meta new file mode 100644 index 0000000..66eab5c --- /dev/null +++ b/Assets/Scripts/Player/Death.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 7c16e6ed26e877e42ba1955f39094ddf +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Player/PlayerController.cs b/Assets/Scripts/Player/PlayerController.cs index 9219771..69f1cb1 100644 --- a/Assets/Scripts/Player/PlayerController.cs +++ b/Assets/Scripts/Player/PlayerController.cs @@ -2,7 +2,6 @@ using System; using Movement; using UnityEngine; using UnityEngine.InputSystem; -using UnityEngine.SceneManagement; using PlayerInput = Input.PlayerInput; namespace Player @@ -28,6 +27,7 @@ namespace Player private PlayerInput _controls; private Rigidbody2D _playerRigidbody2D; private SpriteRenderer _playerSpriteRenderer; + private AudioSource audioSource = null; private CollisionChecker _playerGroundTrigger; private CollisionChecker _playerWallTriggerLeft; @@ -47,7 +47,10 @@ namespace Player private const string IsMovingParameter = "IsMoving"; private const string IsGroundedParameter = "IsGrounded"; + private const string IsWalledParameter = "IsWalled"; private Animator animator = null; + private Death death = null; + private CollisionChecker enemyTrigger = null; private void Awake() { @@ -72,6 +75,9 @@ namespace Player _canJump = true; animator = GetComponent(); + audioSource = GetComponent(); + death = transform.Find("Death").gameObject.GetComponent(); + enemyTrigger = GameObject.Find("Enemy Trigger").GetComponent(); BaseSpeed = 0.0f; } @@ -115,7 +121,9 @@ namespace Player _playerRigidbody2D.velocity = new Vector2(0.0f, _playerRigidbody2D.velocity.y); animator.SetBool(IsMovingParameter, false); } + animator.SetBool(IsGroundedParameter, _playerGroundTrigger.IsCollided); + animator.SetBool(IsWalledParameter, _playerWallTriggerLeft.IsCollided || _playerWallTriggerRight.IsCollided); if (_jumpKeyPressed && _playerGroundTrigger.IsCollided && _canJump) Jump(); @@ -128,12 +136,15 @@ namespace Player { _isOnAir = !_playerGroundTrigger.IsCollided; RespawnCheck(); + + if (enemyTrigger.IsCollided) + death.Die(); } private void RespawnCheck() { if (gameObject.transform.position.y < RespawnLimit) - SceneManager.LoadScene(SceneManager.GetActiveScene().name); + death.Die(); } // PAUSE METHODS @@ -217,6 +228,7 @@ namespace Player private void Jump() { + audioSource.Play(); BaseSpeed = MaxAirSpeed; _playerRigidbody2D.velocity = new Vector2(_playerRigidbody2D.velocity.x, DefaultJumpForce); _canJump = false; diff --git a/Assets/Sprites/Player/Player.aseprite b/Assets/Sprites/Player/Player.aseprite index 5297bb9..03a796d 100644 Binary files a/Assets/Sprites/Player/Player.aseprite and b/Assets/Sprites/Player/Player.aseprite differ diff --git a/Assets/Sprites/Player/Player.png b/Assets/Sprites/Player/Player.png index 47690e6..a01b799 100644 Binary files a/Assets/Sprites/Player/Player.png and b/Assets/Sprites/Player/Player.png differ diff --git a/Assets/Sprites/Player/Player.png.meta b/Assets/Sprites/Player/Player.png.meta index da4b8b9..0a8dc6d 100644 --- a/Assets/Sprites/Player/Player.png.meta +++ b/Assets/Sprites/Player/Player.png.meta @@ -108,7 +108,7 @@ TextureImporter: rect: serializedVersion: 2 x: 0 - y: 16 + y: 0 width: 16 height: 16 alignment: 0 @@ -129,7 +129,7 @@ TextureImporter: rect: serializedVersion: 2 x: 16 - y: 16 + y: 0 width: 16 height: 16 alignment: 0 @@ -150,7 +150,7 @@ TextureImporter: rect: serializedVersion: 2 x: 32 - y: 16 + y: 0 width: 16 height: 16 alignment: 0 @@ -171,7 +171,7 @@ TextureImporter: rect: serializedVersion: 2 x: 48 - y: 16 + y: 0 width: 16 height: 16 alignment: 0 @@ -192,7 +192,7 @@ TextureImporter: rect: serializedVersion: 2 x: 64 - y: 16 + y: 0 width: 16 height: 16 alignment: 0 @@ -213,11 +213,11 @@ TextureImporter: rect: serializedVersion: 2 x: 80 - y: 16 + y: 0 width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -234,7 +234,7 @@ TextureImporter: rect: serializedVersion: 2 x: 0 - y: 0 + y: 16 width: 16 height: 16 alignment: 0 @@ -255,7 +255,7 @@ TextureImporter: rect: serializedVersion: 2 x: 16 - y: 0 + y: 16 width: 16 height: 16 alignment: 0 @@ -276,7 +276,7 @@ TextureImporter: rect: serializedVersion: 2 x: 32 - y: 0 + y: 16 width: 16 height: 16 alignment: 0 @@ -297,7 +297,7 @@ TextureImporter: rect: serializedVersion: 2 x: 48 - y: 0 + y: 16 width: 16 height: 16 alignment: 0 @@ -318,7 +318,7 @@ TextureImporter: rect: serializedVersion: 2 x: 64 - y: 0 + y: 16 width: 16 height: 16 alignment: 0 @@ -339,7 +339,7 @@ TextureImporter: rect: serializedVersion: 2 x: 80 - y: 0 + y: 16 width: 16 height: 16 alignment: 0 @@ -360,7 +360,7 @@ TextureImporter: rect: serializedVersion: 2 x: 96 - y: 0 + y: 16 width: 16 height: 16 alignment: 0 @@ -381,7 +381,7 @@ TextureImporter: rect: serializedVersion: 2 x: 112 - y: 0 + y: 16 width: 16 height: 16 alignment: 0 @@ -402,7 +402,7 @@ TextureImporter: rect: serializedVersion: 2 x: 128 - y: 0 + y: 16 width: 16 height: 16 alignment: 0 @@ -418,6 +418,258 @@ TextureImporter: indices: edges: [] weights: [] + - serializedVersion: 2 + name: Player_15 + rect: + serializedVersion: 2 + x: 0 + y: 32 + width: 16 + height: 16 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 08bb5a4d3b2397a479764c8e6f4df88e + internalID: 180603488 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Player_16 + rect: + serializedVersion: 2 + x: 0 + y: 48 + width: 16 + height: 16 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 87f4848cf958b654891ba0dab593e5cb + internalID: 1293344572 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Player_17 + rect: + serializedVersion: 2 + x: 16 + y: 48 + width: 16 + height: 16 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: cb705532072ec3748a708c551fb62e00 + internalID: 118679525 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Player_18 + rect: + serializedVersion: 2 + x: 32 + y: 48 + width: 16 + height: 16 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 9ea441819b536fe4ebccc4f4bd599091 + internalID: 1291750529 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Player_19 + rect: + serializedVersion: 2 + x: 48 + y: 48 + width: 16 + height: 16 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 01940affa11bc0a4db69c7e6e3b3c71e + internalID: 2143467853 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Player_20 + rect: + serializedVersion: 2 + x: 0 + y: 64 + width: 16 + height: 16 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 6fc6db0a69805bd4382de4148302b4c4 + internalID: -2109353353 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Player_21 + rect: + serializedVersion: 2 + x: 16 + y: 64 + width: 16 + height: 16 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: ea65d534f2c7e5b45aa9a4ea1214efce + internalID: -932523871 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Player_22 + rect: + serializedVersion: 2 + x: 32 + y: 64 + width: 16 + height: 16 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 38dd844f938b031488a7758f51dcf6d8 + internalID: 2059507875 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Player_23 + rect: + serializedVersion: 2 + x: 48 + y: 64 + width: 16 + height: 16 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 38f17b4ed4142bf419a2e5d39b570278 + internalID: -724040594 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Player_24 + rect: + serializedVersion: 2 + x: 64 + y: 64 + width: 16 + height: 16 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 979eac1ed505b2d4f8d571c7d8d5f531 + internalID: -1692090074 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Player_25 + rect: + serializedVersion: 2 + x: 80 + y: 64 + width: 16 + height: 16 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 201d191d173fab6409235fe91c8fcf8a + internalID: -2100026830 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Player_26 + rect: + serializedVersion: 2 + x: 96 + y: 64 + width: 16 + height: 16 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 006877ce92e6edb4483587bdad0e91d9 + internalID: 231691911 + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] @@ -430,8 +682,15 @@ TextureImporter: secondaryTextures: [] nameFileIdTable: Player_11: -375057873 + Player_17: 118679525 + Player_20: -2109353353 + Player_19: 2143467853 Player_2: -1841721584 Player_4: 825225972 + Player_18: 1291750529 + Player_23: -724040594 + Player_22: 2059507875 + Player_25: -2100026830 Player_12: -284386636 Player_6: -1414671332 Player_1: -1592093818 @@ -439,10 +698,15 @@ TextureImporter: Player_14: -2011013116 Player_0: 1298688296 Player_7: 1107039308 + Player_16: 1293344572 Player_3: -526475696 Player_8: 1791482633 Player_10: 1146259828 + Player_26: 231691911 + Player_15: 180603488 Player_13: 1394398855 + Player_21: -932523871 + Player_24: -1692090074 Player_5: 1441602087 spritePackingTag: pSDRemoveMatte: 0