diff --git a/Assets/Audio/Ingame_demo_1_very_early_accesssss.mp3 b/Assets/Audio/Ingame_demo_1_very_early_accesssss.mp3 deleted file mode 100644 index 2006081..0000000 Binary files a/Assets/Audio/Ingame_demo_1_very_early_accesssss.mp3 and /dev/null differ diff --git a/Assets/Audio/Ingame_demo_1_very_early_accesssss.mp3.meta b/Assets/Audio/Ingame_demo_1_very_early_accesssss.mp3.meta deleted file mode 100644 index c61f887..0000000 --- a/Assets/Audio/Ingame_demo_1_very_early_accesssss.mp3.meta +++ /dev/null @@ -1,23 +0,0 @@ -fileFormatVersion: 2 -guid: fa96879f1e5773e4aa5ba67c98756caf -AudioImporter: - externalObjects: {} - serializedVersion: 7 - 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/Intro_Flatline(1).wav b/Assets/Audio/Intro_Flatline(1).wav deleted file mode 100644 index bc79089..0000000 Binary files a/Assets/Audio/Intro_Flatline(1).wav and /dev/null differ diff --git a/Assets/Audio/Intro_Flatline(1).wav.meta b/Assets/Audio/Intro_Flatline(1).wav.meta deleted file mode 100644 index 29a61c2..0000000 --- a/Assets/Audio/Intro_Flatline(1).wav.meta +++ /dev/null @@ -1,23 +0,0 @@ -fileFormatVersion: 2 -guid: 1199ff79c1f3044478a1d7fb88f09f20 -AudioImporter: - externalObjects: {} - serializedVersion: 7 - 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/Scripts/Misc/MainMenuMusic.cs b/Assets/Scripts/Misc/MainMenuMusic.cs index 0655f09..c2f1621 100644 --- a/Assets/Scripts/Misc/MainMenuMusic.cs +++ b/Assets/Scripts/Misc/MainMenuMusic.cs @@ -6,6 +6,13 @@ public class MainMenuMusic : MonoBehaviour { void Start() { - AudioManager.PlaySound("", new Vector3(0f, 0f, 0f)).volume = 1f; + AudioManager.PlaySound("Menu_Whistle_Intro", new Vector3(0f, 0f, 0f)).volume = 1f; + + Invoke("PlayMusic", 10); + } + + void PlayMusic() + { + AudioManager.PlaySound("Menu_Theme", new Vector3(0f, 0f, 0f), false, true, true, true).volume = 1f; } } diff --git a/Assets/Scripts/Misc/MainMenuTransitionAnimation.cs b/Assets/Scripts/Misc/MainMenuTransitionAnimation.cs index 045e43e..3ac84fd 100644 --- a/Assets/Scripts/Misc/MainMenuTransitionAnimation.cs +++ b/Assets/Scripts/Misc/MainMenuTransitionAnimation.cs @@ -27,7 +27,8 @@ public class MainMenuTransitionAnimation : MonoBehaviour yield return new WaitForSecondsRealtime(0.1f); } - + SceneManager.LoadScene(1); + //SceneManager.sceneLoaded += () => AudioManager.Instance. } }