From cbcd196dd986f4d94c679c0e3e897b0dddddcb8f Mon Sep 17 00:00:00 2001 From: Matthew Kalahiki Date: Tue, 20 Apr 2021 09:49:18 -0500 Subject: [PATCH] start of footsteps --- .../Animations/Protagonist Run v1.1.anim | 16 ++- MuseumGame/Assets/Audio/step.wav | Bin 0 -> 14125 bytes MuseumGame/Assets/Audio/step.wav.meta | 22 ++++ MuseumGame/Assets/Audio/subtlestep.wav | Bin 0 -> 238 bytes MuseumGame/Assets/Audio/subtlestep.wav.meta | 22 ++++ MuseumGame/Assets/Prefabs/Player.prefab | 99 ++++++++++++++++++ MuseumGame/Assets/Scripts/movement.cs | 8 ++ .../UserSettings/EditorUserSettings.asset | 8 ++ 8 files changed, 174 insertions(+), 1 deletion(-) create mode 100644 MuseumGame/Assets/Audio/step.wav create mode 100644 MuseumGame/Assets/Audio/step.wav.meta create mode 100644 MuseumGame/Assets/Audio/subtlestep.wav create mode 100644 MuseumGame/Assets/Audio/subtlestep.wav.meta diff --git a/MuseumGame/Assets/Animations/Protagonist Run v1.1.anim b/MuseumGame/Assets/Animations/Protagonist Run v1.1.anim index fc9a226..9f6f34f 100644 --- a/MuseumGame/Assets/Animations/Protagonist Run v1.1.anim +++ b/MuseumGame/Assets/Animations/Protagonist Run v1.1.anim @@ -92,4 +92,18 @@ AnimationClip: m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 0.083333336 + functionName: Step + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 + - time: 0.5 + functionName: Step + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/MuseumGame/Assets/Audio/step.wav b/MuseumGame/Assets/Audio/step.wav new file mode 100644 index 0000000000000000000000000000000000000000..f8492ec3b21c0e0a72c7ce55fa6f8af466041990 GIT binary patch literal 14125 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 literal 0 HcmV?d00001 diff --git a/MuseumGame/Assets/Audio/subtlestep.wav.meta b/MuseumGame/Assets/Audio/subtlestep.wav.meta new file mode 100644 index 0000000..b264023 --- /dev/null +++ b/MuseumGame/Assets/Audio/subtlestep.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 97568e1f7fd360e4c92e4e0b79226a97 +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/MuseumGame/Assets/Prefabs/Player.prefab b/MuseumGame/Assets/Prefabs/Player.prefab index 32d2e9e..e88d02f 100644 --- a/MuseumGame/Assets/Prefabs/Player.prefab +++ b/MuseumGame/Assets/Prefabs/Player.prefab @@ -16,6 +16,7 @@ GameObject: - component: {fileID: 4572441351392969366} - component: {fileID: 4796302867346557188} - component: {fileID: 971613887410275354} + - component: {fileID: 7510283663755342960} m_Layer: 0 m_Name: Player m_TagString: Player @@ -108,6 +109,8 @@ MonoBehaviour: _MinAcc: -2 _Deceleration: 0.4 jumpForce: 350 + clips: + - {fileID: 8300000, guid: 97568e1f7fd360e4c92e4e0b79226a97, type: 3} --- !u!114 &-5793387185563800375 MonoBehaviour: m_ObjectHideFlags: 0 @@ -192,3 +195,99 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_FallSpeed: 0.7 +--- !u!82 &7510283663755342960 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 374150667840124763} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 1 + 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/MuseumGame/Assets/Scripts/movement.cs b/MuseumGame/Assets/Scripts/movement.cs index 717991f..127dc99 100644 --- a/MuseumGame/Assets/Scripts/movement.cs +++ b/MuseumGame/Assets/Scripts/movement.cs @@ -21,12 +21,16 @@ public class movement : MonoBehaviour private float numJumps; private bool isGrounded = true; + public AudioClip[] clips; + private AudioSource a; + // Start is called before the first frame update void Start() { rb2d = GetComponent(); numJumps = maxJumps; animator = GetComponent(); + a = GetComponent(); } // Update is called once per frame @@ -139,5 +143,9 @@ public class movement : MonoBehaviour animator.SetFloat("velocityY", 0); } } + private void Step() + { + a.PlayOneShot(clips[0]); + } } diff --git a/MuseumGame/UserSettings/EditorUserSettings.asset b/MuseumGame/UserSettings/EditorUserSettings.asset index a5f2200..073cf04 100644 --- a/MuseumGame/UserSettings/EditorUserSettings.asset +++ b/MuseumGame/UserSettings/EditorUserSettings.asset @@ -12,27 +12,35 @@ EditorUserSettings: value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621d1224e7f27a2decee22f0 flags: 0 RecentlyUsedScenePath-2: + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620c1336eff9002dece933e5a92f31352d1b value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6 flags: 0 RecentlyUsedScenePath-3: + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d3ae9e5740be1e238eca92f31352d1b value: 22424703114646680e0b0227036c7b151b18342f3a2d2a2362191c27ead43b1aedf425a7f234362820 flags: 0 RecentlyUsedScenePath-4: + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1220f1d23b37efa923e7ee2e26 value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1132eceb7414e7f133e5a92f31352d1b flags: 0 RecentlyUsedScenePath-5: + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621d1224e7f27a2decee22f0 value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1220f1d23b37efa923e7ee2e26 flags: 0 RecentlyUsedScenePath-6: + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a2362191c27ead43b1aedf425a7f234362820 value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d3ae9e5740be1e238eca92f31352d1b flags: 0 RecentlyUsedScenePath-7: + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6 value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d flags: 0 RecentlyUsedScenePath-8: + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0 value: 22424703114646680e0b0227036c6b1505032b292926237e38271427fb flags: 0 RecentlyUsedScenePath-9: + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6 value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0 flags: 0 vcSharedLogLevel: