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 // 購入 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 this.CallWaitForSeconds(waitRefillTime, () => { // 獲得処理 - gameData.MoveHeart(customers.Count); + gameData.MoveHeart(count); GameDataManager.SaveGameData(); refillSubject.OnNext((isReorder, refillList)); @@ -449,19 +449,20 @@ public class Market : SingletonMonoBehaviour return customerController; } - private int SellPopcorn(List stockDataList) + private (int coin, int count) SellPopcorn(List stockDataList) { var gameData = GameDataManager.GameData; // 品切れ if (gameData.ShopStock.Count == 0) { - return 0; + return (0, 0); } // フレーバーを売る var recipeList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.ProductDataSheet); var rarityList = SpreadsheetDataManager.Instance.GetBaseDataList(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 ShuffleOrder(int length)