Недочин недопил но переполошил аудио

Game/CourierOld/Assets/Code/App/BootstrapInstaller.cs

@@ -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>));

Game/CourierOld/Assets/Code/Audio/AudioEnums.cs

@@ -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
+    }
 }

Game/CourierOld/Assets/Code/Audio/AudioFactory.cs

@@ -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);
+        }
     }
 }

Game/CourierOld/Assets/Code/Audio/AudioService.cs

@@ -22,17 +22,7 @@ namespace Code.Audio
         private AudioSource _actionMusicSource;
         private AudioSource _peacefulMusicSource;
 
-        private AudioMixerGroup _masterGroup,
+        private Dictionary<AudioType,AudioMixerGroup> _audioMixerGroups = new ();
-            // _musicGroup,
-            _actionMusicGroup,
-            _menuMusicGroup,
-            _peacefulMusicGroup,
-            _SFXGroup,
-            _creaturesGroup,
-            _dispatcherGroup,
-            _courierGroup,
-            _enemiesGroup;
-
         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;
+            _snapshots[AudioSnapshotState.Peaceful].audioMixer.GetFloat(_audioMixerGroups[type].name, out 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;
-            }
 
             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.Menu].audioMixer.SetFloat(_audioMixerGroups[type].name, volume);
-                    _snapshots[AudioSnapshotState.Peaceful].audioMixer.SetFloat(_masterGroup.name, volume);
+                    _snapshots[AudioSnapshotState.Peaceful].audioMixer.SetFloat(_audioMixerGroups[type].name, volume);
-                    _snapshots[AudioSnapshotState.Action].audioMixer.SetFloat(_masterGroup.name, volume);
+                    _snapshots[AudioSnapshotState.Action].audioMixer.SetFloat(_audioMixerGroups[type].name, volume);
                     break;
-                case AudioType.Creatures:
+                case AudioType.ActionMusic:
-                    _snapshots[AudioSnapshotState.Peaceful].audioMixer.SetFloat(_creaturesGroup.name, volume);
+                    _snapshots[AudioSnapshotState.Action].audioMixer.SetFloat(_audioMixerGroups[type].name, volume);
-                    _snapshots[AudioSnapshotState.Action].audioMixer.SetFloat(_creaturesGroup.name, volume);
                     break;
-                case AudioType.GameplayMusic:
+                case AudioType.PeacefulMusic:
-                    _snapshots[AudioSnapshotState.Peaceful].audioMixer.SetFloat(_peacefulMusicGroup.name, volume);
+                    _snapshots[AudioSnapshotState.Peaceful].audioMixer.SetFloat(_audioMixerGroups[type].name, volume);
-                    _snapshots[AudioSnapshotState.Action].audioMixer.SetFloat(_actionMusicGroup.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);
+                case AudioType.Courier:
-                    _snapshots[AudioSnapshotState.Action].audioMixer.SetFloat(_dispatcherGroup.name, volume);
+                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];
+            _audioMixerGroups.Add(AudioType.Master, _mixer.FindMatchingGroups(AudioGroups.MasterGroup)[0]);
-            _creaturesGroup = _mixer.FindMatchingGroups(AudioGroups.CreaturesGroup)[0];
+            _audioMixerGroups.Add(AudioType.SFX, _mixer.FindMatchingGroups(AudioGroups.SFXGroup)[0]);
-            _dispatcherGroup = _mixer.FindMatchingGroups(AudioGroups.DispatcherMusicGroup)[0];
+            _audioMixerGroups.Add(AudioType.Creatures, _mixer.FindMatchingGroups(AudioGroups.CreaturesGroup)[0]);
-            _courierGroup = _mixer.FindMatchingGroups(AudioGroups.CourierMusicGroup)[0];
+            _audioMixerGroups.Add(AudioType.DispatcherSounds, _mixer.FindMatchingGroups(AudioGroups.DispatcherMusicGroup)[0]);
-            _enemiesGroup = _mixer.FindMatchingGroups(AudioGroups.EnemiesMusicGroup)[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,
+            _audioSourcePool.PlayOneShot(_audioFactory.DispatcherAudios[(int)dispatcherSoundId], _audioMixerGroups[AudioType.DispatcherSounds],
-                AudioSourceType.NoBlend, () => OnDispatcherEnded?.Invoke());
+                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)
+            _audioSourcePool.PlayOneShot(_audioFactory.AudioTestClips[audioType],
-            {
+                _audioMixerGroups[audioType], _testClipCancellationTokenSource,
-                case AudioType.SFX:
+                AudioSourceType.NoBlend, ResetCurrentTestAudioSource).Forget();
-                    _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;
-            }
-        }
     }
 }

Game/CourierOld/Assets/Code/Audio/IAudioService.cs

@@ -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);
     }
 }

Game/CourierOld/Assets/Code/Audio/MusicType.cs

@@ -10,9 +10,12 @@ namespace Code.Audio
     {
         Master,
         MenuMusic,
-        GameplayMusic,
         Creatures,
         DispatcherSounds,
-        SFX
+        SFX,
+        Courier,
+        Enemies,
+        ActionMusic,
+        PeacefulMusic
     } 
 }

Game/CourierOld/Assets/Code/Configs/AudioMixerConfig.cs

