diff --git a/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoin.unity b/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoin.unity index 4b7d1688..042b440e 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoin.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoin.unity @@ -1596,6 +1596,7 @@ MonoBehaviour: narrowMessageText: {fileID: 1469609944} normalWindow: {fileID: 1336838851} narrowWindow: {fileID: 1450516236} + movieObject: {fileID: 251547152} coinObject: {fileID: 1081810292} fertilizerObject: {fileID: 471677967} publicityObject: {fileID: 262919494} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/VipCustomerButtonView.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/VipCustomerButtonView.cs index 1fb9d61f..f81c96cf 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/VipCustomerButtonView.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/VipCustomerButtonView.cs @@ -42,7 +42,6 @@ namespace MyGame.Scenes.marketing.Scripts if (animated) { // 左から歩いてきて立ち止まってmovie_Vip再生 - vipCustomerAnimator.speed = 1f; vipCustomerAnimator.Play("customer_nomal_walk_side"); moveDisposable?.Dispose(); moveDisposable = this.UpdateAsObservable() @@ -54,16 +53,14 @@ namespace MyGame.Scenes.marketing.Scripts vipTransform.localPosition = localPosition.SetZ(initialPos.z); }, () => { - vipCustomerAnimator.speed = 0f; - vipCustomerAnimator.Play("customer_nomal"); + vipCustomerAnimator.Play("customer_nomal_stay_front"); vipSpeechBubbleObject.SetActive(true); }).AddTo(this); } else { vipTransform.localPosition = vipStayPosTransform.localPosition.SetZ(initialPos.z); - vipCustomerAnimator.speed = 0f; - vipCustomerAnimator.Play("customer_nomal"); + vipCustomerAnimator.Play("customer_nomal_stay_front"); vipSpeechBubbleObject.SetActive(true); } } @@ -76,7 +73,6 @@ namespace MyGame.Scenes.marketing.Scripts } // vip左にはける customerDirection.SetFlipSide(); - vipCustomerAnimator.speed = 1f; vipCustomerAnimator.Play("customer_nomal_walk_side"); vipButton.transform.SetLocalScale(0f); var vipTransform = vipCustomerAnimator.transform; diff --git a/popcorn/Assets/MyGame/Scripts/GetRewardDialog.cs b/popcorn/Assets/MyGame/Scripts/GetRewardDialog.cs index 1b70b290..7d9302dc 100644 --- a/popcorn/Assets/MyGame/Scripts/GetRewardDialog.cs +++ b/popcorn/Assets/MyGame/Scripts/GetRewardDialog.cs @@ -34,6 +34,7 @@ namespace MyGame.Scripts [SerializeField] private Text narrowMessageText; [SerializeField] private GameObject normalWindow; [SerializeField] private GameObject narrowWindow; + [SerializeField] private GameObject movieObject; [SerializeField] private GameObject coinObject; [SerializeField] private GameObject fertilizerObject; [SerializeField] private GameObject publicityObject; @@ -42,6 +43,7 @@ namespace MyGame.Scripts private void Start() { narrowWindow.SetActive(false); + movieObject.SetActive(false); coinObject.SetActive(false); fertilizerObject.SetActive(false); publicityObject.SetActive(false); @@ -50,24 +52,28 @@ namespace MyGame.Scripts { case RewardType.Coin: normalWindow.SetActive(true); + movieObject.SetActive(true); coinObject.SetActive(true); messageText.text = ScriptLocalization.System.CoinMainMessage; SetButtonAction(closeButton, okButton, AdManager.AD_PLACEMENT_COIN); break; case RewardType.CornField: normalWindow.SetActive(true); + movieObject.SetActive(true); fertilizerObject.SetActive(true); messageText.text = ScriptLocalization.System.CornFieldMessage; SetButtonAction(closeButton, okButton, AdManager.AD_PLACEMENT_CORNFIELD); break; case RewardType.IncreaseCustomer: normalWindow.SetActive(true); + movieObject.SetActive(true); publicityObject.SetActive(true); messageText.text = ScriptLocalization.System.IncreaseCustomerMessage; SetButtonAction(closeButton, okButton, AdManager.AD_PLACEMENT_CUSTOMER); break; case RewardType.PerfectPopcorn: normalWindow.SetActive(true); + movieObject.SetActive(true); messageText.text = ScriptLocalization.System.PerfectPopcornMessage; SetButtonAction(closeButton, okButton, AdManager.AD_PLACEMENT_PERFECT); break;