From 4202f24fadfcbfc8b43a50dcddb42a31aeec7305 Mon Sep 17 00:00:00 2001 From: kimura Date: Wed, 6 Oct 2021 15:00:29 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=8E=E3=83=BC=E3=83=9E=E3=83=AB=E6=99=82?= =?UTF-8?q?=E3=83=AA=E3=82=B6=E3=83=AB=E3=83=88=E8=A1=A8=E7=A4=BA=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3/=20commit=E6=BC=8F=E3=82=8C=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scenes/Cooking/Scripts/CookingResult.cs | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs index e322a28d..55bb3e67 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs @@ -35,7 +35,7 @@ public class CookingResult : MonoBehaviour SetData(productData, rarityData); result.Subscribe(r => { - SetUI(r); + SetUI(r, rarityData.Rarity != ProductRarity.Normal); if (r != CornResult.Failure) { successAction?.Invoke(); @@ -77,7 +77,7 @@ public class CookingResult : MonoBehaviour rarityView.SetRarity(rarity.Rarity); } - private void SetUI(CornResult result) + private void SetUI(CornResult result, bool hasRarity) { centerOkButton.gameObject.SetActive(false); perfectButton.gameObject.SetActive(false); @@ -101,7 +101,11 @@ public class CookingResult : MonoBehaviour detailObject.SetActive(result != CornResult.Failure); explainObject.SetActive(result == CornResult.Good); - explainWithRarityObject.SetActive(result == CornResult.Perfect); + if (result == CornResult.Perfect) + { + explainWithRarityObject.SetActive(hasRarity); + explainObject.SetActive(!hasRarity); + } } private void AddStock(ProductData productData, ProductRarity rarity = ProductRarity.Normal) @@ -111,7 +115,11 @@ public class CookingResult : MonoBehaviour var remain = productData.volume; var shopSpace = Market.ShopStockCount - gameData.ShopStock.Count; var stockCount = Mathf.Min(shopSpace, remain); - gameData.ShopStock.AddRange(Enumerable.Repeat(productData.id, stockCount)); + gameData.ShopStock.AddRange(Enumerable.Repeat(new ProductStockData + { + FlavorId = productData.id, + Rarity = rarity, + }, stockCount)); remain -= stockCount; // 空タンク並び替え