vip宣伝調整
This commit is contained in:
parent
442b250c31
commit
5caea10e96
|
|
@ -31,10 +31,9 @@ namespace MyGame.Scenes.marketing.Scripts
|
||||||
.Merge(eventTrigger.OnPointerClickAsObservable().AsUnitObservable())
|
.Merge(eventTrigger.OnPointerClickAsObservable().AsUnitObservable())
|
||||||
.TakeUntilDestroy(this);
|
.TakeUntilDestroy(this);
|
||||||
|
|
||||||
var bubbleAnimator = vipSpeechBubbleObject.GetComponent<Animator>();
|
|
||||||
IsPause.DistinctUntilChanged().Subscribe(x =>
|
IsPause.DistinctUntilChanged().Subscribe(x =>
|
||||||
{
|
{
|
||||||
bubbleAnimator.speed = x ? 0f : 1f;
|
vipSpeechBubbleObject.transform.SetLocalScale(x ? 0f : 1f);
|
||||||
buttonAnimator.speed = x ? 0f : 1f;
|
buttonAnimator.speed = x ? 0f : 1f;
|
||||||
vipCustomerAnimator.speed = x ? 0f : 1f;
|
vipCustomerAnimator.speed = x ? 0f : 1f;
|
||||||
}).AddTo(this);
|
}).AddTo(this);
|
||||||
|
|
@ -57,6 +56,10 @@ 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)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
var localPosition = vipTransform.localPosition;
|
var localPosition = vipTransform.localPosition;
|
||||||
localPosition = Vector2.MoveTowards(localPosition, vipStayPosTransform.localPosition, vipMoveSpeed * Time.deltaTime);
|
localPosition = Vector2.MoveTowards(localPosition, vipStayPosTransform.localPosition, vipMoveSpeed * Time.deltaTime);
|
||||||
vipTransform.localPosition = localPosition.SetZ(initialPos.z);
|
vipTransform.localPosition = localPosition.SetZ(initialPos.z);
|
||||||
|
|
@ -91,6 +94,10 @@ namespace MyGame.Scenes.marketing.Scripts
|
||||||
.TakeWhile(_ => Vector2.Distance(vipTransform.localPosition, initialPos) > .01f)
|
.TakeWhile(_ => Vector2.Distance(vipTransform.localPosition, initialPos) > .01f)
|
||||||
.Subscribe(_ =>
|
.Subscribe(_ =>
|
||||||
{
|
{
|
||||||
|
if (IsPause.Value)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
var localPosition = vipTransform.localPosition;
|
var localPosition = vipTransform.localPosition;
|
||||||
localPosition = Vector2.MoveTowards(localPosition, initialPos, vipMoveSpeed * Time.deltaTime);
|
localPosition = Vector2.MoveTowards(localPosition, initialPos, vipMoveSpeed * Time.deltaTime);
|
||||||
vipTransform.localPosition = localPosition.SetZ(initialPos.z);
|
vipTransform.localPosition = localPosition.SetZ(initialPos.z);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue