From d622e79949693525086619fc11d06f59955c94d7 Mon Sep 17 00:00:00 2001
From: kimura <kimura@usaya.jp>
Date: Tue, 17 May 2022 16:01:33 +0900
Subject: [PATCH] =?UTF-8?q?=E3=83=87=E3=82=A4=E3=83=AA=E3=83=BC=E3=83=9F?=
 =?UTF-8?q?=E3=83=83=E3=82=B7=E3=83=A7=E3=83=B3=E3=81=AE=E3=83=9F=E3=83=83?=
 =?UTF-8?q?=E3=82=B7=E3=83=A7=E3=83=B3=E9=81=B8=E5=87=BA=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 popcorn/Assets/MyGame/Scripts/Const.cs         |  1 -
 .../Assets/MyGame/Scripts/GameDataObserver.cs  | 18 +++++++++++++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

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<GameDataObserver>
                 // 新ミッション登録
                 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++;