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 0000000..f8492ec Binary files /dev/null and b/MuseumGame/Assets/Audio/step.wav differ diff --git a/MuseumGame/Assets/Audio/step.wav.meta b/MuseumGame/Assets/Audio/step.wav.meta new file mode 100644 index 0000000..88e05df --- /dev/null +++ b/MuseumGame/Assets/Audio/step.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 95acea3c3032b894d9f9dd9bb069e447 +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/Audio/subtlestep.wav b/MuseumGame/Assets/Audio/subtlestep.wav new file mode 100644 index 0000000..edaf6f8 Binary files /dev/null and b/MuseumGame/Assets/Audio/subtlestep.wav differ 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: