diff --git a/popcorn/Assets/MyGame/Scripts/Const.cs b/popcorn/Assets/MyGame/Scripts/Const.cs index f18d5787..be6a4bb3 100644 --- a/popcorn/Assets/MyGame/Scripts/Const.cs +++ b/popcorn/Assets/MyGame/Scripts/Const.cs @@ -30,7 +30,6 @@ public static class Const { public static readonly int ShopCustomizeDefaultCartId = 3; public static readonly int ShopCustomizeDefaultStockId = 4; public static readonly int ShopCustomizeDefaultDecoration2Id = 5; - public static readonly int DailyMissionStaticId = 340; public static readonly int DailyMissionCompleteRewardShopCustomizeCoin = 5; // tag diff --git a/popcorn/Assets/MyGame/Scripts/GameDataObserver.cs b/popcorn/Assets/MyGame/Scripts/GameDataObserver.cs index f679bb2c..924ee5ca 100644 --- a/popcorn/Assets/MyGame/Scripts/GameDataObserver.cs +++ b/popcorn/Assets/MyGame/Scripts/GameDataObserver.cs @@ -176,11 +176,23 @@ public class GameDataObserver : SingletonMonoBehaviour // 新ミッション登録 var targetList = missionList .Where(data => data.Category == MissionCategory.Daily && data.shopLevel <= gameData.ViewedShopLevel) - .Where(data => MissionManager.CheckAvailableMission(data, GameDataManager.GameData.MyRecipes)); - gameData.dailyMissionIdArray = targetList.ToList() + .Where(data => MissionManager.CheckAvailableMission(data, GameDataManager.GameData.MyRecipes)) + .ToList(); + var staticMissionConditions = new[] + { + MissionCondition.UseFertilizer, + MissionCondition.UseAdWalker, + MissionCondition.UseAutoCook, + }; + var staticMissionList = targetList + .Where(data => staticMissionConditions.Contains(data.Condition)) + .ToList(); + gameData.dailyMissionIdArray = targetList + .Where(data => !staticMissionConditions.Contains(data.Condition)) + .ToList() .RandomChoose(2) + .Append(staticMissionList.RandomChoose()) // 固定ミッション広告視聴 .Select(data => data.id) - .Append(Const.DailyMissionStaticId) // 固定ミッション広告視聴 .ToArray(); gameData.lastDailyMissionSetTime = DateTime.UtcNow.ToBinary(); gameData.dailyLoginCount++;