@@ -1,6 +1,6 @@
 using UnityEngine;
 using UnityEngine.AddressableAssets;
-using UnityEngine.Audio;
+using UnityEngine.Audio; 
 
 namespace Code.Configs
 {

Game/CourierOld/Assets/Code/Configs/CharacterSoundListConfig.cs

@@ -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;
-    }
-}

Game/CourierOld/Assets/Code/Configs/CourierSoundListConfig.cs

@@ -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;
+    }
+}

Game/CourierOld/Assets/Code/Configs/MusicPlayerConfig.cs

@@ -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;
+    }
+}

Game/CourierOld/Assets/Code/Configs/MusicPlayerConfig.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 8708e3c129d241b08563f1a170bd3a44
+timeCreated: 1764585060

Game/CourierOld/Assets/Code/Constants/StringPaths.cs

@@ -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";

Game/CourierOld/Assets/Code/Gameplay/Player/PlayerAudio.cs

@@ -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);
+        }
+    }
+}

Game/CourierOld/Assets/Code/Gameplay/Player/PlayerAudio.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 64f99dccce9d41df98accae0f355dbca
+timeCreated: 1764584350

Game/CourierOld/Assets/Code/StaticData/IStaticDataService.cs

@@ -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;
     }

Game/CourierOld/Assets/Code/StaticData/StaticDataService.cs

@@ -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

Game/CourierOld/Assets/Code/UI/Panels/SettingsPanel.cs

@@ -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.ChangeSetting(AudioType.ActionMusic, value);
-            _audioService.PlayTestClip(AudioType.GameplayMusic);
+            _audioService.ChangeSetting(AudioType.PeacefulMusic, value);
+            _audioService.PlayTestClip(AudioType.ActionMusic);
         }
 
         public override void Hide()

Game/CourierOld/Assets/Resources/Configs/Audio/CourierSoundListConfig.asset

@@ -10,6 +10,6 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 83304a98bbdc4e7c9c7c643653ae1368, type: 3}
-  m_Name: CharacterSoundListConfig
+  m_Name: CourierSoundListConfig
-  m_EditorClassIdentifier: Assembly-CSharp::Code.Configs.CharacterSoundListConfig
+  m_EditorClassIdentifier: Assembly-CSharp::Code.Configs.CourierSoundListConfig
-  character: []
+  courierSounds: []

Game/CourierOld/Assets/Resources/Configs/Audio/CourierSoundListConfig.asset.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 5160d7af825d295229a3be611f44db76
+guid: 377caa2d01eb3e54cb77ab98346ef669
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 11400000

Game/CourierOld/Assets/Resources/UI/Fonts/ClearSansInfanity-Bold SDF.asset

@@ -40,7 +40,7 @@ Texture2D:
   m_ColorSpace: 1
   m_PlatformBlob: 
   image data: 1048576
-  _typelessdata: 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010406070a0d0e0e0d0c0906050300000000000000000000000000000000010406070a0d0e0e0d0c0906050300000000000000000000000000000000010406070a0d0e0e0d0c090806030000000000000000000000000000000000020507080a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a08070502000000000000000000000000000000000000000000000000000000000000000000010406070809090a0a09090807060401000000000000000000000000000000000000000000000000000000000000000105090b0c13131313131313131313131312110e0904000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001050707090a0a09080706040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000105090b0c13131313131313131313131312110e09040000000000000000000000000205070813131313131313131313131310100d0a0500000000000000000000000000000000000000000000000000000000000005090d0f1013131313131313131313130f0e0c08040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000306070809090a0a09090806050300000000000000000000000000000000000000000000000000000000000000000000000105090b0c13131313131313131313131313080705020000000000000000000000000000000106090b0c1313131313131313131313080806020000000000000000000000000000000000000000000000000000000000000000000406070809090a0a090908070604000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004080c0e0f131313131313131313131212100c080200000000000000000000000000000000000000000000000000000000000000000000000105090b0c1313131313131313131313130a09070400000000000000000000000000000004090e1112131313131313131313131313100f0d090500000000000000000000000105090b0c131313131313131313131313131313131313131313131313131211100e0d0b080705020000000000000000000000000000000000000000000000000000000105090b0b131313131313131313131313130a090704000000000000000000000000000000000000020507081313131313131313131313131311070603000000000000000000000000000000000000000000000000000000000000000001070d10131417191a1b1a191613120f0b0600000000000000000000000001070d11131417191a1b1a191613120f0b0600000000000000000000000001080d11131417191a1b1a191615130f0a040000000000000000000000000002090e1214151616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161514120e0902000000000000000000000000000000000000000000000000000002050708070d11131415151616171616151413110d070906050300000000000000000000000000000000000000000000000000060c111518182020202020202020202020201f1d1a150f08000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004060709080d11131416161616151413100c07060300000000000000000000000000000000000000000000000000000000000000000000000000000000000000060c111518182020202020202020202020201f1d1a150f0800000000000000000002090e1114142020202020202020202020201d1c1a16110a030000000000000000000000000000Line truncated
+  _typelessdata: 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010406070a0d0e0e0d0c0906050300000000000000000000000000000000010406070a0d0e0e0d0c0906050300000000000000000000000000000000010406070a0d0e0e0d0c090806030000000000000000000000000000000000020507080a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a08070502000000000000000000000000000000000000000000000000000000000000000000010406070809090a0a09090807060401000000000000000000000000000000000000000000000000000000000000000105090b0c13131313131313131313131312110e0904000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001050707090a0a09080706040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000105090b0c13131313131313131313131312110e09040000000000000000000000000205070813131313131313131313131310100d0a0500000000000000000000000000000000000000000000000000000000000005090d0f1013131313131313131313130f0e0c08040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000306070809090a0a09090806050300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001070d10131417191a1b1a191613120f0b0600000000000000000000000001070d11131417191a1b1a191613120f0b0600000000000000000000000001080d11131417191a1b1a191615130f0a040000000000000000000000000002090e1214151616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161514120e0902000000000000000000000000000000000000000000000000000002050708070d11131415151616171616151413110d070906050300000000000000000000000000000000000000000000000000060c111518182020202020202020202020201f1d1a150f08000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004060709080d11131416161616151413100c07060300000000000000000000000000000000000000000000000000000000000000000000000000000000000000060c111518182020202020202020202020201f1d1a150f0800000000000000000002090e1114142020202020202020202020201d1c1a16110a030000000000000000000000000000Line truncated
   m_StreamData:
     serializedVersion: 2
     offset: 0
