From 7ba4aa85c95b5df007730848221036e0514a70a2 Mon Sep 17 00:00:00 2001
From: kimura <kimura@usaya.jp>
Date: Mon, 15 Nov 2021 14:23:06 +0900
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E9=87=8F=E6=B3=A8=E6=96=87=E3=83=9C?=
 =?UTF-8?q?=E3=83=BC=E3=83=8A=E3=82=B9=E3=81=AE=E8=A8=88=E7=AE=97=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=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      | 6 +++---
 .../MyGame/Scenes/Main/Scripts/BulkOrderAchievedView.cs     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

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<RarityData>(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<RarityData> rarityList, List<BulkOrderResultData> resultData, int shopLevel)
+    public static int CalcBonus(List<RarityData> rarityList, List<BulkOrderResultData> 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<BulkOrderTextData>(Const.BulkOrderTextDataSheet);
             var rarityList = SpreadsheetDataManager.Instance.GetBaseDataList<RarityData>(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();