stepan/project-entity
1
0
Fork 0
mirror of https://github.com/Bragin-Stepan/project-entity.git synced 2026-04-19 21:19:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: att team feature

Browse Source
This commit is contained in:
Bragin Stepan
2026-03-13 14:46:21 +05:00
parent 1356b8bfb2
commit f9b0996922
34 changed files with 445 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
Assets/_Project/Develop/Runtime/Logic/Gameplay/Entities/EntitiesFactory.cs
View File

@@ -1,4 +1,5 @@
using _Project.Develop.Runtime.Logic.Gameplay.Features.Attack.Systems;
using _Project.Develop.Runtime.Configs.Gameplay.Entities;
using _Project.Develop.Runtime.Logic.Gameplay.Features.Attack.Systems;
using _Project.Develop.Runtime.Logic.Gameplay.Features.Attack.Systems.Shoot;
using _Project.Develop.Runtime.Logic.Gameplay.Features.Damage;
using _Project.Develop.Runtime.Logic.Gameplay.Features.Energy.Systems;
@@ -30,7 +31,7 @@ namespace _Project.Develop.Runtime.Entities
_monoEntitiesFactory = container.Resolve<MonoEntitiesFactory>();
}
public Entity CreateHero(Vector3 position)
public Entity CreateHero(Vector3 position, HeroConfigSO config)
{
Entity entity = CreateEmpty();
@@ -39,31 +40,30 @@ namespace _Project.Develop.Runtime.Entities
entity
.AddMoveDirection()
.AddRotateDirection()
.AddMoveSpeed(new ReactiveVariable<float>(10))
.AddRotationSpeed(new ReactiveVariable<float>(800))
.AddMaxHealth(new ReactiveVariable<float>(150))
.AddCurrentHealth(new ReactiveVariable<float>(150))
.AddMoveSpeed(new ReactiveVariable<float>(config.MoveSpeed))
.AddRotationSpeed(new ReactiveVariable<float>(config.RotationSpeed))
.AddMaxHealth(new ReactiveVariable<float>(config.MaxHealth))
.AddCurrentHealth(new ReactiveVariable<float>(config.MaxHealth))
.AddTakeDamageRequest()
.AddTakeDamageEvent()
.AddIsDead()
.AddIsMoving()
.AddInDeathProcess()
.AddDeathProcessInitialTime(new ReactiveVariable<float>(2))
.AddDeathProcessInitialTime(new ReactiveVariable<float>(config.DeathProcessTime))
.AddDeathProcessCurrentTime()
.AddAttackProcessInitialTime(new ReactiveVariable<float>(1))
.AddAttackProcessInitialTime(new ReactiveVariable<float>(config.AttackProcessTime))
.AddAttackProcessCurrentTime()
.AddInAttackProcess()
.AddStartAttackRequest()
.AddStartAttackEvent()
.AddEndAttackEvent()
.AddAttackDelayTime(new ReactiveVariable<float>(0.1f))
.AddAttackDelayTime(new ReactiveVariable<float>(config.AttackDelayTime))
.AddAttackDelayEndEvent()
.AddInstantAttackDamage(new ReactiveVariable<float>(50))
.AddInstantAttackDamage(new ReactiveVariable<float>(config.InstantAttackDamage))
.AddAttackCanceledEvent()
.AddAttackCooldownInitialTime()
.AddAttackCooldownCurrentTime()
.AddInAttackCooldown()
.AddCurrentTarget();
.AddInAttackCooldown();
ICompositeCondition canMove = new CompositeCondition()
.Add(new FuncCondition(() => entity.IsDead.Value == false));
@@ -121,12 +121,10 @@ namespace _Project.Develop.Runtime.Entities
.AddSystem(new DisableCollidersOnDeathSystem())
.AddSystem(new SelfReleaseSystem(_entitiesLifeContext));
_entitiesLifeContext.Add(entity);
return entity;
}
public Entity CreateGhost(Vector3 position)
public Entity CreateGhost(Vector3 position, GhostConfigSO config)
{
Entity entity = CreateEmpty();
@@ -138,17 +136,17 @@ namespace _Project.Develop.Runtime.Entities
.AddContactEntitiesBuffer(new Buffer<Entity>(64))
.AddMoveDirection()
.AddRotateDirection()
.AddMoveSpeed(new ReactiveVariable<float>(10))
.AddRotationSpeed(new ReactiveVariable<float>(800))
.AddMaxHealth(new ReactiveVariable<float>(50))
.AddCurrentHealth(new ReactiveVariable<float>(50))
.AddBodyContactDamage(new ReactiveVariable<float>(50))
.AddMoveSpeed(new ReactiveVariable<float>(config.MoveSpeed))
.AddRotationSpeed(new ReactiveVariable<float>(config.RotationSpeed))
.AddMaxHealth(new ReactiveVariable<float>(config.MaxHealth))
.AddCurrentHealth(new ReactiveVariable<float>(config.MaxHealth))
.AddBodyContactDamage(new ReactiveVariable<float>(config.BodyContactDamage))
.AddTakeDamageRequest()
.AddTakeDamageEvent()
.AddIsDead()
.AddIsMoving()
.AddInDeathProcess()
.AddDeathProcessInitialTime(new ReactiveVariable<float>(2))
.AddDeathProcessInitialTime(new ReactiveVariable<float>(config.DeathProcessTime))
.AddDeathProcessCurrentTime();
ICompositeCondition canMove = new CompositeCondition()
@@ -190,12 +188,10 @@ namespace _Project.Develop.Runtime.Entities
.AddSystem(new DisableCollidersOnDeathSystem())
.AddSystem(new SelfReleaseSystem(_entitiesLifeContext));
_entitiesLifeContext.Add(entity);
return entity;
}
public Entity CreateTeleportWizard(Vector3 position)
public Entity CreateTeleportWizard(Vector3 position, WizardConfigSO config)
{
Entity entity = CreateEmpty();
@@ -206,8 +202,8 @@ namespace _Project.Develop.Runtime.Entities
.AddContactCollidersBuffer(new Buffer<Collider>(32))
.AddContactEntitiesBuffer(new Buffer<Entity>(32))
.AddMaxHealth(new ReactiveVariable<float>(150))
.AddCurrentHealth(new ReactiveVariable<float>(150))
.AddMaxHealth(new ReactiveVariable<float>(config.MaxHealth))
.AddCurrentHealth(new ReactiveVariable<float>(config.MaxHealth))
.AddTeleportSource(entity.Transform)
.AddTeleportToPoint(entity.Transform)
@@ -219,34 +215,33 @@ namespace _Project.Develop.Runtime.Entities
.AddEndTeleportEvent()
.AddCurrentTarget()
.AddTeleportDamage(new ReactiveVariable<float>(50))
.AddTeleportDamageRadius(new ReactiveVariable<float>(6))
.AddTeleportDamage(new ReactiveVariable<float>(config.TeleportDamage))
.AddTeleportDamageRadius(new ReactiveVariable<float>(config.TeleportDamageRadius))
.AddTeleportDamageMask(Layers.CharactersMask)
.AddTeleportEnergyCost(new ReactiveVariable<int>(20))
.AddTeleportSearchRadius(new ReactiveVariable<float>(6))
.AddTeleportEnergyCost(new ReactiveVariable<int>(config.TeleportEnergyCast))
.AddTeleportSearchRadius(new ReactiveVariable<float>(config.TeleportSearchRadius))
.AddTeleportCooldownInitialTime(new ReactiveVariable<float>(3))
.AddTeleportCooldownCurrentTime(new ReactiveVariable<float>(3))
.AddTeleportCooldownInitialTime(new ReactiveVariable<float>(config.TeleportCooldownTime))
.AddTeleportCooldownCurrentTime(new ReactiveVariable<float>(config.TeleportCooldownTime))
.AddInTeleportCooldown(new ReactiveVariable<bool>(true))
.AddCurrentEnergy(new ReactiveVariable<int>(60))
.AddMaxEnergy(new ReactiveVariable<int>(60))
.AddCurrentEnergy(new ReactiveVariable<int>(config.MaxEnergy))
.AddMaxEnergy(new ReactiveVariable<int>(config.MaxEnergy))
.AddUseEnergyEvent()
.AddUseEnergyRequest()
.AddRegenEnergyEvent()
.AddRegenEnergyRequest()
.AddAutoRegenEnergyAmount(new ReactiveVariable<int>(10))
.AddAutoRegenEnergyAmount(new ReactiveVariable<int>(config.RegenEnergyAmount))
.AddIsAutoRegenEnergy(new ReactiveVariable<bool>(true))
.AddEnergyAutoRegenCurrentTime()
.AddEnergyAutoRegenInitialTime(new ReactiveVariable<float>(3))
.AddBodyContactDamage(new ReactiveVariable<float>(50))
.AddEnergyAutoRegenInitialTime(new ReactiveVariable<float>(config.AutoRegenEnergyTime))
.AddTakeDamageRequest()
.AddTakeDamageEvent()
.AddIsDead()
.AddInDeathProcess()
.AddDeathProcessInitialTime(new ReactiveVariable<float>(2))
.AddDeathProcessInitialTime(new ReactiveVariable<float>(config.DeathProcessTime))
.AddDeathProcessCurrentTime();
ICompositeCondition canRegenEnergy = new CompositeCondition()
@@ -298,7 +293,7 @@ namespace _Project.Develop.Runtime.Entities
.AddSystem(new BodyContactsDetectingSystem())
.AddSystem(new BodyContactsEntitiesFilterSystem(_collidersRegistryService))
.AddSystem(new DealDamageOnContactSystem())
// .AddSystem(new DealDamageOnContactSystem())
.AddSystem(new ApplyDamageSystem())
.AddSystem(new DeathSwitcherSystem())
@@ -307,8 +302,6 @@ namespace _Project.Develop.Runtime.Entities
.AddSystem(new DisableCollidersOnDeathSystem())
.AddSystem(new SelfReleaseSystem(_entitiesLifeContext));
_entitiesLifeContext.Add(entity);
return entity;
}

