Миксер

Почини интерфейс

Assets/UnityCodeGen.Generated/AudioMixer.Generated.cs

@@ -12,6 +12,15 @@ private partial void InitializeMixer(){
             _audioMixerGroups.Add(Code.Infrastructure.Audio.AudioGroupType.Master, _mixer.FindMatchingGroups("Master")[0]);
     
 
+            _audioMixerGroups.Add(Code.Infrastructure.Audio.AudioGroupType.SFX, _mixer.FindMatchingGroups("SFX")[0]);
+    
+
+            _audioMixerGroups.Add(Code.Infrastructure.Audio.AudioGroupType.Music, _mixer.FindMatchingGroups("Music")[0]);
+    
+
+            _audioMixerGroups.Add(Code.Infrastructure.Audio.AudioGroupType.UIFX, _mixer.FindMatchingGroups("UIFX")[0]);
+    
+
 }
     }
 }

Assets/UnityCodeGen.Generated/AudioMixerConfigConfig.Generated.cs

@@ -0,0 +1,18 @@
+
+#pragma warning disable CS0105 
+using UnityEngine.Audio;
+
+using UnityEngine;
+using UnityEngine.AddressableAssets;
+
+namespace Code.Infrastructure.Audio{
+#pragma warning restore CS0105 
+
+[CreateAssetMenu(fileName = "AudioMixerConfigConfig", menuName = "Configs/Audio/AudioMixer")]
+
+public class AudioMixerConfigConfig : ScriptableObject
+{
+    public UnityEngine.Audio.AudioMixer mixerAsset;
+
+}
+}

Assets/UnityCodeGen.Generated/AudioMixerConfigConfig.Generated.cs.meta

@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 0f979b3faf3a08153b7fcb2350141017

Assets/UnityCodeGen.Generated/AudioSourcePrefabConfig.Generated.cs

