diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketManager.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketManager.cs index 1a532522..f21050f3 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketManager.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketManager.cs @@ -63,16 +63,21 @@ public class MarketManager : MonoBehaviour // 初回都市来訪スクリプト var scriptList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.ScriptDataSheet); - if (UnityEngine.SceneManagement.SceneManager.sceneCount != 1) return; // シナリオ読み込み - if (ItemConditionUtils.GetScriptList(GameDataManager.GameData.CurrentCityId, ItemCondition.FirstVisitCityMarket, true).FirstOrDefault() is not { } conditionData) return; - var scripts = scriptList.Where(data => data.id == conditionData.scriptId).ToList(); - if (scripts.Count <= 0) return; - BrotherConversation.ShowDialog(scripts, () => + if (ItemConditionUtils + .GetScriptList(GameDataManager.GameData.CurrentCityId, ItemCondition.FirstVisitCityMarket, true) + .FirstOrDefault() is { } conditionData) { - // 既読処理 - ItemConditionUtils.Use(conditionData); - }); + var scripts = scriptList.Where(data => data.id == conditionData.scriptId).ToList(); + if (scripts.Count > 0 && UnityEngine.SceneManagement.SceneManager.sceneCount == 1) + { + BrotherConversation.ShowDialog(scripts, () => + { + // 既読処理 + ItemConditionUtils.Use(conditionData); + }); + } + } // 最新の都市ではない場合、バイトが有効 if (!market.IsLatestCity)