Настройки
This commit is contained in:
1 parent
4a547f1348
commit
79d03528f6
34 files changed
+17027
-62
No files matched your search
@@ -1,5 +1,6 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using Code.Configs;
|
||||
using Cysharp.Threading.Tasks;
|
||||
using UnityEngine;
|
||||
@@ -15,6 +16,7 @@ namespace Code.Audio
|
||||
public AudioMixer AudioMixer { get; private set; }
|
||||
private AssetReference _audioSourcePrefab;
|
||||
|
||||
private AssetReference[] _audioTestClipsReferences;
|
||||
private AssetReference[] _peacefulSoundtrack;
|
||||
private AssetReference[] _actionSoundtrack;
|
||||
private AssetReference[] _menuSoundtrack;
|
||||
@@ -23,6 +25,7 @@ namespace Code.Audio
|
||||
private AssetReference[] _dispatcher;
|
||||
private AssetReference[] _character;
|
||||
|
||||
private AsyncOperationHandle<IList<AudioClip>> _audioTestClipsHandle;
|
||||
private AsyncOperationHandle<IList<AudioClip>> _menuMusicHandle;
|
||||
private AsyncOperationHandle<IList<AudioClip>> _actionMusicHandle;
|
||||
private AsyncOperationHandle<IList<AudioClip>> _peacefulMusicHandle;
|
||||
@@ -30,6 +33,7 @@ namespace Code.Audio
|
||||
private AsyncOperationHandle<IList<AudioClip>> _enemiesHandle;
|
||||
private AsyncOperationHandle<IList<AudioClip>> _dispatcherHandle;
|
||||
|
||||
public Dictionary<AudioType, AudioClip> AudioTestClips { get; private set; } = new();
|
||||
public Dictionary<MusicType, List<AudioClip>> MusicDictionary { get; private set; } = new();
|
||||
public List<AudioClip> SFXAudios { get; private set; } = new();
|
||||
public List<AudioClip> EnemiesAudios { get; private set; } = new();
|
||||
@@ -39,7 +43,8 @@ namespace Code.Audio
|
||||
SoundtrackListConfig soundtrackListConfig,
|
||||
SFXListConfig sfxListConfig,
|
||||
EnemiesSoundListConfig enemiesSoundListConfig,
|
||||
DispatcherSoundListConfig dispatcherSoundListConfig
|
||||
DispatcherSoundListConfig dispatcherSoundListConfig,
|
||||
AudioTestClipsConfig audioTestClipsConfig
|
||||
)
|
||||
{
|
||||
AudioMixer = audioMixerConfig.audioMixerAsset;
|
||||
@@ -51,6 +56,7 @@ namespace Code.Audio
|
||||
_SFX = sfxListConfig.SFX;
|
||||
_enemies = enemiesSoundListConfig.enemies;
|
||||
_dispatcher = dispatcherSoundListConfig.dispatcher;
|
||||
_audioTestClipsReferences = audioTestClipsConfig.audioTestClips;
|
||||
|
||||
MusicDictionary.Add(MusicType.Menu, new ());
|
||||
MusicDictionary.Add(MusicType.Peaceful, new ());
|
||||
@@ -77,12 +83,28 @@ namespace Code.Audio
|
||||
MusicDictionary[MusicType.Peaceful].Clear();
|
||||
_peacefulMusicHandle.Release();
|
||||
}
|
||||
public async UniTask WarmAudioTestClips( )
|
||||
{
|
||||
// _audioTestClipCounter = 0;
|
||||
_audioTestClipsHandle = Addressables.LoadAssetsAsync<AudioClip>(_audioTestClipsReferences, OnAudioTestClipLoaded, Addressables.MergeMode.Union);
|
||||
|
||||
// foreach (var assetReference in _menuSoundtrack) MenuMusic.Add(await assetReference.LoadAssetAsync<AudioClip>());
|
||||
var clips = (await _audioTestClipsHandle.ToUniTask()).ToList();
|
||||
|
||||
for (int i = 0; i < clips.Count; i++)
|
||||
AudioTestClips[(AudioType)i] = clips[i];
|
||||
}
|
||||
public void ReleaseAudioTestClips()
|
||||
{
|
||||
AudioTestClips.Clear();
|
||||
// foreach (var assetReference in _menuSoundtrack) assetReference.ReleaseAsset();
|
||||
_audioTestClipsHandle.Release();
|
||||
}
|
||||
public async UniTask WarmMenuMusic( )
|
||||
{
|
||||
_menuMusicHandle = Addressables.LoadAssetsAsync<AudioClip>(_menuSoundtrack, OnMenuTrackLoaded, Addressables.MergeMode.Union);
|
||||
// foreach (var assetReference in _menuSoundtrack) MenuMusic.Add(await assetReference.LoadAssetAsync<AudioClip>());
|
||||
await _menuMusicHandle.ToUniTask();
|
||||
|
||||
}
|
||||
public void ReleaseMenuMusic()
|
||||
{
|
||||
@@ -134,6 +156,12 @@ namespace Code.Audio
|
||||
{
|
||||
MusicDictionary[MusicType.Menu].Add(audioClip);
|
||||
}
|
||||
|
||||
// private int _audioTestClipCounter;
|
||||
private void OnAudioTestClipLoaded(AudioClip audioClip)
|
||||
{
|
||||
// AudioTestClips[(AudioType)_audioTestClipCounter] = audioClip;_audioTestClipCounter++;
|
||||
}
|
||||
private void OnActionTrackLoaded(AudioClip audioClip)
|
||||
{
|
||||
MusicDictionary[MusicType.Action].Add(audioClip);
|
||||
|
||||
@@ -24,8 +24,9 @@ namespace Code.Audio
|
||||
|
||||
private AudioMixerGroup _masterGroup,
|
||||
// _musicGroup,
|
||||
// _actionMusicGroup,
|
||||
// _peacefulMusicGroup,
|
||||
_actionMusicGroup,
|
||||
_menuMusicGroup,
|
||||
_peacefulMusicGroup,
|
||||
_SFXGroup,
|
||||
_creaturesGroup,
|
||||
_dispatcherGroup,
|
||||
@@ -44,27 +45,69 @@ namespace Code.Audio
|
||||
_settings = settings;
|
||||
}
|
||||
|
||||
// TODO Грязно
|
||||
public void ChangeSetting(AudioType type, float volume)
|
||||
// TODO Грязно, убрать снапшоты НАХУЙ
|
||||
public float GetSetting(AudioType type)
|
||||
{
|
||||
float value;
|
||||
switch (type)
|
||||
{
|
||||
case AudioType.SFX:
|
||||
case AudioType.SFX:
|
||||
_snapshots[AudioSnapshotState.Peaceful].audioMixer.GetFloat(_SFXGroup.name, out value);
|
||||
break;
|
||||
case AudioType.Master:
|
||||
_snapshots[AudioSnapshotState.Menu].audioMixer.GetFloat(_masterGroup.name, out value);
|
||||
break;
|
||||
case AudioType.Creatures:
|
||||
_snapshots[AudioSnapshotState.Peaceful].audioMixer.GetFloat(_creaturesGroup.name, out value);
|
||||
break;
|
||||
case AudioType.GameplayMusic:
|
||||
_snapshots[AudioSnapshotState.Peaceful].audioMixer.GetFloat(_peacefulMusicGroup.name, out value);
|
||||
break;
|
||||
case AudioType.MenuMusic:
|
||||
_snapshots[AudioSnapshotState.Menu].audioMixer.GetFloat(_menuMusicGroup.name, out value);
|
||||
break;
|
||||
case AudioType.DispatcherSounds:
|
||||
_snapshots[AudioSnapshotState.Action].audioMixer.GetFloat(_dispatcherGroup.name, out value);
|
||||
break;
|
||||
default:
|
||||
value = 1;
|
||||
break;
|
||||
}
|
||||
|
||||
value = Mathf.Pow(10f, value / 20);
|
||||
|
||||
return value;
|
||||
}
|
||||
|
||||
// TODO Грязно, убрать снапшоты НАХУЙ
|
||||
public void ChangeSetting(AudioType type, float value)
|
||||
{
|
||||
float volume = Mathf.Log10(value) * 20;
|
||||
switch (type)
|
||||
{
|
||||
case AudioType.SFX:
|
||||
_snapshots[AudioSnapshotState.Peaceful].audioMixer.SetFloat(_SFXGroup.name, volume);
|
||||
_snapshots[AudioSnapshotState.Action].audioMixer.SetFloat(_SFXGroup.name, volume);
|
||||
break;
|
||||
case AudioType.Master:
|
||||
_snapshots[AudioSnapshotState.Menu].audioMixer.SetFloat("Master", volume);
|
||||
_snapshots[AudioSnapshotState.Peaceful].audioMixer.SetFloat("Master", volume);
|
||||
_snapshots[AudioSnapshotState.Action].audioMixer.SetFloat("Master", volume);
|
||||
_snapshots[AudioSnapshotState.Menu].audioMixer.SetFloat(_masterGroup.name, volume);
|
||||
_snapshots[AudioSnapshotState.Peaceful].audioMixer.SetFloat(_masterGroup.name, volume);
|
||||
_snapshots[AudioSnapshotState.Action].audioMixer.SetFloat(_masterGroup.name, volume);
|
||||
break;
|
||||
case AudioType.Creatures:
|
||||
_snapshots[AudioSnapshotState.Peaceful].audioMixer.SetFloat(_creaturesGroup.name, volume);
|
||||
_snapshots[AudioSnapshotState.Action].audioMixer.SetFloat(_creaturesGroup.name, volume);
|
||||
break;
|
||||
case AudioType.GameplayMusic:
|
||||
case AudioType.GameplayMusic:
|
||||
_snapshots[AudioSnapshotState.Peaceful].audioMixer.SetFloat(_peacefulMusicGroup.name, volume);
|
||||
_snapshots[AudioSnapshotState.Action].audioMixer.SetFloat(_actionMusicGroup.name, volume);
|
||||
break;
|
||||
case AudioType.MenuMusic:
|
||||
case AudioType.MenuMusic:
|
||||
_snapshots[AudioSnapshotState.Menu].audioMixer.SetFloat(_menuMusicGroup.name, volume);
|
||||
break;
|
||||
case AudioType.DispatcherSounds:
|
||||
_snapshots[AudioSnapshotState.Peaceful].audioMixer.SetFloat(_dispatcherGroup.name, volume);
|
||||
_snapshots[AudioSnapshotState.Action].audioMixer.SetFloat(_dispatcherGroup.name, volume);
|
||||
break;
|
||||
}
|
||||
// _mixer.FindSnapshot("Action").audioMixer.SetFloat("music", volume);
|
||||
@@ -76,8 +119,9 @@ namespace Code.Audio
|
||||
_mixer = _audioFactory.AudioMixer;
|
||||
|
||||
_masterGroup = _mixer.FindMatchingGroups(AudioGroups.MasterGroup)[0];
|
||||
// _actionMusicGroup = _mixer.FindMatchingGroups(AudioGroups.ActionMusicGroup)[0];
|
||||
// _peacefulMusicGroup = _mixer.FindMatchingGroups(AudioGroups.PeacefulMusoup)[0];
|
||||
_menuMusicGroup = _mixer.FindMatchingGroups(AudioGroups.MenuMusicGroup)[0];
|
||||
_actionMusicGroup = _mixer.FindMatchingGroups(AudioGroups.ActionMusicGroup)[0];
|
||||
_peacefulMusicGroup = _mixer.FindMatchingGroups(AudioGroups.PeacefulMusicGroup)[0];
|
||||
// _musicGroup = _mixer.FindMatchingGroups(AudioGroups.MusicGroup)[0];
|
||||
_musicAudioGroups.Add(MusicType.Menu, _mixer.FindMatchingGroups(AudioGroups.MenuMusicGroup)[0]);
|
||||
_musicAudioGroups.Add(MusicType.Action, _mixer.FindMatchingGroups(AudioGroups.ActionMusicGroup)[0]);
|
||||
@@ -204,5 +248,105 @@ namespace Code.Audio
|
||||
_audioSourcePool.PlayOneShot(_audioFactory.DispatcherAudios[(int)dispatcherSoundId], _dispatcherGroup,
|
||||
AudioSourceType.NoBlend, () => OnDispatcherEnded?.Invoke());
|
||||
}
|
||||
|
||||
private CancellationTokenSource _testClipCancellationTokenSource = new();
|
||||
private void ResetCurrentTestAudioSource() => _currentTestClipAudioType = AudioType.Master;
|
||||
// TODO Засунуть в словарь
|
||||
public void PlayTestClip(AudioType audioType)
|
||||
{
|
||||
if(_currentTestClipAudioType == audioType) return;
|
||||
|
||||
_testClipCancellationTokenSource.Cancel();
|
||||
_testClipCancellationTokenSource = new();
|
||||
|
||||
_currentTestClipAudioType = audioType;
|
||||
|
||||
switch (audioType)
|
||||
{
|
||||
case AudioType.SFX:
|
||||
_audioSourcePool.PlayOneShot(_audioFactory.AudioTestClips[audioType],
|
||||
_SFXGroup, _testClipCancellationTokenSource,
|
||||
AudioSourceType.NoBlend, ResetCurrentTestAudioSource);
|
||||
break;
|
||||
case AudioType.Master:
|
||||
_audioSourcePool.PlayOneShot(_audioFactory.AudioTestClips[audioType],
|
||||
_masterGroup, _testClipCancellationTokenSource,
|
||||
AudioSourceType.NoBlend, ResetCurrentTestAudioSource);
|
||||
break;
|
||||
case AudioType.Creatures:
|
||||
_audioSourcePool.PlayOneShot( _audioFactory.AudioTestClips[audioType],
|
||||
_creaturesGroup, _testClipCancellationTokenSource,
|
||||
AudioSourceType.NoBlend, ResetCurrentTestAudioSource);
|
||||
break;
|
||||
case AudioType.GameplayMusic:
|
||||
_audioSourcePool.PlayOneShot(_audioFactory.AudioTestClips[audioType],
|
||||
_actionMusicGroup, _testClipCancellationTokenSource,
|
||||
AudioSourceType.NoBlend, ResetCurrentTestAudioSource);
|
||||
break;
|
||||
case AudioType.MenuMusic:
|
||||
_audioSourcePool.PlayOneShot(_audioFactory.AudioTestClips[audioType],
|
||||
_menuMusicGroup, _testClipCancellationTokenSource,
|
||||
AudioSourceType.NoBlend, ResetCurrentTestAudioSource);
|
||||
break;
|
||||
case AudioType.DispatcherSounds:
|
||||
_audioSourcePool.PlayOneShot(_audioFactory.AudioTestClips[audioType],
|
||||
_dispatcherGroup, _testClipCancellationTokenSource,
|
||||
AudioSourceType.NoBlend, ResetCurrentTestAudioSource);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
private AudioSource _testClipAudioSource;
|
||||
private AudioType _currentTestClipAudioType;
|
||||
|
||||
// Эффективно и просто, может не так хитровыебано
|
||||
private void ReleaseTestAudioClipSource()
|
||||
{
|
||||
_testClipAudioSource = null;
|
||||
}
|
||||
|
||||
// TODO Засунуть в словарь
|
||||
public void PlayTestClipDeprecated(AudioType audioType)
|
||||
{
|
||||
if (!_testClipAudioSource) _testClipAudioSource = _audioSourcePool.GetSource();
|
||||
else if (_currentTestClipAudioType != audioType) _testClipAudioSource.Stop();
|
||||
else return;
|
||||
|
||||
_currentTestClipAudioType = audioType;
|
||||
|
||||
switch (audioType)
|
||||
{
|
||||
case AudioType.SFX:
|
||||
_audioSourcePool.PlayOneShot(_testClipAudioSource, _audioFactory.AudioTestClips[audioType],
|
||||
_SFXGroup,
|
||||
AudioSourceType.NoBlend, ReleaseTestAudioClipSource);
|
||||
break;
|
||||
case AudioType.Master:
|
||||
_audioSourcePool.PlayOneShot(_testClipAudioSource, _audioFactory.AudioTestClips[audioType],
|
||||
_masterGroup,
|
||||
AudioSourceType.NoBlend, ReleaseTestAudioClipSource);
|
||||
break;
|
||||
case AudioType.Creatures:
|
||||
_audioSourcePool.PlayOneShot(_testClipAudioSource, _audioFactory.AudioTestClips[audioType],
|
||||
_creaturesGroup,
|
||||
AudioSourceType.NoBlend, ReleaseTestAudioClipSource);
|
||||
break;
|
||||
case AudioType.GameplayMusic:
|
||||
_audioSourcePool.PlayOneShot(_testClipAudioSource, _audioFactory.AudioTestClips[audioType],
|
||||
_actionMusicGroup,
|
||||
AudioSourceType.NoBlend, ReleaseTestAudioClipSource);
|
||||
break;
|
||||
case AudioType.MenuMusic:
|
||||
_audioSourcePool.PlayOneShot(_testClipAudioSource, _audioFactory.AudioTestClips[audioType],
|
||||
_menuMusicGroup,
|
||||
AudioSourceType.NoBlend, ReleaseTestAudioClipSource);
|
||||
break;
|
||||
case AudioType.DispatcherSounds:
|
||||
_audioSourcePool.PlayOneShot(_testClipAudioSource, _audioFactory.AudioTestClips[audioType],
|
||||
_dispatcherGroup,
|
||||
AudioSourceType.NoBlend, ReleaseTestAudioClipSource);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,6 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Threading;
|
||||
using Code.Configs;
|
||||
using Cysharp.Threading.Tasks;
|
||||
using UnityEngine;
|
||||
@@ -86,6 +87,34 @@ namespace Code.Audio
|
||||
onComplete?.Invoke();
|
||||
_pool.Release(source);
|
||||
}
|
||||
public async UniTaskVoid PlayOneShot(AudioSource audioSource, AudioClip clip, AudioMixerGroup audioMixerGroup, AudioSourceType audioSourceType = AudioSourceType.NoBlend, Action onComplete = null)
|
||||
{
|
||||
audioSource.PlayOneShot(clip);
|
||||
audioSource.spatialBlend = _settings[audioSourceType].spatialBlend;
|
||||
audioSource.outputAudioMixerGroup = audioMixerGroup;
|
||||
|
||||
// TODO Потом сделать. Можно с cancellation, но сейчас лень. Ну правда
|
||||
await UniTask.WaitUntilValueChanged(audioSource, x => x.isPlaying);
|
||||
|
||||
if (!audioSource) return;
|
||||
|
||||
_pool.Release(audioSource);
|
||||
onComplete?.Invoke();
|
||||
}
|
||||
public async UniTaskVoid PlayOneShot(AudioClip clip, AudioMixerGroup audioMixerGroup, CancellationTokenSource cancellationToken, AudioSourceType audioSourceType = AudioSourceType.NoBlend, Action onComplete = null)
|
||||
{
|
||||
AudioSource source = _pool.Get();
|
||||
source.PlayOneShot(clip);
|
||||
source.spatialBlend = _settings[audioSourceType].spatialBlend;
|
||||
source.outputAudioMixerGroup = audioMixerGroup;
|
||||
|
||||
var (isCanceled, _) = await UniTask.WaitUntilValueChanged(source, x => x.isPlaying, cancellationToken: cancellationToken.Token).SuppressCancellationThrow();
|
||||
|
||||
_pool.Release(source);
|
||||
|
||||
if(!isCanceled) onComplete?.Invoke();
|
||||
else cancellationToken.Dispose();
|
||||
}
|
||||
public AudioSource GetSource() => _pool.Get();
|
||||
public void ReleaseSource(AudioSource source) => _pool.Release(source);
|
||||
}
|
||||
|
||||
@@ -8,22 +8,25 @@ namespace Code.Audio
|
||||
{
|
||||
public interface IAudioFactory
|
||||
{
|
||||
AudioMixer AudioMixer { get; }
|
||||
Dictionary<AudioType, AudioClip> AudioTestClips { get; }
|
||||
Dictionary<MusicType, List<AudioClip>> MusicDictionary { get; }
|
||||
List<AudioClip> SFXAudios { get; }
|
||||
List<AudioClip> EnemiesAudios { get; }
|
||||
List<AudioClip> DispatcherAudios { get; }
|
||||
AudioMixer AudioMixer { get; }
|
||||
Dictionary<MusicType, List<AudioClip>> MusicDictionary { get; }
|
||||
UniTask LoadAudioSourcePrefab(Action<GameObject> callback);
|
||||
UniTask WarmGameplayMusic();
|
||||
UniTask WarmGameplayMusic( );
|
||||
void ReleaseActionMusic();
|
||||
UniTask WarmMenuMusic();
|
||||
void ReleaseMenuMusic();
|
||||
UniTask WarmSFX();
|
||||
void ReleaseSFX();
|
||||
UniTask WarmEnemies();
|
||||
void ReleaseEnemies();
|
||||
UniTask WarmDispatcher();
|
||||
void ReleaseDispatcher();
|
||||
void ReleasePeacefulMusic();
|
||||
UniTask WarmAudioTestClips( );
|
||||
void ReleaseAudioTestClips();
|
||||
UniTask WarmMenuMusic( );
|
||||
void ReleaseMenuMusic();
|
||||
UniTask WarmSFX( );
|
||||
void ReleaseSFX();
|
||||
UniTask WarmEnemies( );
|
||||
void ReleaseEnemies();
|
||||
UniTask WarmDispatcher( );
|
||||
void ReleaseDispatcher();
|
||||
}
|
||||
}
|
||||
@@ -20,6 +20,8 @@ namespace Code.Audio
|
||||
event OnAudioPlayingDelegate OnDispatcherStarted;
|
||||
event OnAudioPlayingDelegate OnDispatcherEnded;
|
||||
void PlayDispatcher(DispatcherSounds dispatcherSoundId);
|
||||
void ChangeSetting(AudioType type, float volume);
|
||||
void ChangeSetting(AudioType type, float value);
|
||||
float GetSetting(AudioType type);
|
||||
void PlayTestClip(AudioType audioType);
|
||||
}
|
||||
}
|
||||
@@ -14,5 +14,5 @@ namespace Code.Audio
|
||||
Creatures,
|
||||
DispatcherSounds,
|
||||
SFX
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user