Озвучка при уроне, новая музыка

Game/CourierOld/Assets/Code/App/AppStates/GameplayState.cs

@@ -47,15 +47,15 @@ namespace Code.App.AppStates
                 .RegisterLoading(LoadingWork.WaitForSceneInstaller)
                 .RegisterLoading(LoadingWork.LoadUI)
                 .RegisterLoading(LoadingWork.LoadModelResource)
-                .RegisterLoading(LoadingWork.LoadAudio);
-            // Context.UIService.LoadingScreen.Show();
+                .RegisterLoading(LoadingWork.LoadAudio); 
             
             _playerMoney = Context.PlayerFactory.CreatePlayerMoney();
             _playerHealth = Context.PlayerFactory.CreatePlayerHealth();
-            
+
+            _playerHealth.OnDamage += PlayerDamageTaken;
             _playerHealth.OnDeath += EndGame;
             
-            Context.AudioService.TransitToSnapshot(AudioSnapshotState.Peaceful);
+            Context.AudioService.TransitToSnapshot(AudioSnapshotState.None);
             
             Context.InputService.EnableMap(ActionMappings.Gameplay);
             
@@ -64,7 +64,7 @@ namespace Code.App.AppStates
             Context.InputService.DebugBindAction((int)ActionMappings.Debug, (int)DebugActions.Debug3, DeliverOrderDEBUG);
             Context.InputService.DebugBindAction((int)ActionMappings.Debug, (int)DebugActions.Debug4, RoomPassedDEBUG);
             Context.InputService.DebugBindAction((int)ActionMappings.Debug, (int)DebugActions.Debug5, Tube);
-            // Context.InputService.DebugBindAction((int)ActionMappings.Debug, (int)DebugActions.Debug6, PlayDebugDispatcher);
+            Context.InputService.DebugBindAction((int)ActionMappings.Debug, (int)DebugActions.Debug6, TakeDamageDEBUG);
 
 #pragma warning disable CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
             WaitForSceneToLoad();
@@ -118,6 +118,7 @@ namespace Code.App.AppStates
         private void OrderGiven(float time)
         { 
             _gameplayPanel.ShowTimer();
+            Context.AudioService.TransitToSnapshot(AudioSnapshotState.Action);
         }
         private void OrderFailure()
         {
@@ -133,13 +134,23 @@ namespace Code.App.AppStates
 
             if(time < 0f) Context.AudioService.PlayDispatcher((DispatcherSounds)Random.Range((int)DispatcherSounds.Late1,(int)DispatcherSounds.Late2));
             _playerMoney.GiveMoney(score);
+            
+            Context.AudioService.TransitToSnapshot(AudioSnapshotState.Peaceful);
+        }
+
+        private void PlayerDamageTaken(int damage, PlayerHealth health)
+        {
+            Context.AudioService.PlayDispatcher((DispatcherSounds)Random.Range((int)DispatcherSounds.TakeDamage1,(int)DispatcherSounds.TakeDamage4));
         }
         // DEBUG
         private void GiveOrderDEBUG(InputAction.CallbackContext context)
         {
             _orderService.OrderGive();
         }
-
+        private void TakeDamageDEBUG(InputAction.CallbackContext context)
+        {
+            _playerHealth.GetDamage(1);
+        }
         private void RecieveOrderDEBUG(InputAction.CallbackContext context)
         {
             _orderService.OrderRecieved();
@@ -186,6 +197,9 @@ namespace Code.App.AppStates
             _armsMesh = null;
             _orderService = null;
             
+            Context.AudioService.OnDispatcherStarted -= _gameplayPanel.SummonDispatcher;
+            Context.AudioService.OnDispatcherEnded -= _gameplayPanel.CloseDispatcher;
+            
             Context.InputService.DisableMap(ActionMappings.Gameplay);
             Context.AudioService.GladlyAskToStopMusic(MusicType.Action, callback: Context.AudioFactory.ReleaseActionMusic);
             Context.AudioService.GladlyAskToStopMusic(MusicType.Peaceful, callback: Context.AudioFactory.ReleasePeacefulMusic);
@@ -196,7 +210,7 @@ namespace Code.App.AppStates
             Context.InputService.DebugUnbindAction((int)ActionMappings.Debug, (int)DebugActions.Debug3, DeliverOrderDEBUG);
             Context.InputService.DebugUnbindAction((int)ActionMappings.Debug, (int)DebugActions.Debug4, RoomPassedDEBUG);
             Context.InputService.DebugUnbindAction((int)ActionMappings.Debug, (int)DebugActions.Debug5, Tube);
-            // Context.InputService.DebugUnbindAction((int)ActionMappings.Debug, (int)DebugActions.Debug6, PlayDebugDispatcher);
+            Context.InputService.DebugUnbindAction((int)ActionMappings.Debug, (int)DebugActions.Debug6, TakeDamageDEBUG);
             
             base.ExitState();
         }
