diff --git a/Game/CourierOld/Assets/Code/App/AppStates/GameOverState.cs b/Game/CourierOld/Assets/Code/App/AppStates/GameOverState.cs index d02257d..f272991 100644 --- a/Game/CourierOld/Assets/Code/App/AppStates/GameOverState.cs +++ b/Game/CourierOld/Assets/Code/App/AppStates/GameOverState.cs @@ -11,7 +11,7 @@ namespace Code.App.AppStates public GameOverState(AppStateMachineContext context) : base(context) { } - private float damnTimer = 3f; + private float damnTimer = 3f; // TODO Удалить при первой возможности public override void EnterState() { diff --git a/Game/CourierOld/Assets/Code/App/AppStates/GameplayState.cs b/Game/CourierOld/Assets/Code/App/AppStates/GameplayState.cs index 75639a8..569361b 100644 --- a/Game/CourierOld/Assets/Code/App/AppStates/GameplayState.cs +++ b/Game/CourierOld/Assets/Code/App/AppStates/GameplayState.cs @@ -21,10 +21,11 @@ namespace Code.App.AppStates public override void EnterState() { - Context.SceneLoaderService.LoadScene((int)SceneIds.MovementDev, SceneLoaded); + Context.UIService.LoadingScreen.Show(); + + Context.SceneLoaderService.LoadScene((int)SceneIds.MovementDev, SceneLoaded); // TODO Фабрика говна Nada Context.InputService.EnableMap(ActionMappings.Gameplay); - Context.UIService.LoadingScreen.Show(); Context.UIService.SwitchPanelTo(UIPanel.Gameplay); Context.CameraStateMachine.SwitchState(CameraMode.FirstPerson); diff --git a/Game/CourierOld/Assets/Code/App/AppStates/MainMenuState.cs b/Game/CourierOld/Assets/Code/App/AppStates/MainMenuState.cs index 4ac3e69..37a7aef 100644 --- a/Game/CourierOld/Assets/Code/App/AppStates/MainMenuState.cs +++ b/Game/CourierOld/Assets/Code/App/AppStates/MainMenuState.cs @@ -21,6 +21,7 @@ namespace Code.App.AppStates public override void EnterState() { Context.UIService.LoadingScreen.Show(); + Context.SceneLoaderService.LoadScene((int)SceneIds.MainMenu, SceneLoaded); Context.InputService.EnableMap(ActionMappings.MainMenu); @@ -53,7 +54,6 @@ namespace Code.App.AppStates private void StartGame() { Context.StateMachine.SwitchState(AppState.Gameplay) - .AllowStateTransition(AppState.MainMenu) .AllowStateTransition(AppState.GameOver); } diff --git a/Game/CourierOld/Assets/Code/UI/Dispatcher.cs b/Game/CourierOld/Assets/Code/UI/Dispatcher.cs new file mode 100644 index 0000000..284ba6e --- /dev/null +++ b/Game/CourierOld/Assets/Code/UI/Dispatcher.cs @@ -0,0 +1,17 @@ +using UnityEngine; + +namespace Code.UI +{ + public class Dispatcher : MonoBehaviour + { + public void Show() + { + + } + + public void Hide() + { + + } + } +} \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/UI/Dispatcher.cs.meta b/Game/CourierOld/Assets/Code/UI/Dispatcher.cs.meta new file mode 100644 index 0000000..5fcef9e --- /dev/null +++ b/Game/CourierOld/Assets/Code/UI/Dispatcher.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: da44ad1c93f34423a3edfea9d6c2b688 +timeCreated: 1761951417 \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/UI/Panels.meta b/Game/CourierOld/Assets/Code/UI/Panels.meta new file mode 100644 index 0000000..003447b --- /dev/null +++ b/Game/CourierOld/Assets/Code/UI/Panels.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: e8f289dfee4b4bd4988d217b988ae82d +timeCreated: 1761951389 \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/UI/GameOverPanel.cs b/Game/CourierOld/Assets/Code/UI/Panels/GameOverPanel.cs similarity index 80% rename from Game/CourierOld/Assets/Code/UI/GameOverPanel.cs rename to Game/CourierOld/Assets/Code/UI/Panels/GameOverPanel.cs index 58dc898..3e1b296 100644 --- a/Game/CourierOld/Assets/Code/UI/GameOverPanel.cs +++ b/Game/CourierOld/Assets/Code/UI/Panels/GameOverPanel.cs @@ -7,11 +7,11 @@ namespace Code.UI { [SerializeField] private Image _background; - public void Hide() + public override void Hide() { _background.enabled = false; } - public void Show() + public override void Show() { _background.enabled = true; } diff --git a/Game/CourierOld/Assets/Code/UI/GameOverPanel.cs.meta b/Game/CourierOld/Assets/Code/UI/Panels/GameOverPanel.cs.meta similarity index 100% rename from Game/CourierOld/Assets/Code/UI/GameOverPanel.cs.meta rename to Game/CourierOld/Assets/Code/UI/Panels/GameOverPanel.cs.meta diff --git a/Game/CourierOld/Assets/Code/UI/GameplayPanel.cs b/Game/CourierOld/Assets/Code/UI/Panels/GameplayPanel.cs similarity index 77% rename from Game/CourierOld/Assets/Code/UI/GameplayPanel.cs rename to Game/CourierOld/Assets/Code/UI/Panels/GameplayPanel.cs index 96f640b..fa40fe2 100644 --- a/Game/CourierOld/Assets/Code/UI/GameplayPanel.cs +++ b/Game/CourierOld/Assets/Code/UI/Panels/GameplayPanel.cs @@ -7,7 +7,7 @@ namespace Code.UI { public class GameplayPanel : UIElement { - [SerializeField] private Image dispatcher; + [SerializeField] private Dispatcher dispatcher; [SerializeField] private TMP_Text timer; [SerializeField] private Image healthBar; [SerializeField] private TMP_Text moneyText; @@ -36,10 +36,21 @@ namespace Code.UI { timer.text = Time.deltaTime.ToString(); } - public void Hide() + + public void SummonDispatcher() + { + // TODO + dispatcher.Show(); + } + public void CloseDispatcher() + { + // TODO + dispatcher.Hide(); + } + public override void Hide() { } - public void Show() + public override void Show() { } } diff --git a/Game/CourierOld/Assets/Code/UI/GameplayPanel.cs.meta b/Game/CourierOld/Assets/Code/UI/Panels/GameplayPanel.cs.meta similarity index 100% rename from Game/CourierOld/Assets/Code/UI/GameplayPanel.cs.meta rename to Game/CourierOld/Assets/Code/UI/Panels/GameplayPanel.cs.meta diff --git a/Game/CourierOld/Assets/Code/UI/LoadingPanel.cs b/Game/CourierOld/Assets/Code/UI/Panels/LoadingPanel.cs similarity index 80% rename from Game/CourierOld/Assets/Code/UI/LoadingPanel.cs rename to Game/CourierOld/Assets/Code/UI/Panels/LoadingPanel.cs index 8dc5013..300dc66 100644 --- a/Game/CourierOld/Assets/Code/UI/LoadingPanel.cs +++ b/Game/CourierOld/Assets/Code/UI/Panels/LoadingPanel.cs @@ -6,11 +6,11 @@ namespace Code.UI public class LoadingPanel : UIElement { [SerializeField] private Image _background; - public void Hide() + public override void Hide() { _background.enabled = false; } - public void Show() + public override void Show() { _background.enabled = true; } diff --git a/Game/CourierOld/Assets/Code/UI/LoadingPanel.cs.meta b/Game/CourierOld/Assets/Code/UI/Panels/LoadingPanel.cs.meta similarity index 100% rename from Game/CourierOld/Assets/Code/UI/LoadingPanel.cs.meta rename to Game/CourierOld/Assets/Code/UI/Panels/LoadingPanel.cs.meta diff --git a/Game/CourierOld/Assets/Code/UI/MainMenuPanel.cs b/Game/CourierOld/Assets/Code/UI/Panels/MainMenuPanel.cs similarity index 62% rename from Game/CourierOld/Assets/Code/UI/MainMenuPanel.cs rename to Game/CourierOld/Assets/Code/UI/Panels/MainMenuPanel.cs index 21f1737..bdd190d 100644 --- a/Game/CourierOld/Assets/Code/UI/MainMenuPanel.cs +++ b/Game/CourierOld/Assets/Code/UI/Panels/MainMenuPanel.cs @@ -7,5 +7,12 @@ namespace Code.UI { public Button startButton; public Button exitButton; + public override void Show() + { + } + + public override void Hide() + { + } } } \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/UI/MainMenuPanel.cs.meta b/Game/CourierOld/Assets/Code/UI/Panels/MainMenuPanel.cs.meta similarity index 100% rename from Game/CourierOld/Assets/Code/UI/MainMenuPanel.cs.meta rename to Game/CourierOld/Assets/Code/UI/Panels/MainMenuPanel.cs.meta diff --git a/Game/CourierOld/Assets/Code/UI/UIElement.cs b/Game/CourierOld/Assets/Code/UI/UIElement.cs index 9e9aa5b..85c220d 100644 --- a/Game/CourierOld/Assets/Code/UI/UIElement.cs +++ b/Game/CourierOld/Assets/Code/UI/UIElement.cs @@ -2,7 +2,9 @@ using UnityEngine; namespace Code.UI { - public class UIElement : MonoBehaviour + public abstract class UIElement : MonoBehaviour { + public abstract void Show(); + public abstract void Hide(); } } \ No newline at end of file