Health System
This commit is contained in:
1 parent
329cc98ade
commit
cb05da5e89
87 files changed
+568550
-155362
No files matched your search
@@ -15,6 +15,7 @@ using Code.OfficeGame.BattleMode.Actions;
|
||||
using Code.OfficeGame.BattleMode.Actions.Attacks;
|
||||
using Code.OfficeGame.BattleMode.Actions.Deciders;
|
||||
using Code.OfficeGame.BattleMode.Actions.Player;
|
||||
using Code.OfficeGame.BattleMode.Health;
|
||||
using Code.OfficeGame.BattleMode.Marker;
|
||||
using Code.OfficeGame.BattleMode.Timeline;
|
||||
using Code.OfficeGame.BattleMode.UI;
|
||||
@@ -91,6 +92,10 @@ namespace Code.Game.OfficeGame.GameStates
|
||||
BattleTimelinePanel battleTimelinePanel =
|
||||
(BattleTimelinePanel)await Context.UIFactory
|
||||
.LoadPanel(UIPanelType.BattleTimeline, false);
|
||||
|
||||
var healthBarHolder = new HealthPanelsHolder();
|
||||
|
||||
await healthBarHolder.SpawnHealthBars(Context.UIFactory, entities);
|
||||
|
||||
void InstallExtra(Scene scene, ContainerBuilder builder)
|
||||
{
|
||||
@@ -104,6 +109,8 @@ namespace Code.Game.OfficeGame.GameStates
|
||||
builder.RegisterValue(battleActionDecisionPanel);
|
||||
builder.RegisterValue(battleTimelinePanel);
|
||||
|
||||
builder.RegisterValue(healthBarHolder);
|
||||
|
||||
builder.RegisterType(typeof(BattleActionMove), new[]{ typeof(BattleAction) }, Lifetime.Singleton, Resolution.Eager);
|
||||
builder.RegisterType(typeof(BattleActionWait), new[]{ typeof(BattleAction) }, Lifetime.Singleton, Resolution.Eager);
|
||||
builder.RegisterType(typeof(BattleActionNone), new[]{ typeof(BattleAction) }, Lifetime.Singleton, Resolution.Eager);
|
||||
@@ -129,6 +136,10 @@ namespace Code.Game.OfficeGame.GameStates
|
||||
|
||||
container = Context.SceneContainerManager.ScenesContainers[SceneId.Battle];
|
||||
|
||||
GameObjectInjector
|
||||
.InjectRecursiveMany(
|
||||
healthBarHolder.PanelList.Select(x => x.gameObject).ToList(), container);
|
||||
|
||||
///// T
|
||||
GameObjectInjector
|
||||
.InjectRecursiveMany(
|
||||
@@ -162,8 +173,7 @@ namespace Code.Game.OfficeGame.GameStates
|
||||
var player = container.Resolve<EntityProperties>();
|
||||
|
||||
entities.Remove(player);
|
||||
entities.Add(player);
|
||||
entities.Reverse();
|
||||
entities.Insert(0,player);
|
||||
|
||||
_battleTimeline?.RunBattleLoopAsync(entities, _battleTokenSource.Token).Forget();
|
||||
|
||||
|
||||
Reference in new issue
Block a user