diff --git a/Assets/_Project/Develop/Runtime/Logic/Gameplay/Entities/EntitiesFactory.cs b/Assets/_Project/Develop/Runtime/Logic/Gameplay/Entities/EntitiesFactory.cs index a95a0bd..32c8021 100644 --- a/Assets/_Project/Develop/Runtime/Logic/Gameplay/Entities/EntitiesFactory.cs +++ b/Assets/_Project/Develop/Runtime/Logic/Gameplay/Entities/EntitiesFactory.cs @@ -240,7 +240,7 @@ namespace _Project.Develop.Runtime.Entities .AddRegenEnergyEvent() .AddRegenEnergyRequest() .AddAutoRegenEnergyAmount(new ReactiveVariable(5)) - .AddIsAutoRegenEnergy() + .AddIsAutoRegenEnergy(new ReactiveVariable(true)) .AddEnergyAutoRegenCurrentTime() .AddEnergyAutoRegenInitialTime(new ReactiveVariable(3)) diff --git a/Assets/_Project/Develop/Runtime/Logic/Gameplay/Features/Energy/Systems/AutoRegenEnergyTimerSystem.cs b/Assets/_Project/Develop/Runtime/Logic/Gameplay/Features/Energy/Systems/AutoRegenEnergyTimerSystem.cs index 3783cbf..0bd0d0e 100644 --- a/Assets/_Project/Develop/Runtime/Logic/Gameplay/Features/Energy/Systems/AutoRegenEnergyTimerSystem.cs +++ b/Assets/_Project/Develop/Runtime/Logic/Gameplay/Features/Energy/Systems/AutoRegenEnergyTimerSystem.cs @@ -1,6 +1,7 @@ using _Project.Develop.Runtime.Entities; using _Project.Develop.Runtime.Utils.ReactiveManagement; using _Project.Develop.Runtime.Utils.ReactiveManagement.Event; +using UnityEngine; namespace _Project.Develop.Runtime.Logic.Gameplay.Features.Energy.Systems { @@ -19,6 +20,7 @@ namespace _Project.Develop.Runtime.Logic.Gameplay.Features.Energy.Systems { _isAutoRegen = entity.IsAutoRegenEnergy; _regenAmount = entity.AutoRegenEnergyAmount; + _regenEnergyRequest = entity.RegenEnergyRequest; _initialTime = entity.EnergyAutoRegenInitialTime; _currentTime = entity.EnergyAutoRegenCurrentTime; diff --git a/Assets/_Project/Develop/Runtime/Logic/Gameplay/Features/Energy/Systems/RegenEnergySystem.cs b/Assets/_Project/Develop/Runtime/Logic/Gameplay/Features/Energy/Systems/RegenEnergySystem.cs index d45a660..1643214 100644 --- a/Assets/_Project/Develop/Runtime/Logic/Gameplay/Features/Energy/Systems/RegenEnergySystem.cs +++ b/Assets/_Project/Develop/Runtime/Logic/Gameplay/Features/Energy/Systems/RegenEnergySystem.cs @@ -4,6 +4,7 @@ using _Project.Develop.Runtime.Utilities.Conditions; using _Project.Develop.Runtime.Utils.ReactiveManagement; using _Project.Develop.Runtime.Utils.ReactiveManagement.Event; using Unity.Mathematics; +using UnityEngine; namespace _Project.Develop.Runtime.Logic.Gameplay.Features.Energy.Systems { @@ -39,10 +40,10 @@ namespace _Project.Develop.Runtime.Logic.Gameplay.Features.Energy.Systems if (_canRegen.Evaluate() == false) return; - + int energyDifference = _maxEnergy.Value - _currentEnergy.Value; - if (energyDifference <= 0f) + if (energyDifference <= 0) return; int valueAdded = math.min(value, energyDifference); diff --git a/Assets/_Project/Develop/Runtime/Logic/Gameplay/Features/Teleport/Systems/TeleportStartByEnergySystem.cs b/Assets/_Project/Develop/Runtime/Logic/Gameplay/Features/Teleport/Systems/TeleportStartByEnergySystem.cs index 6792efe..b179dd5 100644 --- a/Assets/_Project/Develop/Runtime/Logic/Gameplay/Features/Teleport/Systems/TeleportStartByEnergySystem.cs +++ b/Assets/_Project/Develop/Runtime/Logic/Gameplay/Features/Teleport/Systems/TeleportStartByEnergySystem.cs @@ -3,7 +3,6 @@ using _Project.Develop.Runtime.Entities; using _Project.Develop.Runtime.Utilities.Conditions; using _Project.Develop.Runtime.Utils.ReactiveManagement; using _Project.Develop.Runtime.Utils.ReactiveManagement.Event; -using UnityEngine; namespace _Project.Develop.Runtime.Logic.Gameplay.Features.Teleport.Systems { @@ -38,7 +37,6 @@ namespace _Project.Develop.Runtime.Logic.Gameplay.Features.Teleport.Systems { if (_canStartTeleport.Evaluate()) { - Debug.Log("OnTeleportRequest"); _inTeleportProcess.Value = true; _useEnergyRequest.Invoke(_teleportCost.Value); _startTeleportEvent.Invoke();