31
Assets/_Project/Develop/Runtime/Logic/Gameplay/Entities/Generated/EntityAPI.cs
View File

@@ -466,6 +466,30 @@ namespace _Project.Develop.Runtime.Entities
return AddComponent(new _Project.Develop.Runtime.Logic.Gameplay.Features.Teleport.TeleportDamageMask() {Value = value});
}
public _Project.Develop.Runtime.Logic.Gameplay.Features.Teams.Team TeamC => GetComponent<_Project.Develop.Runtime.Logic.Gameplay.Features.Teams.Team>();
public _Project.Develop.Runtime.Utils.ReactiveManagement.ReactiveVariable<_Project.Develop.Runtime.Logic.Gameplay.Features.Teams.Teams> Team => TeamC.Value;
public bool TryGetTeam(out _Project.Develop.Runtime.Utils.ReactiveManagement.ReactiveVariable<_Project.Develop.Runtime.Logic.Gameplay.Features.Teams.Teams> value)
{
bool result = TryGetComponent(out _Project.Develop.Runtime.Logic.Gameplay.Features.Teams.Team component);
if(result)
value = component.Value;
else
value = default(_Project.Develop.Runtime.Utils.ReactiveManagement.ReactiveVariable<_Project.Develop.Runtime.Logic.Gameplay.Features.Teams.Teams>);
return result;
}
public _Project.Develop.Runtime.Entities.Entity AddTeam()
{
return AddComponent(new _Project.Develop.Runtime.Logic.Gameplay.Features.Teams.Team() { Value = new _Project.Develop.Runtime.Utils.ReactiveManagement.ReactiveVariable<_Project.Develop.Runtime.Logic.Gameplay.Features.Teams.Teams>() });
}
public _Project.Develop.Runtime.Entities.Entity AddTeam(_Project.Develop.Runtime.Utils.ReactiveManagement.ReactiveVariable<_Project.Develop.Runtime.Logic.Gameplay.Features.Teams.Teams> value)
{
return AddComponent(new _Project.Develop.Runtime.Logic.Gameplay.Features.Teams.Team() {Value = value});
}
public _Project.Develop.Runtime.Logic.Gameplay.Features.Sensors.CapsuleColliderComponent CapsuleColliderC => GetComponent<_Project.Develop.Runtime.Logic.Gameplay.Features.Sensors.CapsuleColliderComponent>();
public UnityEngine.CapsuleCollider CapsuleCollider => CapsuleColliderC.Value;
@@ -810,6 +834,13 @@ namespace _Project.Develop.Runtime.Entities
return AddComponent(new _Project.Develop.Runtime.Logic.Gameplay.Features.Movement.CanJump() {Value = value});
}
public _Project.Develop.Runtime.Logic.Gameplay.Features.MainHero.IsMainHero IsMainHeroC => GetComponent<_Project.Develop.Runtime.Logic.Gameplay.Features.MainHero.IsMainHero>();
public _Project.Develop.Runtime.Entities.Entity AddIsMainHero()
{
return AddComponent(new _Project.Develop.Runtime.Logic.Gameplay.Features.MainHero.IsMainHero() );
}
public _Project.Develop.Runtime.Logic.Gameplay.Features.Lifetime.CurrentHealth CurrentHealthC => GetComponent<_Project.Develop.Runtime.Logic.Gameplay.Features.Lifetime.CurrentHealth>();
public _Project.Develop.Runtime.Utils.ReactiveManagement.ReactiveVariable<System.Single> CurrentHealth => CurrentHealthC.Value;

