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

チュートリアル時の兄弟非表示に対応

This commit is contained in:
kimura 2022-02-14 10:16:39 +09:00
parent dafb584739
commit ade2634303
3 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs
View File

@ -90,10 +90,12 @@ public class KitchenManager : MonoBehaviour
gameData.ResetDailyTotalCount(); gameData.ResetDailyTotalCount();
// 店舗レベル1達成表示 // 店舗レベル1達成表示
kitchenView.SetActive(false);
ShopLevelUp.ShowDialog(1, () => ShopLevelUp.ShowDialog(1, () =>
{ {
TutorialManager.Instance.ShowTutorialConversation(1, () => TutorialManager.Instance.ShowTutorialConversation(1, () =>
{ {
kitchenView.SetActive(true);
// マスク表示 // マスク表示
var buttonRectTransform = cookingButton.transform as RectTransform; var buttonRectTransform = cookingButton.transform as RectTransform;
var go = TutorialManager.Instance.ShowTutorialMask(buttonRectTransform.parent, buttonRectTransform); var go = TutorialManager.Instance.ShowTutorialMask(buttonRectTransform.parent, buttonRectTransform);
@ -107,8 +109,10 @@ public class KitchenManager : MonoBehaviour
else else
{ {
// チュートリアル調理終了後 // チュートリアル調理終了後
kitchenView.SetActive(false);
TutorialManager.Instance.ShowTutorialConversation(3, () => TutorialManager.Instance.ShowTutorialConversation(3, () =>
{ {
kitchenView.SetActive(true);
var go = FindObjectOfType<FooterManager>().transform; var go = FindObjectOfType<FooterManager>().transform;
go.transform.FindChildByName("Button_shop", t => go.transform.FindChildByName("Button_shop", t =>
{ {

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

@ -47,9 +47,11 @@ public class MarketManager : MonoBehaviour
// SetShopViewを使わず表示構築 // SetShopViewを使わず表示構築
rewardButtonView.gameObject.SetActive(false); rewardButtonView.gameObject.SetActive(false);
blueView.OpenAction(); blueView.OpenAction();
market.IsPause.Value = true;
TutorialManager.Instance.ShowTutorialConversation(4, () => TutorialManager.Instance.ShowTutorialConversation(4, () =>
{ {
market.IsPause.Value = false;
walkerMask.gameObject.SetActive(true); walkerMask.gameObject.SetActive(true);
// お客さん配置 // お客さん配置
var controller = market.SetTutorialCustomer(); var controller = market.SetTutorialCustomer();
@ -81,10 +83,11 @@ public class MarketManager : MonoBehaviour
CoinManager.Instance.ChangeCoin(gameData.Coin); CoinManager.Instance.ChangeCoin(gameData.Coin);
HeartMeter.Instance.Initialize(gameData.ViewedShopLevel, gameData.Heart); HeartMeter.Instance.Initialize(gameData.ViewedShopLevel, gameData.Heart);
// ポーズ中動作指定
market.IsPause.Subscribe(isPause => market.IsPause.Subscribe(isPause =>
{ {
vipCustomerButtonView.IsPause.Value = isPause; vipCustomerButtonView.SetActive(isPause);
// ポーズ中非表示 // 兄弟非表示
blueView.SetActive(!isPause); blueView.SetActive(!isPause);
BrotherPinkView.Instance.SetActive(!isPause); BrotherPinkView.Instance.SetActive(!isPause);
}).AddTo(this); }).AddTo(this);

13
popcorn/Assets/MyGame/Scenes/marketing/Scripts/VipCustomerButtonView.cs
View File

@ -15,7 +15,8 @@ namespace MyGame.Scenes.marketing.Scripts
[SerializeField] private GameObject vipSpeechBubbleObject; [SerializeField] private GameObject vipSpeechBubbleObject;
[SerializeField] private Transform vipStayPosTransform; [SerializeField] private Transform vipStayPosTransform;
[SerializeField] private float vipMoveSpeed; [SerializeField] private float vipMoveSpeed;
public readonly BoolReactiveProperty IsPause = new BoolReactiveProperty(); private readonly BoolReactiveProperty isPause = new BoolReactiveProperty();
public IObservable<Unit> VipButton { get; private set; } public IObservable<Unit> VipButton { get; private set; }
private IDisposable timerDisposable; private IDisposable timerDisposable;
private IDisposable moveDisposable; private IDisposable moveDisposable;
@ -30,8 +31,8 @@ namespace MyGame.Scenes.marketing.Scripts
VipButton = vipButton.OnClickAsObservable() VipButton = vipButton.OnClickAsObservable()
.Merge(eventTrigger.OnPointerClickAsObservable().AsUnitObservable()) .Merge(eventTrigger.OnPointerClickAsObservable().AsUnitObservable())
.TakeUntilDestroy(this); .TakeUntilDestroy(this);
IsPause.AddTo(this); isPause.AddTo(this);
IsPause.DistinctUntilChanged().Subscribe(x => isPause.DistinctUntilChanged().Subscribe(x =>
{ {
vipSpeechBubbleObject.transform.SetLocalScale(x ? 0f : 1f); vipSpeechBubbleObject.transform.SetLocalScale(x ? 0f : 1f);
buttonAnimator.speed = x ? 0f : 1f; buttonAnimator.speed = x ? 0f : 1f;
@ -56,7 +57,7 @@ namespace MyGame.Scenes.marketing.Scripts
.TakeWhile(_ => Vector2.Distance(vipTransform.localPosition, vipStayPosTransform.localPosition) > .01f) .TakeWhile(_ => Vector2.Distance(vipTransform.localPosition, vipStayPosTransform.localPosition) > .01f)
.Subscribe(_ => .Subscribe(_ =>
{ {
if (IsPause.Value) if (isPause.Value)
{ {
return; return;
} }
@ -94,7 +95,7 @@ namespace MyGame.Scenes.marketing.Scripts
.TakeWhile(_ => Vector2.Distance(vipTransform.localPosition, initialPos) > .01f) .TakeWhile(_ => Vector2.Distance(vipTransform.localPosition, initialPos) > .01f)
.Subscribe(_ => .Subscribe(_ =>
{ {
if (IsPause.Value) if (isPause.Value)
{ {
return; return;
} }
@ -119,5 +120,7 @@ namespace MyGame.Scenes.marketing.Scripts
CloseButton(); CloseButton();
}).AddTo(this); }).AddTo(this);
} }
public void SetActive(bool active) => isPause.Value = active;
} }
} }