@@ -332,261 +332,6 @@ MonoBehaviour:
     m_Scale: 1
     m_AtlasIndex: 0
     m_ClassDefinitionType: 0
-  - m_Index: 477
-    m_Metrics:
-      m_Width: 60.109375
-      m_Height: 60.828125
-      m_HorizontalBearingX: 6.59375
-      m_HorizontalBearingY: 60.828125
-      m_HorizontalAdvance: 73.25
-    m_GlyphRect:
-      m_X: 232
-      m_Y: 170
-      m_Width: 61
-      m_Height: 61
-    m_Scale: 1
-    m_AtlasIndex: 0
-    m_ClassDefinitionType: 0
-  - m_Index: 492
-    m_Metrics:
-      m_Width: 66.484375
-      m_Height: 60.828125
-      m_HorizontalBearingX: 6.59375
-      m_HorizontalBearingY: 60.828125
-      m_HorizontalAdvance: 79.625
-    m_GlyphRect:
-      m_X: 10
-      m_Y: 124
-      m_Width: 68
-      m_Height: 61
-    m_Scale: 1
-    m_AtlasIndex: 0
-    m_ClassDefinitionType: 0
-  - m_Index: 482
-    m_Metrics:
-      m_Width: 51.859375
-      m_Height: 63.375
-      m_HorizontalBearingX: 4.21875
-      m_HorizontalBearingY: 62.09375
-      m_HorizontalAdvance: 58.578125
-    m_GlyphRect:
-      m_X: 97
-      m_Y: 174
-      m_Width: 53
-      m_Height: 65
-    m_Scale: 1
-    m_AtlasIndex: 0
-    m_ClassDefinitionType: 0
-  - m_Index: 474
-    m_Metrics:
-      m_Width: 48.5625
-      m_Height: 79.109375
-      m_HorizontalBearingX: 6.59375
-      m_HorizontalBearingY: 79.109375
-      m_HorizontalAdvance: 61.75
-    m_GlyphRect:
-      m_X: 10
-      m_Y: 204
-      m_Width: 50
-      m_Height: 80
-    m_Scale: 1
-    m_AtlasIndex: 0
-    m_ClassDefinitionType: 0
-  - m_Index: 473
-    m_Metrics:
-      m_Width: 48.5625
-      m_Height: 60.828125
-      m_HorizontalBearingX: 6.59375
-      m_HorizontalBearingY: 60.828125
-      m_HorizontalAdvance: 61.75
-    m_GlyphRect:
-      m_X: 585
-      m_Y: 10
-      m_Width: 50
-      m_Height: 61
-    m_Scale: 1
-    m_AtlasIndex: 0
-    m_ClassDefinitionType: 0
-  - m_Index: 494
-    m_Metrics:
-      m_Width: 51.8125
-      m_Height: 63.375
-      m_HorizontalBearingX: 1.453125
-      m_HorizontalBearingY: 62.09375
-      m_HorizontalAdvance: 55.8125
-    m_GlyphRect:
-      m_X: 654
-      m_Y: 10
-      m_Width: 53
-      m_Height: 65
-    m_Scale: 1
-    m_AtlasIndex: 0
-    m_ClassDefinitionType: 0
-  - m_Index: 485
-    m_Metrics:
-      m_Width: 61.171875
-      m_Height: 64.828125
-      m_HorizontalBearingX: 3.421875
-      m_HorizontalBearingY: 62.84375
-      m_HorizontalAdvance: 68.03125
-    m_GlyphRect:
-      m_X: 726
-      m_Y: 10
-      m_Width: 62
-      m_Height: 65
-    m_Scale: 1
-    m_AtlasIndex: 0
-    m_ClassDefinitionType: 0
-  - m_Index: 466
-    m_Metrics:
-      m_Width: 46.046875
-      m_Height: 60.828125
-      m_HorizontalBearingX: 6.59375
-      m_HorizontalBearingY: 60.828125
-      m_HorizontalAdvance: 57.265625
-    m_GlyphRect:
-      m_X: 585
-      m_Y: 90
-      m_Width: 47
-      m_Height: 61
-    m_Scale: 1
-    m_AtlasIndex: 0
-    m_ClassDefinitionType: 0
-  - m_Index: 496
-    m_Metrics:
-      m_Width: 48.421875
-      m_Height: 60.828125
-      m_HorizontalBearingX: 1.453125
-      m_HorizontalBearingY: 60.828125
-      m_HorizontalAdvance: 56.421875
-    m_GlyphRect:
-      m_X: 506
-      m_Y: 94
-      m_Width: 49
-      m_Height: 61
-    m_Scale: 1
-    m_AtlasIndex: 0
-    m_ClassDefinitionType: 0
-  - m_Index: 480
-    m_Metrics:
-      m_Width: 49.125
-      m_Height: 60.828125
-      m_HorizontalBearingX: 6.59375
-      m_HorizontalBearingY: 60.828125
-      m_HorizontalAdvance: 62.265625
-    m_GlyphRect:
-      m_X: 807
-      m_Y: 10
-      m_Width: 50
-      m_Height: 61
-    m_Scale: 1
-    m_AtlasIndex: 0
-    m_ClassDefinitionType: 0
-  - m_Index: 467
-    m_Metrics:
-      m_Width: 46.578125
-      m_Height: 60.828125
-      m_HorizontalBearingX: 6.59375
-      m_HorizontalBearingY: 60.828125
-      m_HorizontalAdvance: 57.046875
-    m_GlyphRect:
-      m_X: 876
-      m_Y: 10
-      m_Width: 48
-      m_Height: 61
-    m_Scale: 1
-    m_AtlasIndex: 0
-    m_ClassDefinitionType: 0
-  - m_Index: 495
-    m_Metrics:
-      m_Width: 74.84375
-      m_Height: 63.375
-      m_HorizontalBearingX: 6.59375
-      m_HorizontalBearingY: 62.09375
-      m_HorizontalAdvance: 85.203125
-    m_GlyphRect:
-      m_X: 807
-      m_Y: 90
-      m_Width: 76
-      m_Height: 65
-    m_Scale: 1
-    m_AtlasIndex: 0
-    m_ClassDefinitionType: 0
-  - m_Index: 486
-    m_Metrics:
-      m_Width: 53.953125
-      m_Height: 60.828125
-      m_HorizontalBearingX: 1.28125
-      m_HorizontalBearingY: 60.828125
-      m_HorizontalAdvance: 56.515625
-    m_GlyphRect:
-      m_X: 943
-      m_Y: 10
-      m_Width: 55
-      m_Height: 61
-    m_Scale: 1
-    m_AtlasIndex: 0
-    m_ClassDefinitionType: 0
-  - m_Index: 469
-    m_Metrics:
-      m_Width: 57.484375
-      m_Height: 71.640625
-      m_HorizontalBearingX: 1.1875
-      m_HorizontalBearingY: 60.828125
-      m_HorizontalAdvance: 59.859375
-    m_GlyphRect:
-      m_X: 902
-      m_Y: 90
-      m_Width: 58
-      m_Height: 72
-    m_Scale: 1
-    m_AtlasIndex: 0
-    m_ClassDefinitionType: 0
-  - m_Index: 493
-    m_Metrics:
-      m_Width: 45.4375
-      m_Height: 60.828125
-      m_HorizontalBearingX: 6.59375
-      m_HorizontalBearingY: 60.828125
-      m_HorizontalAdvance: 55.453125
-    m_GlyphRect:
-      m_X: 651
-      m_Y: 94
-      m_Width: 47
-      m_Height: 61
-    m_Scale: 1
-    m_AtlasIndex: 0
-    m_ClassDefinitionType: 0
-  - m_Index: 476
-    m_Metrics:
-      m_Width: 56.46875
-      m_Height: 62.1875
-      m_HorizontalBearingX: 0.796875
-      m_HorizontalBearingY: 60.828125
-      m_HorizontalAdvance: 63.8125
-    m_GlyphRect:
-      m_X: 574
-      m_Y: 170
-      m_Width: 58
-      m_Height: 63
-    m_Scale: 1
-    m_AtlasIndex: 0
-    m_ClassDefinitionType: 0
-  - m_Index: 488
-    m_Metrics:
-      m_Width: 46.171875
-      m_Height: 60.828125
-      m_HorizontalBearingX: 3.875
-      m_HorizontalBearingY: 60.828125
-      m_HorizontalAdvance: 56.609375
-    m_GlyphRect:
-      m_X: 717
-      m_Y: 94
-      m_Width: 48
-      m_Height: 61
-    m_Scale: 1
-    m_AtlasIndex: 0
-    m_ClassDefinitionType: 0
   m_CharacterTable:
   - m_ElementType: 1
     m_Unicode: 8230
