From 30201403602d7757e8e458747fca6f7246b764eb Mon Sep 17 00:00:00 2001 From: ThomasCharester Date: Fri, 14 Nov 2025 23:07:55 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9C=D1=83=D1=81=D0=BE=D1=80=20-?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Code/App/AppStates/GameplayState.cs | 59 ------------------- .../Code/App/AppStates/MainMenuState.cs | 55 ----------------- 2 files changed, 114 deletions(-) diff --git a/Game/CourierOld/Assets/Code/App/AppStates/GameplayState.cs b/Game/CourierOld/Assets/Code/App/AppStates/GameplayState.cs index 47fa1bd..3f0fc56 100644 --- a/Game/CourierOld/Assets/Code/App/AppStates/GameplayState.cs +++ b/Game/CourierOld/Assets/Code/App/AppStates/GameplayState.cs @@ -24,16 +24,12 @@ namespace Code.App.AppStates private PlayerHealth _playerHealth; private PlayerMoney _playerMoney; - private bool _uiLoaded, _sceneLoaded, _onGameplayMusicLoaded, _onSFXLoaded; - public GameplayState(AppStateMachineContext context) : base(context) { } public override void EnterState() { - _uiLoaded = _sceneLoaded = _onGameplayMusicLoaded = _onSFXLoaded = false; - Context.UIService.LoadingScreen.Show(); _playerMoney = Context.PlayerFactory.CreatePlayerMoney(); @@ -41,14 +37,6 @@ namespace Code.App.AppStates _playerHealth.OnDeath += EndGame; - // TODO - // Context.SceneLoaderService.LoadSceneAsync((int)SceneIds.MovementDev, callBack: OnSceneLoaded); // TODO Фабрика игрока Nada - - // Context.UIService.SwitchPanelTo(UIPanel.Gameplay, callback: PostUILoaded); - - // Context.AudioFactory.WarmGameplayMusic(OnGameplayMusicLoaded); - // Context.AudioFactory.WarmSFX(OnSFXLoaded); - // TODO Context.AudioService.TransitToSnapshot(AudioSnapshotState.Peaceful); Context.InputService.DebugBindAction((int)ActionMappings.Debug, (int)DebugActions.Debug1, GiveHealth); @@ -84,53 +72,6 @@ namespace Code.App.AppStates Context.UIService.LoadingScreen.Hide(); } - - // private void OnGameplayMusicLoaded() - // { - // _onGameplayMusicLoaded = true; - // - // Context.AudioService.PlayRandomPeacefulMusicUntilHumanityWillBeDestroyedForTheySins(); - // Context.AudioService.PlayRandomActionMusicUntilHumanityWillBeDestroyedForTheySins(); - // - // CheckIfLoaded(); - // } - // private void OnSFXLoaded() - // { - // _onSFXLoaded = true; - // - // CheckIfLoaded(); - // } - // private void OnSceneLoaded() - // { - // _sceneLoaded = true; - // - // var sceneEnvironment = ((GameplaySceneEnvironment)SceneManager.GetActiveScene() - // .GetSceneContainer().Resolve()); - // - // _testSFXTransform = sceneEnvironment.debugSfxTarget; - // - // CheckIfLoaded(); - // } - // - // private void PostUILoaded() - // { - // ((GameplayPanel)Context.UIService.CurrentPanel).Initialize(_playerMoney, _playerHealth); - // _uiLoaded = true; - // CheckIfLoaded(); - // } - // - // private void CheckIfLoaded() - // { - // if(!_uiLoaded || !_sceneLoaded || !_onGameplayMusicLoaded || !_onSFXLoaded) return; - // - // Context.UIService.LoadingScreen.Hide(); - // - // Context.CameraStateMachine.SwitchState(CameraMode.FirstPerson); - // Context.InputService.EnableMap(ActionMappings.Gameplay); - // } - - - // DEBUG private void PlayDebugSFX(InputAction.CallbackContext context) { diff --git a/Game/CourierOld/Assets/Code/App/AppStates/MainMenuState.cs b/Game/CourierOld/Assets/Code/App/AppStates/MainMenuState.cs index f0d5683..b570144 100644 --- a/Game/CourierOld/Assets/Code/App/AppStates/MainMenuState.cs +++ b/Game/CourierOld/Assets/Code/App/AppStates/MainMenuState.cs @@ -16,22 +16,13 @@ namespace Code.App.AppStates { public class MainMenuState : BaseState { - // private bool _uiLoaded, _sceneLoaded, _menuMusicLoaded; public MainMenuState(AppStateMachineContext context) : base(context) { } public override void EnterState() { - // _uiLoaded = _sceneLoaded = _menuMusicLoaded = false; - Context.UIService.LoadingScreen.Show(); - - // Context.SceneLoaderService.LoadSceneAsync((int)SceneIds.MainMenu); - // - // Context.UIService.SwitchPanelTo(UIPanel.MainMenu, PostUILoaded); - // - // Context.AudioFactory.WarmMenuMusic(MenuMusicLoaded); Context.CameraStateMachine.SwitchState(CameraMode.Static); @@ -65,52 +56,6 @@ namespace Code.App.AppStates Context.InputService.EnableMap(ActionMappings.MainMenu); } - // private void MenuMusicLoaded() - // { - // _menuMusicLoaded = true; - // - // Context.AudioService.TransitToSnapshot(AudioSnapshotState.Peaceful); - // Context.AudioService.PlayRandomMenuMusicUntilHumanityWillBeDestroyedForTheySins(); - // - // CheckIfLoaded(); - // } - // private void PostUILoaded() - // { - // ((MainMenuPanel)Context.UIService.CurrentPanel).startButton.onClick.AddListener(StartGame); - // ((MainMenuPanel)Context.UIService.CurrentPanel).exitButton.onClick.AddListener(ExitGame); - // - // _uiLoaded = true; - // - // CheckIfLoaded(); - // } - // - // private void SceneLoaded() - // { - // var hui = ((MainMenuEnvironment)SceneManager.GetActiveScene() - // .GetSceneContainer().Resolve()); - // - // ((StaticState)Context.CameraStateMachine.CurrentBaseState).LookTarget = - // hui.cameraTarget; - // - // ((BaseCameraState)Context.CameraStateMachine.CurrentBaseState).SetFollowTransform(hui.cameraPosition); - // - // - // _sceneLoaded = true; - // - // CheckIfLoaded(); - // } - // - // private void CheckIfLoaded() - // { - // if(!_uiLoaded || !_sceneLoaded || !_menuMusicLoaded) return; - // - // Context.UIService.LoadingScreen.Hide(); - // - // Context.InputService.EnableMap(ActionMappings.MainMenu); - // - // base.EnterState(); - // } - public override void Tick() { }