3
Assets/_Project/Develop/Runtime/Logic/Gameplay/Features/Enemies.meta Normal file
View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 073e06f2bd1243408c61652926dbac9a
timeCreated: 1773390931

52
Assets/_Project/Develop/Runtime/Logic/Gameplay/Features/Enemies/EnemiesFactory.cs Normal file
View File

@@ -0,0 +1,52 @@
using System;
using _Project.Develop.Runtime.Configs.Gameplay.Entities;
using _Project.Develop.Runtime.Entities;
using _Project.Develop.Runtime.Logic.Gameplay.Features.AI;
using _Project.Develop.Runtime.Logic.Gameplay.Features.Selectors;
using _Project.Develop.Runtime.Utils.ReactiveManagement;
using Assets._Project.Develop.Runtime.Infrastructure.DI;
using UnityEngine;
namespace _Project.Develop.Runtime.Logic.Gameplay.Features.Enemies
{
public class EnemiesFactory
{
private readonly EntitiesFactory _entitiesFactory;
private readonly BrainsFactory _brainsFactory;
private readonly EntitiesLifeContext _entitiesLifeContext;
public EnemiesFactory(DIContainer container)
{
_entitiesFactory = container.Resolve<EntitiesFactory>();
_brainsFactory = container.Resolve<BrainsFactory>();
_entitiesLifeContext = container.Resolve<EntitiesLifeContext>();
}
public Entity Create(Vector3 position, EntityConfigSO config)
{
Entity entity;
switch (config)
{
case GhostConfigSO ghostConfig:
entity = _entitiesFactory.CreateGhost(position, ghostConfig);
_brainsFactory.CreateGhostBrain(entity);
break;
case WizardConfigSO wizardConfig:
entity = _entitiesFactory.CreateTeleportWizard(position, wizardConfig);
_brainsFactory.CreateDangerWizardBrain(entity, new LowestHealthTargetSelector(entity));
break;
default:
throw new ArgumentException($"Not support {config.GetType()} type config");
}
entity.AddTeam(new ReactiveVariable<Teams.Teams>(Teams.Teams.Enemies));
_entitiesLifeContext.Add(entity);
return entity;
}
}
}

