basil/vampire-like
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

将 Weapon 攻击冷却计时器 由 Weapon 内部维护迁移到 TimerModule 维护

Browse Source
This commit is contained in:
basil
2026-06-18 23:23:29 +08:00
parent 25f36d38c9
commit 846e4d6f44
26 changed files with 48 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.AttackState.cs
+1 -1
View File
@@ -10,7 +10,7 @@ namespace SepCore.Entity.Weapon
public override void OnEnter()
{
_weapon._currAttackTimer = 0f;
_weapon.ResetAttackCooldown(_weapon._weaponData.Cooldown);
_weapon.Attack();
}
Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.CheckInRangeState.cs
+2 -3
View File
@@ -10,7 +10,7 @@ namespace SepCore.Entity.Weapon
public override void OnEnter()
{
if (_weapon._currAttackTimer >= _weapon._weaponData.Cooldown)
if (_weapon._canAttack)
{
_weapon.TransitionTo(WeaponStateType.Attack);
}
@@ -20,7 +20,6 @@ namespace SepCore.Entity.Weapon
{
_weapon.Check();
_weapon.RotateToTarget(elapseSeconds);
_weapon._currAttackTimer += elapseSeconds;
if (_weapon._target == null || !_weapon._target.Available)
{
@@ -34,7 +33,7 @@ namespace SepCore.Entity.Weapon
return;
}
if (_weapon._currAttackTimer >= _weapon._weaponData.Cooldown)
if (_weapon._canAttack)
{
_weapon.TransitionTo(WeaponStateType.Attack);
}
Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.CheckOutRangeState.cs
-1
View File
@@ -13,7 +13,6 @@ namespace SepCore.Entity.Weapon
{
_weapon.Check();
_weapon.RotateToTarget(elapseSeconds);
_weapon._currAttackTimer += elapseSeconds;
if (_weapon._target == null || !_weapon._target.Available)
{
Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.IdleState.cs
-1
View File
@@ -13,7 +13,6 @@ namespace SepCore.Entity.Weapon
{
_weapon.Check();
_weapon.RotateToOrigin(elapseSeconds);
_weapon._currAttackTimer += elapseSeconds;
if (_weapon._target != null && _weapon._target.Available)
{
Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.cs
+2 -1
View File
@@ -129,7 +129,7 @@ namespace SepCore.Entity.Weapon
if (_weaponData == null) return false;
WeaponData = _weaponData;
_currAttackTimer = 0f;
StartAttackCooldown(_weaponData.Cooldown);
_sqrRange = _weaponData.AttackRange * _weaponData.AttackRange;
_cachedRotation = CachedTransform.rotation;
_attackEffect = new HandgunHitMarkerAttackEffect(_hitMarkerSize, _hitMarkerYOffset, _hitMarkerDuration,
@@ -151,6 +151,7 @@ namespace SepCore.Entity.Weapon
protected override void OnWeaponHide(object userData)
{
CancelAttackCooldown();
_attackEffect = null;
}