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

通知用ミッションの達成チェック時にデイリーミッション達成後に更新が走っていなかったのを解消

This commit is contained in:
kimura 2021-11-15 20:39:03 +09:00
parent 466dfa1717
commit 4869c55956
2 changed files with 45 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
popcorn/Assets/MyGame/Scripts/GameDataObserver.cs
View File

@ -6,7 +6,7 @@ using UnityEngine;
public class GameDataObserver : SingletonMonoBehaviour<GameDataObserver> public class GameDataObserver : SingletonMonoBehaviour<GameDataObserver>
{ {
[SerializeField] private FloatReactiveProperty checkInterval = new FloatReactiveProperty(.1f); [SerializeField] private FloatReactiveProperty checkInterval = new FloatReactiveProperty(.2f);
private readonly Subject<int> heartObserver = new Subject<int>(); private readonly Subject<int> heartObserver = new Subject<int>();
private readonly Subject<int> sceneCounter = new Subject<int>(); private readonly Subject<int> sceneCounter = new Subject<int>();
private readonly Subject<int> shopLevelObserver = new Subject<int>(); private readonly Subject<int> shopLevelObserver = new Subject<int>();
@ -19,6 +19,7 @@ public class GameDataObserver : SingletonMonoBehaviour<GameDataObserver>
private readonly Subject<int> addRareSalesObserver = new Subject<int>(); private readonly Subject<int> addRareSalesObserver = new Subject<int>();
private readonly Subject<int> hasRecipeObserver = new Subject<int>(); private readonly Subject<int> hasRecipeObserver = new Subject<int>();
private readonly Subject<int> deliveredBulkOrderObserver = new Subject<int>(); private readonly Subject<int> deliveredBulkOrderObserver = new Subject<int>();
private readonly Subject<Unit> updateMissionProgress = new Subject<Unit>();
private readonly BoolReactiveProperty updateMissionAchieved = new BoolReactiveProperty(); private readonly BoolReactiveProperty updateMissionAchieved = new BoolReactiveProperty();
public IReadOnlyReactiveProperty<bool> UpdateMissionAchieved => updateMissionAchieved; public IReadOnlyReactiveProperty<bool> UpdateMissionAchieved => updateMissionAchieved;
@ -30,22 +31,24 @@ public class GameDataObserver : SingletonMonoBehaviour<GameDataObserver>
updateMissionAchieved.AddTo(this); updateMissionAchieved.AddTo(this);
var levelList = SpreadsheetDataManager.Instance.GetBaseDataList<ShopLevelData>(Const.ShopLevelDataSheet); var levelList = SpreadsheetDataManager.Instance.GetBaseDataList<ShopLevelData>(Const.ShopLevelDataSheet);
levelList = levelList.Where(data => data.shopLevel != Const.SpecialShopLevel).ToList(); levelList = levelList.Where(data => data.shopLevel != Const.SpecialShopLevel).ToList();
checkInterval.Select(x => Observable.Interval(TimeSpan.FromSeconds(x))).Switch().Subscribe(_ => checkInterval
{ .Select(x => Observable.Interval(TimeSpan.FromSeconds(x))).Switch()
var gameData = GameDataManager.GameData; .Subscribe(_ =>
heartObserver.OnNext(gameData.Heart); {
sceneCounter.OnNext(UnityEngine.SceneManagement.SceneManager.sceneCount); var gameData = GameDataManager.GameData;
shopLevelObserver.OnNext(gameData.ViewedShopLevel); heartObserver.OnNext(gameData.Heart);
achievedMissionObserver.OnNext(gameData.AchievedMission.Count); sceneCounter.OnNext(UnityEngine.SceneManagement.SceneManager.sceneCount);
// addCoinObserver.OnNext(gameData.TotalAddCoin); shopLevelObserver.OnNext(gameData.ViewedShopLevel);
subCoinObserver.OnNext(gameData.TotalSubCoin); achievedMissionObserver.OnNext(gameData.AchievedMission.Count);
addCornObserver.OnNext(gameData.TotalAddCornSeed); // addCoinObserver.OnNext(gameData.TotalAddCoin);
addCustomerObserver.OnNext(gameData.TotalCustomerCount); subCoinObserver.OnNext(gameData.TotalSubCoin);
addSalesObserver.OnNext(gameData.TotalSales); addCornObserver.OnNext(gameData.TotalAddCornSeed);
addRareSalesObserver.OnNext(gameData.RareTotalSales); addCustomerObserver.OnNext(gameData.TotalCustomerCount);
hasRecipeObserver.OnNext(gameData.MyRecipes.Length); addSalesObserver.OnNext(gameData.TotalSales);
deliveredBulkOrderObserver.OnNext(gameData.BulkOrderDeliveredCount); addRareSalesObserver.OnNext(gameData.RareTotalSales);
}).AddTo(this); hasRecipeObserver.OnNext(gameData.MyRecipes.Length);
deliveredBulkOrderObserver.OnNext(gameData.BulkOrderDeliveredCount);
}).AddTo(this);
ShopLevelUpdate = Observable.CombineLatest( ShopLevelUpdate = Observable.CombineLatest(
heartObserver.DistinctUntilChanged(), heartObserver.DistinctUntilChanged(),
@ -79,13 +82,32 @@ public class GameDataObserver : SingletonMonoBehaviour<GameDataObserver>
// 店舗レベルアップorミッション達成でリスト更新して達成チェック // 店舗レベルアップorミッション達成でリスト更新して達成チェック
Observable.Merge( Observable.Merge(
shopLevelObserver.DistinctUntilChanged(), shopLevelObserver.DistinctUntilChanged(),
achievedMissionObserver.DistinctUntilChanged()) achievedMissionObserver.DistinctUntilChanged(),
updateMissionProgress.Select(_ => 0))
.Subscribe(_ => .Subscribe(_ =>
{ {
latestMissionList = GetLatestMissionList(); latestMissionList = GetLatestMissionList();
// ここで達成を再確認 // ここで達成を再確認
updateMissionAchieved.Value = latestMissionList updateMissionAchieved.Value = latestMissionList
.Any(data => data.count <= MissionManager.GetProgressValue(data)); .Any(data => data.count <= MissionManager.GetProgressValue(data));
if (latestMissionList.FirstOrDefault(
data => data.count <= MissionManager.GetProgressValue(data)) is MissionData debugMissionData)
{
Debug.Log($@"update normal:{debugMissionData.text} {MissionManager.GetProgressValue(debugMissionData)}/{debugMissionData.count}");
}
else
{
Debug.Log($"normal no progress");
}
// dailyMission
var ids = GameDataManager.GameData.dailyMissionIdArray.Except(GameDataManager.GameData.dailyMissionAchievedIdArray);
if (missionList
.Where(data => ids.Contains(data.id))
.Any(missionData => missionData.count <= MissionManager.GetDailyProgressValue(missionData)))
{
updateMissionAchieved.Value = true;
}
// CheckDailyCompleteMission // CheckDailyCompleteMission
if (!GameDataManager.GameData.dailyMissionCompleted) if (!GameDataManager.GameData.dailyMissionCompleted)
@ -189,4 +211,8 @@ public class GameDataObserver : SingletonMonoBehaviour<GameDataObserver>
GameDataManager.SaveGameData(); GameDataManager.SaveGameData();
}); });
} }
public void CheckMissionProgress(){
updateMissionProgress.OnNext(Unit.Default);
}
} }

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

@ -26,6 +26,7 @@ public class HeaderManager : MonoBehaviour
MissionManager.ShowDialog(() => MissionManager.ShowDialog(() =>
{ {
isOpenMission = false; isOpenMission = false;
GameDataObserver.Instance.CheckMissionProgress();
missionIndicator.SetActive(GameDataObserver.Instance.UpdateMissionAchieved.Value); missionIndicator.SetActive(GameDataObserver.Instance.UpdateMissionAchieved.Value);
}, },
active => missionIndicator.SetActive(active)); active => missionIndicator.SetActive(active));