3
Assets/_Project/Develop/Runtime/Logic/Gameplay/Features/Enemies/EnemiesFactory.cs.meta Normal file
View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 51102a09ab584bd8a413995baf3ed9b9
timeCreated: 1773390941

3
Assets/_Project/Develop/Runtime/Logic/Gameplay/Features/MainHero.meta Normal file
View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 3bfebd749d5b44a295ddf91039d598a4
timeCreated: 1773389854

6
Assets/_Project/Develop/Runtime/Logic/Gameplay/Features/MainHero/MainHeroComponents.cs Normal file
View File

@@ -0,0 +1,6 @@
using _Project.Develop.Runtime.Entities;
namespace _Project.Develop.Runtime.Logic.Gameplay.Features.MainHero
{
public class IsMainHero : IEntityComponent { }
}

3
Assets/_Project/Develop/Runtime/Logic/Gameplay/Features/MainHero/MainHeroComponents.cs.meta Normal file
View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 1d7f214ebbb94ba3a40b05d47a56ea32
timeCreated: 1773389869

44
Assets/_Project/Develop/Runtime/Logic/Gameplay/Features/MainHero/MainHeroFactory.cs Normal file
View File

@@ -0,0 +1,44 @@
using _Project.Develop.Runtime.Configs.Gameplay.Entities;
using _Project.Develop.Runtime.Entities;
using _Project.Develop.Runtime.Logic.Gameplay.Features.AI;
using _Project.Develop.Runtime.Utils.ReactiveManagement;
using Assets._Project.Develop.Runtime.Infrastructure.DI;
using Assets._Project.Develop.Runtime.Utilities.ConfigsManagement;
using UnityEngine;
namespace _Project.Develop.Runtime.Logic.Gameplay.Features.MainHero
{
public class MainHeroFactory
{
private readonly EntitiesFactory _entitiesFactory;
private readonly BrainsFactory _brainsFactory;
private readonly ConfigsProviderService _configLoader;
private readonly EntitiesLifeContext _entitiesLifeContext;
public MainHeroFactory(DIContainer container)
{
_entitiesFactory = container.Resolve<EntitiesFactory>();
_brainsFactory = container.Resolve<BrainsFactory>();
_configLoader = container.Resolve<ConfigsProviderService>();
_entitiesLifeContext = container.Resolve<EntitiesLifeContext>();
}
public Entity Create(Vector3 position)
{
HeroConfigSO config = _configLoader.GetConfig<HeroConfigSO>();
Entity entity = _entitiesFactory.CreateHero(position, config);
entity
.AddIsMainHero()
.AddTeam(new ReactiveVariable<Teams.Teams>(Teams.Teams.MainHero));
entity.AddCurrentTarget();
_brainsFactory.CreateMainHeroBrain(entity);
_entitiesLifeContext.Add(entity);
return entity;
}
}
}

