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

大量注文ボーナスのレートをfloatに対応

This commit is contained in:
kimura 2021-11-15 15:47:09 +09:00
parent 5da45a65e3
commit 326dcd2db0
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -233,7 +233,7 @@ public class BulkOrder : MonoBehaviour
public static int CalcBonus(List<RarityData> rarityList, List<BulkOrderResultData> resultData, int heart) public static int CalcBonus(List<RarityData> rarityList, List<BulkOrderResultData> resultData, int heart)
{ {
var totalBonus = 0; var totalBonus = 0f;
var hasRarityList = resultData.Where(data => data.Rarity != ProductRarity.Normal).ToList(); var hasRarityList = resultData.Where(data => data.Rarity != ProductRarity.Normal).ToList();
if (hasRarityList.Count == 0) if (hasRarityList.Count == 0)
{ {
@ -244,6 +244,6 @@ public class BulkOrder : MonoBehaviour
var bonusRate = rarityList.FirstOrDefault(data => data.Rarity == progressData.Rarity)?.bulkOrderBonus ?? 0; var bonusRate = rarityList.FirstOrDefault(data => data.Rarity == progressData.Rarity)?.bulkOrderBonus ?? 0;
totalBonus += bonusRate * heart; totalBonus += bonusRate * heart;
} }
return Mathf.CeilToInt((float) totalBonus / hasRarityList.Count); return Mathf.CeilToInt(totalBonus / hasRarityList.Count);
} }
} }

2
popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs
View File

@ -162,7 +162,7 @@ public sealed class MissionData
public sealed class RarityData public sealed class RarityData
{ {
public int id; public int id;
public int bulkOrderBonus; public float bulkOrderBonus;
public string text; public string text;
public ProductRarity Rarity => (ProductRarity)id; public ProductRarity Rarity => (ProductRarity)id;
} }