Платформер враги, инфраструктура, герой

Assets/Code/Infrastructure/App/PapaInstaller.cs

@@ -6,6 +6,7 @@ using Code.Infrastructure.Input;
 using Code.Infrastructure.Loadings;
 using Code.Infrastructure.SceneLoader;
 using Code.Infrastructure.UI;
+using Code.Infrastructure.UI.Panels;
 using Code.Infrastructure.Volume;
 using Reflex.Core;
 using Reflex.Enums;
@@ -23,7 +24,8 @@ namespace Code.Infrastructure.App
         IInputServiceInitializedHandle,
         ICameraInitializedHandle,
         IUIInitializedHandle,
-        IUIPanelLoaded,
+        ILoadingPanelCreatedHandle,
+        ILogoPanelCreatedHandle,
         IVolumesInitializedHandle,
         IVolumeLoaded,
         IAudioSourcePoolInitializedHandle,
@@ -151,26 +153,8 @@ namespace Code.Infrastructure.App
             _ui2CamLoading.DoProgress();
             _initialLoading.DoProgress();
 
-            _thatRightContainer.Resolve<IUIService>().TryLoadPanel(UIPanelType.Logo); 
-            _thatRightContainer.Resolve<IUIService>().TryLoadPanel(UIPanelType.Loading); 
-        }
-
-        public void UILoaded(UIPanelType uiPanelType)
-        {
-            switch (uiPanelType)
-            {
-                case UIPanelType.Logo:
-                    _thatRightContainer.Resolve<IUIService>().OpenPanel(UIPanelType.Logo);
-
-                    _initialLoading.DoProgress();
-                    break;
-                case UIPanelType.Loading:
-                    // _thatRightContainer.Resolve<IUIService>().OpenPanel(UIPanelType.Logo);
-                    break;
-                default:
-                    Application.Quit();
-                    break;
-            }
+            _thatRightContainer.Resolve<IUIService>().TryLoadCreatePanel(UIPanelType.Logo); 
+            _thatRightContainer.Resolve<IUIService>().TryLoadCreatePanel(UIPanelType.Loading); 
         }
 
         public void VolumesInitialized()
@@ -212,5 +196,17 @@ namespace Code.Infrastructure.App
         {
             _initialLoading.DoProgress();
         }
+
+        public void LoadingPanelCreated(UIPanel panel)
+        {
+            _thatRightContainer.Resolve<IUIService>().OpenPanel(UIPanelType.Logo);
+
+            _initialLoading.DoProgress();
+        }
+
+        public void LogoPanelCreated(UIPanel panel)
+        {
+            
+        }
     }
 }

Assets/Code/Infrastructure/App/States/BootstrapState.cs

@@ -1,14 +1,13 @@
-using System.Threading;
-using Code.Debug;
 using Code.Infrastructure.Audio;
 using Code.Infrastructure.Generators; 
-using Code.Infrastructure.UI; 
+using Code.Infrastructure.UI;
+using Code.Infrastructure.UI.Panels;
 
 namespace Code.Infrastructure.App.States
 {
     [State(typeof(AppStates),typeof(AppStateMachineContext))]
     [StateRaisingEvent]
-    public partial class BootstrapState : IUIPanelLoaded, IReadyToPlayHandle
+    public partial class BootstrapState : IReadyToPlayHandle, IMenuChoosePanelCreatedHandle
     {
         private EventBus.EventBus _eventBus;
         public BootstrapState(AppStateMachineContext context, EventBus.EventBus eventBus) : base(context,eventBus)
@@ -23,7 +22,7 @@ namespace Code.Infrastructure.App.States
             
             Context.UIService.TryRemovePanel(UIPanelType.Logo);
             
-            Context.UIService.TryLoadPanel(UIPanelType.DebugSceneChooser);
+            Context.UIService.TryLoadCreatePanel(UIPanelType.DebugSceneChooser);
             Context.AudioFactory.LoadAudioClips(AudioNames.UISounds);
         }
  
@@ -33,16 +32,16 @@ namespace Code.Infrastructure.App.States
             Context.UIService.TryRemovePanel(UIPanelType.DebugSceneChooser);
             _eventBus.Unsubscribe(this);
         }