@@ -648,74 +393,6 @@ MonoBehaviour:
     m_Unicode: 46
     m_GlyphIndex: 15
     m_Scale: 1
-  - m_ElementType: 1
-    m_Unicode: 1052
-    m_GlyphIndex: 477
-    m_Scale: 1
-  - m_ElementType: 1
-    m_Unicode: 1067
-    m_GlyphIndex: 492
-    m_Scale: 1
-  - m_ElementType: 1
-    m_Unicode: 1057
-    m_GlyphIndex: 482
-    m_Scale: 1
-  - m_ElementType: 1
-    m_Unicode: 1049
-    m_GlyphIndex: 474
-    m_Scale: 1
-  - m_ElementType: 1
-    m_Unicode: 1048
-    m_GlyphIndex: 473
-    m_Scale: 1
-  - m_ElementType: 1
-    m_Unicode: 1069
-    m_GlyphIndex: 494
-    m_Scale: 1
-  - m_ElementType: 1
-    m_Unicode: 1060
-    m_GlyphIndex: 485
-    m_Scale: 1
-  - m_ElementType: 1
-    m_Unicode: 1041
-    m_GlyphIndex: 466
-    m_Scale: 1
-  - m_ElementType: 1
-    m_Unicode: 1071
-    m_GlyphIndex: 496
-    m_Scale: 1
-  - m_ElementType: 1
-    m_Unicode: 1055
-    m_GlyphIndex: 480
-    m_Scale: 1
-  - m_ElementType: 1
-    m_Unicode: 1042
-    m_GlyphIndex: 467
-    m_Scale: 1
-  - m_ElementType: 1
-    m_Unicode: 1070
-    m_GlyphIndex: 495
-    m_Scale: 1
-  - m_ElementType: 1
-    m_Unicode: 1061
-    m_GlyphIndex: 486
-    m_Scale: 1
-  - m_ElementType: 1
-    m_Unicode: 1044
-    m_GlyphIndex: 469
-    m_Scale: 1
-  - m_ElementType: 1
-    m_Unicode: 1068
-    m_GlyphIndex: 493
-    m_Scale: 1
-  - m_ElementType: 1
-    m_Unicode: 1051
-    m_GlyphIndex: 476
-    m_Scale: 1
-  - m_ElementType: 1
-    m_Unicode: 1063
-    m_GlyphIndex: 488
-    m_Scale: 1
   m_AtlasTextures:
   - {fileID: -680064802141868518}
   m_AtlasTextureIndex: 0
