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

チュートリアル中のUI表示修正

This commit is contained in:
kimura 2021-12-14 17:39:40 +09:00
parent 34735a3456
commit f954f83749
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketManager.cs
View File

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