-
-        public void UILoaded(UIPanelType uiPanelType)
-        {
-            if (uiPanelType != UIPanelType.DebugSceneChooser) return;
-            
-            Context.UIService.OpenPanel(uiPanelType);  
-        }
+ 
         public void OnReadyToPlay(AudioNames groupName)
         {
             Context.AudioService.PlayRepeatedly(AudioNames.UISounds,0);
         }
+
+        public void MenuChoosePanelCreated(UIPanel panel)
+        {
+            panel.gameObject.SetActive(true);
+            panel.Open();
+        }
     }
 }

Assets/Code/Infrastructure/App/States/GameplayState.cs

@@ -18,7 +18,7 @@ using Reflex.Core;
 using Reflex.Injectors;
 using Unity.Cinemachine;
 using UnityEngine.SceneManagement;
-
+// Ивенты создания панелей сломаны TODO
 namespace Code.Infrastructure.App.States
 {
     [State(typeof(AppStates), typeof(AppStateMachineContext))]
@@ -27,7 +27,6 @@ namespace Code.Infrastructure.App.States
         IOnGameplaySceneLoadedHandler, 
         IRaceGameHandle, 
         IRacerFactoryInitializedHandle,
-        IUIPanelLoaded,
         ICinematicMachineHandle
     {
         public GameplayState(AppStateMachineContext context, EventBus.EventBus eventBus) : base(context, eventBus)
@@ -52,11 +51,11 @@ namespace Code.Infrastructure.App.States
             // CinemachineCamera
             _gameplayLoading = new Loading(7, GameplayLoadingCompleted);
             
-            Context.UIService.TryLoadPanel(UIPanelType.PlayerScoreCounter);
-            Context.UIService.TryLoadPanel(UIPanelType.WinScreen);
-            Context.UIService.TryLoadPanel(UIPanelType.PlayerScores);
+            Context.UIService.TryLoadCreatePanel(UIPanelType.PlayerScoreCounter);
+            Context.UIService.TryLoadCreatePanel(UIPanelType.WinScreen);
+            Context.UIService.TryLoadCreatePanel(UIPanelType.PlayerScores);
             Context.SceneLoader.LoadSceneAsync(SceneId.Gameplay, LoadSceneMode.Single).Forget();
-            Context.InputService.EnableMap(ActionMappings.Gameplay);
+            Context.InputService.EnableMap(ActionMappings.Race);
             Context.CameraFactory.LoadCinemachineCamera(CameraMode.ThirdPerson).Forget();
         }
 
@@ -85,7 +84,7 @@ namespace Code.Infrastructure.App.States
             Context.UIService.TryRemovePanel(UIPanelType.WinScreen);
             Context.UIService.TryRemovePanel(UIPanelType.PlayerScores);
             Context.CameraFactory.ReleaseCinemachineCamera(CameraMode.ThirdPerson);
-            Context.InputService.DisableMap(ActionMappings.Gameplay);
+            Context.InputService.DisableMap(ActionMappings.Race);
             
             _raceGame = null;
             
@@ -120,7 +119,7 @@ namespace Code.Infrastructure.App.States
 
         public void RaceGameEnded(RaceScores scores)
         {
-            var winScreen = (WinScreen)Context.UIService.TryGetPanel(UIPanelType.WinScreen);
+            var winScreen = (WinScreen)Context.UIService.TryGetSinglePanel(UIPanelType.WinScreen);
             
             var id = 0;
             var cachedScores = scores.GetScores();
@@ -133,7 +132,7 @@ namespace Code.Infrastructure.App.States
             var winText = $@"{id} МЕСТО\n";
             winScreen.SetText(winText);
 
-            var getPanel = Context.UIService.TryGetPanel(UIPanelType.PlayerScores);
+            var getPanel = Context.UIService.TryGetSinglePanel(UIPanelType.PlayerScores);
             ((PlayerScores)getPanel)
                 .SetText(UNTILTHEYFIXCONTAINERS.Resolve<PlayerPrefsRacePoopshitter>().GetRaces());
             Context.UIService.ClosePanel(UIPanelType.PlayerScoreCounter);
@@ -176,5 +175,14 @@ namespace Code.Infrastructure.App.States
         }
  
         public void CinemachineLoaded(CinemachineCamera cinemachineCamera) => _gameplayLoading.DoProgress();
+        public void UISinglePanelLoaded(UIPanelType uiPanelType)
+        {
+            
+        }
+
+        public void UISinglePanelRemoved(UIPanelType uiPanelType)
+        {
+            throw new System.NotImplementedException();
+        }
     }
 }

