yangwu
/
popcorn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ハート加算変更

This commit is contained in:
kimura 2022-07-08 14:56:28 +09:00
parent 587aa1897e
commit 99b901afe3
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs
View File

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