Compare commits

..

No commits in common. "6690ff0b44431b0be0cb26ce74aa374335bea4be" and "6903b3602a86159912a9bceea91955818d35a918" have entirely different histories.

6 changed files with 48 additions and 10 deletions

Binary file not shown.

View File

@ -0,0 +1,23 @@
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:

Binary file not shown.

View File

@ -0,0 +1,23 @@
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:

View File

@ -6,13 +6,6 @@ public class MainMenuMusic : MonoBehaviour
{
void Start()
{
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;
AudioManager.PlaySound("", new Vector3(0f, 0f, 0f)).volume = 1f;
}
}

View File

@ -27,8 +27,7 @@ public class MainMenuTransitionAnimation : MonoBehaviour
yield return new WaitForSecondsRealtime(0.1f);
}
SceneManager.LoadScene(1);
//SceneManager.sceneLoaded += () => AudioManager.Instance.
}
}