Миксер

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

Assets/Code/Infrastructure/UI/Panels/LoadingPanel.cs

@@ -1,23 +1,25 @@
-using System; 
+using System;
+using Code.Infrastructure.Generators;
 using PrimeTween;
 using UnityEngine;
 using UnityEngine.UI;
 
 namespace Code.Infrastructure.UI.Panels
 {
+    [UIEventOpenClose]
     public partial class LoadingPanel : UIPanel
     {
         [SerializeField] private RawImage image;
         [SerializeField] private Color shownColor; 
         [SerializeField] private Color hiddenColor; 
-        public override void Open(Action callback = null)
+        public override void Open()
         { 
-            Tween.Color(image,shownColor, 1f).OnComplete( () => callback?.Invoke()); 
+            Tween.Color(image,shownColor, 1f).OnComplete(FireOpenedEvent); 
         }
 
-        public override void Close(Action callback = null)
+        public override void Close()
         {
-            Tween.Color(image,hiddenColor, 1f).OnComplete( () => callback?.Invoke());  
+            Tween.Color(image,hiddenColor, 1f).OnComplete(FireClosedEvent); 
         }
     }
 }

Assets/Code/Infrastructure/UI/Panels/LogoPanel.cs

@@ -1,23 +1,24 @@
-using System; 
+using Code.Infrastructure.Generators;
 using PrimeTween;
 using UnityEngine;
 using UnityEngine.UI; 
 
 namespace Code.Infrastructure.UI.Panels
 {
+    [UIEventOpenClose]
     public partial class LogoPanel : UIPanel
     { 
         [SerializeField] private Image image;
         [SerializeField] private Color shownColor; 
         [SerializeField] private Color hiddenColor; 
-        public override void Open(Action callback = null)
+        public override void Open()
         { 
-            Tween.Color(image,shownColor, 1f).OnComplete( () => callback?.Invoke()); 
+            Tween.Color(image,shownColor, 1f).OnComplete(FireOpenedEvent); 
         }
 
-        public override void Close(Action callback = null)
+        public override void Close()
         {
-            Tween.Color(image,hiddenColor, 1f).OnComplete( () => callback?.Invoke());  
+            Tween.Color(image,hiddenColor, 1f).OnComplete(FireClosedEvent);  
         }
     }
 }

Assets/Code/Infrastructure/UI/Panels/MenuChoosePanel.cs

@@ -1,28 +1,28 @@
-using System;
 using Code.Debug;
 using Code.Infrastructure.Audio;
+using Code.Infrastructure.Generators;
 using Reflex.Attributes;
 using UnityEngine;
 
 namespace Code.Infrastructure.UI.Panels
 {
+    [UIEventOpenClose]
     public partial class MenuChoosePanel : UIPanel
     {
         [Inject] IAudioService _audioService;
         [SerializeField] private SceneChooser sceneChooser;
-        public void PlaySelectSound() => _audioService.PlayOneShot(AudioNames.UISounds, 7);
-        public void PlayDeselectSound() => _audioService.PlayOneShot(AudioNames.UISounds, 8);
-        public void PlayClickSound() => _audioService.PlayOneShot(AudioNames.UISounds, 1);
-        public override void Open(Action callback = null)
+        public void PlaySelectSound() => _audioService.PlayOneShot(AudioNames.UISounds, 7, AudioGroupType.UIFX);
+        public void PlayDeselectSound() => _audioService.PlayOneShot(AudioNames.UISounds, 8, AudioGroupType.UIFX);
+        public void PlayClickSound() => _audioService.PlayOneShot(AudioNames.UISounds, 1, AudioGroupType.UIFX);
+        public override void Open()
         {
             sceneChooser.EnableButtons();
-            callback?.Invoke();
+            FireOpenedEvent();
         }
 
-        public override void Close(Action callback = null)
+        public override void Close()
         {
-            
-            callback?.Invoke();
+            FireClosedEvent();
         }
     }
 }

Assets/Code/Infrastructure/UI/UIPanel.cs

@@ -1,4 +1,3 @@
-using System;
 using Reflex.Attributes;
 using UnityEngine;
 
@@ -11,11 +10,17 @@ namespace Code.Infrastructure.UI
         [SerializeField] protected bool injectMeSenpai;
         public bool InjectMeSenpai => injectMeSenpai;
         [Inject] protected EventBus.EventBus _eventBus;
-        public abstract void Open(Action callback = null);
-        public abstract void Close(Action callback = null);
+        public abstract void Open();
+        public abstract void Close();
 
+        // Вызвать вручную \ добавить в коллбек для вызова ивента в EventBus
         public virtual void FireCreatedEvent(){}
+        // Вызвать вручную \ добавить в коллбек для вызова ивента в EventBus
         public virtual void FireRemovedEvent(){}
+        // Вызвать вручную \ добавить в коллбек для вызова ивента в EventBus
+        protected virtual void FireOpenedEvent(){}
+        // Вызвать вручную \ добавить в коллбек для вызова ивента в EventBus
+        protected virtual void FireClosedEvent(){gameObject.SetActive(false);}
     }
     
 }

Assets/Code/Infrastructure/UI/UIService.cs

@@ -52,10 +52,7 @@ namespace Code.Infrastructure.UI
         // TODO Close event
         public void ClosePanel(UIPanelType uiPanelType)
         {
-            _loadedSinglePanels[uiPanelType].Close(() =>
-            {
-                _loadedSinglePanels[uiPanelType].gameObject.SetActive(false);
-            });
+            _loadedSinglePanels[uiPanelType].Close();
         }
 
         public void TryLoadCreatePanel(UIPanelType uiPanelType, Transform parent = null) => _factory.LoadPanel(uiPanelType, parent);
@@ -89,20 +86,11 @@ namespace Code.Infrastructure.UI
                 UnityEngine.Debug.LogError("Это для единичных панелей олух");
                 return;
             }
-            _loadedSinglePanels[uiPanelType].Close(() =>
-            {
-                _loadedSinglePanels[uiPanelType].gameObject.SetActive(false);
-                RemovePanel(uiPanelType);
-            });
+            _loadedSinglePanels[uiPanelType].Close();
         }
         public void TryRemovePanel(UIPanel panel)
         {
-            panel.Close(() =>
-            {
-                panel.gameObject.SetActive(false);
-                RemovePanel(panel);
-                // _eventBus.RaiseEvent<IUIMultiplePanelHandle>(x=> x.UIMultiplePanelRemoved(panel));
-            });
+            panel.Close();
         }
 
         private void RemovePanel(UIPanelType panelType)