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

宣伝処理修正

This commit is contained in:
kimura 2022-02-07 15:47:15 +09:00
parent eaad34dcfe
commit 4a9bcecd5a
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
popcorn/Assets/MyGame/Scenes/marketing/Scripts/BrotherPinkView.cs
View File

@ -89,7 +89,7 @@ public class BrotherPinkView : SingletonMonoBehaviour<BrotherPinkView>
}).AddTo(this); }).AddTo(this);
this.UpdateAsObservable().Subscribe(_ => this.UpdateAsObservable().Subscribe(_ =>
{ {
if (waitMove || isMoveLocked || isPromotion) if (waitMove || isMoveLocked)
{ {
return; return;
} }
@ -108,7 +108,7 @@ public class BrotherPinkView : SingletonMonoBehaviour<BrotherPinkView>
moveIndex++; moveIndex++;
if (moveIndex == selectedMoves.Length) if (moveIndex == selectedMoves.Length)
{ {
if (isTasting) if (isTasting || isPromotion)
{ {
moveIndex = 0; moveIndex = 0;
SetPinkMove(); SetPinkMove();
@ -166,7 +166,6 @@ public class BrotherPinkView : SingletonMonoBehaviour<BrotherPinkView>
if (animator != null) if (animator != null)
{ {
animator.ResetTrigger(Normal); animator.ResetTrigger(Normal);
// animator.SetTrigger(move.trigger);
setTrigger.OnNext(move.trigger); setTrigger.OnNext(move.trigger);
} }
if (Vector2.Distance(wayPoint, pinkTransform.localPosition.ToVector2()) < .01f) if (Vector2.Distance(wayPoint, pinkTransform.localPosition.ToVector2()) < .01f)
@ -204,23 +203,24 @@ public class BrotherPinkView : SingletonMonoBehaviour<BrotherPinkView>
public void StartPromotion() public void StartPromotion()
{ {
moveLockDispose?.Dispose();
isMoveLocked = false;
waitMove = false;
isPromotion = true; isPromotion = true;
animator.ResetTrigger(Normal); selectedMoves = pinkAdvertiseMoves;
animator.SetTrigger(Promotion); SetPinkMove();
Vector3 localPosition = RightPos;
localPosition += Vector3.forward * (localPosition.y + Mathf.Abs(walkSideBottomPos));
pinkTransform.localPosition = localPosition;
pinkTransform.localRotation = Quaternion.Euler(Vector3.zero);
} }
public void StopPromotion() public void StopPromotion()
{ {
if (animator != null) if (!isPromotion)
{ {
animator.ResetTrigger(Promotion); return;
} }
ResetMove();
isPromotion = false; isPromotion = false;
selectedMoves = pinkMoves;
SetPinkMove();
} }
public void StartTasting() public void StartTasting()

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

@ -260,9 +260,10 @@ public class MarketManager : MonoBehaviour
{ {
if (isPromotion) if (isPromotion)
{ {
signBoardView.SetActiveTastingBoard(false);
// 宣伝ボタン表示 // 宣伝ボタン表示
rewardButtonView.gameObject.SetActive(true); rewardButtonView.gameObject.SetActive(true);
signBoardView.SetActiveTastingBoard(false); BrotherPinkView.Instance.StartPromotion();
} }
else if (gameData.TastingCount > 0) else if (gameData.TastingCount > 0)
{ {