diff --git a/Assets/JAY/Scripts/PlayerAction/PlayerActionAttack.cs b/Assets/JAY/Scripts/PlayerAction/PlayerActionAttack.cs index 154d9f60..faed4253 100644 --- a/Assets/JAY/Scripts/PlayerAction/PlayerActionAttack.cs +++ b/Assets/JAY/Scripts/PlayerAction/PlayerActionAttack.cs @@ -12,6 +12,7 @@ public class PlayerActionAttack : IPlayerAction { [SerializeField] private float comboDuration = 0.7f; private int maxComboStep = 4; + public bool IsActive { get; private set; } public int CurrentComboStep => comboStep; @@ -35,7 +36,7 @@ public class PlayerActionAttack : IPlayerAction { comboQueued = true; } - if (comboTimer >= comboDuration) { + if (comboTimer >= comboDuration-player.attackSpeedLevel) { ProceedComboOrEnd(); } } diff --git a/Assets/JAY/Scripts/PlayerController.cs b/Assets/JAY/Scripts/PlayerController.cs index 43338619..e946a346 100644 --- a/Assets/JAY/Scripts/PlayerController.cs +++ b/Assets/JAY/Scripts/PlayerController.cs @@ -34,6 +34,7 @@ public class PlayerController : CharacterBase, IObserver private float attackPowerLevel; private float moveSpeedLevel; private float dashCoolLevel; + public float attackSpeedLevel; // 상태 관련 private PlayerStateIdle _playerStateIdle; @@ -92,6 +93,8 @@ public class PlayerController : CharacterBase, IObserver moveSpeedLevel = 1.5f; //dashCoolLevel = (float)UpgradeManager.Instance.upgradeStat.CurrentUpgradeLevel(StatType.DashCoolDown)/4; dashCoolLevel = 0.25f; + //attackSpeedLevel = (float)UpgradeManager.Instance.upgradeStat.CurrentUpgradeLevel(StatType.AttackSpeed)/5; + attackSpeedLevel = 0.5f; attackPower *= attackPowerLevel; moveSpeed *= moveSpeedLevel;