From 721d5ebf9c59a1fb34f22a25786a7f8ab5117de3 Mon Sep 17 00:00:00 2001 From: ThomasCharester Date: Sat, 15 Nov 2025 14:02:16 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B5=D0=B1=D0=BE=D0=BB=D1=8C=D1=88?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F,=20=D1=80=D0=B5=D0=B0=D0=BB=D1=8C=D0=BD=D0=BE=20=D0=BD?= =?UTF-8?q?=D0=B5=D0=B7=D0=BD=D0=B0=D1=87=D0=B8=D1=82=D0=B5=D0=BB=D1=8C?= =?UTF-8?q?=D0=BD=D1=8B=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Game/CourierOld/Assets/Code/Audio/AudioFactory.cs | 3 +-- Game/CourierOld/Assets/Code/Audio/AudioService.cs | 12 +++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Game/CourierOld/Assets/Code/Audio/AudioFactory.cs b/Game/CourierOld/Assets/Code/Audio/AudioFactory.cs index f46bc60..64d3800 100644 --- a/Game/CourierOld/Assets/Code/Audio/AudioFactory.cs +++ b/Game/CourierOld/Assets/Code/Audio/AudioFactory.cs @@ -39,7 +39,7 @@ namespace Code.Audio SoundtrackListConfig soundtrackListConfig, SFXListConfig sfxListConfig, EnemiesSoundListConfig enemiesSoundListConfig, - DispatcherSoundListConfig dispatcherSoundListConfig//, CharacterSoundListConfig characterSoundListConfig + DispatcherSoundListConfig dispatcherSoundListConfig ) { AudioMixer = audioMixerConfig.audioMixerAsset; @@ -51,7 +51,6 @@ namespace Code.Audio _SFX = sfxListConfig.SFX; _enemies = enemiesSoundListConfig.enemies; _dispatcher = dispatcherSoundListConfig.dispatcher; - // _character = characterSoundListConfig.character; MusicDictionary.Add(MusicType.Menu, new ()); MusicDictionary.Add(MusicType.Peaceful, new ()); diff --git a/Game/CourierOld/Assets/Code/Audio/AudioService.cs b/Game/CourierOld/Assets/Code/Audio/AudioService.cs index 3211705..c76c331 100644 --- a/Game/CourierOld/Assets/Code/Audio/AudioService.cs +++ b/Game/CourierOld/Assets/Code/Audio/AudioService.cs @@ -99,19 +99,21 @@ namespace Code.Audio // await UniTask.WaitUntilValueChanged(_musicAudioSources[musicType], // _ => !_musicAudioSources[musicType].isPlaying, // cancellationToken: _cancellationTokenSources[musicType].Token); - await UniTask.WaitUntil(() => _musicAudioSources[musicType].isPlaying); - Debug.Log($"Playing {musicType}"); - var isCanceled = await UniTask.WaitUntil(() => !_musicAudioSources[musicType].isPlaying, + await UniTask.NextFrame(); + // Debug.Log($"Playing {musicType}"); + var (isCanceled, _) = await UniTask.WaitUntilValueChanged(_musicAudioSources[musicType], + _ => !_musicAudioSources[musicType].isPlaying, cancellationToken: _cancellationTokenSources[musicType].Token).SuppressCancellationThrow(); - Debug.Log($"Finished {musicType}"); + // Debug.Log($"Finished {musicType}"); if (isCanceled) { - Debug.Log($"Cancelled {musicType}"); + // Debug.Log($"Cancelled {musicType}"); _cancellationTokenSources[musicType].Dispose(); _cancellationTokenSources[musicType] = new(); _audioSourcePool.ReleaseSource(_musicAudioSources[musicType]); + _musicAudioSources[musicType] = null; return; }