From 9868c7b39e23e5dc82bc479dc94ad57e52fb3f96 Mon Sep 17 00:00:00 2001 From: kimura Date: Fri, 2 Dec 2022 19:14:21 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=9E=E3=83=BC=E3=82=B1=E3=83=83=E3=83=88?= =?UTF-8?q?=E3=81=AE=E5=88=9D=E5=9B=9E=E8=A1=A8=E7=A4=BA=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scenes/marketing/Scripts/MarketManager.cs | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) 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)