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

vip宣伝時の座標計算修正

This commit is contained in:
kimura 2022-02-07 11:37:01 +09:00
parent c7f4ed6e92
commit 2087280991
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,18 +38,20 @@ namespace MyGame.Scenes.marketing.Scripts
vipCustomerAnimator.transform.SetLocalScale(1f); vipCustomerAnimator.transform.SetLocalScale(1f);
vipSpeechBubbleObject.SetActive(false); vipSpeechBubbleObject.SetActive(false);
customerDirection.SetDefaultSide(); customerDirection.SetDefaultSide();
var vipTransform = vipCustomerAnimator.transform;
if (animated) if (animated)
{ {
// 左から歩いてきて立ち止まってmovie_Vip再生 // 左から歩いてきて立ち止まってmovie_Vip再生
vipCustomerAnimator.speed = 1f; vipCustomerAnimator.speed = 1f;
vipCustomerAnimator.Play("customer_nomal_walk_side"); vipCustomerAnimator.Play("customer_nomal_walk_side");
var vipTransform = vipCustomerAnimator.transform;
moveDisposable?.Dispose(); moveDisposable?.Dispose();
moveDisposable = this.UpdateAsObservable() moveDisposable = this.UpdateAsObservable()
.TakeWhile(_ => Vector2.Distance(vipTransform.localPosition, vipStayPosTransform.localPosition) > .01f) .TakeWhile(_ => Vector2.Distance(vipTransform.localPosition, vipStayPosTransform.localPosition) > .01f)
.Subscribe(_ => .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; vipCustomerAnimator.speed = 0f;
@ -59,6 +61,7 @@ namespace MyGame.Scenes.marketing.Scripts
} }
else else
{ {
vipTransform.localPosition = vipStayPosTransform.localPosition.SetZ(initialPos.z);
vipCustomerAnimator.speed = 0f; vipCustomerAnimator.speed = 0f;
vipCustomerAnimator.Play("customer_nomal"); vipCustomerAnimator.Play("customer_nomal");
vipSpeechBubbleObject.SetActive(true); vipSpeechBubbleObject.SetActive(true);
@ -82,7 +85,9 @@ namespace MyGame.Scenes.marketing.Scripts
.TakeWhile(_ => Vector2.Distance(vipTransform.localPosition, initialPos) > .01f) .TakeWhile(_ => Vector2.Distance(vipTransform.localPosition, initialPos) > .01f)
.Subscribe(_ => .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); vipCustomerAnimator.transform.SetLocalScale(0f);

2
popcorn/Assets/MyGame/Scenes/marketing/marketing.unity
View File

@ -5366,7 +5366,7 @@ PrefabInstance:
- target: {fileID: 8476357288433061812, guid: cd3da4efffd34614794276964fca59c7, - target: {fileID: 8476357288433061812, guid: cd3da4efffd34614794276964fca59c7,
type: 3} type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: -35.82837 value: 4.385805
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8476357288433061812, guid: cd3da4efffd34614794276964fca59c7, - target: {fileID: 8476357288433061812, guid: cd3da4efffd34614794276964fca59c7,
type: 3} type: 3}