diff --git a/popcorn/Assets/MyGame/Scripts/HeartMeter.cs b/popcorn/Assets/MyGame/Scripts/HeartMeter.cs index 56920e7d..3c21b89b 100644 --- a/popcorn/Assets/MyGame/Scripts/HeartMeter.cs +++ b/popcorn/Assets/MyGame/Scripts/HeartMeter.cs @@ -62,10 +62,12 @@ public class HeartMeter : SingletonMonoBehaviour public void SetShopLevel(int newShopLevel, bool animate = false) { - shopLevel.Value = newShopLevel; - heartLevel.text = $"{newShopLevel}"; - minHeart = shopLevelList.FirstOrDefault(data => data.shopLevel == newShopLevel)?.heart ?? 0; - maxHeart = shopLevelList.FirstOrDefault(data => data.shopLevel == newShopLevel + 1)?.heart ?? 0; + var maxLevel = shopLevelList.Last().shopLevel; + var level = Mathf.Min(newShopLevel, maxLevel); + shopLevel.Value = level; + heartLevel.text = $"{level}"; + minHeart = shopLevelList.FirstOrDefault(data => data.shopLevel == level)?.heart ?? 0; + maxHeart = shopLevelList.FirstOrDefault(data => data.shopLevel == level + 1)?.heart ?? minHeart; if (animate) { var tmpCount = currentHeartCount - (int)minHeart;