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

大量注文ボーナスの計算方法変更

This commit is contained in:
kimura 2021-11-15 14:23:06 +09:00
parent 2ac4eb8cef
commit 7ba4aa85c9
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrder.cs
View File

@ -111,7 +111,7 @@ public class BulkOrder : MonoBehaviour
{ {
// 獲得 // 獲得
var rarityList = SpreadsheetDataManager.Instance.GetBaseDataList<RarityData>(Const.RarityDataSheet); var rarityList = SpreadsheetDataManager.Instance.GetBaseDataList<RarityData>(Const.RarityDataSheet);
var bonus = CalcBonus(rarityList, gameData.CompletedProductList, bulkOrderData.shopLevel); var bonus = CalcBonus(rarityList, gameData.CompletedProductList, bulkOrderData.rewardHeart);
CoinManager.Instance.AddCoinWithEffect(bulkOrderData.rewardCoin + bonus); CoinManager.Instance.AddCoinWithEffect(bulkOrderData.rewardCoin + bonus);
gameData.Coin = CoinManager.Instance.OwnCoin; gameData.Coin = CoinManager.Instance.OwnCoin;
gameData.Heart += bulkOrderData.rewardHeart; gameData.Heart += bulkOrderData.rewardHeart;
@ -231,7 +231,7 @@ public class BulkOrder : MonoBehaviour
TransitionManager.Instance.LoadSceneAdditive(GameScenes.BulkOrder); TransitionManager.Instance.LoadSceneAdditive(GameScenes.BulkOrder);
} }
public static int CalcBonus(List<RarityData> rarityList, List<BulkOrderResultData> resultData, int shopLevel) public static int CalcBonus(List<RarityData> rarityList, List<BulkOrderResultData> resultData, int heart)
{ {
var totalBonus = 0; var totalBonus = 0;
var hasRarityList = resultData.Where(data => data.Rarity != ProductRarity.Normal).ToList(); var hasRarityList = resultData.Where(data => data.Rarity != ProductRarity.Normal).ToList();
@ -242,7 +242,7 @@ public class BulkOrder : MonoBehaviour
foreach (var progressData in hasRarityList) foreach (var progressData in hasRarityList)
{ {
var bonusRate = rarityList.FirstOrDefault(data => data.Rarity == progressData.Rarity)?.bulkOrderBonus ?? 0; var bonusRate = rarityList.FirstOrDefault(data => data.Rarity == progressData.Rarity)?.bulkOrderBonus ?? 0;
totalBonus += bonusRate * shopLevel; totalBonus += bonusRate * heart;
} }
return Mathf.CeilToInt((float) totalBonus / hasRarityList.Count); return Mathf.CeilToInt((float) totalBonus / hasRarityList.Count);
} }

2
popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderAchievedView.cs
View File

@ -26,7 +26,7 @@ public class BulkOrderAchievedView : MonoBehaviour
var gameData = GameDataManager.GameData; var gameData = GameDataManager.GameData;
var messageList = SpreadsheetDataManager.Instance.GetBaseDataList<BulkOrderTextData>(Const.BulkOrderTextDataSheet); var messageList = SpreadsheetDataManager.Instance.GetBaseDataList<BulkOrderTextData>(Const.BulkOrderTextDataSheet);
var rarityList = SpreadsheetDataManager.Instance.GetBaseDataList<RarityData>(Const.RarityDataSheet); var rarityList = SpreadsheetDataManager.Instance.GetBaseDataList<RarityData>(Const.RarityDataSheet);
var bonus = BulkOrder.CalcBonus(rarityList, gameData.CompletedProductList, orderData.shopLevel); var bonus = BulkOrder.CalcBonus(rarityList, gameData.CompletedProductList, orderData.rewardHeart);
heartText.text = orderData.rewardHeart.ToString(); heartText.text = orderData.rewardHeart.ToString();
coinText.text = orderData.rewardCoin.ToString(); coinText.text = orderData.rewardCoin.ToString();
bonusCoinText.text = bonus.ToString(); bonusCoinText.text = bonus.ToString();