From 385f26a30077083c2d3298813a6c4b308df33c6e Mon Sep 17 00:00:00 2001 From: kimura Date: Fri, 4 Feb 2022 19:40:03 +0900 Subject: [PATCH] =?UTF-8?q?Vip=E5=AE=A3=E4=BC=9D=E8=A1=A8=E7=A4=BA?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyGame/Scenes/marketing/Scripts/MarketManager.cs | 3 +++ .../Scenes/marketing/Scripts/VipCustomerButtonView.cs | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketManager.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketManager.cs index d6e9abb0..423bcb64 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketManager.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketManager.cs @@ -133,6 +133,9 @@ public class MarketManager : MonoBehaviour GetRewardDialog.ShowVipCustomerDialog(() => { market.VipAction(); + // 現在時刻に設定して期限切れにする + gameData.vipCustomerLimitTime = DateTime.UtcNow.ToBinary(); + vipTimerUpdateSubject.OnNext(Unit.Default); }, () => { // 現在時刻に設定して期限切れにする diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/VipCustomerButtonView.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/VipCustomerButtonView.cs index ccd7168f..6678b749 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/VipCustomerButtonView.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/VipCustomerButtonView.cs @@ -17,6 +17,7 @@ namespace MyGame.Scenes.marketing.Scripts [SerializeField] private float vipMoveSpeed; public IObservable VipButton { get; private set; } private IDisposable timerDisposable; + private IDisposable moveDisposable; private Vector3 initialPos; private void Awake() @@ -43,7 +44,8 @@ namespace MyGame.Scenes.marketing.Scripts vipCustomerAnimator.speed = 1f; vipCustomerAnimator.Play("customer_nomal_walk_side"); var vipTransform = vipCustomerAnimator.transform; - this.UpdateAsObservable() + moveDisposable?.Dispose(); + moveDisposable = this.UpdateAsObservable() .TakeWhile(_ => Vector2.Distance(vipTransform.localPosition, vipStayPosTransform.localPosition) > .01f) .Subscribe(_ => { @@ -75,7 +77,8 @@ namespace MyGame.Scenes.marketing.Scripts vipCustomerAnimator.Play("customer_nomal_walk_side"); vipButton.transform.SetLocalScale(0f); var vipTransform = vipCustomerAnimator.transform; - this.UpdateAsObservable() + moveDisposable?.Dispose(); + moveDisposable = this.UpdateAsObservable() .TakeWhile(_ => Vector2.Distance(vipTransform.localPosition, initialPos) > .01f) .Subscribe(_ => {