From d577089cbea03a960c54ca482d968bca486f49e8 Mon Sep 17 00:00:00 2001 From: Matthew Kalahiki Date: Wed, 14 Apr 2021 23:53:37 -0500 Subject: [PATCH] Background music should work --- MuseumGame/Assets/Audio/Jump.wav | Bin 0 -> 31789 bytes MuseumGame/Assets/Audio/Jump.wav.meta | 22 ++++ .../Assets/Scenes/DemoLevels/Spawn.unity | 99 ++++++++++++++++++ MuseumGame/Assets/Scripts/GameManager.cs | 12 +++ .../UserSettings/EditorUserSettings.asset | 18 ++-- 5 files changed, 141 insertions(+), 10 deletions(-) create mode 100644 MuseumGame/Assets/Audio/Jump.wav create mode 100644 MuseumGame/Assets/Audio/Jump.wav.meta diff --git a/MuseumGame/Assets/Audio/Jump.wav b/MuseumGame/Assets/Audio/Jump.wav new file mode 100644 index 0000000000000000000000000000000000000000..bae8dff5e8a41765ab93890f7c4b43a1f3fe4e89 GIT binary patch literal 31789 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 F{D0Rx>4pFR literal 0 HcmV?d00001 diff --git a/MuseumGame/Assets/Audio/Jump.wav.meta b/MuseumGame/Assets/Audio/Jump.wav.meta new file mode 100644 index 0000000..2018581 --- /dev/null +++ b/MuseumGame/Assets/Audio/Jump.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 77edfdaebf0b2e14982246c1f8be7828 +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/Scenes/DemoLevels/Spawn.unity b/MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity index 63a27e2..7cfe489 100644 --- a/MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity +++ b/MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity @@ -1955,6 +1955,7 @@ GameObject: m_Component: - component: {fileID: 637676178} - component: {fileID: 637676177} + - component: {fileID: 637676179} m_Layer: 0 m_Name: GameManager m_TagString: Untagged @@ -1981,6 +1982,8 @@ MonoBehaviour: obtainedPowerups: powerupStatus: sceneToLoad: BossRoom + music: + - {fileID: 8300000, guid: f29919963390ff24fa1ae468277b309e, type: 3} --- !u!4 &637676178 Transform: m_ObjectHideFlags: 0 @@ -1995,6 +1998,102 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &637676179 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 637676176} + 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 --- !u!1 &874186942 GameObject: m_ObjectHideFlags: 0 diff --git a/MuseumGame/Assets/Scripts/GameManager.cs b/MuseumGame/Assets/Scripts/GameManager.cs index 0e44e69..9d4f958 100644 --- a/MuseumGame/Assets/Scripts/GameManager.cs +++ b/MuseumGame/Assets/Scripts/GameManager.cs @@ -16,11 +16,15 @@ public class GameManager : MonoBehaviour public GameObject events; public GameObject player; + private AudioSource sound; + public List obtainedPowerups = new List{ }; public List powerupStatus = new List{ }; public string sceneToLoad = ""; + public AudioClip[] music; + void Awake() { if (Instance == null) @@ -47,12 +51,20 @@ public class GameManager : MonoBehaviour { LoadLevel(sceneToLoad, new Vector3(0, 0, 0)); } + sound = GetComponent(); } // Update is called once per frame void Update() { doGliderButtonCheck(); + if (SceneManager.GetActiveScene().name == "Spawn" || SceneManager.GetActiveScene().name == "EnemyTunnel" || SceneManager.GetActiveScene().name == "RouteToTower" || SceneManager.GetActiveScene().name == "Tower" || SceneManager.GetActiveScene().name == "PathToBoss" || SceneManager.GetActiveScene().name == "BossRoom" ){ + sound.clip = music[0]; + } + if (!sound.isPlaying) + { + sound.Play(); + } } public void LoadLevel(string levelName, Vector3 whereTo) diff --git a/MuseumGame/UserSettings/EditorUserSettings.asset b/MuseumGame/UserSettings/EditorUserSettings.asset index ae3bbfa..73eedf9 100644 --- a/MuseumGame/UserSettings/EditorUserSettings.asset +++ b/MuseumGame/UserSettings/EditorUserSettings.asset @@ -6,36 +6,34 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedScenePath-0: - value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620c1336eff9002dece933e5a92f31352d1b flags: 0 RecentlyUsedScenePath-1: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621d1224e7f27a2decee22f0 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1220f1a00637edea78fce9332b25 flags: 0 RecentlyUsedScenePath-2: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1132eceb7414e7f133e5a92f31352d1b + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1220f1a00637edea78fce9332b25 flags: 0 RecentlyUsedScenePath-3: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620c1336eff9002dece933e5a92f31352d1b + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1220f1d23b37efa923e7ee2e26 flags: 0 RecentlyUsedScenePath-4: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6 value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d3ae9e5740be1e238eca92f31352d1b flags: 0 RecentlyUsedScenePath-5: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1220f1a00637edea78fce9332b25 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621d1224e7f27a2decee22f0 flags: 0 RecentlyUsedScenePath-6: value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6 flags: 0 RecentlyUsedScenePath-7: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1220f1a00637edea78fce9332b25 - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a2362191c27ead43b1aedf425a7f234362820 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621d1224e7f27a2decee22f0 flags: 0 RecentlyUsedScenePath-8: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a2362191c27ead43b1aedf425a7f234362820 flags: 0 RecentlyUsedScenePath-9: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1220f1d23b37efa923e7ee2e26 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0 flags: 0 vcSharedLogLevel: value: 0d5e400f0650