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

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

This commit is contained in:
SepComet 2026-06-18 23:23:29 +08:00
parent 25f36d38c9
commit 846e4d6f44
26 changed files with 48 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponBase.cs
View File

@ -4,6 +4,7 @@ using SepCore.Definition;
using SepCore.Entity;
using GameFramework;
using SepCore.CustomUtility;
using SepCore.Timer;
using UnityEngine;
using UnityGameFramework.Runtime;
@ -41,7 +42,8 @@ namespace SepCore.Entity.Weapon
protected EntityBase _target;
protected float _currAttackTimer;
protected bool _canAttack;
protected TimerHandle _attackTimerHandle;
protected float _sqrRange;
@ -306,6 +308,26 @@ namespace SepCore.Entity.Weapon
_attackStatCallback = null;
AttackStat = new StatProperty();
}
protected void StartAttackCooldown(float cooldown)
{
_canAttack = false;
_attackTimerHandle = GameEntry.Timer.ScheduleOnce(cooldown, () => _canAttack = true, this);
}
protected void ResetAttackCooldown(float cooldown)
{
GameEntry.Timer.Cancel(_attackTimerHandle);
_canAttack = false;
_attackTimerHandle = GameEntry.Timer.ScheduleOnce(cooldown, () => _canAttack = true, this);
}
protected void CancelAttackCooldown()
{
GameEntry.Timer.Cancel(_attackTimerHandle);
_attackTimerHandle = TimerHandle.Invalid;
_canAttack = false;
}
}
public abstract class WeaponStateBase

2
Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.AttackState.cs
View File

@ -10,7 +10,7 @@ namespace SepCore.Entity.Weapon
public override void OnEnter()
{
_weapon._currAttackTimer = 0f;
_weapon.ResetAttackCooldown(_weapon._weaponData.Cooldown);
_weapon.Attack();
}

5
Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.CheckInRangeState.cs
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);
}

1
Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.CheckOutRangeState.cs
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)
{

1
Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.IdleState.cs
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)
{

3
Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.cs
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;
}

2
Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.AttackState.cs
View File

@ -11,7 +11,7 @@ namespace SepCore.Entity.Weapon
public override void OnEnter()
{
_weapon._currAttackTimer = 0f;
_weapon.ResetAttackCooldown(_weapon._weaponData.Cooldown);
_weapon.Attack();
}

5
Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.CheckInRangeState.cs
View File

