diff --git a/Assets/JAY/Scripts/PlayerController.cs b/Assets/JAY/Scripts/PlayerController.cs index 82a34e05..50db3311 100644 --- a/Assets/JAY/Scripts/PlayerController.cs +++ b/Assets/JAY/Scripts/PlayerController.cs @@ -5,6 +5,7 @@ using System.Runtime.CompilerServices; using UnityEditor.TextCore.Text; using UnityEngine; using UnityEngine.SceneManagement; +using UnityEngine.UI; public enum PlayerState { None, Idle, Move, Win, Hit, Dead } @@ -17,6 +18,7 @@ public class PlayerController : CharacterBase, IObserver [SerializeField] private GameObject normalModel; // char_body : 일상복 [SerializeField] private GameObject battleModel; // warrior_1 : 전투복 [SerializeField] private Transform dashEffectAnchor; // 대시 이펙트 위치 + [SerializeField] private Image dashCooldownFillImage; //대시 쿨다운 이미지 // 내부에서만 사용하는 변수 private PlayerHitEffectController hitEffectController; @@ -105,7 +107,17 @@ public class PlayerController : CharacterBase, IObserver //대시 쿨타임 진행 if (dashCooldownTimer > 0f) + { dashCooldownTimer -= Time.deltaTime; + if(dashCooldownFillImage != null) + dashCooldownFillImage.fillAmount = DashCooldownRatio; + } + else + { + if(dashCooldownFillImage != null) + dashCooldownFillImage.fillAmount = 0f; + } + // Hit 상태거나 게임 끝났을 땐 땐 입력 무시 if (CurrentState == PlayerState.Hit || CurrentState == PlayerState.Dead || CurrentState == PlayerState.Win) diff --git a/Assets/KSH/ReDungeon.unity b/Assets/KSH/ReDungeon.unity index 40c41a6d..b672d670 100644 --- a/Assets/KSH/ReDungeon.unity +++ b/Assets/KSH/ReDungeon.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a1d61074bbb8366ae290687ea6dc34c30266acc9273be837f634593b70b6d8c4 -size 45432 +oid sha256:c92e11586d095039889c51ff2174ee89df993ceaa85107b4081fa9975ecaf67e +size 46245 diff --git a/Assets/Prefabs/ReDungeon/Canvas.prefab b/Assets/Prefabs/ReDungeon/Canvas.prefab index 4f26dbe9..a357c724 100644 --- a/Assets/Prefabs/ReDungeon/Canvas.prefab +++ b/Assets/Prefabs/ReDungeon/Canvas.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1ac8334b7b5b5f841204f07248d67eccfed47fdc795c3c10689f7fafd054a68b -size 61754 +oid sha256:72e2767e42779e7867cc6bf2af0aea4e0df3e33b28f38b7fb59f49d308d58ca8 +size 64019