diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/VipCustomerButtonView.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/VipCustomerButtonView.cs index 6678b749..1fb9d61f 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/VipCustomerButtonView.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/VipCustomerButtonView.cs @@ -38,18 +38,20 @@ namespace MyGame.Scenes.marketing.Scripts vipCustomerAnimator.transform.SetLocalScale(1f); vipSpeechBubbleObject.SetActive(false); customerDirection.SetDefaultSide(); + var vipTransform = vipCustomerAnimator.transform; if (animated) { // 左から歩いてきて立ち止まってmovie_Vip再生 vipCustomerAnimator.speed = 1f; vipCustomerAnimator.Play("customer_nomal_walk_side"); - var vipTransform = vipCustomerAnimator.transform; moveDisposable?.Dispose(); moveDisposable = this.UpdateAsObservable() .TakeWhile(_ => Vector2.Distance(vipTransform.localPosition, vipStayPosTransform.localPosition) > .01f) .Subscribe(_ => { - vipTransform.localPosition = Vector2.MoveTowards(vipTransform.localPosition, vipStayPosTransform.localPosition, vipMoveSpeed * Time.deltaTime); + var localPosition = vipTransform.localPosition; + localPosition = Vector2.MoveTowards(localPosition, vipStayPosTransform.localPosition, vipMoveSpeed * Time.deltaTime); + vipTransform.localPosition = localPosition.SetZ(initialPos.z); }, () => { vipCustomerAnimator.speed = 0f; @@ -59,6 +61,7 @@ namespace MyGame.Scenes.marketing.Scripts } else { + vipTransform.localPosition = vipStayPosTransform.localPosition.SetZ(initialPos.z); vipCustomerAnimator.speed = 0f; vipCustomerAnimator.Play("customer_nomal"); vipSpeechBubbleObject.SetActive(true); @@ -82,7 +85,9 @@ namespace MyGame.Scenes.marketing.Scripts .TakeWhile(_ => Vector2.Distance(vipTransform.localPosition, initialPos) > .01f) .Subscribe(_ => { - vipTransform.localPosition = Vector2.MoveTowards(vipTransform.localPosition, initialPos, vipMoveSpeed * Time.deltaTime); + var localPosition = vipTransform.localPosition; + localPosition = Vector2.MoveTowards(localPosition, initialPos, vipMoveSpeed * Time.deltaTime); + vipTransform.localPosition = localPosition.SetZ(initialPos.z); }, () => { vipCustomerAnimator.transform.SetLocalScale(0f); diff --git a/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity b/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity index db82f977..2004dff6 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity @@ -5366,7 +5366,7 @@ PrefabInstance: - target: {fileID: 8476357288433061812, guid: cd3da4efffd34614794276964fca59c7, type: 3} propertyPath: m_LocalPosition.z - value: -35.82837 + value: 4.385805 objectReference: {fileID: 0} - target: {fileID: 8476357288433061812, guid: cd3da4efffd34614794276964fca59c7, type: 3}