From 99b901afe35d810a2514e3552dc2941c6914ba9a Mon Sep 17 00:00:00 2001
From: kimura <kimura@usaya.jp>
Date: Fri, 8 Jul 2022 14:56:28 +0900
Subject: [PATCH] =?UTF-8?q?=E3=83=8F=E3=83=BC=E3=83=88=E5=8A=A0=E7=AE=97?=
 =?UTF-8?q?=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MyGame/Scenes/marketing/Scripts/Market.cs      | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs
index 48a453f3..74a0d4b8 100644
--- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs
+++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs
@@ -230,11 +230,11 @@ public class Market : SingletonMonoBehaviour<Market>
             
             // 購入
             var flavors = orders.Select(x => displayFlavors[x]).ToList();
-            var coin = SellPopcorn(flavors);
+            var (coin, count) = SellPopcorn(flavors);
             
             // 獲得処理（遅延追加用変数に加算）
             gameData.WaitAddCoin += coin;
-            gameData.WaitAddHeart += customers.Count;
+            gameData.WaitAddHeart += count;
             gameData.AddVipCustomerCount(customers.Count(data => data.CustomerType == CustomerType.Vip));
             GameDataManager.SaveGameData();
             
@@ -270,7 +270,7 @@ public class Market : SingletonMonoBehaviour<Market>
                 this.CallWaitForSeconds(waitRefillTime, () =>
                 {
                     // 獲得処理
-                    gameData.MoveHeart(customers.Count);
+                    gameData.MoveHeart(count);
                     GameDataManager.SaveGameData();
 
                     refillSubject.OnNext((isReorder, refillList));
@@ -449,19 +449,20 @@ public class Market : SingletonMonoBehaviour<Market>
         return customerController;
     }
 
-    private int SellPopcorn(List<ProductStockData> stockDataList)
+    private (int coin, int count) SellPopcorn(List<ProductStockData> stockDataList)
     {
         var gameData = GameDataManager.GameData;
         // 品切れ
         if (gameData.ShopStock.Count == 0)
         {
-            return 0;
+            return (0, 0);
         }
 
         // フレーバーを売る
         var recipeList = SpreadsheetDataManager.Instance.GetBaseDataList<ProductData>(Const.ProductDataSheet);
         var rarityList = SpreadsheetDataManager.Instance.GetBaseDataList<RarityData>(Const.RarityDataSheet);
         var coin = 0;
+        var count = 0;
         foreach (var stockData in stockDataList)
         {
             var productData = recipeList.First(data => data.id == stockData.FlavorId);
@@ -480,8 +481,9 @@ displayFlavors: {displayFlavors.Aggregate("", (s, data) => $"{s},{data.FlavorId}
             gameData.AddSalesCount(stockData.FlavorId, 1, stockData.Rarity);
             coin += productData.GetRarityPrice(rarityData.Rarity);
             coin += salesBonus;
+            count++;
         }
-        return coin;
+        return (coin, count);
     }
 
     private List<int> ShuffleOrder(int length)