diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketManager.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketManager.cs index cf17689c..8c5003b1 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketManager.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketManager.cs @@ -69,7 +69,7 @@ public class MarketManager : MonoBehaviour GameDataManager.SaveGameData(); walkerMask.gameObject.SetActive(false); resetRefreshTimer.OnNext(Unit.Default); - SetShopView(market.CurrentShopState.Value); + rewardButtonView.gameObject.SetActive(true); }).AddTo(controller).AddTo(this); }); } @@ -220,7 +220,6 @@ public class MarketManager : MonoBehaviour // 開閉店 market.CurrentShopState - .SkipWhile(_ => !gameData.FinishedFlags.HasFlag(TutorialFlag.FirstPlay)) .Subscribe(state => { SetShopView(state); @@ -232,6 +231,7 @@ public class MarketManager : MonoBehaviour // 宣伝ボタン/試食表示切替 var tastingComplete = new Subject().AddTo(this); market.CurrentShopState + .SkipWhile(_ => !gameData.FinishedFlags.HasFlag(TutorialFlag.FirstPlay)) .CombineLatest(market.IsPromotion, tastingComplete, (shopState, isPromotion, _) => (shopState == ShopState.Open, isPromotion)) .Subscribe(x => {