@@ -225,6 +239,7 @@ namespace Code.App.AppStates
         {
             Context.AudioService.PlayRandomMusicUntilHumanityWillBeDestroyedForTheySins(MusicType.Peaceful);
             Context.AudioService.PlayRandomMusicUntilHumanityWillBeDestroyedForTheySins(MusicType.Action);
+            Context.AudioService.TransitToSnapshot(AudioSnapshotState.Peaceful);
         }
         private void PlayerInitialize(GameplaySceneEnvironment sceneEnvironment)
         {

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

@@ -16,9 +16,6 @@ namespace Code.Audio
     }
     public enum DispatcherSounds
     {
-        Absolutely,
-        AbsolutelyNot,
-        AhFreeman,
         Recieve1,
         Recieve2,
         TakeDamage1,

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

@@ -1,119 +0,0 @@
-using System.Collections.Generic;
-using Code.Constants;
-using UnityEngine;
-using UnityEngine.Audio;
-using UnityEngine.Serialization;
-
-namespace Code.Audio
-{
-    public class AudioServiceDebug : MonoBehaviour
-    {
-        [SerializeField] private AudioMixer mixer;
-
-        private AudioSource _actionMusicSource;
-        private AudioSource _peacefulMusicSource;
-        [SerializeField] private AudioSource prefab;
-
-        [SerializeField] private AudioResource[] peacefulAudio;
-        [SerializeField] private AudioResource[] actionAudio;
-
-        private AudioMixerGroup _masterGroup,
-            _musicGroup,
-            _actionMusicGroup,
-            _peacefulMusicGroup,
-            _SFXGroup,
-            _creaturesGroup,
-            _dispatcherGroup,
-            _courierGroup,
-            _enemiesGroup;
-
-        private readonly AudioSourcePool _audioSourcePool = new();
-
-        private Dictionary<AudioSnapshotState, AudioMixerSnapshot> _snapshots = new();
-        
-        [FormerlySerializedAs("sfxAudio")] [SerializeField] private AudioClip[] sfxAudios;
-        [SerializeField] private AudioClip[] enemiesAudios;
-        [SerializeField] private AudioClip[] dispatcherAudios;
-
-        private void MixerCreated()
-        {
-            _masterGroup = mixer.FindMatchingGroups(AudioGroups.MasterGroup)[0];
-            _actionMusicGroup = mixer.FindMatchingGroups(AudioGroups.ActionMusicGroup)[0];
-            _peacefulMusicGroup = mixer.FindMatchingGroups(AudioGroups.PeacefulMusicGroup)[0];
-            _SFXGroup = mixer.FindMatchingGroups(AudioGroups.SFXGroup)[0];
-            _musicGroup = mixer.FindMatchingGroups(AudioGroups.MusicGroup)[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];
-
-            _snapshots[AudioSnapshotState.Peaceful] = mixer.FindSnapshot(AudioGroups.PeacefulSnapshot);
-            _snapshots[AudioSnapshotState.Action] = mixer.FindSnapshot(AudioGroups.ActionSnapshot);
-
-            // _audioSourcePool.Initialize(10,prefab);
-
-            InitializeMusicSources();
-        }
-
-        private void InitializeMusicSources()
-        {
-            _actionMusicSource = _audioSourcePool.GetSource();
-            _actionMusicSource.outputAudioMixerGroup = _actionMusicGroup;
-            _actionMusicSource.spatialBlend = 0f;
-            
-            _peacefulMusicSource = _audioSourcePool.GetSource();
-            _peacefulMusicSource.outputAudioMixerGroup = _peacefulMusicGroup;
-            _peacefulMusicSource.spatialBlend = 0f;
-        }
-
-        private void Start()
-        {
-            MixerCreated();
-        }
-
-        public void PlayRandomGameplayMusic()
-        {
-            _peacefulMusicSource.resource = peacefulAudio[Random.Range(0, peacefulAudio.Length)];
-            _actionMusicSource.resource = actionAudio[Random.Range(0, actionAudio.Length)];
-
-            _peacefulMusicSource.Play();
-            _actionMusicSource.Play();
-        } 
-
-        public void TransitToSnapshot(AudioSnapshotState state)
-        {
-            _snapshots[state].TransitionTo(1f);
-        }
-
-#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(sfxAudios[(int)sfxId], position, _SFXGroup);
-        }
-        public void PlayDebugSFX()
-        {
-            _audioSourcePool.PlayOneShot(sfxAudios[(int)SFXSounds.Crowbar], transform.position, _SFXGroup);
-        }
-        public void PlayEnemy(EnemiesSounds enemySoundId, Vector3 position)
-        {
-            _audioSourcePool.PlayOneShot(enemiesAudios[(int)enemySoundId], position, _enemiesGroup);
-        }
-        public void PlayDebugEnemySFX()
-        {
-            _audioSourcePool.PlayOneShot(enemiesAudios[(int)EnemiesSounds.Bastard], transform.position, _enemiesGroup);
-        }
-        public void PlayDispatcher(DispatcherSounds dispatcherSoundId)
-        {
-            _audioSourcePool.PlayShizo(dispatcherAudios[(int)dispatcherSoundId], _dispatcherGroup);
-        }
-        public void PlayDebugDispatcherSFX()
-        {
-            _audioSourcePool.PlayShizo(dispatcherAudios[(int)DispatcherSounds.AhFreeman], _dispatcherGroup);
-        }
-        
-#pragma warning restore CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
-    }
-
-}
-
-    

Game/CourierOld/Assets/Code/Audio/AudioServiceDebug.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: a42cad8f28f54a53bef23d9313014abd
-timeCreated: 1762805867