From 7f6a6d8e1ae68567209f0b2d4a2e483b4bfb92d8 Mon Sep 17 00:00:00 2001
From: kimura <kimura@usaya.jp>
Date: Wed, 27 Oct 2021 20:12:37 +0900
Subject: [PATCH] =?UTF-8?q?=E3=83=9F=E3=83=83=E3=82=B7=E3=83=A7=E3=83=B3?=
 =?UTF-8?q?=E5=A0=B1=E9=85=AC=E3=83=98=E3=83=83=E3=83=80=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E6=A9=9F=E8=83=BD=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Scenes/Main/Scripts/MissionManager.cs     |  4 +--
 .../Assets/MyGame/Scripts/HeaderManager.cs    | 32 +++++++++++++++++++
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionManager.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionManager.cs
index 284f6c41..59ad7faf 100644
--- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionManager.cs
+++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionManager.cs
@@ -151,7 +151,7 @@ public class MissionManager : MonoBehaviour
         listView.SetTab(MissionCategory.Daily);
     }
 
-    private int GetProgressValue(MissionData missionData)
+    public static int GetProgressValue(MissionData missionData)
     {
         var gameData = GameDataManager.GameData;
         switch (missionData.Condition)
@@ -271,7 +271,7 @@ public class MissionManager : MonoBehaviour
         }
     }
 
-    private int GetDailyProgressValue(MissionData missionData)
+    public static int GetDailyProgressValue(MissionData missionData)
     {
         var gameData = GameDataManager.GameData;
         switch (missionData.Condition)
diff --git a/popcorn/Assets/MyGame/Scripts/HeaderManager.cs b/popcorn/Assets/MyGame/Scripts/HeaderManager.cs
index 18cd8722..f4d53a14 100644
--- a/popcorn/Assets/MyGame/Scripts/HeaderManager.cs
+++ b/popcorn/Assets/MyGame/Scripts/HeaderManager.cs
@@ -27,5 +27,37 @@ public class HeaderManager : MonoBehaviour
         {
             TransitionManager.Instance.LoadSceneAdditive(GameScenes.Information);
         });
+        // mission報酬通知
+        missionIndicator.SetActive(CheckMissionIndicate());
+    }
+
+    private bool CheckMissionIndicate()
+    {
+        // ミッション読み込み
+        var missionList = SpreadsheetDataManager.Instance.GetBaseDataList<MissionData>(Const.MissionDataSheet);
+        var gameData = GameDataManager.GameData;
+        // ミッション表示
+        if (missionList
+            .Where(data => data.Category == MissionCategory.Normal && data.shopLevel <= gameData.ViewedShopLevel)
+            .Where(missionData => !GameDataManager.GameData.AchievedMission.Contains(missionData.id))
+            .Any(missionData => missionData.count <= MissionManager.GetProgressValue(missionData)))
+        {
+            return true;
+        }
+
+        // dailyMission
+        // コンプリートミッション
+        if (!gameData.dailyMissionCompleted)
+        {
+            if (gameData.dailyMissionIdArray.Length <= gameData.dailyMissionAchievedIdArray.Length)
+            {
+                return true;
+            }
+        }
+
+        var ids = gameData.dailyMissionIdArray.Except(gameData.dailyMissionAchievedIdArray);
+        return missionList
+            .Where(data => ids.Contains(data.id))
+            .Any(missionData => missionData.count <= MissionManager.GetDailyProgressValue(missionData));
     }
 }