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 - { - 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]