From a84a4db880749dc595a2244763de6e1fb1faeaf8 Mon Sep 17 00:00:00 2001 From: Jeremy Smitherman Date: Sat, 25 Apr 2026 02:28:33 -0500 Subject: [PATCH] Added animation driver, SFX --- .idea/.idea.SpringJam2026/.idea/workspace.xml | 49 +++++---- Assets/Audio/SFX.meta | 8 ++ Assets/Audio/SFX/bump.aiff | Bin 0 -> 32650 bytes Assets/Audio/SFX/bump.aiff.meta | 23 +++++ Assets/Audio/SFX/jump.mp3 | 3 + Assets/Audio/SFX/jump.mp3.meta | 23 +++++ Assets/Audio/SFX/pickup.mp3 | 3 + Assets/Audio/SFX/pickup.mp3.meta | 23 +++++ Assets/Audio/SFX/spring.wav | 3 + Assets/Audio/SFX/spring.wav.meta | 23 +++++ Assets/Prefabs/Catepillar/Fall.anim | 4 +- Assets/Prefabs/Catepillar/Idle.anim | 4 +- Assets/Prefabs/Catepillar/Jump.anim | 6 +- Assets/Prefabs/Catepillar/Player.controller | 10 +- Assets/Prefabs/Catepillar/Player.prefab | 52 +++++++++- Assets/Prefabs/Catepillar/Walk.anim | 10 +- Assets/Scenes/Bootstrap.unity | 4 +- Assets/Scenes/Game.unity | 95 +++--------------- Assets/Scripts/Management/SFX.cs | 2 +- Assets/Scripts/Player/Movement.cs | 36 ++++++- 20 files changed, 251 insertions(+), 130 deletions(-) create mode 100644 Assets/Audio/SFX.meta create mode 100644 Assets/Audio/SFX/bump.aiff create mode 100644 Assets/Audio/SFX/bump.aiff.meta create mode 100644 Assets/Audio/SFX/jump.mp3 create mode 100644 Assets/Audio/SFX/jump.mp3.meta create mode 100644 Assets/Audio/SFX/pickup.mp3 create mode 100644 Assets/Audio/SFX/pickup.mp3.meta create mode 100644 Assets/Audio/SFX/spring.wav create mode 100644 Assets/Audio/SFX/spring.wav.meta diff --git a/.idea/.idea.SpringJam2026/.idea/workspace.xml b/.idea/.idea.SpringJam2026/.idea/workspace.xml index 369b004..58a394d 100644 --- a/.idea/.idea.SpringJam2026/.idea/workspace.xml +++ b/.idea/.idea.SpringJam2026/.idea/workspace.xml @@ -6,11 +6,16 @@ - - + + + + + + + + - + @@ -40,23 +46,23 @@ - { + "keyToString": { + "ASKED_SHARE_PROJECT_CONFIGURATION_FILES": "true", + "Attach to Unity Editor.Attach to Unity Editor.executor": "Debug", + "ModuleVcsDetector.initialDetectionPerformed": "true", + "RunOnceActivity.ShowReadmeOnStart": "true", + "RunOnceActivity.git.unshallow": "true", + "git-widget-placeholder": "main", + "ignore.virus.scanning.warn.message": "true", + "node.js.detected.package.eslint": "true", + "node.js.detected.package.tslint": "true", + "node.js.selected.package.eslint": "(autodetect)", + "node.js.selected.package.tslint": "(autodetect)", + "nodejs_package_manager_path": "npm", + "vue.rearranger.settings.migration": "true" } -}]]> +} - + diff --git a/Assets/Audio/SFX.meta b/Assets/Audio/SFX.meta new file mode 100644 index 0000000..ddef356 --- /dev/null +++ b/Assets/Audio/SFX.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bff06c94c30a74e4d9a941ee0f422091 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/SFX/bump.aiff b/Assets/Audio/SFX/bump.aiff new file mode 100644 index 0000000000000000000000000000000000000000..1501ac71a966d72c06c20923df1416ceac795da8 GIT binary patch literal 32650 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 Q(Ab~I*Q#E-s@xp@57jEQ0RR91 literal 0 HcmV?d00001 diff --git a/Assets/Audio/SFX/bump.aiff.meta b/Assets/Audio/SFX/bump.aiff.meta new file mode 100644 index 0000000..b9c6a3e --- /dev/null +++ b/Assets/Audio/SFX/bump.aiff.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 7c28608e819f6574193756354a7974fe +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/SFX/jump.mp3 b/Assets/Audio/SFX/jump.mp3 new file mode 100644 index 0000000..c71fdfa --- /dev/null +++ b/Assets/Audio/SFX/jump.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c89de454c43191d66197d3ef8f5edfbfe856ae18c8b3c9808f54b1bfa9336403 +size 3792 diff --git a/Assets/Audio/SFX/jump.mp3.meta b/Assets/Audio/SFX/jump.mp3.meta new file mode 100644 index 0000000..733766e --- /dev/null +++ b/Assets/Audio/SFX/jump.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 0734beac3512cee4783e5a66f9df87bb +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 1 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/SFX/pickup.mp3 b/Assets/Audio/SFX/pickup.mp3 new file mode 100644 index 0000000..7c58291 --- /dev/null +++ b/Assets/Audio/SFX/pickup.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a25c8f24fc51c1a26689d779635d5a98030055e8516843c4430859529175a16a +size 38209 diff --git a/Assets/Audio/SFX/pickup.mp3.meta b/Assets/Audio/SFX/pickup.mp3.meta new file mode 100644 index 0000000..d7ecda3 --- /dev/null +++ b/Assets/Audio/SFX/pickup.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 4f190d6dc258d8f4b843f97dd0e5d2db +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 1 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/SFX/spring.wav b/Assets/Audio/SFX/spring.wav new file mode 100644 index 0000000..4cfadeb --- /dev/null +++ b/Assets/Audio/SFX/spring.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dd156db0002e22f9538958defc9dd407f6b1a5734fbdb98b8d0a3373bae64168 +size 294304 diff --git a/Assets/Audio/SFX/spring.wav.meta b/Assets/Audio/SFX/spring.wav.meta new file mode 100644 index 0000000..6b9526d --- /dev/null +++ b/Assets/Audio/SFX/spring.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 07e96691431e68849b974e73b4e1dc2c +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 1 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Catepillar/Fall.anim b/Assets/Prefabs/Catepillar/Fall.anim index 525b68e..9da04ea 100644 --- a/Assets/Prefabs/Catepillar/Fall.anim +++ b/Assets/Prefabs/Catepillar/Fall.anim @@ -23,7 +23,7 @@ AnimationClip: - time: 0 value: {fileID: -2070610911, guid: b960c99507aa1a84a8f28bdcbcc81c19, type: 3} attribute: m_Sprite - path: + path: Sprite classID: 212 script: {fileID: 0} flags: 2 @@ -35,7 +35,7 @@ AnimationClip: m_ClipBindingConstant: genericBindings: - serializedVersion: 2 - path: 0 + path: 850496168 attribute: 0 script: {fileID: 0} typeID: 212 diff --git a/Assets/Prefabs/Catepillar/Idle.anim b/Assets/Prefabs/Catepillar/Idle.anim index bfb942d..43a4d02 100644 --- a/Assets/Prefabs/Catepillar/Idle.anim +++ b/Assets/Prefabs/Catepillar/Idle.anim @@ -23,7 +23,7 @@ AnimationClip: - time: 0 value: {fileID: 5487822846996609747, guid: b960c99507aa1a84a8f28bdcbcc81c19, type: 3} attribute: m_Sprite - path: + path: Sprite classID: 212 script: {fileID: 0} flags: 2 @@ -35,7 +35,7 @@ AnimationClip: m_ClipBindingConstant: genericBindings: - serializedVersion: 2 - path: 0 + path: 850496168 attribute: 0 script: {fileID: 0} typeID: 212 diff --git a/Assets/Prefabs/Catepillar/Jump.anim b/Assets/Prefabs/Catepillar/Jump.anim index 87681a0..6952bf6 100644 --- a/Assets/Prefabs/Catepillar/Jump.anim +++ b/Assets/Prefabs/Catepillar/Jump.anim @@ -23,7 +23,7 @@ AnimationClip: - time: 0 value: {fileID: 9201126744234322706, guid: b960c99507aa1a84a8f28bdcbcc81c19, type: 3} attribute: m_Sprite - path: + path: Sprite classID: 212 script: {fileID: 0} flags: 2 @@ -35,7 +35,7 @@ AnimationClip: m_ClipBindingConstant: genericBindings: - serializedVersion: 2 - path: 0 + path: 850496168 attribute: 0 script: {fileID: 0} typeID: 212 @@ -55,7 +55,7 @@ AnimationClip: m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 + m_LoopTime: 0 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 diff --git a/Assets/Prefabs/Catepillar/Player.controller b/Assets/Prefabs/Catepillar/Player.controller index 4a2fa39..bc572a8 100644 --- a/Assets/Prefabs/Catepillar/Player.controller +++ b/Assets/Prefabs/Catepillar/Player.controller @@ -10,7 +10,7 @@ AnimatorStateTransition: m_Conditions: - m_ConditionMode: 4 m_ConditionEvent: vspeed - m_EventTreshold: 0 + m_EventTreshold: -0.2 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 705262314255223608} m_Solo: 0 @@ -70,7 +70,7 @@ AnimatorStateMachine: m_Position: {x: 290, y: 10, z: 0} - serializedVersion: 1 m_State: {fileID: 705262314255223608} - m_Position: {x: 570, y: -40, z: 0} + m_Position: {x: 50, y: -70, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: - {fileID: 2479910129929821769} @@ -93,7 +93,7 @@ AnimatorStateTransition: m_Conditions: - m_ConditionMode: 4 m_ConditionEvent: vspeed - m_EventTreshold: 0 + m_EventTreshold: -0.2 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 705262314255223608} m_Solo: 0 @@ -107,7 +107,7 @@ AnimatorStateTransition: m_HasFixedDuration: 0 m_InterruptionSource: 0 m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 + m_CanTransitionToSelf: 0 --- !u!1102 &-4553251249938837047 AnimatorState: serializedVersion: 6 @@ -282,7 +282,7 @@ AnimatorStateTransition: m_HasFixedDuration: 0 m_InterruptionSource: 0 m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 + m_CanTransitionToSelf: 0 --- !u!1101 &3950393567183418223 AnimatorStateTransition: m_ObjectHideFlags: 1 diff --git a/Assets/Prefabs/Catepillar/Player.prefab b/Assets/Prefabs/Catepillar/Player.prefab index 1c3633a..f05b63c 100644 --- a/Assets/Prefabs/Catepillar/Player.prefab +++ b/Assets/Prefabs/Catepillar/Player.prefab @@ -13,9 +13,10 @@ GameObject: - component: {fileID: 849756540516150458} - component: {fileID: 4169369283586250626} - component: {fileID: 3534034070345576868} + - component: {fileID: 4576448781989217082} m_Layer: 0 m_Name: Player - m_TagString: Untagged + m_TagString: Player m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -93,7 +94,7 @@ CapsuleCollider2D: m_CompositeOperation: 0 m_CompositeOrder: 0 m_Offset: {x: 0.23512886, y: 0.114549875} - m_Size: {x: 1, y: 0.65625} + m_Size: {x: 1, y: 0.75} m_Direction: 1 --- !u!50 &4169369283586250626 Rigidbody2D: @@ -134,9 +135,50 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 35cab81567d235b489aef6d0fa17c729, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::Player.Movement - runSpeed: 1 - springPower: 0 - spriteRenderer: {fileID: 0} + runSpeed: 4 + springPower: 12 + jumpForce: 5 + airJumpForce: 10 + spriteRenderer: {fileID: 342790821639359709} + turnDelay: 0.08 + interactReference: {fileID: 1781555164194001046, guid: 2bcd2660ca9b64942af0de543d8d7100, type: 3} + impactPauseTime: 0.2 + bouncePower: 5 + animator: {fileID: 2598533458249844269} + jumpSound: {fileID: 8300000, guid: 0734beac3512cee4783e5a66f9df87bb, type: 3} + pickupSound: {fileID: 8300000, guid: 4f190d6dc258d8f4b843f97dd0e5d2db, type: 3} + springSound: {fileID: 8300000, guid: 07e96691431e68849b974e73b4e1dc2c, type: 3} + bumpSound: {fileID: 8300000, guid: 7c28608e819f6574193756354a7974fe, type: 3} +--- !u!114 &4576448781989217082 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7621021177568661959} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.InputSystem::UnityEngine.InputSystem.PlayerInput + m_Actions: {fileID: -944628639613478452, guid: 2bcd2660ca9b64942af0de543d8d7100, type: 3} + m_NotificationBehavior: 3 + m_UIInputModule: {fileID: 0} + m_DeviceLostEvent: + m_PersistentCalls: + m_Calls: [] + m_DeviceRegainedEvent: + m_PersistentCalls: + m_Calls: [] + m_ControlsChangedEvent: + m_PersistentCalls: + m_Calls: [] + m_ActionEvents: [] + m_NeverAutoSwitchControlSchemes: 0 + m_DefaultControlScheme: + m_DefaultActionMap: Player + m_SplitScreenIndex: -1 + m_Camera: {fileID: 0} --- !u!1 &8270890549788907285 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Catepillar/Walk.anim b/Assets/Prefabs/Catepillar/Walk.anim index ffe81ed..d7ca364 100644 --- a/Assets/Prefabs/Catepillar/Walk.anim +++ b/Assets/Prefabs/Catepillar/Walk.anim @@ -21,11 +21,11 @@ AnimationClip: - serializedVersion: 2 curve: - time: 0 - value: {fileID: 5487822846996609747, guid: b960c99507aa1a84a8f28bdcbcc81c19, type: 3} - - time: 0.083333336 value: {fileID: -835469789631162461, guid: b960c99507aa1a84a8f28bdcbcc81c19, type: 3} + - time: 0.083333336 + value: {fileID: 5487822846996609747, guid: b960c99507aa1a84a8f28bdcbcc81c19, type: 3} attribute: m_Sprite - path: + path: Sprite classID: 212 script: {fileID: 0} flags: 2 @@ -37,7 +37,7 @@ AnimationClip: m_ClipBindingConstant: genericBindings: - serializedVersion: 2 - path: 0 + path: 850496168 attribute: 0 script: {fileID: 0} typeID: 212 @@ -46,8 +46,8 @@ AnimationClip: isIntCurve: 0 isSerializeReferenceCurve: 0 pptrCurveMapping: - - {fileID: 5487822846996609747, guid: b960c99507aa1a84a8f28bdcbcc81c19, type: 3} - {fileID: -835469789631162461, guid: b960c99507aa1a84a8f28bdcbcc81c19, type: 3} + - {fileID: 5487822846996609747, guid: b960c99507aa1a84a8f28bdcbcc81c19, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} diff --git a/Assets/Scenes/Bootstrap.unity b/Assets/Scenes/Bootstrap.unity index 4bb67b4..06e504f 100644 --- a/Assets/Scenes/Bootstrap.unity +++ b/Assets/Scenes/Bootstrap.unity @@ -324,7 +324,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!114 &1671688484 MonoBehaviour: m_ObjectHideFlags: 0 @@ -361,7 +361,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1671688483} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 4b256c4001284134990a2af43c375455, type: 3} m_Name: diff --git a/Assets/Scenes/Game.unity b/Assets/Scenes/Game.unity index 1be320e..7a930ef 100644 --- a/Assets/Scenes/Game.unity +++ b/Assets/Scenes/Game.unity @@ -705,7 +705,7 @@ Transform: m_GameObject: {fileID: 972659586} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -995,7 +995,7 @@ MonoBehaviour: m_RefResolutionX: 256 m_RefResolutionY: 154 m_CropFrame: 2 - m_GridSnapping: 1 + m_GridSnapping: 0 m_FilterMode: 0 m_UpscaleRT: 0 m_PixelSnapping: 0 @@ -1016,11 +1016,6 @@ MonoBehaviour: m_EditorClassIdentifier: Assembly-CSharp::Cam camSpeed: 20 yOffset: 1 ---- !u!212 &1111270482 stripped -SpriteRenderer: - m_CorrespondingSourceObject: {fileID: 342790821639359709, guid: fbc05a08dfccd6a4cb1bcc1cf1910065, type: 3} - m_PrefabInstance: {fileID: 2062647807} - m_PrefabAsset: {fileID: 0} --- !u!1 &1552194188 GameObject: m_ObjectHideFlags: 0 @@ -1047,7 +1042,7 @@ Transform: m_GameObject: {fileID: 1552194188} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.73, y: -0.4, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -4981,7 +4976,7 @@ Transform: m_GameObject: {fileID: 1718672489} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -4.37, y: 12.95, z: 0} + m_LocalPosition: {x: -2.46, y: 10.74, z: 0} m_LocalScale: {x: 0.8, y: 0.8, z: 0.8} m_ConstrainProportionsScale: 0 m_Children: @@ -5150,41 +5145,6 @@ BoxCollider2D: m_AutoTiling: 0 m_Size: {x: 2, y: 0.5} m_EdgeRadius: 0 ---- !u!1 &1892581088 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7621021177568661959, guid: fbc05a08dfccd6a4cb1bcc1cf1910065, type: 3} - m_PrefabInstance: {fileID: 2062647807} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1892581094 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1892581088} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3} - m_Name: - m_EditorClassIdentifier: Unity.InputSystem::UnityEngine.InputSystem.PlayerInput - m_Actions: {fileID: -944628639613478452, guid: 2bcd2660ca9b64942af0de543d8d7100, type: 3} - m_NotificationBehavior: 3 - m_UIInputModule: {fileID: 0} - m_DeviceLostEvent: - m_PersistentCalls: - m_Calls: [] - m_DeviceRegainedEvent: - m_PersistentCalls: - m_Calls: [] - m_ControlsChangedEvent: - m_PersistentCalls: - m_Calls: [] - m_ActionEvents: [] - m_NeverAutoSwitchControlSchemes: 0 - m_DefaultControlScheme: - m_DefaultActionMap: Player - m_SplitScreenIndex: -1 - m_Camera: {fileID: 1102711993} --- !u!1 &2032829252 GameObject: m_ObjectHideFlags: 0 @@ -5247,7 +5207,7 @@ Transform: m_GameObject: {fileID: 2032829252} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 2.85, y: 10.4, z: 0} + m_LocalPosition: {x: 2.59, y: 8.82, z: 0} m_LocalScale: {x: 0.8, y: 0.8, z: 0.8} m_ConstrainProportionsScale: 0 m_Children: @@ -5262,38 +5222,14 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 849756540516150458, guid: fbc05a08dfccd6a4cb1bcc1cf1910065, type: 3} - propertyPath: m_Size.y - value: 0.75 + - target: {fileID: 342790821639359709, guid: fbc05a08dfccd6a4cb1bcc1cf1910065, type: 3} + propertyPath: m_SortingOrder + value: 1 objectReference: {fileID: 0} - - target: {fileID: 3534034070345576868, guid: fbc05a08dfccd6a4cb1bcc1cf1910065, type: 3} - propertyPath: runSpeed - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 3534034070345576868, guid: fbc05a08dfccd6a4cb1bcc1cf1910065, type: 3} - propertyPath: jumpForce - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 3534034070345576868, guid: fbc05a08dfccd6a4cb1bcc1cf1910065, type: 3} - propertyPath: turnDelay - value: 0.08 - objectReference: {fileID: 0} - - target: {fileID: 3534034070345576868, guid: fbc05a08dfccd6a4cb1bcc1cf1910065, type: 3} - propertyPath: springPower - value: 12 - objectReference: {fileID: 0} - - target: {fileID: 3534034070345576868, guid: fbc05a08dfccd6a4cb1bcc1cf1910065, type: 3} - propertyPath: airJumpForce - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 3534034070345576868, guid: fbc05a08dfccd6a4cb1bcc1cf1910065, type: 3} - propertyPath: spriteRenderer + - target: {fileID: 4576448781989217082, guid: fbc05a08dfccd6a4cb1bcc1cf1910065, type: 3} + propertyPath: m_Camera value: - objectReference: {fileID: 1111270482} - - target: {fileID: 3534034070345576868, guid: fbc05a08dfccd6a4cb1bcc1cf1910065, type: 3} - propertyPath: interactReference - value: - objectReference: {fileID: 1781555164194001046, guid: 2bcd2660ca9b64942af0de543d8d7100, type: 3} + objectReference: {fileID: 1102711993} - target: {fileID: 6196444245332325679, guid: fbc05a08dfccd6a4cb1bcc1cf1910065, type: 3} propertyPath: m_LocalPosition.x value: -6.31 @@ -5338,17 +5274,10 @@ PrefabInstance: propertyPath: m_Name value: Player objectReference: {fileID: 0} - - target: {fileID: 7621021177568661959, guid: fbc05a08dfccd6a4cb1bcc1cf1910065, type: 3} - propertyPath: m_TagString - value: Player - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 7621021177568661959, guid: fbc05a08dfccd6a4cb1bcc1cf1910065, type: 3} - insertIndex: -1 - addedObject: {fileID: 1892581094} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fbc05a08dfccd6a4cb1bcc1cf1910065, type: 3} --- !u!1660057539 &9223372036854775807 SceneRoots: diff --git a/Assets/Scripts/Management/SFX.cs b/Assets/Scripts/Management/SFX.cs index abd58cd..2acde0b 100644 --- a/Assets/Scripts/Management/SFX.cs +++ b/Assets/Scripts/Management/SFX.cs @@ -21,7 +21,7 @@ namespace Management private AudioSource _audioSource; // Playing clip registry. Used as data source to limit amount of times a clip will play simultaneously - private Dictionary _clipsInProgress; + private Dictionary _clipsInProgress = new Dictionary(); /// /// Plpays the given audio clip through the audio driver diff --git a/Assets/Scripts/Player/Movement.cs b/Assets/Scripts/Player/Movement.cs index 5ace56b..7354df4 100644 --- a/Assets/Scripts/Player/Movement.cs +++ b/Assets/Scripts/Player/Movement.cs @@ -1,4 +1,5 @@ using System; +using System.Collections; using System.Collections.Generic; using Management; using UnityEngine; @@ -10,6 +11,9 @@ namespace Player public class Movement : MonoBehaviour { private static readonly int Spring = Animator.StringToHash("spring"); + private static readonly int Grounded = Animator.StringToHash("grounded"); + private static readonly int Speed = Animator.StringToHash("speed"); + private static readonly int Vspeed = Animator.StringToHash("vspeed"); [SerializeField] private float runSpeed; [SerializeField] private float springPower; [SerializeField] private float jumpForce; @@ -17,6 +21,15 @@ namespace Player [SerializeField] private SpriteRenderer spriteRenderer; [SerializeField] private float turnDelay; [SerializeField] private InputActionReference interactReference; + [SerializeField] private float impactPauseTime; + [SerializeField] private float bouncePower; + [SerializeField] private Animator animator; + + [Header("Audio")] + [SerializeField] private AudioClip jumpSound; + [SerializeField] private AudioClip pickupSound; + [SerializeField] private AudioClip springSound; + [SerializeField] private AudioClip bumpSound; private Animator _springAnimator; private Rigidbody2D _rb; @@ -66,6 +79,8 @@ namespace Player _groundedCheckTimer += Time.deltaTime; _turnDelayTimer += Time.deltaTime; + if (!_autoDrive && Mathf.Abs(_rb.linearVelocityX) > 0.1f) + _facingLeft = _rb.linearVelocity.x < 0; spriteRenderer.flipX = !_facingLeft; if (_springAnimator && _jumpPressedThisFrame) { @@ -87,7 +102,6 @@ namespace Player if (!_grounded && _airJumpCharges > 0 && _jumpPressedThisFrame) { - Debug.Log(_airJumpDir); _airJump = true; } @@ -98,6 +112,7 @@ namespace Player { if (_jump) { + Services.Instance.SFX.PlayOneShot(jumpSound); _jump = false; _grounded = false; _rb.AddForce(Vector2.up * jumpForce, ForceMode2D.Impulse); @@ -105,13 +120,17 @@ namespace Player if (_airJump) { + Services.Instance.SFX.PlayOneShot(jumpSound); + StartCoroutine(ImpactPause(impactPauseTime)); _airJump = false; _airJumpCharges--; + _rb.linearVelocity = Vector3.zero; _rb.AddForce(_airJumpDir * airJumpForce, ForceMode2D.Impulse); } if (_fireSpring) { + Services.Instance.SFX.PlayOneShot(springSound); _fireSpring = false; _rb.linearVelocityX = 0; _rb.AddForce(Vector2.up * springPower, ForceMode2D.Impulse); @@ -120,14 +139,26 @@ namespace Player { _rb.linearVelocityX = _facingLeft ? -runSpeed : runSpeed; } + + animator.SetBool(Grounded, _grounded); + animator.SetFloat(Speed, Mathf.Abs(_rb.linearVelocity.x)); + animator.SetFloat(Vspeed, _rb.linearVelocity.y); } + private IEnumerator ImpactPause(float pauseTime) + { + Time.timeScale = 0f; + yield return new WaitForSecondsRealtime(pauseTime); + Time.timeScale = 1f; + } + private void OnTriggerEnter2D(Collider2D other) { if (other.gameObject.layer == LayerMask.NameToLayer("Spring")) _springAnimator = other.gameObject.GetComponent(); if (other.gameObject.layer == LayerMask.NameToLayer("Pickup")) { + Services.Instance.SFX.PlayOneShot(pickupSound); _airJumpCharges++; Destroy(other.gameObject); } @@ -166,6 +197,9 @@ namespace Player { _facingLeft = !_facingLeft; _turnDelayTimer = 0f; + if (!_autoDrive) + _rb.AddForce(new Vector2(x, 0f) * bouncePower, ForceMode2D.Impulse); + Services.Instance.SFX.PlayOneShot(bumpSound); break; } }