diff --git a/Assets/JAY/Scripts/PlayerController.cs b/Assets/JAY/Scripts/PlayerController.cs index 8bf60c1e..43338619 100644 --- a/Assets/JAY/Scripts/PlayerController.cs +++ b/Assets/JAY/Scripts/PlayerController.cs @@ -86,9 +86,12 @@ public class PlayerController : CharacterBase, IObserver PlayerInit(); //강화 수치 적용 - attackPowerLevel = 1 + (float)UpgradeManager.Instance.upgradeStat.CurrentUpgradeLevel(StatType.AttackPower) / 2; - moveSpeedLevel = 1 + (float)UpgradeManager.Instance.upgradeStat.CurrentUpgradeLevel(StatType.MoveSpeed) / 2; - dashCoolLevel = (float)UpgradeManager.Instance.upgradeStat.CurrentUpgradeLevel(StatType.DashCoolDown)/4; + //attackPowerLevel = 1 + (float)UpgradeManager.Instance.upgradeStat.CurrentUpgradeLevel(StatType.AttackPower) / 2; + attackPowerLevel = 1.5f; + //moveSpeedLevel = 1 + (float)UpgradeManager.Instance.upgradeStat.CurrentUpgradeLevel(StatType.MoveSpeed) / 2; + moveSpeedLevel = 1.5f; + //dashCoolLevel = (float)UpgradeManager.Instance.upgradeStat.CurrentUpgradeLevel(StatType.DashCoolDown)/4; + dashCoolLevel = 0.25f; attackPower *= attackPowerLevel; moveSpeed *= moveSpeedLevel; diff --git a/Assets/KSH/DungeonPanelController.cs b/Assets/KSH/DungeonPanelController.cs index 952bad9e..3a2fd7e5 100644 --- a/Assets/KSH/DungeonPanelController.cs +++ b/Assets/KSH/DungeonPanelController.cs @@ -9,7 +9,27 @@ public class DungeonPanelController : MonoBehaviour [SerializeField] private Slider _bossHealthBar; // 0~1 value [SerializeField] private Image[] _playerHealthImages; // color 값 white / black 로 조정 private int _countHealth = 0; + private int visibleHeartCount = 3; // 강화 레벨로 설정됨 + + void Start() + { + //int level = UpgradeManager.Instance.upgradeStat.CurrentUpgradeLevel(StatType.Heart); // 1~3 + int level = 2; + + visibleHeartCount = 3 + (level - 1); // level 1=3개, 2=4개, 3=5개 + + for (int i = 0; i < _playerHealthImages.Length; i++) + { + var color = _playerHealthImages[i].color; + color.a = (i < visibleHeartCount) ? 1f : 0f; + color = (i < visibleHeartCount) ? Color.white : new Color(1,1,1,0); + _playerHealthImages[i].color = color; + } + + _countHealth = 0; + } + public void SetBossHealthBar(float hp) // hp: 0~100 { float normalizedHp = hp / 100f; // 0~1 사이 값으로 조정 @@ -21,11 +41,11 @@ public class DungeonPanelController : MonoBehaviour { StartCoroutine(WaitForOneSecond()); // out of index error 방지 - if (_countHealth > _playerHealthImages.Length - 1) return false; + if (_countHealth >= visibleHeartCount) return false; _playerHealthImages[_countHealth].color = Color.black; _countHealth++; - return _countHealth <= _playerHealthImages.Length - 1; + return _countHealth < visibleHeartCount; } IEnumerator WaitForOneSecond() diff --git a/Assets/KSH/ReDungeon.unity b/Assets/KSH/ReDungeon.unity index 2eff2973..f98982ac 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:908889f0158f1e1ef86cf9a7ddeb607c5fab7b4afebf4418be91f18329a97003 -size 35082 +oid sha256:e4a5d73fa44bbe32e063a06feceaa87ffb6b9fb899137aab6308e3ec24686255 +size 47132