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 13:28:53 +09:00
parent 8d7be09a89
commit 440f4ea4c7
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoin.unity
View File

@ -1596,6 +1596,7 @@ MonoBehaviour:
narrowMessageText: {fileID: 1469609944} narrowMessageText: {fileID: 1469609944}
normalWindow: {fileID: 1336838851} normalWindow: {fileID: 1336838851}
narrowWindow: {fileID: 1450516236} narrowWindow: {fileID: 1450516236}
movieObject: {fileID: 251547152}
coinObject: {fileID: 1081810292} coinObject: {fileID: 1081810292}
fertilizerObject: {fileID: 471677967} fertilizerObject: {fileID: 471677967}
publicityObject: {fileID: 262919494} publicityObject: {fileID: 262919494}

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

@ -42,7 +42,6 @@ namespace MyGame.Scenes.marketing.Scripts
if (animated) if (animated)
{ {
// 左から歩いてきて立ち止まってmovie_Vip再生 // 左から歩いてきて立ち止まってmovie_Vip再生
vipCustomerAnimator.speed = 1f;
vipCustomerAnimator.Play("customer_nomal_walk_side"); vipCustomerAnimator.Play("customer_nomal_walk_side");
moveDisposable?.Dispose(); moveDisposable?.Dispose();
moveDisposable = this.UpdateAsObservable() moveDisposable = this.UpdateAsObservable()
@ -54,16 +53,14 @@ namespace MyGame.Scenes.marketing.Scripts
vipTransform.localPosition = localPosition.SetZ(initialPos.z); vipTransform.localPosition = localPosition.SetZ(initialPos.z);
}, () => }, () =>
{ {
vipCustomerAnimator.speed = 0f; vipCustomerAnimator.Play("customer_nomal_stay_front");
vipCustomerAnimator.Play("customer_nomal");
vipSpeechBubbleObject.SetActive(true); vipSpeechBubbleObject.SetActive(true);
}).AddTo(this); }).AddTo(this);
} }
else else
{ {
vipTransform.localPosition = vipStayPosTransform.localPosition.SetZ(initialPos.z); vipTransform.localPosition = vipStayPosTransform.localPosition.SetZ(initialPos.z);
vipCustomerAnimator.speed = 0f; vipCustomerAnimator.Play("customer_nomal_stay_front");
vipCustomerAnimator.Play("customer_nomal");
vipSpeechBubbleObject.SetActive(true); vipSpeechBubbleObject.SetActive(true);
} }
} }
@ -76,7 +73,6 @@ namespace MyGame.Scenes.marketing.Scripts
} }
// vip左にはける // vip左にはける
customerDirection.SetFlipSide(); customerDirection.SetFlipSide();
vipCustomerAnimator.speed = 1f;
vipCustomerAnimator.Play("customer_nomal_walk_side"); vipCustomerAnimator.Play("customer_nomal_walk_side");
vipButton.transform.SetLocalScale(0f); vipButton.transform.SetLocalScale(0f);
var vipTransform = vipCustomerAnimator.transform; var vipTransform = vipCustomerAnimator.transform;

6
popcorn/Assets/MyGame/Scripts/GetRewardDialog.cs
View File

@ -34,6 +34,7 @@ namespace MyGame.Scripts
[SerializeField] private Text narrowMessageText; [SerializeField] private Text narrowMessageText;
[SerializeField] private GameObject normalWindow; [SerializeField] private GameObject normalWindow;
[SerializeField] private GameObject narrowWindow; [SerializeField] private GameObject narrowWindow;
[SerializeField] private GameObject movieObject;
[SerializeField] private GameObject coinObject; [SerializeField] private GameObject coinObject;
[SerializeField] private GameObject fertilizerObject; [SerializeField] private GameObject fertilizerObject;
[SerializeField] private GameObject publicityObject; [SerializeField] private GameObject publicityObject;
@ -42,6 +43,7 @@ namespace MyGame.Scripts
private void Start() private void Start()
{ {
narrowWindow.SetActive(false); narrowWindow.SetActive(false);
movieObject.SetActive(false);
coinObject.SetActive(false); coinObject.SetActive(false);
fertilizerObject.SetActive(false); fertilizerObject.SetActive(false);
publicityObject.SetActive(false); publicityObject.SetActive(false);
@ -50,24 +52,28 @@ namespace MyGame.Scripts
{ {
case RewardType.Coin: case RewardType.Coin:
normalWindow.SetActive(true); normalWindow.SetActive(true);
movieObject.SetActive(true);
coinObject.SetActive(true); coinObject.SetActive(true);
messageText.text = ScriptLocalization.System.CoinMainMessage; messageText.text = ScriptLocalization.System.CoinMainMessage;
SetButtonAction(closeButton, okButton, AdManager.AD_PLACEMENT_COIN); SetButtonAction(closeButton, okButton, AdManager.AD_PLACEMENT_COIN);
break; break;
case RewardType.CornField: case RewardType.CornField:
normalWindow.SetActive(true); normalWindow.SetActive(true);
movieObject.SetActive(true);
fertilizerObject.SetActive(true); fertilizerObject.SetActive(true);
messageText.text = ScriptLocalization.System.CornFieldMessage; messageText.text = ScriptLocalization.System.CornFieldMessage;
SetButtonAction(closeButton, okButton, AdManager.AD_PLACEMENT_CORNFIELD); SetButtonAction(closeButton, okButton, AdManager.AD_PLACEMENT_CORNFIELD);
break; break;
case RewardType.IncreaseCustomer: case RewardType.IncreaseCustomer:
normalWindow.SetActive(true); normalWindow.SetActive(true);
movieObject.SetActive(true);
publicityObject.SetActive(true); publicityObject.SetActive(true);
messageText.text = ScriptLocalization.System.IncreaseCustomerMessage; messageText.text = ScriptLocalization.System.IncreaseCustomerMessage;
SetButtonAction(closeButton, okButton, AdManager.AD_PLACEMENT_CUSTOMER); SetButtonAction(closeButton, okButton, AdManager.AD_PLACEMENT_CUSTOMER);
break; break;
case RewardType.PerfectPopcorn: case RewardType.PerfectPopcorn:
normalWindow.SetActive(true); normalWindow.SetActive(true);
movieObject.SetActive(true);
messageText.text = ScriptLocalization.System.PerfectPopcornMessage; messageText.text = ScriptLocalization.System.PerfectPopcornMessage;
SetButtonAction(closeButton, okButton, AdManager.AD_PLACEMENT_PERFECT); SetButtonAction(closeButton, okButton, AdManager.AD_PLACEMENT_PERFECT);
break; break;