Timeline works YAY
This commit is contained in:
1 parent
6114192055
commit
7098d938a7
84 files changed
+96509
-51755
No files matched your search
@@ -1,9 +1,14 @@
|
||||
using System.Collections.Generic;
|
||||
using System.Threading;
|
||||
using Code.Game.Cleaning.Player;
|
||||
using Code.Infrastructure.App;
|
||||
using Code.Infrastructure.Camera;
|
||||
using Code.Infrastructure.Generators;
|
||||
using Code.Infrastructure.Input;
|
||||
using Code.Infrastructure.SceneLoader;
|
||||
using Code.OfficeGame.BattleMode.Actions;
|
||||
using Code.OfficeGame.BattleMode.Actions.Player;
|
||||
using Code.OfficeGame.BattleMode.Timeline;
|
||||
using Code.OfficeGame.Player;
|
||||
using Cysharp.Threading.Tasks;
|
||||
using KinematicCharacterController;
|
||||
@@ -22,6 +27,9 @@ namespace Code.Game.OfficeGame.GameStates
|
||||
|
||||
public override AppStates MyState => AppStates.BattleState;
|
||||
|
||||
private BattleTimeline _battleTimeline = new BattleTimeline();
|
||||
private CancellationTokenSource _battleTokenSource = new CancellationTokenSource();
|
||||
|
||||
public override async UniTask EnterState()
|
||||
{
|
||||
#if UNITY_EDITOR
|
||||
@@ -37,6 +45,8 @@ namespace Code.Game.OfficeGame.GameStates
|
||||
|
||||
if (Context.StateMachine.CurrentState == AppStates.Testing)
|
||||
{
|
||||
_battleTokenSource = new();
|
||||
|
||||
Physics.simulationMode = SimulationMode.Script;
|
||||
KinematicCharacterSystem.EnsureCreation();
|
||||
KinematicCharacterSystem.Settings.AutoSimulation = false;
|
||||
@@ -46,6 +56,10 @@ namespace Code.Game.OfficeGame.GameStates
|
||||
|
||||
await Context.Camera.SwitchState(CameraMode.BattleMode);
|
||||
}
|
||||
|
||||
List<EntityTimelineActor> entities = new List<EntityTimelineActor>(){container.Resolve<PlayerTimelineActor>()};
|
||||
|
||||
_battleTimeline.RunBattleLoopAsync(entities,_battleTokenSource.Token).Forget();
|
||||
}
|
||||
|
||||
private void TogglePlayerBattleMode(Container container, bool enabled)
|
||||
@@ -62,7 +76,10 @@ namespace Code.Game.OfficeGame.GameStates
|
||||
public override async UniTask ExitState()
|
||||
{
|
||||
if (Context.StateMachine.NextState == AppStates.Testing)
|
||||
{
|
||||
{
|
||||
_battleTokenSource.Cancel();
|
||||
_battleTokenSource.Dispose();
|
||||
|
||||
Physics.simulationMode = SimulationMode.FixedUpdate;
|
||||
KinematicCharacterSystem.Settings.AutoSimulation = true;
|
||||
KinematicCharacterSystem.Settings.Interpolate = true;
|
||||
|
||||
Reference in new issue
Block a user