From 221127674efe945f304d42df2d3e6cbea1d0f287 Mon Sep 17 00:00:00 2001
From: kimura <kimura@usaya.jp>
Date: Fri, 15 Oct 2021 13:09:11 +0900
Subject: [PATCH] =?UTF-8?q?=E3=83=8F=E3=83=BC=E3=83=88=E6=95=B0=E3=81=AE?=
 =?UTF-8?q?=E8=A1=A8=E7=A4=BA=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 popcorn/Assets/MyGame/Scripts/HeartMeter.cs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

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