yangwu
/
popcorn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

通知処理修正

This commit is contained in:
kimura 2022-10-20 14:05:55 +09:00
parent ec220fd0cd
commit 2df45dffbf
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
popcorn/Assets/MyGame/Scripts/GameDataObserver.cs
View File

@ -30,7 +30,7 @@ public class GameDataObserver : SingletonMonoBehaviour<GameDataObserver>
private GameData globalGameData; private GameData globalGameData;
private GameData cityGameData; private GameData cityGameData;
private readonly List<MissionData> MissionDataList = SpreadsheetDataManager.Instance.GetBaseDataList<MissionData>(Const.MissionDataSheet); private List<MissionData> missionDataList;
private List<MissionData> latestNormalMissions; private List<MissionData> latestNormalMissions;
private List<MissionData> normalMissionList; private List<MissionData> normalMissionList;
@ -66,7 +66,8 @@ public class GameDataObserver : SingletonMonoBehaviour<GameDataObserver>
}).AddTo(this); }).AddTo(this);
// ミッション達成チェッカー // ミッション達成チェッカー
normalMissionList = MissionDataList.Where(data => data.Category == MissionCategory.Normal).ToList(); missionDataList = SpreadsheetDataManager.Instance.GetBaseDataList<MissionData>(Const.MissionDataSheet);
normalMissionList = missionDataList.Where(data => data.Category == MissionCategory.Normal).ToList();
UpdateLatestNormalMissions(); UpdateLatestNormalMissions();
// 店舗レベルアップorミッション達成でリスト更新して達成チェック // 店舗レベルアップorミッション達成でリスト更新して達成チェック
@ -128,7 +129,7 @@ public class GameDataObserver : SingletonMonoBehaviour<GameDataObserver>
globalGameData.dailyMissionCompleted = false; globalGameData.dailyMissionCompleted = false;
globalGameData.ResetDailyTotalCount(); globalGameData.ResetDailyTotalCount();
// 新ミッション登録 // 新ミッション登録
var targetList = MissionDataList var targetList = missionDataList
.Where(data => data.Category == MissionCategory.Daily && data.shopLevel <= globalGameData.ViewedShopLevel) .Where(data => data.Category == MissionCategory.Daily && data.shopLevel <= globalGameData.ViewedShopLevel)
.Where(data => MissionManager.CheckAvailableMission(data, globalGameData.MyRecipes)) .Where(data => MissionManager.CheckAvailableMission(data, globalGameData.MyRecipes))
.ToList(); .ToList();
@ -177,7 +178,7 @@ public class GameDataObserver : SingletonMonoBehaviour<GameDataObserver>
{ {
var ids = globalGameData.dailyMissionIdArray var ids = globalGameData.dailyMissionIdArray
.Except(globalGameData.dailyMissionAchievedIdArray); .Except(globalGameData.dailyMissionAchievedIdArray);
if (MissionDataList if (missionDataList
.Where(data => ids.Contains(data.id)) .Where(data => ids.Contains(data.id))
.Any(missionData => missionData.count <= MissionManager.GetDailyProgressValue(missionData))) .Any(missionData => missionData.count <= MissionManager.GetDailyProgressValue(missionData)))
{ {