From fcbe53f5d691aebe17b184898cea0afa3cdff846 Mon Sep 17 00:00:00 2001
From: kimura <kimura@usaya.jp>
Date: Fri, 27 May 2022 15:36:56 +0900
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E9=87=8F=E6=B3=A8=E6=96=87=E9=81=94?=
 =?UTF-8?q?=E6=88=90=E6=99=82=E3=81=AB=E3=83=9D=E3=83=83=E3=83=97=E3=82=B3?=
 =?UTF-8?q?=E3=83=BC=E3=83=B3=E8=B2=A9=E5=A3=B2=E6=95=B0=E5=8A=A0=E7=AE=97?=
 =?UTF-8?q?=E3=82=92=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MyGame/Scenes/Main/Scripts/BulkOrder.cs       | 15 ++++++++-------
 popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs  |  9 +++++++++
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrder.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrder.cs
index 5b97ed64..283ae1a0 100644
--- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrder.cs
+++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrder.cs
@@ -91,13 +91,7 @@ public class BulkOrder : MonoBehaviour
         }).AddTo(this);
 
         // 納品チェック
-        var orderList = new List<int>
-        {
-            bulkOrderData.productId1,
-            bulkOrderData.productId2,
-            bulkOrderData.productId3,
-        };
-        var completed = gameData.CompletedProductList.Count == orderList.Count(x => x != 0);
+        var completed = gameData.CompletedProductList.Count == bulkOrderData.OrderList.Count(data => data.productId != 0);
         var delivered = gameData.DeliveredOrder.Contains(bulkOrderData.id);
         if (completed)
         {
@@ -127,6 +121,13 @@ public class BulkOrder : MonoBehaviour
                     GameDataManager.GameData.MoveHeart(bulkOrderData.rewardHeart);
                 });
                 
+                // 販売数加算
+                foreach (var (num,productId,count) in bulkOrderData.OrderList)
+                {
+                    var rarity = gameData.CompletedProductList.FirstOrDefault(data => data.Number == num)?.Rarity ?? ProductRarity.Normal;
+                    gameData.AddSalesCount(productId, count, rarity);
+                }
+                
                 // カウントリセット
                 gameData.OrderConditionCount = 0;
                 gameData.DeliveredOrder.Add(bulkOrderData.id);
diff --git a/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs b/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs
index 82f2f712..2718eeb2 100644
--- a/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs
+++ b/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs
@@ -377,6 +377,15 @@ public sealed class BulkOrderData
     public int count3;
     public int rewardCoin;
     public int rewardHeart;
+
+    private List<(int id, int productId, int count)> orderList;
+    public List<(int id, int productId, int count)> OrderList =>
+        orderList ?? (orderList = new List<(int id, int productId, int count)>
+        {
+            (1, productId1, count1),
+            (2, productId2, count2),
+            (3, productId3, count3)
+        });
 }
 
 [Serializable]