@@ -8,7 +8,7 @@ using UnityEngine.AddressableAssets;
 namespace Code.Infrastructure.Audio{
 #pragma warning restore CS0105 
 
-[CreateAssetMenu(fileName = "AudioSourcePrefabConfig", menuName = "Configs/Audio/AudioSourceSettings")]
+[CreateAssetMenu(fileName = "AudioSourcePrefabConfig", menuName = "Configs/Audio/AudioSource")]
 
 public class AudioSourcePrefabConfig : ScriptableObject
 {

Assets/UnityCodeGen.Generated/Code.Infrastructure.App.AppStateMachine.Generated.cs

@@ -3,12 +3,12 @@
 #pragma warning disable CS0105 
 using Code.Infrastructure.StateMachine;
  
-using Code.Infrastructure.App.States;
- 
 using Code.Example.Platformer;
  
 using Code.Infrastructure.App.States;
  
+using Code.Infrastructure.App.States;
+ 
 using Code.Infrastructure.App.States;
 
 #pragma warning restore CS0105
@@ -21,12 +21,12 @@ public partial class AppStateMachine : AbstractStateMachine<Code.Infrastructure.
         public AppStateMachine(Code.Infrastructure.App.AppStateMachineContext context, EventBus.EventBus eventBus) : base(context)
         { 
             
-var stateMainMenuState = new MainMenuState(StateMachineContext,eventBus);
-States.Add(stateMainMenuState.myState, stateMainMenuState);
-
 var statePlatformerState = new PlatformerState(StateMachineContext,eventBus);
 States.Add(statePlatformerState.myState, statePlatformerState);
 
+var stateMainMenuState = new MainMenuState(StateMachineContext,eventBus);
+States.Add(stateMainMenuState.myState, stateMainMenuState);
+
 var stateGameplayState = new GameplayState(StateMachineContext,eventBus);
 States.Add(stateGameplayState.myState, stateGameplayState);
 

Assets/UnityCodeGen.Generated/Code.Infrastructure.Camera.CameraStateMachine.Generated.cs

@@ -17,12 +17,12 @@ public partial class CameraStateMachine : AbstractStateMachine<Code.Infrastructu
         public CameraStateMachine(Code.Infrastructure.Camera.CameraStateMachineContext context, EventBus.EventBus eventBus) : base(context)
         { 
             
-var stateThirdPersonState = new ThirdPersonState(StateMachineContext,eventBus);
-States.Add(stateThirdPersonState.myState, stateThirdPersonState);
-
 var stateNoneCameraState = new NoneCameraState(StateMachineContext,eventBus);
 States.Add(stateNoneCameraState.myState, stateNoneCameraState);
 
+var stateThirdPersonState = new ThirdPersonState(StateMachineContext,eventBus);
+States.Add(stateThirdPersonState.myState, stateThirdPersonState);
+
         }
 
         protected override bool CheckTransitionAllowed(Code.Infrastructure.Camera.CameraMode nextState) => AllowedStates.HasFlag(nextState);

Assets/UnityCodeGen.Generated/Code.Infrastructure.UI.Panels.LoadingPanelEvents.Generated.cs

@@ -20,6 +20,17 @@ namespace Code.Infrastructure.UI.Panels
         {
             _eventBus.RaiseEvent<ILoadingPanelRemovedHandle>(h => h.LoadingPanelRemoved());
         }
+        
+        protected override void FireOpenedEvent()
+        {
+            _eventBus.RaiseEvent<ILoadingPanelOpenedHandle>(h => h.LoadingPanelOpened(this));
+        }
+
+        protected override void FireClosedEvent()
+        {
+            _eventBus.RaiseEvent<ILoadingPanelClosedHandle>(h => h.LoadingPanelClosed());
+            base.FireClosedEvent();
+        }
 
     }  
 
@@ -34,5 +45,16 @@ namespace Code.Infrastructure.UI.Panels
     {
         void LoadingPanelRemoved();
     }
+        
+        
+    public interface ILoadingPanelOpenedHandle : IGlobalSubscriber 
+    {
+        void LoadingPanelOpened(UIPanel panel);
+    }
+
+    public interface ILoadingPanelClosedHandle : IGlobalSubscriber 
+    {
+        void LoadingPanelClosed();
+    }
 
 }

Assets/UnityCodeGen.Generated/Code.Infrastructure.UI.Panels.LogoPanelEvents.Generated.cs

@@ -20,6 +20,17 @@ namespace Code.Infrastructure.UI.Panels
         {
             _eventBus.RaiseEvent<ILogoPanelRemovedHandle>(h => h.LogoPanelRemoved());
         }
+        
+        protected override void FireOpenedEvent()
+        {
+            _eventBus.RaiseEvent<ILogoPanelOpenedHandle>(h => h.LogoPanelOpened(this));
+        }
+
+        protected override void FireClosedEvent()
+        {
+            _eventBus.RaiseEvent<ILogoPanelClosedHandle>(h => h.LogoPanelClosed());
+            base.FireClosedEvent();
+        }
 
     }  
 
@@ -34,5 +45,16 @@ namespace Code.Infrastructure.UI.Panels
     {
         void LogoPanelRemoved();
     }
+        
+        
+    public interface ILogoPanelOpenedHandle : IGlobalSubscriber 
+    {
+        void LogoPanelOpened(UIPanel panel);
+    }
+
+    public interface ILogoPanelClosedHandle : IGlobalSubscriber 
+    {
+        void LogoPanelClosed();
+    }
 
 }

Assets/UnityCodeGen.Generated/Code.Infrastructure.UI.Panels.MenuChoosePanelEvents.Generated.cs

@@ -20,6 +20,17 @@ namespace Code.Infrastructure.UI.Panels
         {
             _eventBus.RaiseEvent<IMenuChoosePanelRemovedHandle>(h => h.MenuChoosePanelRemoved());
         }
+        
+        protected override void FireOpenedEvent()
+        {
+            _eventBus.RaiseEvent<IMenuChoosePanelOpenedHandle>(h => h.MenuChoosePanelOpened(this));
+        }
+
+        protected override void FireClosedEvent()
+        {
+            _eventBus.RaiseEvent<IMenuChoosePanelClosedHandle>(h => h.MenuChoosePanelClosed());
+            base.FireClosedEvent();
+        }
 
     }  
 
