Перекинул энтерстейт
This commit is contained in:
1 parent
d861e06caf
commit
0f8a629e4b
7 files changed
+822
-36
No files matched your search
@@ -52,7 +52,6 @@ namespace Code.App.AppStates
|
||||
|
||||
((BaseCameraState)Context.CameraStateMachine.CurrentBaseState).SetFollowTransform(hui.cameraPosition);
|
||||
|
||||
base.EnterState();
|
||||
|
||||
_sceneLoaded = true;
|
||||
|
||||
@@ -66,6 +65,8 @@ namespace Code.App.AppStates
|
||||
Context.UIService.LoadingScreen.Hide();
|
||||
|
||||
Context.InputService.EnableMap(ActionMappings.MainMenu);
|
||||
|
||||
base.EnterState();
|
||||
}
|
||||
|
||||
public override void Tick()
|
||||
|
||||
@@ -39,13 +39,8 @@ namespace Code.App
|
||||
|
||||
private void InitializeCamera(ContainerBuilder containerBuilder, IStaticDataService staticDataService)
|
||||
{
|
||||
// CameraService cameraService = Instantiate(staticDataService.CameraConfig.cameraPrefab);
|
||||
// containerBuilder.AddSingleton(cameraService);
|
||||
// DontDestroyOnLoad(cameraService);
|
||||
|
||||
// var task = staticDataService.InstantiateAsset<Camera>(staticDataService.CameraConfig.cameraAssetReference);
|
||||
Camera camera = Instantiate(staticDataService.CameraConfig.cameraPrefab);
|
||||
// Camera camera = task.Result;
|
||||
|
||||
DontDestroyOnLoad(camera);
|
||||
containerBuilder.AddSingleton(camera);
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@ using Cysharp.Threading.Tasks;
|
||||
using Reflex.Attributes;
|
||||
using UnityEngine;
|
||||
using UnityEngine.AddressableAssets;
|
||||
using UnityEngine.ResourceManagement.AsyncOperations;
|
||||
using Object = UnityEngine.Object;
|
||||
|
||||
namespace Code.UI
|
||||
|
||||
Reference in new issue
Block a user