From e128ee59f95bd93b3a4b74fa67601e2026872a46 Mon Sep 17 00:00:00 2001 From: ThomasCharester Date: Sat, 15 Nov 2025 01:14:11 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A7=D0=B8=D1=81=D1=82=D0=BA=D0=B0=20=D0=BC?= =?UTF-8?q?=D1=83=D1=81=D0=BE=D1=80=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets/Code/Audio/AudioFactory.cs | 7 - .../Assets/Code/Audio/AudioService.cs | 163 ------------------ 2 files changed, 170 deletions(-) diff --git a/Game/CourierOld/Assets/Code/Audio/AudioFactory.cs b/Game/CourierOld/Assets/Code/Audio/AudioFactory.cs index d6738f1..f46bc60 100644 --- a/Game/CourierOld/Assets/Code/Audio/AudioFactory.cs +++ b/Game/CourierOld/Assets/Code/Audio/AudioFactory.cs @@ -57,13 +57,6 @@ namespace Code.Audio MusicDictionary.Add(MusicType.Peaceful, new ()); MusicDictionary.Add(MusicType.Action, new ()); } - - // public async UniTask CreateMixer() - // { - // AudioMixer audioMixer = (await Addressables.InstantiateAsync(_audioMixerPrefab).ToUniTask()).GetComponent(); - // - // return audioMixer; - // } public async UniTask LoadAudioSourcePrefab(Action callback) => callback?.Invoke(await Addressables.LoadAssetAsync(_audioSourcePrefab)); diff --git a/Game/CourierOld/Assets/Code/Audio/AudioService.cs b/Game/CourierOld/Assets/Code/Audio/AudioService.cs index 87de38c..3211705 100644 --- a/Game/CourierOld/Assets/Code/Audio/AudioService.cs +++ b/Game/CourierOld/Assets/Code/Audio/AudioService.cs @@ -74,49 +74,8 @@ namespace Code.Audio await _audioFactory.LoadAudioSourcePrefab(_audioSourcePool.Initialize); - // InitializeMusicSources(); } - // private void InitializeMusicSources() - // { - // _actionMusicSource = _audioSourcePool.GetSource(); - // _actionMusicSource.outputAudioMixerGroup = _actionMusicGroup; - // _actionMusicSource.spatialBlend = 0f; - // - // _peacefulMusicSource = _audioSourcePool.GetSource(); - // _peacefulMusicSource.outputAudioMixerGroup = _peacefulMusicGroup; - // _peacefulMusicSource.spatialBlend = 0f; - // } - - // public void PlayRandomGameplayMusic() - // { - // _peacefulMusicSource.resource = - // _audioFactory.PeacefulMusic[Random.Range(0, _audioFactory.PeacefulMusic.Count)]; - // _actionMusicSource.resource = - // _audioFactory.ActionMusic[Random.Range(0, _audioFactory.ActionMusic.Count)]; - // - // _peacefulMusicSource.Play(); - // _actionMusicSource.Play(); - // } - - // public void PlayRandomMenuMusic() - // { - // TransitToSnapshot(AudioSnapshotState.Peaceful); - // - // _peacefulMusicSource.resource = _audioFactory.MenuMusic[Random.Range(0, _audioFactory.MenuMusic.Count)]; - // - // _peacefulMusicSource.Play(); - // } - // - // public void PlayRandomMenuMusic() - // { - // TransitToSnapshot(AudioSnapshotState.Peaceful); - // - // _peacefulMusicSource.resource = _audioFactory.MenuMusic[Random.Range(0, _audioFactory.MenuMusic.Count)]; - // - // _peacefulMusicSource.Play(); - // } - #pragma warning disable CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed private Dictionary _cancellationTokenSources = new(); private Dictionary _musicAudioSources = new(); @@ -167,77 +126,9 @@ namespace Code.Audio await UniTask.WaitForSeconds(time); _cancellationTokenSources[musicType].Cancel(); - - // _musicAudioSources[musicType].Stop(); callback?.Invoke(); } - // - // private CancellationTokenSource _menuMusicTokenSource = new(); - // - // public async UniTaskVoid PlayRandomMenuMusicUntilHumanityWillBeDestroyedForTheySins() - // { - // TransitToSnapshot(AudioSnapshotState.Peaceful); - // - // _peacefulMusicSource.resource = _audioFactory.MenuMusic[Random.Range(0, _audioFactory.MenuMusic.Count)]; - // - // _peacefulMusicSource.Play(); - // - // await UniTask.WaitUntilValueChanged(_peacefulMusicSource, _ => _peacefulMusicSource.isPlaying, - // cancellationToken: _menuMusicTokenSource.Token); - // if (_menuMusicTokenSource.IsCancellationRequested) - // { - // _menuMusicTokenSource.Dispose(); - // _menuMusicTokenSource = new(); - // return; - // } - // - // PlayRandomMenuMusicUntilHumanityWillBeDestroyedForTheySins(); - // } - // - // private CancellationTokenSource _peacefulMusicTokenSource = new(); - // - // public async UniTaskVoid PlayRandomPeacefulMusicUntilHumanityWillBeDestroyedForTheySins() - // { - // TransitToSnapshot(AudioSnapshotState.Peaceful); - // - // _peacefulMusicSource.resource = - // _audioFactory.PeacefulMusic[Random.Range(0, _audioFactory.PeacefulMusic.Count)]; - // - // _peacefulMusicSource.Play(); - // - // await UniTask.WaitUntilValueChanged(_peacefulMusicSource, _ => _peacefulMusicSource.isPlaying, - // cancellationToken: _peacefulMusicTokenSource.Token); - // if (_peacefulMusicTokenSource.IsCancellationRequested) - // { - // _peacefulMusicTokenSource.Dispose(); - // _peacefulMusicTokenSource = new(); - // return; - // } - // - // PlayRandomPeacefulMusicUntilHumanityWillBeDestroyedForTheySins(); - // } - // - // private CancellationTokenSource _actionMusicTokenSource = new(); - // public async UniTaskVoid PlayRandomActionMusicUntilHumanityWillBeDestroyedForTheySins() - // { - // TransitToSnapshot(AudioSnapshotState.Action); - // - // _actionMusicSource.resource = _audioFactory.ActionMusic[Random.Range(0, _audioFactory.ActionMusic.Count)]; - // - // _actionMusicSource.Play(); - // - // await UniTask.WaitUntilValueChanged(_actionMusicSource, _ => _actionMusicSource.isPlaying, - // cancellationToken: _actionMusicTokenSource.Token); - // if (_actionMusicTokenSource.IsCancellationRequested) - // { - // _actionMusicTokenSource.Dispose(); - // _actionMusicTokenSource = new(); - // return; - // } - // - // PlayRandomActionMusicUntilHumanityWillBeDestroyedForTheySins(); - // } #pragma warning restore CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed public void StopMusic() @@ -254,60 +145,6 @@ namespace Code.Audio callback?.Invoke(); } - // - // public async UniTaskVoid GladlyAskToStopMenuMusic(Action callback = null) - // { - // TransitToSnapshot(AudioSnapshotState.None); - // - // await UniTask.WaitForSeconds(1f); - // - // _peacefulMusicSource.Stop(); - // - // _menuMusicTokenSource.Cancel(); - // - // callback?.Invoke(); - // } - // - // public async UniTaskVoid GladlyAskToStopGameplayMusic(Action callback = null) - // { - // TransitToSnapshot(AudioSnapshotState.None); - // - // await UniTask.WaitForSeconds(1f); - // - // _actionMusicSource.Stop(); - // _peacefulMusicSource.Stop(); - // - // _actionMusicTokenSource.Cancel(); - // _peacefulMusicTokenSource.Cancel(); - // - // callback?.Invoke(); - // } - // - // public async UniTaskVoid GladlyAskToStopActionMusic(Action callback = null) - // { - // TransitToSnapshot(AudioSnapshotState.None); - // - // await UniTask.WaitForSeconds(1f); - // - // _actionMusicSource.Stop(); - // - // _actionMusicTokenSource.Cancel(); - // - // callback?.Invoke(); - // } - // - // public async UniTaskVoid GladlyAskToStopPeacefulMusic(Action callback = null) - // { - // TransitToSnapshot(AudioSnapshotState.None); - // - // await UniTask.WaitForSeconds(1f); - // - // _peacefulMusicSource.Stop(); - // - // _peacefulMusicTokenSource.Cancel(); - // - // callback?.Invoke(); - // } public void TransitToSnapshot(AudioSnapshotState state, float time = 1f) {