Assets/Code/Infrastructure/App/States/MainMenuState.cs

@@ -12,7 +12,7 @@ namespace Code.Infrastructure.App.States
 {
     [State(typeof(AppStates),typeof(AppStateMachineContext))]
     [StateRaisingEvent] 
-    public partial class MainMenuState : IUIPanelLoaded, IReadyToPlayHandle, IOnMainMenuSceneLoadedHandler
+    public partial class MainMenuState : IReadyToPlayHandle, IOnMainMenuSceneLoadedHandler, IMenuChoosePanelCreatedHandle
     { 
         public MainMenuState(AppStateMachineContext context, EventBus.EventBus eventBus) : base(context,eventBus)
         { 
@@ -26,7 +26,7 @@ namespace Code.Infrastructure.App.States
 
             _loading = new Loading(2, LoadComplete);
             
-            Context.UIService.TryLoadPanel(UIPanelType.DebugSceneChooser);
+            Context.UIService.TryLoadCreatePanel(UIPanelType.DebugSceneChooser);
             // Context.AudioFactory.LoadAudioClips(AudioNames.UISounds);
             Context.SceneLoader.LoadSceneAsync(SceneId.MainMenu, LoadSceneMode.Single).Forget();
             Context.AudioService.PlayRepeatedly(AudioNames.UISounds,0);
@@ -39,14 +39,6 @@ namespace Code.Infrastructure.App.States
             EventBus.Unsubscribe(this);
         }
 
-        public void UILoaded(UIPanelType uiPanelType)
-        {
-            if (uiPanelType != UIPanelType.DebugSceneChooser) return;
-            
-            Context.UIService.OpenPanel(uiPanelType);
-            _loading.DoProgress();
-        }
-
         private void LoadComplete()
         {
             Context.UIService.OpenPanel(UIPanelType.DebugSceneChooser);
@@ -68,5 +60,13 @@ namespace Code.Infrastructure.App.States
         {
             
         }
+
+        public void MenuChoosePanelCreated(UIPanel panel)
+        {
+            panel.gameObject.SetActive(true);
+            panel.Open();
+            
+            _loading.DoProgress();
+        }
     }
 }

Assets/Code/Infrastructure/Configs/LayerMaskType.cs

@@ -2,6 +2,8 @@ namespace Code.Infrastructure.Configs
 {
     public enum LayerMaskType
     {
-        PlatformerGround
+        PlatformerGround,
+        PlatformerEnemy,
+        PlatformerPlayer
     }
 }

Assets/Code/Infrastructure/Generators/UIPanelEventsGenerator.cs

@@ -0,0 +1,71 @@
+#if UNITY_EDITOR 
+using Code.Infrastructure.UI; 
+using UnityCodeGen;
+using UnityEditor;
+
+namespace Code.Infrastructure.Generators
+{
+    [Generator]
+    public class UIPanelEventsGenerator : ICodeGenerator
+    {
+        public void Execute(GeneratorContext context)
+        {
+            GenerateStates(context);
+        }
+
+        private void GenerateStates(GeneratorContext context)
+        {
+            var states = TypeCache.GetTypesDerivedFrom<UIPanel>();
+
+            foreach (var st in states)
+            {
+                var fireStatesCode = $@"        
+        public override void FireCreatedEvent()
+        {{
+            _eventBus.RaiseEvent<I{st.Name}CreatedHandle>(h => h.{st.Name}Created(this));
+        }}
+
+        public override void FireRemovedEvent()
+        {{
+            _eventBus.RaiseEvent<I{st.Name}RemovedHandle>(h => h.{st.Name}Removed());
+        }}
+";
+                var fireStatesInterfacesCode = $@"        
+        
+    public interface I{st.Name}CreatedHandle : IGlobalSubscriber 
+    {{
+        void {st.Name}Created(UIPanel panel);
+    }}
+
+    public interface I{st.Name}RemovedHandle : IGlobalSubscriber 
+    {{
+        void {st.Name}Removed();
+    }}
+";
+
+                var statesCode = $@"
+
+// retard-generated
+
+using Code.Infrastructure.UI;
+using Code.Infrastructure.EventBus;
+using Code.Infrastructure.StateMachine;
+
+namespace {st.Namespace}
+{{
+    public partial class {st.Name}
+    {{
+        {fireStatesCode}
+    }}  
+
+    {fireStatesInterfacesCode}
+}}
+";
+
+
+                context.AddCode($"{st.FullName}Events.Generated.cs", statesCode);
+            }
+        }
+    }
+}
+#endif

Assets/Code/Infrastructure/Generators/UIPanelEventsGenerator.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: e534143b792f4c2692451b19fb9b7e98
+timeCreated: 1773046409

Assets/Code/Infrastructure/Input/ActionMappings.cs

@@ -3,13 +3,21 @@ namespace Code.Infrastructure.Input
     public enum ActionMappings
     {
         MainMenu, 
-        Gameplay,
+        Race,
+        Platformer,
         Debug
     }
-    public enum GameplayActions
+    public enum RaceActions
     {
         Move,
-        Brake, 
+        Brake,  
+    }
+    public enum PlatformerActions
+    {
+        Move,
+        Jump, 
+        Attack, 
+        Sprint, 
     }
     public enum DebugActions
     {

Assets/Code/Infrastructure/SceneLoader/ScenesAssetReferences.cs

@@ -1,11 +1,9 @@
 using UnityEngine;
-using UnityEngine.AddressableAssets; 
 
 namespace Code.Infrastructure.SceneLoader
 {
     [CreateAssetMenu(fileName = "ScenesAssetReferences", menuName = "Configs/ScenesAssetReferences")]
     public class ScenesAssetReferences : ScriptableObject
     {
-        public AssetReference gameplaySceneReference;
     }
 }

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

@@ -1,17 +0,0 @@
-using System;
-
-namespace Code.Infrastructure.UI.Panels
-{
-    public class DamnEmptyPanel : UIPanel
-    {
-        public override void Open(Action callback = null)
-        {
-            callback?.Invoke();
-        }
-
-        public override void Close(Action callback = null)
-        {
-            callback?.Invoke();
-        }
-    }
-}

Assets/Code/Infrastructure/UI/Panels/DamnEmptyPanel.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: ce4e618236c441ca857ad458fa13e09d
-timeCreated: 1769347387

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

@@ -5,7 +5,7 @@ using UnityEngine.UI;
 
 namespace Code.Infrastructure.UI.Panels
 {
-    public class LoadingPanel : UIPanel
+    public partial class LoadingPanel : UIPanel
     {
         [SerializeField] private RawImage image;
         [SerializeField] private Color shownColor; 

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

@@ -5,7 +5,7 @@ using UnityEngine.UI;
 
 namespace Code.Infrastructure.UI.Panels
 {
-    public class LogoPanel : UIPanel
+    public partial class LogoPanel : UIPanel
     { 
         [SerializeField] private Image image;
         [SerializeField] private Color shownColor; 

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

@@ -6,7 +6,7 @@ using UnityEngine;
 
 namespace Code.Infrastructure.UI.Panels
 {
-    public class MenuChoosePanel : UIPanel
+    public partial class MenuChoosePanel : UIPanel
     {
         [Inject] IAudioService _audioService;
         [SerializeField] private SceneChooser sceneChooser;

Assets/Code/Infrastructure/UI/UIFactory.cs

@@ -12,14 +12,16 @@ namespace Code.Infrastructure.UI
 {
     public interface IUIFactory
     {
-        UniTaskVoid LoadPanel(UIPanelType panelType);
+        UniTaskVoid LoadPanel(UIPanelType panelType, Transform parent = null);
         void ReleasePanel(UIPanel panel);
         Canvas Canvas { get; }
+        bool CheckIsMultiple(UIPanelType panelType);
     }
 
     public class UIFactory : IDisposable, IUIFactory
     {
         private Dictionary<UIPanelType, UIPanelSettingsConfig> _configs;
+        public bool CheckIsMultiple(UIPanelType panelType) => _configs[panelType].Multiple;
         private AssetReference _canvasConfigReference;
         private string _configsLabel;
         private EventBus.EventBus _eventBus;
@@ -41,9 +43,9 @@ namespace Code.Infrastructure.UI
             LoadConfigs().Forget();
         }
 
-        public async UniTaskVoid LoadPanel(UIPanelType panelType)
+        public async UniTaskVoid LoadPanel(UIPanelType panelType, Transform parent = null)
         {
-            var panel = (await Addressables.InstantiateAsync(_configs[panelType].Prefab, _canvas.transform).ToUniTask())
+            var panel = (await Addressables.InstantiateAsync(_configs[panelType].Prefab, parent ?? _canvas.transform).ToUniTask())
                 .GetComponent<UIPanel>();
             
             UnityEngine.Debug.LogWarning($"Panel loaded {panelType}");
@@ -90,5 +92,6 @@ namespace Code.Infrastructure.UI
     public interface IUIPanelLoadedHandle : IGlobalSubscriber
     {
         void UIPanelLoaded(UIPanel panel, UIPanelType panelType);
+        List<UIPanel> TryGetMultiplePanels(UIPanelType panelType); 
     }
 }

Assets/Code/Infrastructure/UI/UIFactory.cs.meta

@@ -1,3 +1,2 @@
 fileFormatVersion: 2
-guid: 8447b81247b24f1b869b0067aeeff0b8
-timeCreated: 1768979324
+guid: 8447b81247b24f1b869b0067aeeff0b8

Assets/Code/Infrastructure/UI/UIPanel.cs

@@ -1,13 +1,21 @@
 using System;
+using Reflex.Attributes;
 using UnityEngine;
 
 namespace Code.Infrastructure.UI
 {
     public abstract class UIPanel : MonoBehaviour
     {
+        public UIPanelType PanelType { get; set; }
+        
         [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 virtual void FireCreatedEvent(){}
+        public virtual void FireRemovedEvent(){}
     }
+    
 }

Assets/Code/Infrastructure/UI/UIPanelSettings.cs

@@ -8,6 +8,7 @@ namespace Code.Infrastructure.UI
     {
         [ToConfig] public AssetReference Prefab;
         [ToConfig] public UIPanelType UIPanelType;
+        [ToConfig] public bool Multiple;
     }
     
     [Config("Configs/UI/CanvasSettings")]

Assets/Code/Infrastructure/UI/UIService.cs

@@ -1,9 +1,11 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using Code.Infrastructure.EventBus;
 using Reflex.Core;
 using Reflex.Extensions;
 using Reflex.Injectors;
+using UnityEngine;
 using UnityEngine.SceneManagement;
 
 namespace Code.Infrastructure.UI
@@ -12,15 +14,18 @@ namespace Code.Infrastructure.UI
     {
         void OpenPanel(UIPanelType uiPanelType);
         void ClosePanel(UIPanelType uiPanelType);
-        void TryLoadPanel(UIPanelType uiPanelType);
+        void TryLoadCreatePanel(UIPanelType uiPanelType, Transform parent = null);
         void TryRemovePanel(UIPanelType uiPanelType);
         void SetCanvasCamera(UnityEngine.Camera camera);
-        UIPanel TryGetPanel(UIPanelType panelType);
+        UIPanel TryGetSinglePanel(UIPanelType panelType);
+        void TryRemovePanel(UIPanel panel);
     }
 
+    // Крайне неудобно пользоваться
     public class UIService : IUIPanelLoadedHandle, IUIService
     {
-        private Dictionary<UIPanelType, UIPanel> _loadedPanels = new();
+        private Dictionary<UIPanelType, UIPanel> _loadedSinglePanels = new();
+        private Dictionary<UIPanelType, List<UIPanel>> _loadedMultiplePanels = new();
 
         private EventBus.EventBus _eventBus;
         private IUIFactory _factory;
@@ -40,49 +45,101 @@ namespace Code.Infrastructure.UI
 
         public void OpenPanel(UIPanelType uiPanelType)
         {
-            _loadedPanels[uiPanelType].gameObject.SetActive(true);
-            _loadedPanels[uiPanelType].Open();
+            _loadedSinglePanels[uiPanelType].gameObject.SetActive(true);
+            _loadedSinglePanels[uiPanelType].Open();
         }
 
         // TODO Close event
         public void ClosePanel(UIPanelType uiPanelType)
         {
-            _loadedPanels[uiPanelType].Close(() => { _loadedPanels[uiPanelType].gameObject.SetActive(false); });
+            _loadedSinglePanels[uiPanelType].Close(() =>
+            {
+                _loadedSinglePanels[uiPanelType].gameObject.SetActive(false);
+            });
         }
 
-        public void TryLoadPanel(UIPanelType uiPanelType) => _factory.LoadPanel(uiPanelType);
+        public void TryLoadCreatePanel(UIPanelType uiPanelType, Transform parent = null) => _factory.LoadPanel(uiPanelType, parent);
 
         public void UIPanelLoaded(UIPanel panel, UIPanelType panelType)
         {
-            _loadedPanels.Add(panelType, panel);
+            panel.PanelType = panelType;
+            
+            if (!_factory.CheckIsMultiple(panelType))
+                _loadedSinglePanels.Add(panelType, panel);
+            else
+            {
+                if (!_loadedMultiplePanels.ContainsKey(panelType))
+                    _loadedMultiplePanels.Add(panelType, new List<UIPanel>());
+                _loadedMultiplePanels[panelType].Add(panel);
+            }
 
             if (panel.InjectMeSenpai)
                 GameObjectInjector.InjectRecursive(panel.gameObject, Container.RootContainer);
+            else
+                GameObjectInjector.InjectSingle(panel.gameObject, Container.RootContainer);
             // GameObjectInjector.InjectRecursive(panel.gameObject, SceneManager.GetActiveScene().GetSceneContainer()); // Скорее всего будут нужны компоненты текущей сцены
-
-            _eventBus.RaiseEvent<IUIPanelLoaded>(ui => ui.UILoaded(panelType));
+            
+            panel.FireCreatedEvent();
         }
 
         public void TryRemovePanel(UIPanelType uiPanelType)
         {
-            _loadedPanels[uiPanelType].Close(() =>
+            if (_factory.CheckIsMultiple(uiPanelType))
             {
-                _loadedPanels[uiPanelType].gameObject.SetActive(false);
+                UnityEngine.Debug.LogError("Это для единичных панелей олух");
+                return;
+            }
+            _loadedSinglePanels[uiPanelType].Close(() =>
+            {
+                _loadedSinglePanels[uiPanelType].gameObject.SetActive(false);
                 RemovePanel(uiPanelType);
             });
         }
+        public void TryRemovePanel(UIPanel panel)
+        {
+            panel.Close(() =>
+            {
+                panel.gameObject.SetActive(false);
+                RemovePanel(panel);
+                // _eventBus.RaiseEvent<IUIMultiplePanelHandle>(x=> x.UIMultiplePanelRemoved(panel));
+            });
+        }
 
         private void RemovePanel(UIPanelType panelType)
         {
-            _factory.ReleasePanel(_loadedPanels[panelType]);
-            _loadedPanels.Remove(panelType);
+            if (!_factory.CheckIsMultiple(panelType))
+            {
+                var temp = _loadedSinglePanels[panelType];
+                _loadedSinglePanels.Remove(panelType);
+                
+                temp.FireRemovedEvent();
+                
+                _factory.ReleasePanel(temp);
+            }
+            else
+            {
+                var temp = _loadedMultiplePanels[panelType];
+                _loadedMultiplePanels.Remove(panelType);
+                
+                foreach (var panel in temp)
+                {
+                    panel.FireRemovedEvent();
+                    _factory.ReleasePanel(panel);
+                }
+            }
         }
 
-        public UIPanel TryGetPanel(UIPanelType panelType) => _loadedPanels.GetValueOrDefault(panelType);
-    }
+        private void RemovePanel(UIPanel panel)
+        {
+            _loadedMultiplePanels[panel.PanelType].Remove(panel);
+            panel.FireRemovedEvent();
+            
+            _factory.ReleasePanel(panel);
+            
+            if(_loadedMultiplePanels[panel.PanelType].Count == 0) _loadedMultiplePanels.Remove(panel.PanelType);
+        }
 
-    public interface IUIPanelLoaded : IGlobalSubscriber
-    {
-        void UILoaded(UIPanelType uiPanelType);
+        public UIPanel TryGetSinglePanel(UIPanelType panelType) => _loadedSinglePanels.GetValueOrDefault(panelType);
+        public List<UIPanel> TryGetMultiplePanels(UIPanelType panelType) => _loadedMultiplePanels.GetValueOrDefault(panelType);
     }
 }