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(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);