@@ -783,179 +460,63 @@ MonoBehaviour:
     m_Y: 80
     m_Width: 34
     m_Height: 34
-  - m_X: 222
-    m_Y: 160
-    m_Width: 80
-    m_Height: 80
-  - m_X: 0
-    m_Y: 114
-    m_Width: 87
-    m_Height: 80
-  - m_X: 87
-    m_Y: 164
-    m_Width: 72
-    m_Height: 84
-  - m_X: 0
-    m_Y: 194
-    m_Width: 69
-    m_Height: 99
-  - m_X: 575
-    m_Y: 0
-    m_Width: 69
-    m_Height: 80
-  - m_X: 644
-    m_Y: 0
-    m_Width: 72
-    m_Height: 84
-  - m_X: 716
-    m_Y: 0
-    m_Width: 81
-    m_Height: 84
-  - m_X: 575
-    m_Y: 80
-    m_Width: 66
-    m_Height: 80
-  - m_X: 496
-    m_Y: 84
-    m_Width: 68
-    m_Height: 80
-  - m_X: 797
-    m_Y: 0
-    m_Width: 69
-    m_Height: 80
-  - m_X: 866
-    m_Y: 0
-    m_Width: 67
-    m_Height: 80
-  - m_X: 797
-    m_Y: 80
-    m_Width: 95
-    m_Height: 84
-  - m_X: 933
-    m_Y: 0
-    m_Width: 74
-    m_Height: 80
-  - m_X: 892
-    m_Y: 80
-    m_Width: 77
-    m_Height: 91
-  - m_X: 641
-    m_Y: 84
-    m_Width: 66
-    m_Height: 80
-  - m_X: 564
-    m_Y: 160
-    m_Width: 77
-    m_Height: 82
-  - m_X: 707
-    m_Y: 84
-    m_Width: 67
-    m_Height: 80
   m_FreeGlyphRects:
+  - m_X: 76
+    m_Y: 34
+    m_Width: 18
+    m_Height: 989
+  - m_X: 575
+    m_Y: 0
+    m_Width: 448
+    m_Height: 1023
+  - m_X: 0
+    m_Y: 171
+    m_Width: 1023
+    m_Height: 852
+  - m_X: 288
+    m_Y: 80
+    m_Width: 5
+    m_Height: 943
+  - m_X: 288
+    m_Y: 82
+    m_Width: 78
+    m_Height: 941
   - m_X: 153
     m_Y: 25
     m_Width: 7
     m_Height: 59
-  - m_X: 288
+  - m_X: 0
-    m_Y: 80
+    m_Y: 164
-    m_Width: 5
+    m_Width: 366
-    m_Height: 80
+    m_Height: 859
-  - m_X: 288
-    m_Y: 82
-    m_Width: 78
-    m_Height: 78
-  - m_X: 302
-    m_Y: 82
-    m_Width: 64
-    m_Height: 941
   - m_X: 222
-    m_Y: 84
+    m_Y: 160
-    m_Width: 6
+    m_Width: 144
-    m_Height: 76
+    m_Height: 863
-  - m_X: 76
+  - m_X: 0
-    m_Y: 34
+    m_Y: 114
-    m_Width: 18
+    m_Width: 153
-    m_Height: 80
+    m_Height: 909
   - m_X: 76
     m_Y: 105
     m_Width: 77
