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

ミッションアイコン用の達成チェック処理削除

This commit is contained in:
kimura 2021-10-29 10:34:30 +09:00
parent 14d0e2122b
commit 8b14f51258
1 changed files with 4 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
popcorn/Assets/MyGame/Scripts/HeaderManager.cs
View File

@ -21,43 +21,16 @@ public class HeaderManager : MonoBehaviour
}); });
missionButton.OnClickAsObservable().ThrottleFirst(TimeSpan.FromSeconds(1f)).Subscribe(_ => missionButton.OnClickAsObservable().ThrottleFirst(TimeSpan.FromSeconds(1f)).Subscribe(_ =>
{ {
MissionManager.ShowDialog(onAchieved:() => missionIndicator.SetActive(CheckMissionIndicate())); MissionManager.ShowDialog();
}); });
informationButton.OnClickAsObservable().ThrottleFirst(TimeSpan.FromSeconds(1f)).Subscribe(_ => informationButton.OnClickAsObservable().ThrottleFirst(TimeSpan.FromSeconds(1f)).Subscribe(_ =>
{ {
TransitionManager.Instance.LoadSceneAdditive(GameScenes.Information); TransitionManager.Instance.LoadSceneAdditive(GameScenes.Information);
}); });
// mission報酬通知 // mission報酬通知
missionIndicator.SetActive(CheckMissionIndicate()); GameDataObserver.Instance.UpdateMissionAchieved.Subscribe(x =>
}
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; missionIndicator.SetActive(x);
} }).AddTo(this);
// 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));
} }
} }