diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrder.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrder.cs index ebb9a20b..8053002d 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrder.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrder.cs @@ -111,7 +111,7 @@ public class BulkOrder : MonoBehaviour { // 獲得 var rarityList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.RarityDataSheet); - var bonus = CalcBonus(rarityList, gameData.CompletedProductList, bulkOrderData.shopLevel); + var bonus = CalcBonus(rarityList, gameData.CompletedProductList, bulkOrderData.rewardHeart); CoinManager.Instance.AddCoinWithEffect(bulkOrderData.rewardCoin + bonus); gameData.Coin = CoinManager.Instance.OwnCoin; gameData.Heart += bulkOrderData.rewardHeart; @@ -231,7 +231,7 @@ public class BulkOrder : MonoBehaviour TransitionManager.Instance.LoadSceneAdditive(GameScenes.BulkOrder); } - public static int CalcBonus(List rarityList, List resultData, int shopLevel) + public static int CalcBonus(List rarityList, List resultData, int heart) { var totalBonus = 0; var hasRarityList = resultData.Where(data => data.Rarity != ProductRarity.Normal).ToList(); @@ -242,7 +242,7 @@ public class BulkOrder : MonoBehaviour foreach (var progressData in hasRarityList) { var bonusRate = rarityList.FirstOrDefault(data => data.Rarity == progressData.Rarity)?.bulkOrderBonus ?? 0; - totalBonus += bonusRate * shopLevel; + totalBonus += bonusRate * heart; } return Mathf.CeilToInt((float) totalBonus / hasRarityList.Count); } diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderAchievedView.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderAchievedView.cs index 092b4ef2..3dbe924e 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderAchievedView.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderAchievedView.cs @@ -26,7 +26,7 @@ public class BulkOrderAchievedView : MonoBehaviour var gameData = GameDataManager.GameData; var messageList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.BulkOrderTextDataSheet); var rarityList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.RarityDataSheet); - var bonus = BulkOrder.CalcBonus(rarityList, gameData.CompletedProductList, orderData.shopLevel); + var bonus = BulkOrder.CalcBonus(rarityList, gameData.CompletedProductList, orderData.rewardHeart); heartText.text = orderData.rewardHeart.ToString(); coinText.text = orderData.rewardCoin.ToString(); bonusCoinText.text = bonus.ToString();