リファクタ

This commit is contained in:
kimura 2022-10-20 13:31:29 +09:00
parent e69e46c5cd
commit 7dfbf83b8e
3 changed files with 7 additions and 15 deletions

View File

@ -57,6 +57,7 @@ public class FooterManager : MonoBehaviour
ScrollGameLockDialog.ShowDialog(); ScrollGameLockDialog.ShowDialog();
}).AddTo(this); }).AddTo(this);
scrollGameNotifyIcon.SetActive(false);
GameDataObserver.Instance.ShopLevelObserver GameDataObserver.Instance.ShopLevelObserver
.DistinctUntilChanged() .DistinctUntilChanged()
.Where(x => x >= Const.ScrollGameAvailableLevel) .Where(x => x >= Const.ScrollGameAvailableLevel)
@ -65,17 +66,10 @@ public class FooterManager : MonoBehaviour
{ {
scrollGameButton.gameObject.SetActive(true); scrollGameButton.gameObject.SetActive(true);
scrollGameLockedButton.gameObject.SetActive(false); scrollGameLockedButton.gameObject.SetActive(false);
}).AddTo(this); if (!GameDataManager.GameData.FinishedFlags.HasFlag(TutorialFlag.ScrollGame))
{
scrollGameNotifyIcon.SetActive(false); scrollGameNotifyIcon.SetActive(true);
GameDataObserver.Instance.ShopLevelObserver }
.DistinctUntilChanged()
.Where(x => x >= Const.ScrollGameAvailableLevel)
.TakeWhile(_ => !GameDataManager.GameData.FinishedFlags.HasFlag(TutorialFlag.ScrollGame))
.Take(1)
.Subscribe(x =>
{
scrollGameNotifyIcon.SetActive(true);
}).AddTo(this); }).AddTo(this);
} }
} }

View File

@ -30,7 +30,6 @@ public class HeaderManager : MonoBehaviour
{ {
isOpenMission = false; isOpenMission = false;
GameDataObserver.Instance.CheckMissionProgress(); GameDataObserver.Instance.CheckMissionProgress();
missionIndicator.SetActive(GameDataObserver.Instance.UpdateMissionAchieved.Value);
}, },
active => missionIndicator.SetActive(active)); active => missionIndicator.SetActive(active));
}).AddTo(this); }).AddTo(this);
@ -43,9 +42,8 @@ public class HeaderManager : MonoBehaviour
TransitionManager.Instance.LoadScene(GameScenes.WorldMap); TransitionManager.Instance.LoadScene(GameScenes.WorldMap);
}).AddTo(this); }).AddTo(this);
var gameData = GameDataManager.GameData;
var cityData = SpreadsheetDataManager.Instance.GetBaseDataList<CityData>(Const.CityDataSheet) var cityData = SpreadsheetDataManager.Instance.GetBaseDataList<CityData>(Const.CityDataSheet)
.First(data => data.id == gameData.CurrentCityId); .First(data => data.id == GameDataManager.GameData.CurrentCityId);
cityIconTarget.DestroyAllChildrens(); cityIconTarget.DestroyAllChildrens();
Instantiate(cityData.GetIconPrefab(), cityIconTarget); Instantiate(cityData.GetIconPrefab(), cityIconTarget);

View File

@ -10,7 +10,7 @@ namespace MyGame.Scripts
public enum TutorialFlag public enum TutorialFlag
{ {
None = 0, None = 0,
FirstPlay = 1, FirstPlay = 1 << 0,
CornField = 1 << 1, CornField = 1 << 1,
Shopping = 1 << 2, Shopping = 1 << 2,
Management = 1 << 3, Management = 1 << 3,