@@ -34,5 +45,16 @@ namespace Code.Infrastructure.UI.Panels
     {
         void MenuChoosePanelRemoved();
     }
+        
+        
+    public interface IMenuChoosePanelOpenedHandle : IGlobalSubscriber 
+    {
+        void MenuChoosePanelOpened(UIPanel panel);
+    }
+
+    public interface IMenuChoosePanelClosedHandle : IGlobalSubscriber 
+    {
+        void MenuChoosePanelClosed();
+    }
 
 }

Assets/UnityCodeGen.Generated/ConfigLocator.Generated.cs

@@ -1,19 +1,20 @@
 
 #pragma warning disable CS0105 
     using Code.Example.Platformer.Entity;
+using Code.Infrastructure.Input;
+using Code.Example.Race.Racer;
 using Code.Infrastructure.Audio;
 using Code.Infrastructure.Volume;
-using Code.Infrastructure.Camera;
 using Code.Infrastructure.UI;
-using Code.Example.Race.Racer;
-using Code.Infrastructure.Configs;
 using Code.Infrastructure.Audio;
-using Code.Example.Platformer.Entity;
 using Code.Infrastructure.Audio;
-using Code.Infrastructure.UI;
 using Code.Infrastructure.SceneLoader;
 using Code.Infrastructure.Camera;
-using Code.Infrastructure.Input;
+using Code.Infrastructure.Camera;
+using Code.Example.Platformer.Entity;
+using Code.Infrastructure.UI;
+using Code.Infrastructure.Configs;
+using Code.Infrastructure.Audio;
 
     using UnityEngine;
 #pragma warning restore CS0105
@@ -27,33 +28,35 @@ using Code.Infrastructure.Input;
                       {
                            SystemConfigsReferences systemConfigsReferences = Resources.Load<SystemConfigsReferences>("SystemConfigsReferences");
                            
-             _multipleConfigReferences.Add(typeof(Code.Example.Platformer.Entity.PlatformerEntitySettingsConfig), systemConfigsReferences.PlatformerEntitySettings);
+             _singleConfigReferences.Add(typeof(Code.Example.Platformer.Entity.PlatformerPlayerSettingsConfig), systemConfigsReferences.PlatformerPlayerSettings);
 
-             _multipleConfigReferences.Add(typeof(Code.Infrastructure.Audio.AudioInfoConfig), systemConfigsReferences.AudioInfo);
-
-             _multipleConfigReferences.Add(typeof(Code.Infrastructure.Volume.VolumeSettingsConfig), systemConfigsReferences.VolumeSettings);
-
-             _singleConfigReferences.Add(typeof(Code.Infrastructure.Camera.GameCameraConfig), systemConfigsReferences.GameCamera);
-
-             _multipleConfigReferences.Add(typeof(Code.Infrastructure.UI.UIPanelSettingsConfig), systemConfigsReferences.UIPanelSettings);
+             _singleConfigReferences.Add(typeof(Code.Infrastructure.Input.InputServiceConfig), systemConfigsReferences.InputService);
 
              _multipleConfigReferences.Add(typeof(Code.Example.Race.Racer.RacerSettingsConfig), systemConfigsReferences.RacerSettings);
 
-             _multipleConfigReferences.Add(typeof(Code.Infrastructure.Configs.LayerMasksConfigConfig), systemConfigsReferences.LayerMasksConfig);
+             _singleConfigReferences.Add(typeof(Code.Infrastructure.Audio.AudioSourcePrefabConfig), systemConfigsReferences.AudioSourcePrefab);
+
+             _multipleConfigReferences.Add(typeof(Code.Infrastructure.Volume.VolumeSettingsConfig), systemConfigsReferences.VolumeSettings);
+
+             _multipleConfigReferences.Add(typeof(Code.Infrastructure.UI.UIPanelSettingsConfig), systemConfigsReferences.UIPanelSettings);
 
              _multipleConfigReferences.Add(typeof(Code.Infrastructure.Audio.AudioSourceSettingsConfig), systemConfigsReferences.AudioSourceSettings);
 
-             _singleConfigReferences.Add(typeof(Code.Example.Platformer.Entity.PlatformerPlayerSettingsConfig), systemConfigsReferences.PlatformerPlayerSettings);
-
-             _singleConfigReferences.Add(typeof(Code.Infrastructure.Audio.AudioSourcePrefabConfig), systemConfigsReferences.AudioSourcePrefab);
-
-             _singleConfigReferences.Add(typeof(Code.Infrastructure.UI.CanvasSettingsConfig), systemConfigsReferences.CanvasSettings);
+             _multipleConfigReferences.Add(typeof(Code.Infrastructure.Audio.AudioInfoConfig), systemConfigsReferences.AudioInfo);
 
              _multipleConfigReferences.Add(typeof(Code.Infrastructure.SceneLoader.SceneInfoConfig), systemConfigsReferences.SceneInfo);
 
              _multipleConfigReferences.Add(typeof(Code.Infrastructure.Camera.CameraSettingsConfig), systemConfigsReferences.CameraSettings);
 
-             _singleConfigReferences.Add(typeof(Code.Infrastructure.Input.InputServiceConfig), systemConfigsReferences.InputService);
+             _singleConfigReferences.Add(typeof(Code.Infrastructure.Camera.GameCameraConfig), systemConfigsReferences.GameCamera);
+
+             _multipleConfigReferences.Add(typeof(Code.Example.Platformer.Entity.PlatformerEntitySettingsConfig), systemConfigsReferences.PlatformerEntitySettings);
+
+             _singleConfigReferences.Add(typeof(Code.Infrastructure.UI.CanvasSettingsConfig), systemConfigsReferences.CanvasSettings);
+
+             _multipleConfigReferences.Add(typeof(Code.Infrastructure.Configs.LayerMasksConfigConfig), systemConfigsReferences.LayerMasksConfig);
+
+             _singleConfigReferences.Add(typeof(Code.Infrastructure.Audio.AudioMixerConfigConfig), systemConfigsReferences.AudioMixerConfig);
 
                       }
                   }