-    m_Height: 9
+    m_Height: 918
-  - m_X: 87
+  - m_X: 222
-    m_Y: 34
+    m_Y: 84
-    m_Width: 7
+    m_Width: 6
-    m_Height: 130
+    m_Height: 939
-  - m_X: 87
+  - m_X: 462
-    m_Y: 105
+    m_Y: 114
-    m_Width: 66
+    m_Width: 561
-    m_Height: 59
+    m_Height: 909
-  - m_X: 159
+  - m_X: 496
-    m_Y: 164
+    m_Y: 84
-    m_Width: 63
+    m_Width: 527
-    m_Height: 859
+    m_Height: 939
-  - m_X: 0
-    m_Y: 293
-    m_Width: 1023
-    m_Height: 730
-  - m_X: 69
-    m_Y: 248
-    m_Width: 954
-    m_Height: 775
-  - m_X: 69
-    m_Y: 194
-    m_Width: 18
-    m_Height: 829
   - m_X: 496
     m_Y: 80
     m_Width: 6
-    m_Height: 4
-  - m_X: 462
-    m_Y: 114
-    m_Width: 34
-    m_Height: 909
-  - m_X: 1007
-    m_Y: 0
-    m_Width: 16
-    m_Height: 1023
-  - m_X: 969
-    m_Y: 80
-    m_Width: 54
     m_Height: 943
-  - m_X: 641
-    m_Y: 80
-    m_Width: 3
-    m_Height: 4
-  - m_X: 302
-    m_Y: 171
-    m_Width: 262
-    m_Height: 852
-  - m_X: 641
-    m_Y: 171
-    m_Width: 382
-    m_Height: 852
-  - m_X: 159
-    m_Y: 242
-    m_Width: 864
-    m_Height: 781
-  - m_X: 159
-    m_Y: 240
-    m_Width: 405
-    m_Height: 783
-  - m_X: 564
-    m_Y: 84
-    m_Width: 11
-    m_Height: 76
-  - m_X: 462
-    m_Y: 164
-    m_Width: 102
-    m_Height: 859
-  - m_X: 641
-    m_Y: 164
-    m_Width: 251
-    m_Height: 859
-  - m_X: 774
-    m_Y: 84
-    m_Width: 23
-    m_Height: 939
   m_FontFeatureTable:
     m_MultipleSubstitutionRecords: []
     m_LigatureSubstitutionRecords: []

Game/CourierOld/Assets/Resources/UI/Fonts/VCR_OSD_MONO_1.001 SDF.asset

@@ -60,255 +60,8 @@ MonoBehaviour:
   m_SourceFontFilePath: 
   m_AtlasPopulationMode: 1
   InternalDynamicOS: 0
