From 985ffa79c86b8a642e1db76b8a96d198cd1254ad Mon Sep 17 00:00:00 2001
From: kimura <kimura@usaya.jp>
Date: Fri, 12 Nov 2021 11:06:42 +0900
Subject: [PATCH] =?UTF-8?q?=E3=83=AC=E3=82=B7=E3=83=94=E3=81=94=E3=81=A8?=
 =?UTF-8?q?=E3=81=AB=E8=AA=BF=E7=90=86=E3=83=91=E3=83=BC=E3=83=95=E3=82=A7?=
 =?UTF-8?q?=E3=82=AF=E3=83=88=E6=99=82=E3=81=AE=E5=95=86=E5=93=81=E3=81=AE?=
 =?UTF-8?q?=E5=A3=B2=E5=80=A4=E3=82=92=E6=8C=87=E5=AE=9A=E3=81=A7=E3=81=8D?=
 =?UTF-8?q?=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MyGame/Scenes/marketing/Scripts/Market.cs |  2 +-
 .../marketing/Scripts/ProductManagement.cs    |  3 +--
 .../Assets/MyGame/Scripts/SpreadsheetData.cs  | 21 +++++++++++++++++++
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs
index 078ea603..2f85242d 100644
--- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs
+++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs
@@ -419,7 +419,7 @@ public class Market : SingletonMonoBehaviour<Market>
             var targetIndex = gameData.ShopStock.FindIndex(data => data.FlavorId == stockData.FlavorId && data.Rarity == stockData.Rarity);
             gameData.ShopStock.RemoveAt(targetIndex);
             gameData.AddSalesCount(stockData.FlavorId, 1, stockData.Rarity);
-            coin += productData.price * (1 + rarityData.rate / 100);
+            coin += productData.GetRarityPrice(rarityData.Rarity);
         }
         return coin;
     }
diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagement.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagement.cs
index 7462aed9..54078aa3 100644
--- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagement.cs
+++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagement.cs
@@ -119,9 +119,8 @@ public class ProductManagement : MonoBehaviour
                 var tankStock = gameData.StorageTanks.Where(x => x.FlavorId == tankData.FlavorId).Sum(x => x.Stock);
                 var totalStock = shopStock + tankStock;
                 var productData = productList.FirstOrDefault(data => data.id == tankData.FlavorId);
-                var price = productData?.price ?? 0;
                 List<(ProductRarity rarity, int price, int stock)> raritySummaryData = rarityDataList.Select(x =>
-                    (x.Rarity, price * x.rate / 100, tankData.Stocks.FirstOrDefault(sd => sd.Rarity == x.Rarity)?.Stock ?? 0)
+                    (x.Rarity, productData?.GetRarityPrice(x.Rarity) ?? 0, tankData.Stocks.FirstOrDefault(sd => sd.Rarity == x.Rarity)?.Stock ?? 0)
                 ).ToList();
                 LocalCacheManager.Save(TankDetailView.TankDetailDataTag, (tankView.TankNumber, totalStock, tankData, productData, raritySummaryData));
                 TransitionManager.Instance.LoadSceneAdditive(GameScenes.PopcornDescription);
diff --git a/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs b/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs
index bb4efea6..b40ee752 100644
--- a/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs
+++ b/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs
@@ -297,6 +297,27 @@ public sealed class ProductData
     {
         return materialList.Count(material => material.id != Const.NotSetMaterialId);
     }
+
+    public int GetRarityPrice(ProductRarity rarity)
+    {
+        switch (rarity)
+        {
+            case ProductRarity.Normal:
+                return rarity1Price;
+            case ProductRarity.Yellow:
+                return rarity2Price;
+            case ProductRarity.Copper:
+                return rarity3Price;
+            case ProductRarity.Silver:
+                return rarity4Price;
+            case ProductRarity.Gold:
+                return rarity5Price;
+            case ProductRarity.Rainbow:
+                return rarity6Price;
+            default:
+                throw new ArgumentOutOfRangeException(nameof(rarity), rarity, null);
+        }
+    }
     
     public Transform GetIconPrefab()
     {