Недочин недопил но переполошил аудио
This commit is contained in:
1 parent
2f56a5758d
commit
134adda787
22 files changed
+201
-998
No files matched your search
@@ -93,6 +93,7 @@ namespace Code.App
|
||||
containerBuilder.AddSingleton(staticDataService.SoundtrackListConfig, typeof(SoundtrackListConfig));
|
||||
containerBuilder.AddSingleton(staticDataService.AudioTestClipsConfig, typeof(AudioTestClipsConfig));
|
||||
containerBuilder.AddSingleton(staticDataService.SFXListConfig, typeof(SFXListConfig));
|
||||
containerBuilder.AddSingleton(staticDataService.CourierSoundListConfig, typeof(CourierSoundListConfig));
|
||||
containerBuilder.AddSingleton(staticDataService.DispatcherSoundListConfig, typeof(DispatcherSoundListConfig));
|
||||
containerBuilder.AddSingleton(staticDataService.EnemiesSoundListConfig, typeof(EnemiesSoundListConfig));
|
||||
containerBuilder.AddSingleton(staticDataService.AudioSourceSettingsConfigs, typeof(Dictionary<AudioSourceType, AudioSourceSettingsConfig>));
|
||||
|
||||
@@ -12,7 +12,8 @@ namespace Code.Audio
|
||||
public enum EnemiesSounds
|
||||
{
|
||||
Bastard,
|
||||
Bravo
|
||||
Bravo,
|
||||
GrandpaStep
|
||||
}
|
||||
public enum DispatcherSounds
|
||||
{
|
||||
@@ -28,4 +29,8 @@ namespace Code.Audio
|
||||
Late4,
|
||||
Late5
|
||||
}
|
||||
public enum CourierSounds
|
||||
{
|
||||
Step
|
||||
}
|
||||
}
|
||||
@@ -23,7 +23,7 @@ namespace Code.Audio
|
||||
private AssetReference[] _SFX;
|
||||
private AssetReference[] _enemies;
|
||||
private AssetReference[] _dispatcher;
|
||||
private AssetReference[] _character;
|
||||
private AssetReference[] _courier;
|
||||
|
||||
private AsyncOperationHandle<IList<AudioClip>> _audioTestClipsHandle;
|
||||
private AsyncOperationHandle<IList<AudioClip>> _menuMusicHandle;
|
||||
@@ -32,11 +32,13 @@ namespace Code.Audio
|
||||
private AsyncOperationHandle<IList<AudioClip>> _SFXHandle;
|
||||
private AsyncOperationHandle<IList<AudioClip>> _enemiesHandle;
|
||||
private AsyncOperationHandle<IList<AudioClip>> _dispatcherHandle;
|
||||
private AsyncOperationHandle<IList<AudioClip>> _courierHandle;
|
||||
|
||||
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();
|
||||
public List<AudioClip> CourierAudios { get; private set; } = new();
|
||||
public List<AudioClip> DispatcherAudios { get; private set; } = new();
|
||||
|
||||
public AudioFactory(AudioMixerConfig audioMixerConfig,
|
||||
@@ -44,7 +46,8 @@ namespace Code.Audio
|
||||
SFXListConfig sfxListConfig,
|
||||
EnemiesSoundListConfig enemiesSoundListConfig,
|
||||
DispatcherSoundListConfig dispatcherSoundListConfig,
|
||||
AudioTestClipsConfig audioTestClipsConfig
|
||||
AudioTestClipsConfig audioTestClipsConfig,
|
||||
CourierSoundListConfig courierSoundListConfig
|
||||
)
|
||||
{
|
||||
AudioMixer = audioMixerConfig.audioMixerAsset;
|
||||
@@ -56,6 +59,7 @@ namespace Code.Audio
|
||||
_SFX = sfxListConfig.SFX;
|
||||
_enemies = enemiesSoundListConfig.enemies;
|
||||
_dispatcher = dispatcherSoundListConfig.dispatcher;
|
||||
_courier = courierSoundListConfig.courierSounds;
|
||||
_audioTestClipsReferences = audioTestClipsConfig.audioTestClips;
|
||||
|
||||
MusicDictionary.Add(MusicType.Menu, new ());
|
||||
@@ -137,6 +141,18 @@ namespace Code.Audio
|
||||
EnemiesAudios.Clear();
|
||||
_enemiesHandle.Release();
|
||||
}
|
||||
public async UniTask WarmCourier()
|
||||
{
|
||||
_courierHandle = Addressables.LoadAssetsAsync<AudioClip>(_courier, OnCourierLoaded, Addressables.MergeMode.Union);
|
||||
|
||||
await _courierHandle.ToUniTask();
|
||||
}
|
||||
|
||||
public void ReleaseCourier()
|
||||
{
|
||||
CourierAudios.Clear();
|
||||
_courierHandle.Release();
|
||||
}
|
||||
|
||||
public async UniTask WarmDispatcher( )
|
||||
{
|
||||
@@ -182,5 +198,9 @@ namespace Code.Audio
|
||||
{
|
||||
DispatcherAudios.Add(audioClip);
|
||||
}
|
||||
private void OnCourierLoaded(AudioClip audioClip)
|
||||
{
|
||||
CourierAudios.Add(audioClip);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -22,17 +22,7 @@ namespace Code.Audio
|
||||
private AudioSource _actionMusicSource;
|
||||
private AudioSource _peacefulMusicSource;
|
||||
|
||||
private AudioMixerGroup _masterGroup,
|
||||
// _musicGroup,
|
||||
_actionMusicGroup,
|
||||
_menuMusicGroup,
|
||||
_peacefulMusicGroup,
|
||||
_SFXGroup,
|
||||
_creaturesGroup,
|
||||
_dispatcherGroup,
|
||||
_courierGroup,
|
||||
_enemiesGroup;
|
||||
|
||||
private Dictionary<AudioType,AudioMixerGroup> _audioMixerGroups = new ();
|
||||
private readonly AudioSourcePool _audioSourcePool;
|
||||
|
||||
private Dictionary<AudioSnapshotState, AudioMixerSnapshot> _snapshots = new();
|
||||
@@ -48,81 +38,47 @@ namespace Code.Audio
|
||||
// TODO Грязно, убрать снапшоты НАХУЙ
|
||||
public float GetSetting(AudioType type)
|
||||
{
|
||||
float value;
|
||||
switch (type)
|
||||
{
|
||||
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;
|
||||
}
|
||||
_snapshots[AudioSnapshotState.Peaceful].audioMixer.GetFloat(_audioMixerGroups[type].name, out float value);
|
||||
|
||||
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(_masterGroup.name, volume);
|
||||
_snapshots[AudioSnapshotState.Peaceful].audioMixer.SetFloat(_masterGroup.name, volume);
|
||||
_snapshots[AudioSnapshotState.Action].audioMixer.SetFloat(_masterGroup.name, volume);
|
||||
_snapshots[AudioSnapshotState.Menu].audioMixer.SetFloat(_audioMixerGroups[type].name, volume);
|
||||
_snapshots[AudioSnapshotState.Peaceful].audioMixer.SetFloat(_audioMixerGroups[type].name, volume);
|
||||
_snapshots[AudioSnapshotState.Action].audioMixer.SetFloat(_audioMixerGroups[type].name, volume);
|
||||
break;
|
||||
case AudioType.Creatures:
|
||||
_snapshots[AudioSnapshotState.Peaceful].audioMixer.SetFloat(_creaturesGroup.name, volume);
|
||||
_snapshots[AudioSnapshotState.Action].audioMixer.SetFloat(_creaturesGroup.name, volume);
|
||||
case AudioType.ActionMusic:
|
||||
_snapshots[AudioSnapshotState.Action].audioMixer.SetFloat(_audioMixerGroups[type].name, volume);
|
||||
break;
|
||||
case AudioType.GameplayMusic:
|
||||
_snapshots[AudioSnapshotState.Peaceful].audioMixer.SetFloat(_peacefulMusicGroup.name, volume);
|
||||
_snapshots[AudioSnapshotState.Action].audioMixer.SetFloat(_actionMusicGroup.name, volume);
|
||||
case AudioType.PeacefulMusic:
|
||||
_snapshots[AudioSnapshotState.Peaceful].audioMixer.SetFloat(_audioMixerGroups[type].name, volume);
|
||||
break;
|
||||
case AudioType.MenuMusic:
|
||||
_snapshots[AudioSnapshotState.Menu].audioMixer.SetFloat(_menuMusicGroup.name, volume);
|
||||
_snapshots[AudioSnapshotState.Menu].audioMixer.SetFloat(_audioMixerGroups[type].name, volume);
|
||||
break;
|
||||
case AudioType.Creatures:
|
||||
case AudioType.SFX:
|
||||
case AudioType.DispatcherSounds:
|
||||
_snapshots[AudioSnapshotState.Peaceful].audioMixer.SetFloat(_dispatcherGroup.name, volume);
|
||||
_snapshots[AudioSnapshotState.Action].audioMixer.SetFloat(_dispatcherGroup.name, volume);
|
||||
case AudioType.Courier:
|
||||
case AudioType.Enemies:
|
||||
_snapshots[AudioSnapshotState.Peaceful].audioMixer.SetFloat(_audioMixerGroups[type].name, volume);
|
||||
_snapshots[AudioSnapshotState.Action].audioMixer.SetFloat(_audioMixerGroups[type].name, volume);
|
||||
break;
|
||||
}
|
||||
// _mixer.FindSnapshot("Action").audioMixer.SetFloat("music", volume);
|
||||
}
|
||||
|
||||
public async UniTask Initialize()
|
||||
{
|
||||
// _mixer = await _audioFactory.CreateMixer();
|
||||
_mixer = _audioFactory.AudioMixer;
|
||||
|
||||
_masterGroup = _mixer.FindMatchingGroups(AudioGroups.MasterGroup)[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]);
|
||||
_musicAudioGroups.Add(MusicType.Peaceful, _mixer.FindMatchingGroups(AudioGroups.PeacefulMusicGroup)[0]);
|
||||
@@ -134,17 +90,21 @@ namespace Code.Audio
|
||||
_musicAudioSources.Add(MusicType.Menu, null);
|
||||
_musicAudioSources.Add(MusicType.Action, null);
|
||||
_musicAudioSources.Add(MusicType.Peaceful, null);
|
||||
|
||||
_SFXGroup = _mixer.FindMatchingGroups(AudioGroups.SFXGroup)[0];
|
||||
_creaturesGroup = _mixer.FindMatchingGroups(AudioGroups.CreaturesGroup)[0];
|
||||
_dispatcherGroup = _mixer.FindMatchingGroups(AudioGroups.DispatcherMusicGroup)[0];
|
||||
_courierGroup = _mixer.FindMatchingGroups(AudioGroups.CourierMusicGroup)[0];
|
||||
_enemiesGroup = _mixer.FindMatchingGroups(AudioGroups.EnemiesMusicGroup)[0];
|
||||
|
||||
_audioMixerGroups.Add(AudioType.Master, _mixer.FindMatchingGroups(AudioGroups.MasterGroup)[0]);
|
||||
_audioMixerGroups.Add(AudioType.SFX, _mixer.FindMatchingGroups(AudioGroups.SFXGroup)[0]);
|
||||
_audioMixerGroups.Add(AudioType.Creatures, _mixer.FindMatchingGroups(AudioGroups.CreaturesGroup)[0]);
|
||||
_audioMixerGroups.Add(AudioType.DispatcherSounds, _mixer.FindMatchingGroups(AudioGroups.DispatcherMusicGroup)[0]);
|
||||
_audioMixerGroups.Add(AudioType.Courier, _mixer.FindMatchingGroups(AudioGroups.CourierGroup)[0]);
|
||||
_audioMixerGroups.Add(AudioType.Enemies, _mixer.FindMatchingGroups(AudioGroups.EnemiesMusicGroup)[0]);
|
||||
_audioMixerGroups.Add(AudioType.MenuMusic, _musicAudioGroups[MusicType.Menu]);
|
||||
_audioMixerGroups.Add(AudioType.ActionMusic, _musicAudioGroups[MusicType.Action]);
|
||||
_audioMixerGroups.Add(AudioType.PeacefulMusic, _musicAudioGroups[MusicType.Peaceful]);
|
||||
|
||||
_snapshots[AudioSnapshotState.None] = _mixer.FindSnapshot(AudioGroups.NoneSnapshot);
|
||||
_snapshots[AudioSnapshotState.Peaceful] = _mixer.FindSnapshot(AudioGroups.PeacefulSnapshot);
|
||||
_snapshots[AudioSnapshotState.Action] = _mixer.FindSnapshot(AudioGroups.ActionSnapshot);
|
||||
_snapshots[AudioSnapshotState.Menu] = _mixer.FindSnapshot(AudioGroups.MenuSnapshot);
|
||||
_snapshots[AudioSnapshotState.Action] = _mixer.FindSnapshot(AudioGroups.ActionSnapshot);
|
||||
_snapshots[AudioSnapshotState.Peaceful] = _mixer.FindSnapshot(AudioGroups.PeacefulSnapshot);
|
||||
|
||||
await _audioFactory.LoadAudioSourcePrefab(_audioSourcePool.Initialize);
|
||||
}
|
||||
@@ -173,15 +133,12 @@ namespace Code.Audio
|
||||
// _ => !_musicAudioSources[musicType].isPlaying,
|
||||
// cancellationToken: _cancellationTokenSources[musicType].Token);
|
||||
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}");
|
||||
|
||||
if (isCanceled)
|
||||
{
|
||||
// Debug.Log($"Cancelled {musicType}");
|
||||
_cancellationTokenSources[musicType].Dispose();
|
||||
_cancellationTokenSources[musicType] = new();
|
||||
|
||||
@@ -227,17 +184,19 @@ namespace Code.Audio
|
||||
_snapshots[state].TransitionTo(time);
|
||||
}
|
||||
|
||||
#pragma warning disable CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
|
||||
public void PlaySFX(SFXSounds sfxId, Vector3 position)
|
||||
{
|
||||
_audioSourcePool.PlayOneShot(_audioFactory.SFXAudios[(int)sfxId], position, _SFXGroup);
|
||||
_audioSourcePool.PlayOneShot(_audioFactory.SFXAudios[(int)sfxId], position, _audioMixerGroups[AudioType.SFX]).Forget();
|
||||
}
|
||||
|
||||
public void PlayEnemy(EnemiesSounds enemySoundId, Vector3 position)
|
||||
{
|
||||
_audioSourcePool.PlayOneShot(_audioFactory.EnemiesAudios[(int)enemySoundId], position, _enemiesGroup);
|
||||
_audioSourcePool.PlayOneShot(_audioFactory.EnemiesAudios[(int)enemySoundId], position, _audioMixerGroups[AudioType.Enemies]).Forget();
|
||||
}
|
||||
|
||||
public AudioSource GetSourceOfGroup(AudioType group) => _audioSourcePool.GetSource();
|
||||
public void ReleaseSourceOfGroup(AudioSource source) => _audioSourcePool.ReleaseSource(source);
|
||||
|
||||
// Чинить долго и дорого пусть Артёмов будет много, ведь он наш друг
|
||||
public event IAudioService.OnAudioPlayingDelegate OnDispatcherStarted;
|
||||
public event IAudioService.OnAudioPlayingDelegate OnDispatcherEnded;
|
||||
@@ -245,12 +204,13 @@ namespace Code.Audio
|
||||
public void PlayDispatcher(DispatcherSounds dispatcherSoundId)
|
||||
{
|
||||
OnDispatcherStarted?.Invoke();
|
||||
_audioSourcePool.PlayOneShot(_audioFactory.DispatcherAudios[(int)dispatcherSoundId], _dispatcherGroup,
|
||||
AudioSourceType.NoBlend, () => OnDispatcherEnded?.Invoke());
|
||||
_audioSourcePool.PlayOneShot(_audioFactory.DispatcherAudios[(int)dispatcherSoundId], _audioMixerGroups[AudioType.DispatcherSounds],
|
||||
AudioSourceType.NoBlend, () => OnDispatcherEnded?.Invoke()).Forget();
|
||||
}
|
||||
|
||||
private CancellationTokenSource _testClipCancellationTokenSource = new();
|
||||
private void ResetCurrentTestAudioSource() => _currentTestClipAudioType = AudioType.Master;
|
||||
private AudioType _currentTestClipAudioType;
|
||||
// TODO Засунуть в словарь
|
||||
public void PlayTestClip(AudioType audioType)
|
||||
{
|
||||
@@ -261,92 +221,10 @@ namespace Code.Audio
|
||||
|
||||
_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;
|
||||
}
|
||||
_audioSourcePool.PlayOneShot(_audioFactory.AudioTestClips[audioType],
|
||||
_audioMixerGroups[audioType], _testClipCancellationTokenSource,
|
||||
AudioSourceType.NoBlend, ResetCurrentTestAudioSource).Forget();
|
||||
}
|
||||
|
||||
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;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -23,5 +23,7 @@ namespace Code.Audio
|
||||
void ChangeSetting(AudioType type, float value);
|
||||
float GetSetting(AudioType type);
|
||||
void PlayTestClip(AudioType audioType);
|
||||
AudioSource GetSourceOfGroup(AudioType group);
|
||||
void ReleaseSourceOfGroup(AudioSource source);
|
||||
}
|
||||
}
|
||||
@@ -10,9 +10,12 @@ namespace Code.Audio
|
||||
{
|
||||
Master,
|
||||
MenuMusic,
|
||||
GameplayMusic,
|
||||
Creatures,
|
||||
DispatcherSounds,
|
||||
SFX
|
||||
SFX,
|
||||
Courier,
|
||||
Enemies,
|
||||
ActionMusic,
|
||||
PeacefulMusic
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
using UnityEngine;
|
||||
using UnityEngine.AddressableAssets;
|
||||
using UnityEngine.Audio;
|
||||
using UnityEngine.Audio;
|
||||
|
||||
namespace Code.Configs
|
||||
{
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
using UnityEngine;
|
||||
using UnityEngine.AddressableAssets;
|
||||
|
||||
namespace Code.Configs
|
||||
{
|
||||
[CreateAssetMenu(menuName = "Config/Audio/CharacterSoundList", fileName = "CharacterSoundListConfig")]
|
||||
public class CharacterSoundListConfig : ScriptableObject
|
||||
{
|
||||
public AssetReference[] character;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
using UnityEngine;
|
||||
using UnityEngine.AddressableAssets;
|
||||
|
||||
namespace Code.Configs
|
||||
{
|
||||
[CreateAssetMenu(menuName = "Config/Audio/CourierSoundListConfig", fileName = "CourierSoundListConfig")]
|
||||
public class CourierSoundListConfig : ScriptableObject
|
||||
{
|
||||
public AssetReference[] courierSounds;
|
||||
}
|
||||
}
|
||||
File renamed without changes.
@@ -0,0 +1,10 @@
|
||||
using UnityEngine;
|
||||
|
||||
namespace Code.Configs
|
||||
{
|
||||
[CreateAssetMenu(menuName = "Config/Audio/MusicPlayer", fileName = "MusicPlayerConfig")]
|
||||
public class MusicPlayerConfig : ScriptableObject
|
||||
{
|
||||
public float threshold = 0.5f;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,3 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 8708e3c129d241b08563f1a170bd3a44
|
||||
timeCreated: 1764585060
|
||||
@@ -19,7 +19,7 @@ namespace Code.Constants
|
||||
public const string PeacefulMusicGroup = "Peaceful";
|
||||
public const string ActionMusicGroup = "Action";
|
||||
public const string DispatcherMusicGroup = "Dispatcher";
|
||||
public const string CourierMusicGroup = "Courier";
|
||||
public const string CourierGroup = "Courier";
|
||||
public const string EnemiesMusicGroup = "Enemies";
|
||||
|
||||
public const string PeacefulSnapshot = "Peaceful";
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
using Code.Audio;
|
||||
using Reflex.Attributes;
|
||||
using UnityEngine;
|
||||
using AudioType = Code.Audio.AudioType;
|
||||
|
||||
namespace Code.Gameplay.Player
|
||||
{
|
||||
public class PlayerAudio : MonoBehaviour
|
||||
{
|
||||
private IAudioService _audioService;
|
||||
private IAudioFactory _audioFactory;
|
||||
private AudioSource _audioSource;
|
||||
|
||||
[Inject]
|
||||
private void Construct(IAudioService audioService, IAudioFactory audioFactory)
|
||||
{
|
||||
_audioService = audioService;
|
||||
_audioSource = audioService.GetSourceOfGroup(AudioType.Courier);
|
||||
|
||||
_audioFactory = audioFactory;
|
||||
}
|
||||
|
||||
public void PlayStep()
|
||||
{
|
||||
// _audioSource.PlayOneShot();
|
||||
}
|
||||
private void OnDestroy()
|
||||
{
|
||||
_audioService.ReleaseSourceOfGroup(_audioSource);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,3 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 64f99dccce9d41df98accae0f355dbca
|
||||
timeCreated: 1764584350
|
||||
@@ -33,6 +33,7 @@ namespace Code.StaticData
|
||||
Dictionary<AudioSourceType, AudioSourceSettingsConfig> AudioSourceSettingsConfigs { get; }
|
||||
AudioTestClipsConfig AudioTestClipsConfig { get; }
|
||||
GeneratorConfig GeneratorConfig { get; }
|
||||
CourierSoundListConfig CourierSoundListConfig { get; }
|
||||
void Load();
|
||||
Task<T> InstantiateAsset<T>(AssetReference assetReference) where T : Behaviour;
|
||||
}
|
||||
|
||||
@@ -29,6 +29,7 @@ namespace Code.StaticData
|
||||
public DispatcherSoundListConfig DispatcherSoundListConfig { get; private set; }
|
||||
public EnemiesSoundListConfig EnemiesSoundListConfig { get; private set; }
|
||||
public AudioTestClipsConfig AudioTestClipsConfig { get; private set; }
|
||||
public CourierSoundListConfig CourierSoundListConfig { get; private set; }
|
||||
|
||||
public DrunkenGrandpaConfig DrunkenGrandpaConfig {get; private set;}
|
||||
public CockroachConfig CockroachConfig { get; private set; }
|
||||
@@ -69,6 +70,7 @@ namespace Code.StaticData
|
||||
SoundtrackListConfig = Resources.Load<SoundtrackListConfig>(string.Format(StringPaths.ConfigSingle, "Audio", "SoundtrackListConfig"));
|
||||
AudioTestClipsConfig = Resources.Load<AudioTestClipsConfig>(string.Format(StringPaths.ConfigSingle, "Audio", "AudioTestClipsConfig"));
|
||||
SFXListConfig = Resources.Load<SFXListConfig>(string.Format(StringPaths.ConfigSingle, "Audio", "SFXListConfig"));
|
||||
CourierSoundListConfig = Resources.Load<CourierSoundListConfig>(string.Format(StringPaths.ConfigSingle, "Audio", "CourierSoundListConfig"));
|
||||
DispatcherSoundListConfig = Resources.Load<DispatcherSoundListConfig>(string.Format(StringPaths.ConfigSingle, "Audio", "DispatcherSoundListConfig"));
|
||||
EnemiesSoundListConfig = Resources.Load<EnemiesSoundListConfig>(string.Format(StringPaths.ConfigSingle, "Audio", "EnemiesSoundListConfig"));
|
||||
AudioSourceSettingsConfigs = Resources
|
||||
|
||||
@@ -37,7 +37,7 @@ namespace Code.UI
|
||||
menuMusic.value = _audioService.GetSetting(AudioType.MenuMusic);
|
||||
menuMusic.onValueChanged.AddListener(OnMenuMusicUpdate);
|
||||
|
||||
gameplayMusic.value = _audioService.GetSetting(AudioType.GameplayMusic);
|
||||
gameplayMusic.value = _audioService.GetSetting(AudioType.ActionMusic);
|
||||
gameplayMusic.onValueChanged.AddListener(OnGameplayUpdate);
|
||||
}
|
||||
|
||||
@@ -68,8 +68,9 @@ namespace Code.UI
|
||||
}
|
||||
private void OnGameplayUpdate(float value)
|
||||
{
|
||||
_audioService.ChangeSetting(AudioType.GameplayMusic, value);
|
||||
_audioService.PlayTestClip(AudioType.GameplayMusic);
|
||||
_audioService.ChangeSetting(AudioType.ActionMusic, value);
|
||||
_audioService.ChangeSetting(AudioType.PeacefulMusic, value);
|
||||
_audioService.PlayTestClip(AudioType.ActionMusic);
|
||||
}
|
||||
|
||||
public override void Hide()
|
||||
|
||||
Reference in new issue
Block a user