-  m_GlyphTable:
+  m_GlyphTable: []
-  - m_Index: 185
+  m_CharacterTable: []
-    m_Metrics:
-      m_Width: 43.953125
-      m_Height: 8.796875
-      m_HorizontalBearingX: 4.390625
-      m_HorizontalBearingY: 13.1875
-      m_HorizontalAdvance: 52.734375
-    m_GlyphRect:
-      m_X: 10
-      m_Y: 10
-      m_Width: 45
-      m_Height: 10
-    m_Scale: 1
-    m_AtlasIndex: 0
-    m_ClassDefinitionType: 0
-  - m_Index: 66
-    m_Metrics:
-      m_Width: 52.734375
-      m_Height: 8.796875
-      m_HorizontalBearingX: 0
-      m_HorizontalBearingY: 8.796875
-      m_HorizontalAdvance: 52.734375
-    m_GlyphRect:
-      m_X: 74
-      m_Y: 10
-      m_Width: 53
-      m_Height: 9
-    m_Scale: 1
-    m_AtlasIndex: 0
-    m_ClassDefinitionType: 0
-  - m_Index: 22
-    m_Metrics:
-      m_Width: 43.953125
-      m_Height: 61.53125
-      m_HorizontalBearingX: 4.390625
-      m_HorizontalBearingY: 65.921875
-      m_HorizontalAdvance: 52.734375
-    m_GlyphRect:
-      m_X: 146
-      m_Y: 10
-      m_Width: 45
-      m_Height: 62
-    m_Scale: 1
-    m_AtlasIndex: 0
-    m_ClassDefinitionType: 0
-  - m_Index: 26
-    m_Metrics:
-      m_Width: 43.953125
-      m_Height: 61.53125
-      m_HorizontalBearingX: 4.390625
-      m_HorizontalBearingY: 65.921875
-      m_HorizontalAdvance: 52.734375
-    m_GlyphRect:
-      m_X: 74
-      m_Y: 38
-      m_Width: 45
-      m_Height: 62
-    m_Scale: 1
-    m_AtlasIndex: 0
-    m_ClassDefinitionType: 0
-  - m_Index: 24
-    m_Metrics:
-      m_Width: 43.953125
-      m_Height: 61.53125
-      m_HorizontalBearingX: 4.390625
-      m_HorizontalBearingY: 65.921875
-      m_HorizontalAdvance: 52.734375
-    m_GlyphRect:
-      m_X: 10
-      m_Y: 39
-      m_Width: 45
-      m_Height: 62
-    m_Scale: 1
-    m_AtlasIndex: 0
-    m_ClassDefinitionType: 0
-  - m_Index: 21
-    m_Metrics:
-      m_Width: 43.953125
-      m_Height: 61.53125
-      m_HorizontalBearingX: 4.390625
-      m_HorizontalBearingY: 65.921875
-      m_HorizontalAdvance: 52.734375
-    m_GlyphRect:
-      m_X: 210
-      m_Y: 10
-      m_Width: 45
-      m_Height: 62
-    m_Scale: 1
-    m_AtlasIndex: 0
-    m_ClassDefinitionType: 0
-  - m_Index: 28
-    m_Metrics:
-      m_Width: 43.953125
-      m_Height: 61.53125
-      m_HorizontalBearingX: 4.390625
-      m_HorizontalBearingY: 65.921875
-      m_HorizontalAdvance: 52.734375
-    m_GlyphRect:
-      m_X: 274
-      m_Y: 10
-      m_Width: 45
-      m_Height: 62
-    m_Scale: 1
-    m_AtlasIndex: 0
-    m_ClassDefinitionType: 0
-  - m_Index: 19
-    m_Metrics:
-      m_Width: 43.953125
-      m_Height: 61.53125
-      m_HorizontalBearingX: 4.390625
-      m_HorizontalBearingY: 65.921875
-      m_HorizontalAdvance: 52.734375
-    m_GlyphRect:
-      m_X: 338
-      m_Y: 10
-      m_Width: 45
-      m_Height: 62
-    m_Scale: 1
-    m_AtlasIndex: 0
-    m_ClassDefinitionType: 0
-  - m_Index: 16
-    m_Metrics:
-      m_Width: 35.15625
-      m_Height: 8.78125
-      m_HorizontalBearingX: 8.796875
-      m_HorizontalBearingY: 39.546875
-      m_HorizontalAdvance: 52.734375
-    m_GlyphRect:
-      m_X: 402
-      m_Y: 10
-      m_Width: 36
-      m_Height: 10
-    m_Scale: 1
-    m_AtlasIndex: 0
-    m_ClassDefinitionType: 0
-  - m_Index: 20
-    m_Metrics:
-      m_Width: 26.359375
-      m_Height: 61.53125
-      m_HorizontalBearingX: 13.1875
-      m_HorizontalBearingY: 65.921875
-      m_HorizontalAdvance: 52.734375
-    m_GlyphRect:
-      m_X: 457
-      m_Y: 10
-      m_Width: 27
-      m_Height: 62
-    m_Scale: 1
-    m_AtlasIndex: 0
-    m_ClassDefinitionType: 0
-  - m_Index: 23
-    m_Metrics:
-      m_Width: 43.953125
-      m_Height: 61.53125
-      m_HorizontalBearingX: 4.390625
-      m_HorizontalBearingY: 65.921875
-      m_HorizontalAdvance: 52.734375
-    m_GlyphRect:
-      m_X: 503
-      m_Y: 10
-      m_Width: 45
-      m_Height: 62
-    m_Scale: 1
-    m_AtlasIndex: 0
-    m_ClassDefinitionType: 0
-  - m_Index: 27
-    m_Metrics:
-      m_Width: 43.953125
-      m_Height: 61.53125
-      m_HorizontalBearingX: 4.390625
-      m_HorizontalBearingY: 65.921875
-      m_HorizontalAdvance: 52.734375
-    m_GlyphRect:
-      m_X: 567
-      m_Y: 10
-      m_Width: 45
-      m_Height: 62
-    m_Scale: 1
-    m_AtlasIndex: 0
-    m_ClassDefinitionType: 0
-  - m_Index: 25
-    m_Metrics:
-      m_Width: 43.953125
-      m_Height: 61.53125
-      m_HorizontalBearingX: 4.390625
-      m_HorizontalBearingY: 65.921875
-      m_HorizontalAdvance: 52.734375
-    m_GlyphRect:
-      m_X: 631
-      m_Y: 10
-      m_Width: 45
-      m_Height: 62
-    m_Scale: 1
-    m_AtlasIndex: 0
-    m_ClassDefinitionType: 0
-  m_CharacterTable:
-  - m_ElementType: 1
-    m_Unicode: 8230
-    m_GlyphIndex: 185
-    m_Scale: 1
-  - m_ElementType: 1
-    m_Unicode: 95
-    m_GlyphIndex: 66
-    m_Scale: 1
-  - m_ElementType: 1
-    m_Unicode: 51
-    m_GlyphIndex: 22
-    m_Scale: 1
-  - m_ElementType: 1
-    m_Unicode: 55
-    m_GlyphIndex: 26
-    m_Scale: 1
-  - m_ElementType: 1
-    m_Unicode: 53
-    m_GlyphIndex: 24
-    m_Scale: 1
-  - m_ElementType: 1
-    m_Unicode: 50
-    m_GlyphIndex: 21
-    m_Scale: 1
-  - m_ElementType: 1
-    m_Unicode: 57
-    m_GlyphIndex: 28
-    m_Scale: 1
-  - m_ElementType: 1
-    m_Unicode: 48
-    m_GlyphIndex: 19
-    m_Scale: 1
-  - m_ElementType: 1
-    m_Unicode: 45
-    m_GlyphIndex: 16
-    m_Scale: 1
-  - m_ElementType: 1
-    m_Unicode: 49
-    m_GlyphIndex: 20
-    m_Scale: 1
-  - m_ElementType: 1
-    m_Unicode: 52
-    m_GlyphIndex: 23
-    m_Scale: 1
-  - m_ElementType: 1
-    m_Unicode: 56
-    m_GlyphIndex: 27
-    m_Scale: 1
-  - m_ElementType: 1
-    m_Unicode: 54
-    m_GlyphIndex: 25
-    m_Scale: 1
   m_AtlasTextures:
   - {fileID: 948717598527772745}
   m_AtlasTextureIndex: 0
