Tetramino/CourierOld
5
0 Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'SoundManager' into PlayerAnimator

Browse Source
This commit is contained in:
ThomasCharester committed 2025-11-15 18:31:13 +03:00
2 parents ddb76a5b93 721d5ebf9c
commit 5b09068b0c
2 files changed
+8 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Game/CourierOld/Assets/Code/Audio/AudioFactory.cs
+1 -2
View File
@@ -39,7 +39,7 @@ namespace Code.Audio
SoundtrackListConfig soundtrackListConfig, SoundtrackListConfig soundtrackListConfig,
SFXListConfig sfxListConfig, SFXListConfig sfxListConfig,
EnemiesSoundListConfig enemiesSoundListConfig, EnemiesSoundListConfig enemiesSoundListConfig,
DispatcherSoundListConfig dispatcherSoundListConfig//, CharacterSoundListConfig characterSoundListConfig DispatcherSoundListConfig dispatcherSoundListConfig
) )
{ {
AudioMixer = audioMixerConfig.audioMixerAsset; AudioMixer = audioMixerConfig.audioMixerAsset;
@@ -51,7 +51,6 @@ namespace Code.Audio
_SFX = sfxListConfig.SFX; _SFX = sfxListConfig.SFX;
_enemies = enemiesSoundListConfig.enemies; _enemies = enemiesSoundListConfig.enemies;
_dispatcher = dispatcherSoundListConfig.dispatcher; _dispatcher = dispatcherSoundListConfig.dispatcher;
// _character = characterSoundListConfig.character;
MusicDictionary.Add(MusicType.Menu, new ()); MusicDictionary.Add(MusicType.Menu, new ());
MusicDictionary.Add(MusicType.Peaceful, new ()); MusicDictionary.Add(MusicType.Peaceful, new ());
Game/CourierOld/Assets/Code/Audio/AudioService.cs
+7 -5
View File
@@ -99,19 +99,21 @@ namespace Code.Audio
// await UniTask.WaitUntilValueChanged(_musicAudioSources[musicType], // await UniTask.WaitUntilValueChanged(_musicAudioSources[musicType],
// _ => !_musicAudioSources[musicType].isPlaying, // _ => !_musicAudioSources[musicType].isPlaying,
// cancellationToken: _cancellationTokenSources[musicType].Token); // cancellationToken: _cancellationTokenSources[musicType].Token);
await UniTask.WaitUntil(() => _musicAudioSources[musicType].isPlaying); await UniTask.NextFrame();
Debug.Log($"Playing {musicType}"); // Debug.Log($"Playing {musicType}");
var isCanceled = await UniTask.WaitUntil(() => !_musicAudioSources[musicType].isPlaying, var (isCanceled, _) = await UniTask.WaitUntilValueChanged(_musicAudioSources[musicType],
_ => !_musicAudioSources[musicType].isPlaying,
cancellationToken: _cancellationTokenSources[musicType].Token).SuppressCancellationThrow(); cancellationToken: _cancellationTokenSources[musicType].Token).SuppressCancellationThrow();
Debug.Log($"Finished {musicType}"); // Debug.Log($"Finished {musicType}");
if (isCanceled) if (isCanceled)
{ {
Debug.Log($"Cancelled {musicType}"); // Debug.Log($"Cancelled {musicType}");
_cancellationTokenSources[musicType].Dispose(); _cancellationTokenSources[musicType].Dispose();
_cancellationTokenSources[musicType] = new(); _cancellationTokenSources[musicType] = new();
_audioSourcePool.ReleaseSource(_musicAudioSources[musicType]); _audioSourcePool.ReleaseSource(_musicAudioSources[musicType]);
_musicAudioSources[musicType] = null;
return; return;
} }