3
Assets/_Project/Develop/Runtime/Logic/Gameplay/Features/MainHero/MainHeroFactory.cs.meta Normal file
View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: f02ea9aeb6334badac37cab0a5e69da0
timeCreated: 1773390441

3
Assets/_Project/Develop/Runtime/Logic/Gameplay/Features/Teams.meta Normal file
View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 2bf870f1fd6247d7aaa3343f010cfd52
timeCreated: 1773394525

8
Assets/_Project/Develop/Runtime/Logic/Gameplay/Features/Teams/Teams.cs Normal file
View File

@@ -0,0 +1,8 @@
namespace _Project.Develop.Runtime.Logic.Gameplay.Features.Teams
{
public enum Teams
{
MainHero,
Enemies
}
}

11
Assets/_Project/Develop/Runtime/Logic/Gameplay/Features/Teams/Teams.cs.meta Normal file
View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 6b5919366f522d048bcde4e406462f16
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

10
Assets/_Project/Develop/Runtime/Logic/Gameplay/Features/Teams/TeamsComponents.cs Normal file
View File

@@ -0,0 +1,10 @@
using _Project.Develop.Runtime.Entities;
using _Project.Develop.Runtime.Utils.ReactiveManagement;
namespace _Project.Develop.Runtime.Logic.Gameplay.Features.Teams
{
public class Team : IEntityComponent
{
public ReactiveVariable<Teams> Value;
}
}

3
Assets/_Project/Develop/Runtime/Logic/Gameplay/Features/Teams/TeamsComponents.cs.meta Normal file
View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 2d8073d07bb648c5b6e3dc920591e9db
timeCreated: 1773394552

7
Assets/_Project/Develop/Runtime/Logic/Gameplay/Infrastructure/GameplayContextRegistrations.cs
View File

