From f4ea9a7f0ab3af0a170fae5606b0655619c79f92 Mon Sep 17 00:00:00 2001 From: kimura Date: Thu, 25 Nov 2021 10:03:56 +0900 Subject: [PATCH] =?UTF-8?q?=E3=82=B3=E3=82=A4=E3=83=B3=E5=8A=A0=E7=AE=97?= =?UTF-8?q?=E8=A1=A8=E7=A4=BA=E3=81=AE=E3=83=A1=E3=82=BD=E3=83=83=E3=83=89?= =?UTF-8?q?=E5=90=8D=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrder.cs | 2 +- popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs | 2 +- popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionManager.cs | 4 ++-- popcorn/Assets/MyGame/Scripts/CoinManager.cs | 2 ++ 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrder.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrder.cs index 0787bda8..3c39be0f 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrder.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrder.cs @@ -112,7 +112,7 @@ public class BulkOrder : MonoBehaviour // 獲得 var rarityList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.RarityDataSheet); var bonus = CalcBonus(rarityList, gameData.CompletedProductList, bulkOrderData.rewardHeart); - CoinManager.Instance.AddCoinWithEffect(bulkOrderData.rewardCoin + bonus); + CoinManager.Instance.AddCoin(bulkOrderData.rewardCoin + bonus); gameData.Coin = CoinManager.Instance.OwnCoin; gameData.Heart += bulkOrderData.rewardHeart; HeartMeter.Instance.AddHeart(bulkOrderData.rewardHeart); diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs index 92e1b4f4..2abae97f 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs @@ -121,7 +121,7 @@ public class KitchenManager : MonoBehaviour adButton.gameObject.SetActive(false); kitchenView.SetNormalAnimation(); - CoinManager.Instance.AddCoinWithEffect(refreshRewardCoin); + CoinManager.Instance.AddCoin(refreshRewardCoin); gameData.Coin = CoinManager.Instance.OwnCoin; gameData.kitchenRefreshTime = DateTime.UtcNow.AddSeconds(refreshWaitTime).ToBinary(); GameDataManager.SaveGameData(); diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionManager.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionManager.cs index ad94e822..b9eb8755 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionManager.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionManager.cs @@ -485,14 +485,14 @@ public class MissionManager : MonoBehaviour { if (missionData.RewardType == MissionRewardType.Coin) { - CoinManager.Instance.AddCoinWithEffect(missionData.reward, () => {}); + CoinManager.Instance.AddCoin(missionData.reward); GameDataManager.GameData.Coin = CoinManager.Instance.OwnCoin; } } private void GetDailyMissionCompleteReward() { - CoinManager.Instance.AddCoinWithEffect(dailyMissionCompleteRewardCoin); + CoinManager.Instance.AddCoin(dailyMissionCompleteRewardCoin); GameDataManager.GameData.Coin = CoinManager.Instance.OwnCoin; } } \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Scripts/CoinManager.cs b/popcorn/Assets/MyGame/Scripts/CoinManager.cs index 82aa20d8..b1419ddd 100644 --- a/popcorn/Assets/MyGame/Scripts/CoinManager.cs +++ b/popcorn/Assets/MyGame/Scripts/CoinManager.cs @@ -37,6 +37,8 @@ public class CoinManager : SingletonMonoBehaviour public void AddCoin(int count) { ownCoin += count; + coinAnimator.SetTrigger(Add); + SoundManager.Instance.PlaySE("se_coin_get"); coinCountText.CountUpAnimation(coinTextFormat, ownCoin, duration); }