фикс траблов с мерджем

This commit is contained in:
MrTorex committed 2025-11-27 09:24:56 +03:00
1 parent 175567e4dd
commit ee7cf3946f
4 files changed
+1012 -99

No files matched your search

@@ -1,7 +1,4 @@
using System.Collections.Generic;
using System.Globalization;
using System.Reflection.Emit;
using System.Threading.Tasks;
using Code.App.Loading;
using Code.App.StateMachine;
using Code.Audio;
@@ -10,7 +7,6 @@ using Code.Gameplay.Camera.CameraStates;
using Code.Gameplay.Character.Core;
using Code.Gameplay.Enemies;
using Code.Gameplay.Orders.Order;
using Code.Gameplay.Orders.Order;
using Code.Gameplay.Player;
using Code.Input;
using Code.Scenes;
@@ -21,7 +17,6 @@ using Code.UI.Panels;
using Cysharp.Threading.Tasks;
using Reflex.Core;
using Reflex.Extensions;
using Reflex.Injectors;
using UnityEngine;
using UnityEngine.InputSystem;
using UnityEngine.SceneManagement;
@@ -46,8 +41,6 @@ namespace Code.App.AppStates
public override void EnterState()
{
Context.UIService.LoadingScreen.Show();
_playerMoney = Context.PlayerFactory.CreatePlayerMoney();
Context.LoadingManager
.RegisterLoading(LoadingWork.LoadScene)
@@ -88,10 +81,6 @@ namespace Code.App.AppStates
Context.AudioFactory.WarmSFX(),
Context.AudioFactory.WarmDispatcher()
);
_playerHealth = Context.PlayerProvider.Health;
_playerHealth.OnDamage += PlayerDamageTaken;
_playerHealth.OnDeath += EndGame;
Context.LoadingManager
.UnregisterLoading(LoadingWork.LoadUI)
@@ -115,6 +104,10 @@ namespace Code.App.AppStates
WaitForPlayerCharacterLoad()
);
_playerHealth = Context.PlayerProvider.Health;
_playerHealth.OnDamage += PlayerDamageTaken;
_playerHealth.OnDeath += EndGame;
Context.LoadingManager
.UnregisterLoading(LoadingWork.LoadModelResource);
}