From 543a6c70d4e03b0057724e59cf89e9e440b644ea Mon Sep 17 00:00:00 2001
From: 99jamin <99jamin56@gmail.com>
Date: Tue, 13 May 2025 14:44:41 +0900
Subject: [PATCH] =?UTF-8?q?DEG-143=20[Feat]=20=EA=B3=B5=EA=B2=A9=EC=86=8D?=
 =?UTF-8?q?=EB=8F=84=20=EA=B0=95=ED=99=94=20=EB=B3=91=ED=95=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Assets/JAY/Scripts/PlayerAction/PlayerActionAttack.cs | 3 ++-
 Assets/JAY/Scripts/PlayerController.cs                | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

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<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;