From 2df45dffbf771abb35e8e95d50465358dd9ff30e Mon Sep 17 00:00:00 2001 From: kimura Date: Thu, 20 Oct 2022 14:05:55 +0900 Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=87=A6=E7=90=86=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/GameDataObserver.cs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/popcorn/Assets/MyGame/Scripts/GameDataObserver.cs b/popcorn/Assets/MyGame/Scripts/GameDataObserver.cs index 805ac07c..558733bd 100644 --- a/popcorn/Assets/MyGame/Scripts/GameDataObserver.cs +++ b/popcorn/Assets/MyGame/Scripts/GameDataObserver.cs @@ -30,7 +30,7 @@ public class GameDataObserver : SingletonMonoBehaviour private GameData globalGameData; private GameData cityGameData; - private readonly List MissionDataList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.MissionDataSheet); + private List missionDataList; private List latestNormalMissions; private List normalMissionList; @@ -66,7 +66,8 @@ public class GameDataObserver : SingletonMonoBehaviour }).AddTo(this); // ミッション達成チェッカー - normalMissionList = MissionDataList.Where(data => data.Category == MissionCategory.Normal).ToList(); + missionDataList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.MissionDataSheet); + normalMissionList = missionDataList.Where(data => data.Category == MissionCategory.Normal).ToList(); UpdateLatestNormalMissions(); // 店舗レベルアップorミッション達成でリスト更新して達成チェック @@ -128,7 +129,7 @@ public class GameDataObserver : SingletonMonoBehaviour globalGameData.dailyMissionCompleted = false; globalGameData.ResetDailyTotalCount(); // 新ミッション登録 - var targetList = MissionDataList + var targetList = missionDataList .Where(data => data.Category == MissionCategory.Daily && data.shopLevel <= globalGameData.ViewedShopLevel) .Where(data => MissionManager.CheckAvailableMission(data, globalGameData.MyRecipes)) .ToList(); @@ -177,7 +178,7 @@ public class GameDataObserver : SingletonMonoBehaviour { var ids = globalGameData.dailyMissionIdArray .Except(globalGameData.dailyMissionAchievedIdArray); - if (MissionDataList + if (missionDataList .Where(data => ids.Contains(data.id)) .Any(missionData => missionData.count <= MissionManager.GetDailyProgressValue(missionData))) {