From b1df88aea81e6eab08d9e26575e26fa8d536cf6e Mon Sep 17 00:00:00 2001
From: kimura <kimura@usaya.jp>
Date: Fri, 2 Dec 2022 18:18:14 +0900
Subject: [PATCH] =?UTF-8?q?=E9=83=BD=E5=B8=82=E9=96=8B=E6=94=BE=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 popcorn/Assets/MyGame/Scripts/HeaderManager.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/popcorn/Assets/MyGame/Scripts/HeaderManager.cs b/popcorn/Assets/MyGame/Scripts/HeaderManager.cs
index 0801a8d3..86d25648 100644
--- a/popcorn/Assets/MyGame/Scripts/HeaderManager.cs
+++ b/popcorn/Assets/MyGame/Scripts/HeaderManager.cs
@@ -94,10 +94,12 @@ public class HeaderManager : MonoBehaviour
         var cityDataList = SpreadsheetDataManager.Instance.GetBaseDataList<CityData>(Const.CityDataSheet);
         GameDataObserver.Instance.HeartObserver.Subscribe(x =>
         {
+            var latestCityId = GameDataUtils.GetLatestCityId();
             var unlockList = GameDataManager.GameData.CityGameDataDict.Keys.ToList();
             unlockList.Add(Const.DefaultCityId);
             if (cityDataList.FirstOrDefault(data => !unlockList.Contains(data.id)) is not { } newCityData) return;
-            if (ItemConditionUtils.GetScriptList(newCityData.id, ItemCondition.CityUnlock, x).FirstOrDefault() is not { } conditionData) return;
+            if (ItemConditionUtils.GetScriptList(latestCityId, ItemCondition.CityUnlock).FirstOrDefault() is not { } conditionData) return;
+            if (conditionData.needValue > x) return;
             if (UnityEngine.SceneManagement.SceneManager.sceneCount != 1) return;
             // 都市開放処理
             GameDataUtils.CreateCityData(newCityData.id);