@ -11,7 +11,7 @@ namespace SepCore.Entity.Weapon
public override void OnEnter()
{
if (_weapon._currAttackTimer >= _weapon._weaponData.Cooldown)
if (_weapon._canAttack)
{
_weapon.TransitionTo(WeaponStateType.Attack);
}
@ -21,7 +21,6 @@ namespace SepCore.Entity.Weapon
{
_weapon.Check();
_weapon.RotateToTarget(elapseSeconds);
_weapon._currAttackTimer += elapseSeconds;
if (_weapon._target == null || !_weapon._target.Available)
{
@ -35,7 +34,7 @@ namespace SepCore.Entity.Weapon
return;
}
if (_weapon._currAttackTimer >= _weapon._weaponData.Cooldown)
if (_weapon._canAttack)
{
_weapon.TransitionTo(WeaponStateType.Attack);
}

1
Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.CheckOutRangeState.cs
View File

@ -17,7 +17,6 @@ namespace SepCore.Entity.Weapon
{
_weapon.Check();
_weapon.RotateToTarget(elapseSeconds);
_weapon._currAttackTimer += elapseSeconds;
if (_weapon._target == null || !_weapon._target.Available)
{

1
Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.IdleState.cs
View File

@ -17,7 +17,6 @@ namespace SepCore.Entity.Weapon
{
_weapon.Check();
_weapon.RotateToOrigin(elapseSeconds);
_weapon._currAttackTimer += elapseSeconds;
if (_weapon._target != null && _weapon._target.Available)
{

3
Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.cs
View File

@ -150,7 +150,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;
@ -183,6 +183,7 @@ namespace SepCore.Entity.Weapon
protected override void OnWeaponHide(object userData)
{
StopAttackTween(true);
CancelAttackCooldown();
_attackEffect = null;
}

2
Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.AttackState.cs
View File

@ -11,7 +11,7 @@ namespace SepCore.Entity.Weapon
public override void OnEnter()
{
_weapon._currAttackTimer = 0f;
_weapon.ResetAttackCooldown(_weapon._weaponData.Cooldown);
_weapon.Attack();
}

5
Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.CheckInRangeState.cs
View File

@ -11,7 +11,7 @@ namespace SepCore.Entity.Weapon
public override void OnEnter()
{
if (_weapon._currAttackTimer >= _weapon._weaponData.Cooldown)
if (_weapon._canAttack)
{
_weapon.TransitionTo(WeaponStateType.Attack);
}
@ -21,7 +21,6 @@ namespace SepCore.Entity.Weapon
{
_weapon.Check();
_weapon.RotateToTarget(elapseSeconds);
_weapon._currAttackTimer += elapseSeconds;
if (_weapon._target == null || !_weapon._target.Available)
{
@ -35,7 +34,7 @@ namespace SepCore.Entity.Weapon
return;
}
if (_weapon._currAttackTimer >= _weapon._weaponData.Cooldown)
if (_weapon._canAttack)
{
_weapon.TransitionTo(WeaponStateType.Attack);
}

1
Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.CheckOutRangeState.cs
View File

@ -17,7 +17,6 @@ namespace SepCore.Entity.Weapon
{
_weapon.Check();
_weapon.RotateToTarget(elapseSeconds);
_weapon._currAttackTimer += elapseSeconds;
if (_weapon._target == null || !_weapon._target.Available)
{

1
Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.IdleState.cs
View File

@ -17,7 +17,6 @@ namespace SepCore.Entity.Weapon
{
_weapon.Check();
_weapon.RotateToOrigin(elapseSeconds);
_weapon._currAttackTimer += elapseSeconds;
if (_weapon._target != null && _weapon._target.Available)
{

3
Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.cs
View File

@ -244,7 +244,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;
@ -308,6 +308,7 @@ namespace SepCore.Entity.Weapon
protected override void OnWeaponHide(object userData)
{
StopAttackTween(true);
CancelAttackCooldown();
_attackEffect = null;
}

2
Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.AttackState.cs
View File

@ -11,7 +11,7 @@ namespace SepCore.Entity.Weapon
public override void OnEnter()
{
_weapon._currAttackTimer = 0f;
_weapon.ResetAttackCooldown(_weapon._weaponData.Cooldown);
_weapon.Attack();
}

5
Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.CheckInRangeState.cs
View File

@ -11,7 +11,7 @@ namespace SepCore.Entity.Weapon
public override void OnEnter()
{
if (_weapon._currAttackTimer >= _weapon._weaponData.Cooldown)
if (_weapon._canAttack)
{
_weapon.TransitionTo(WeaponStateType.Attack);
}
@ -21,7 +21,6 @@ namespace SepCore.Entity.Weapon
{
_weapon.Check();
_weapon.RotateToTarget(elapseSeconds);
_weapon._currAttackTimer += elapseSeconds;
if (_weapon._target == null || !_weapon._target.Available)
{
@ -35,7 +34,7 @@ namespace SepCore.Entity.Weapon
return;
}
if (_weapon._currAttackTimer >= _weapon._weaponData.Cooldown)
if (_weapon._canAttack)
{
_weapon.TransitionTo(WeaponStateType.Attack);
}

1
Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.CheckOutRangeState.cs
View File

@ -17,7 +17,6 @@ namespace SepCore.Entity.Weapon
{
_weapon.Check();
_weapon.RotateToTarget(elapseSeconds);
_weapon._currAttackTimer += elapseSeconds;
if (_weapon._target == null || !_weapon._target.Available)
{

1
Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.IdleState.cs
View File

@ -17,7 +17,6 @@ namespace SepCore.Entity.Weapon
{
_weapon.Check();
_weapon.RotateToOrigin(elapseSeconds);
_weapon._currAttackTimer += elapseSeconds;
if (_weapon._target != null && _weapon._target.Available)
{

3
Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.cs
View File

@ -171,7 +171,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;
@ -209,6 +209,7 @@ namespace SepCore.Entity.Weapon
protected override void OnWeaponHide(object userData)
{
StopAttackTween(true);
CancelAttackCooldown();
_attackEffect = null;
}

2
Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.AttackState.cs
View File

@ -10,7 +10,7 @@ namespace SepCore.Entity.Weapon
public override void OnEnter()
{
_weapon._currAttackTimer = 0f;
_weapon.ResetAttackCooldown(_weapon._weaponData.Cooldown);
_weapon.Attack();
}

5
Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.CheckInRangeState.cs
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);
}

1
Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.CheckOutRangeState.cs
View File

@ -16,7 +16,6 @@ namespace SepCore.Entity.Weapon
{
_weapon.Check();
_weapon.RotateToTarget(elapseSeconds);
_weapon._currAttackTimer += elapseSeconds;
if (_weapon._target == null || !_weapon._target.Available)
{

1
Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.IdleState.cs
View File

@ -16,7 +16,6 @@ namespace SepCore.Entity.Weapon
{
_weapon.Check();
_weapon.RotateToOrigin(elapseSeconds);
_weapon._currAttackTimer += elapseSeconds;
if (_weapon._target != null && _weapon._target.Available)
{

3
Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.cs
View File

@ -174,7 +174,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;
@ -209,6 +209,7 @@ namespace SepCore.Entity.Weapon
protected override void OnWeaponHide(object userData)
{
StopAttackTween(true);
CancelAttackCooldown();
_attackEffect = null;
}