@@ -1,5 +1,7 @@
using _Project.Develop.Runtime.Entities;
using _Project.Develop.Runtime.Logic.Gameplay.Features.AI;
using _Project.Develop.Runtime.Logic.Gameplay.Features.Enemies;
using _Project.Develop.Runtime.Logic.Gameplay.Features.MainHero;
using _Project.Develop.Runtime.UI;
using _Project.Develop.Runtime.UI.Core;
using _Project.Develop.Runtime.UI.Screens.Gameplay;
@@ -25,12 +27,17 @@ namespace Assets._Project.Develop.Runtime.Gameplay.Infrastructure
container.RegisterAsSingle(CreateAIBrainContext);
container.RegisterAsSingle(CreateBrainsFactory);
container.RegisterAsSingle(CreateMonoEntitiesFactory).NonLazy();
container.RegisterAsSingle(CreateMainHeroFactory);
container.RegisterAsSingle(CreateEnemiesFactory);
}
private static AIBrainsContext CreateAIBrainContext(DIContainer c) => new();
private static BrainsFactory CreateBrainsFactory(DIContainer c) => new(c);
private static EntitiesLifeContext CreateEntitiesLifeContext(DIContainer c) => new();
private static EnemiesFactory CreateEnemiesFactory(DIContainer c) => new (c);
private static MainHeroFactory CreateMainHeroFactory(DIContainer c) => new (c);
private static EntitiesFactory CreateEntitiesFactory(DIContainer c) => new(c);
private static GameplayPresentersFactory CreateGameplayPresentersFactory(DIContainer c) => new(c);

21
Assets/_Project/Develop/Runtime/Logic/Gameplay/Infrastructure/TestGameplay.cs
View File

@@ -1,9 +1,14 @@
using System;
using _Project.Develop.Runtime.Configs.Gameplay.Entities;
using _Project.Develop.Runtime.Entities;
using _Project.Develop.Runtime.Logic.Gameplay.Features.AI;
using _Project.Develop.Runtime.Logic.Gameplay.Features.Enemies;
using _Project.Develop.Runtime.Logic.Gameplay.Features.MainHero;
using _Project.Develop.Runtime.Logic.Gameplay.Features.Selectors;
using _Project.Develop.Runtime.Utils.InputManagement;
using Assets._Project.Develop.Runtime.Infrastructure.DI;
using Assets._Project.Develop.Runtime.Utilities.AssetsManagement;
using Assets._Project.Develop.Runtime.Utilities.ConfigsManagement;
using UnityEngine;
namespace _Project.Develop.Runtime.Logic.Gameplay.Features
@@ -11,7 +16,8 @@ namespace _Project.Develop.Runtime.Logic.Gameplay.Features
public class TestGameplay : MonoBehaviour
{
private DIContainer _container;
private EntitiesFactory _entitiesFactory;
private EnemiesFactory _enemiesFactory;
private MainHeroFactory _mainHeroFactory;
private BrainsFactory _brainsFactory;
private Entity _hero;
@@ -24,14 +30,15 @@ namespace _Project.Develop.Runtime.Logic.Gameplay.Features
_container = container;
_container.Resolve<IPlayerInput>().Enable();
_entitiesFactory = _container.Resolve<EntitiesFactory>();
_enemiesFactory = _container.Resolve<EnemiesFactory>();
_mainHeroFactory = _container.Resolve<MainHeroFactory>();
_brainsFactory = _container.Resolve<BrainsFactory>();
_hero = _entitiesFactory.CreateHero(Vector3.zero);
_brainsFactory.CreateMainHeroBrain(_hero);
_enemy = _entitiesFactory.CreateTeleportWizard(Vector3.zero + Vector3.forward * 5);
_brainsFactory.CreateDangerWizardBrain(_enemy, new LowestHealthTargetSelector(_enemy));
_hero = _mainHeroFactory.Create(Vector3.zero);
_enemy = _enemiesFactory.Create(
Vector3.zero + Vector3.forward * 5,
_container.Resolve<ConfigsProviderService>().GetConfig<WizardConfigSO>());
}
public void Run()