From 326dcd2db0fd525558891068b04100207731fa6e Mon Sep 17 00:00:00 2001 From: kimura Date: Mon, 15 Nov 2021 15:47:09 +0900 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E9=87=8F=E6=B3=A8=E6=96=87=E3=83=9C?= =?UTF-8?q?=E3=83=BC=E3=83=8A=E3=82=B9=E3=81=AE=E3=83=AC=E3=83=BC=E3=83=88?= =?UTF-8?q?=E3=82=92float=E3=81=AB=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrder.cs | 4 ++-- popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrder.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrder.cs index 8053002d..930b4eaf 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrder.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrder.cs @@ -233,7 +233,7 @@ public class BulkOrder : MonoBehaviour public static int CalcBonus(List rarityList, List resultData, int heart) { - var totalBonus = 0; + var totalBonus = 0f; var hasRarityList = resultData.Where(data => data.Rarity != ProductRarity.Normal).ToList(); if (hasRarityList.Count == 0) { @@ -244,6 +244,6 @@ public class BulkOrder : MonoBehaviour var bonusRate = rarityList.FirstOrDefault(data => data.Rarity == progressData.Rarity)?.bulkOrderBonus ?? 0; totalBonus += bonusRate * heart; } - return Mathf.CeilToInt((float) totalBonus / hasRarityList.Count); + return Mathf.CeilToInt(totalBonus / hasRarityList.Count); } } \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs b/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs index b40ee752..d94ce4a9 100644 --- a/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs +++ b/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs @@ -162,7 +162,7 @@ public sealed class MissionData public sealed class RarityData { public int id; - public int bulkOrderBonus; + public float bulkOrderBonus; public string text; public ProductRarity Rarity => (ProductRarity)id; }