From 8b14f51258e8dc6815d8297799d09600d3fca998 Mon Sep 17 00:00:00 2001 From: kimura Date: Fri, 29 Oct 2021 10:34:30 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=9F=E3=83=83=E3=82=B7=E3=83=A7=E3=83=B3?= =?UTF-8?q?=E3=82=A2=E3=82=A4=E3=82=B3=E3=83=B3=E7=94=A8=E3=81=AE=E9=81=94?= =?UTF-8?q?=E6=88=90=E3=83=81=E3=82=A7=E3=83=83=E3=82=AF=E5=87=A6=E7=90=86?= =?UTF-8?q?=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets/MyGame/Scripts/HeaderManager.cs | 35 +++---------------- 1 file changed, 4 insertions(+), 31 deletions(-) diff --git a/popcorn/Assets/MyGame/Scripts/HeaderManager.cs b/popcorn/Assets/MyGame/Scripts/HeaderManager.cs index 5e91eda4..ba596a1c 100644 --- a/popcorn/Assets/MyGame/Scripts/HeaderManager.cs +++ b/popcorn/Assets/MyGame/Scripts/HeaderManager.cs @@ -21,43 +21,16 @@ public class HeaderManager : MonoBehaviour }); missionButton.OnClickAsObservable().ThrottleFirst(TimeSpan.FromSeconds(1f)).Subscribe(_ => { - MissionManager.ShowDialog(onAchieved:() => missionIndicator.SetActive(CheckMissionIndicate())); + MissionManager.ShowDialog(); }); informationButton.OnClickAsObservable().ThrottleFirst(TimeSpan.FromSeconds(1f)).Subscribe(_ => { TransitionManager.Instance.LoadSceneAdditive(GameScenes.Information); }); // mission報酬通知 - missionIndicator.SetActive(CheckMissionIndicate()); - } - - private bool CheckMissionIndicate() - { - // ミッション読み込み - var missionList = SpreadsheetDataManager.Instance.GetBaseDataList(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))) + GameDataObserver.Instance.UpdateMissionAchieved.Subscribe(x => { - 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)); + missionIndicator.SetActive(x); + }).AddTo(this); } }