@@ -319,83 +72,11 @@ MonoBehaviour:
   m_AtlasHeight: 1024
   m_AtlasPadding: 9
   m_AtlasRenderMode: 4165
-  m_UsedGlyphRects:
+  m_UsedGlyphRects: []
-  - m_X: 0
-    m_Y: 0
-    m_Width: 64
-    m_Height: 29
-  - m_X: 64
-    m_Y: 0
-    m_Width: 72
-    m_Height: 28
-  - m_X: 136
-    m_Y: 0
-    m_Width: 64
-    m_Height: 81
-  - m_X: 64
-    m_Y: 28
-    m_Width: 64
-    m_Height: 81
-  - m_X: 0
-    m_Y: 29
-    m_Width: 64
-    m_Height: 81
-  - m_X: 200
-    m_Y: 0
-    m_Width: 64
-    m_Height: 81
-  - m_X: 264
-    m_Y: 0
-    m_Width: 64
-    m_Height: 81
-  - m_X: 328
-    m_Y: 0
-    m_Width: 64
-    m_Height: 81
-  - m_X: 392
-    m_Y: 0
-    m_Width: 55
-    m_Height: 29
-  - m_X: 447
-    m_Y: 0
-    m_Width: 46
-    m_Height: 81
-  - m_X: 493
-    m_Y: 0
-    m_Width: 64
-    m_Height: 81
-  - m_X: 557
-    m_Y: 0
-    m_Width: 64
-    m_Height: 81
-  - m_X: 621
-    m_Y: 0
-    m_Width: 64
-    m_Height: 81
   m_FreeGlyphRects:
-  - m_X: 128
-    m_Y: 81
-    m_Width: 895
-    m_Height: 942
-  - m_X: 128
-    m_Y: 28
-    m_Width: 8
-    m_Height: 995
   - m_X: 0
-    m_Y: 110
-    m_Width: 1023
-    m_Height: 913
-  - m_X: 64
-    m_Y: 109
-    m_Width: 959
-    m_Height: 914
-  - m_X: 392
-    m_Y: 29
-    m_Width: 55
-    m_Height: 994
-  - m_X: 685
     m_Y: 0
-    m_Width: 338
+    m_Width: 1023
     m_Height: 1023
   m_FontFeatureTable:
     m_MultipleSubstitutionRecords: []
@@ -478,9 +159,9 @@ Texture2D:
     Hash: 00000000000000000000000000000000
   m_IsAlphaChannelOptional: 0
   serializedVersion: 4
-  m_Width: 1024
+  m_Width: 1
-  m_Height: 1024
+  m_Height: 1
-  m_CompleteImageSize: 1048576
+  m_CompleteImageSize: 1
   m_MipsStripped: 0
   m_TextureFormat: 1
   m_MipCount: 1
@@ -505,8 +186,8 @@ Texture2D:
   m_LightmapFormat: 0
   m_ColorSpace: 1
   m_PlatformBlob: 
-  image data: 1048576
+  image data: 1
-  _typelessdata: 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005080a0b0e0e0e0e0e0e0e0e0807050200000306070e0e0e0e0e0e0e0e0c0c0a0602000407090a0e0e0e0e0e0e0e0e090806030000000000000000000000050a0f121313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313100f0d0905000000000000000000000000000000000000000002060a0c0d0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0b0a08050000000000000000000000000000000000000000000005080a0b0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0908060300000000000000000000000000000000000000000002060a0c0d0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0b0a080500000000000000000000000000000000000000000000000000000000000002060a0c0d0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0b0a08050000000000000000000000000000000000000000000001040607090909090909090909090909090909090909090909090909090909090909090909090909070300000000000000000000000002060a0c0d0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0b0a0805000000000000000000000000000000000000000000000000000000000000000000000000000000020507080e0e0e0e0e0e0e0e0b0a080500000000000000000000000000000000000000000000000000000000000002060a0c0d0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0b0a080500000000000000000000000000000000000000000000000000000000000002060a0c0d0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0b0a08050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060c111517181b1b1b1b1b1b1b1b1514120e090c1012131b1b1b1b1b1b1b1b191816120d0b101416171b1b1b1b1b1b1b1b1615130f0a0400000000000000010910161b1e20202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020201d1c1915100a030000000000000000000000000000000000070d121619191b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b171714110c05000000000000000000000000000000000000060c111517181b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1615130f0a04000000000000000000000000000000000000070d121619191b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b171714110c05000000000000000000000000000000000000000000000000000000070d121619191b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b171714110c0500000000000000000000000000000000000001070d111314161616161616161616161616161616161616161616161616161616161616161616161615130f0a04Line truncated
+  _typelessdata: 00
   m_StreamData:
     serializedVersion: 2
     offset: 0