Compare commits
No commits in common. "ae415cc858ff6f47a7983f0dfdcdd240a81758c3" and "3d1f783f19c72898c7c6e8a945212e3efeac980d" have entirely different histories.
ae415cc858
...
3d1f783f19
Binary file not shown.
|
@ -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.
|
@ -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:
|
|
@ -6,13 +6,6 @@ public class MainMenuMusic : MonoBehaviour
|
||||||
{
|
{
|
||||||
void Start()
|
void Start()
|
||||||
{
|
{
|
||||||
AudioManager.PlaySound("Menu_Whistle_Intro", new Vector3(0f, 0f, 0f)).volume = 1f;
|
AudioManager.PlaySound("", 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;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -29,6 +29,5 @@ public class MainMenuTransitionAnimation : MonoBehaviour
|
||||||
|
|
||||||
|
|
||||||
SceneManager.LoadScene(1);
|
SceneManager.LoadScene(1);
|
||||||
//SceneManager.sceneLoaded += () => AudioManager.Instance.
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue