DEG-143-세이브-강화-병합 #46

Closed
99jamin wants to merge 12 commits from DEG-143-세이브-강화-병합 into main
2 changed files with 5 additions and 1 deletions
Showing only changes of commit 543a6c70d4 - Show all commits

View File

@ -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();
}
}

View File

@ -34,6 +34,7 @@ public class PlayerController : CharacterBase, IObserver<GameObject>
private float attackPowerLevel;
private float moveSpeedLevel;
private float dashCoolLevel;
public float attackSpeedLevel;
// 상태 관련
private PlayerStateIdle _playerStateIdle;
@ -92,6 +93,8 @@ public class PlayerController : CharacterBase, IObserver<GameObject>
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;