diff --git a/Assets/ModelRenderer/Art/Music.meta b/Assets/ModelRenderer/Art/Music.meta new file mode 100644 index 0000000000..34d121d641 --- /dev/null +++ b/Assets/ModelRenderer/Art/Music.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1419f6cd03e824cf3b17ba8ef9ee80ef +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ModelRenderer/Art/Music/music.meta b/Assets/ModelRenderer/Art/Music/music.meta new file mode 100644 index 0000000000..26f6a01bf0 --- /dev/null +++ b/Assets/ModelRenderer/Art/Music/music.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: beeabaddc14c14f07b9793aefc62f9fa +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ModelRenderer/Art/Music/music/2014.meta b/Assets/ModelRenderer/Art/Music/music/2014.meta new file mode 100644 index 0000000000..8e318831ec --- /dev/null +++ b/Assets/ModelRenderer/Art/Music/music/2014.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ac105eb0ccc374f10b4fea04b01f3d47 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ModelRenderer/Art/Music/music/2014/新手村.meta b/Assets/ModelRenderer/Art/Music/music/2014/新手村.meta new file mode 100644 index 0000000000..2246ca69e3 --- /dev/null +++ b/Assets/ModelRenderer/Art/Music/music/2014/新手村.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6221f47222ee14f87b8b8ccdfd1ba0c7 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ModelRenderer/Art/Music/music/2014/新手村/其他地区.mp3 b/Assets/ModelRenderer/Art/Music/music/2014/新手村/其他地区.mp3 new file mode 100644 index 0000000000..3fdc46fd13 Binary files /dev/null and b/Assets/ModelRenderer/Art/Music/music/2014/新手村/其他地区.mp3 differ diff --git a/Assets/ModelRenderer/Art/Music/music/2014/新手村/其他地区.mp3.meta b/Assets/ModelRenderer/Art/Music/music/2014/新手村/其他地区.mp3.meta new file mode 100644 index 0000000000..5130f48e2d --- /dev/null +++ b/Assets/ModelRenderer/Art/Music/music/2014/新手村/其他地区.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 42623de26b41d48319c3c98734c657bb +AudioImporter: + externalObjects: {} + serializedVersion: 8 + 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/ModelRenderer/Art/Music/music/ambiencestereo.meta b/Assets/ModelRenderer/Art/Music/music/ambiencestereo.meta new file mode 100644 index 0000000000..a9c3c6fdf2 --- /dev/null +++ b/Assets/ModelRenderer/Art/Music/music/ambiencestereo.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: df98a3fd090e44f458af27c63a65fd3c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ModelRenderer/Art/Music/music/ambiencestereo/daynormal2.wav b/Assets/ModelRenderer/Art/Music/music/ambiencestereo/daynormal2.wav new file mode 100644 index 0000000000..31252fcb31 Binary files /dev/null and b/Assets/ModelRenderer/Art/Music/music/ambiencestereo/daynormal2.wav differ diff --git a/Assets/ModelRenderer/Art/Music/music/ambiencestereo/daynormal2.wav.meta b/Assets/ModelRenderer/Art/Music/music/ambiencestereo/daynormal2.wav.meta new file mode 100644 index 0000000000..359066feda --- /dev/null +++ b/Assets/ModelRenderer/Art/Music/music/ambiencestereo/daynormal2.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: e5c504ce180264f2c94e1c18c98495e0 +AudioImporter: + externalObjects: {} + serializedVersion: 8 + 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/ModelRenderer/Art/music.meta b/Assets/ModelRenderer/Art/music.meta index 8ce2ebf91e..34d121d641 100644 --- a/Assets/ModelRenderer/Art/music.meta +++ b/Assets/ModelRenderer/Art/music.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0a80035676350bb45b34945e65135af3 +guid: 1419f6cd03e824cf3b17ba8ef9ee80ef folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/PerfectWorld/Scripts/Sound/TemporaryBackgroundMusic.cs b/Assets/PerfectWorld/Scripts/Sound/TemporaryBackgroundMusic.cs new file mode 100644 index 0000000000..38b3c44f67 --- /dev/null +++ b/Assets/PerfectWorld/Scripts/Sound/TemporaryBackgroundMusic.cs @@ -0,0 +1,65 @@ +using Cysharp.Threading.Tasks; +using UnityEngine; + + +namespace BrewMonster.Scripts +{ + public class TemporaryBackgroundMusic : MonoBehaviour + { + public string backgroundMusicPath; + public string ambientSoundPath; + + public AudioSource backgroundMusicSource; + public AudioSource ambientSoundSource; + // Start is called once before the first execution of Update after the MonoBehaviour is created + void Start() + { + // get the HostPlayer + SetupAudioSources().Forget(); + } + + private async UniTask SetupAudioSources() + { + // get the HostPlayer + var hostPlayer = CECGameRun.Instance.GetHostPlayer(); + + while (hostPlayer == null) + { + await UniTask.DelayFrame(1); + hostPlayer = CECGameRun.Instance.GetHostPlayer(); + } + + // attach 2 audio source gameobjects to the host player + GameObject backgroundMusicObject = new GameObject("BackgroundMusic"); + backgroundMusicSource = backgroundMusicObject.AddComponent(); + backgroundMusicObject.transform.parent = hostPlayer.transform; + backgroundMusicObject.transform.localPosition = Vector3.zero; + backgroundMusicObject.transform.localRotation = Quaternion.identity; + backgroundMusicObject.transform.localScale = Vector3.one; + + GameObject ambientSoundObject = new GameObject("AmbientSound"); + ambientSoundSource = ambientSoundObject.AddComponent(); + ambientSoundObject.transform.parent = hostPlayer.transform; + ambientSoundObject.transform.localPosition = Vector3.zero; + ambientSoundObject.transform.localRotation = Quaternion.identity; + ambientSoundObject.transform.localScale = Vector3.one; + + await PlayBackgroundMusic(); + } + + private async UniTask PlayBackgroundMusic() + { + // use AddressableManager to load the background music and ambient sound + var backgroundMusicClip = await AddressableManager.Instance.LoadAudioClipAsync(backgroundMusicPath.ToLower()); + var ambientSoundClip = await AddressableManager.Instance.LoadAudioClipAsync(ambientSoundPath.ToLower()); + + // play the background music and ambient sound + backgroundMusicSource.clip = backgroundMusicClip; + backgroundMusicSource.loop = true; + backgroundMusicSource.Play(); + ambientSoundSource.clip = ambientSoundClip; + ambientSoundSource.loop = true; + ambientSoundSource.Play(); + } + } +} diff --git a/Assets/PerfectWorld/Scripts/Sound/TemporaryBackgroundMusic.cs.meta b/Assets/PerfectWorld/Scripts/Sound/TemporaryBackgroundMusic.cs.meta new file mode 100644 index 0000000000..0d9fcbf825 --- /dev/null +++ b/Assets/PerfectWorld/Scripts/Sound/TemporaryBackgroundMusic.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 7177e3c1538c0477bbcbd3beaacea509 \ No newline at end of file diff --git a/Assets/Scenes/a61.unity b/Assets/Scenes/a61.unity index 64e8ba56d8..31a92df7ae 100644 --- a/Assets/Scenes/a61.unity +++ b/Assets/Scenes/a61.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:80a844f1647a00529b585f34c0ce83c7accc751171d522e33b50787654e98940 -size 5916998 +oid sha256:1de882c8c5ed30da035a6646b66fb92328fca652f37ee4e0a885cec817a9f741 +size 5918457