Assets/UnityCodeGen.Generated/SystemConfigsReferences.Generated.cs

@@ -1,19 +1,20 @@
 
 #pragma warning disable CS0105 
     using Code.Example.Platformer.Entity;
+using Code.Infrastructure.Input;
+using Code.Example.Race.Racer;
 using Code.Infrastructure.Audio;
 using Code.Infrastructure.Volume;
-using Code.Infrastructure.Camera;
 using Code.Infrastructure.UI;
-using Code.Example.Race.Racer;
-using Code.Infrastructure.Configs;
 using Code.Infrastructure.Audio;
-using Code.Example.Platformer.Entity;
 using Code.Infrastructure.Audio;
-using Code.Infrastructure.UI;
 using Code.Infrastructure.SceneLoader;
 using Code.Infrastructure.Camera;
-using Code.Infrastructure.Input;
+using Code.Infrastructure.Camera;
+using Code.Example.Platformer.Entity;
+using Code.Infrastructure.UI;
+using Code.Infrastructure.Configs;
+using Code.Infrastructure.Audio;
 
     using UnityEngine.AddressableAssets;
 #pragma warning restore CS0105
@@ -21,20 +22,21 @@ using Code.Infrastructure.Input;
     namespace Code.Infrastructure.Configs{
     public partial class SystemConfigsReferences
     {
-        public string PlatformerEntitySettings;
-public string AudioInfo;
-public string VolumeSettings;
-public AssetReference GameCamera;
-public string UIPanelSettings;
+        public AssetReference PlatformerPlayerSettings;
+public AssetReference InputService;
 public string RacerSettings;
-public string LayerMasksConfig;
-public string AudioSourceSettings;
-public AssetReference PlatformerPlayerSettings;
 public AssetReference AudioSourcePrefab;
-public AssetReference CanvasSettings;
+public string VolumeSettings;
+public string UIPanelSettings;
+public string AudioSourceSettings;
+public string AudioInfo;
 public string SceneInfo;
 public string CameraSettings;
-public AssetReference InputService;
+public AssetReference GameCamera;
+public string PlatformerEntitySettings;
+public AssetReference CanvasSettings;
+public string LayerMasksConfig;
+public AssetReference AudioMixerConfig;
 
     }
 }