From 769a8286ddfcbef5bd12a01cbf58b8286abcf495 Mon Sep 17 00:00:00 2001 From: kimura Date: Mon, 11 Oct 2021 16:34:19 +0900 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E9=87=8F=E6=B3=A8=E6=96=87=E8=A1=A8?= =?UTF-8?q?=E7=A4=BA=E3=81=8B=E3=82=89=E6=89=80=E6=8C=81=E6=95=B0=E3=82=92?= =?UTF-8?q?=E9=9D=9E=E8=A1=A8=E7=A4=BA/=20=E3=82=BF=E3=83=B3=E3=82=AF?= =?UTF-8?q?=E3=81=8C=E7=A9=BA=E3=81=AE=E3=81=A8=E3=81=8D=E3=81=AE=E3=82=A8?= =?UTF-8?q?=E3=83=A9=E3=83=BC=E6=8A=91=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scenes/marketing/Scripts/ProductManagementTankView.cs | 5 ++++- .../Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagementTankView.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagementTankView.cs index 41d29c1d..a8b170ac 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagementTankView.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagementTankView.cs @@ -91,7 +91,10 @@ public class ProductManagementTankView : MonoBehaviour tankStock.text = isEmply.Value ? tankEmptyText : String.Format(tankStockFormat, tank.Stock, tank.Capacity); rarityView.SetHasRarity(tank.Stocks); packageImageTarget.DestroyAllChildrens(); - Instantiate(productList.FirstOrDefault(data => data.id == tank.FlavorId).GetIconPrefab(), packageImageTarget); + if (productList.FirstOrDefault(data => data.id == tank.FlavorId) is ProductData productData) + { + Instantiate(productData.GetIconPrefab(), packageImageTarget); + } } public void SetState(TankState tankState) diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs index b31bd80e..d4644a53 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs +++ b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs @@ -100,6 +100,7 @@ public class RecipeDetailView : MonoBehaviour case ProductViewType.BulkOrder: flavorVolumeObject.SetActive(false); flavorPrice.transform.parent.gameObject.SetActive(false); + flavorStock.transform.parent.gameObject.SetActive(false); flavorVolume.transform.parent.gameObject.SetActive(true); break; default: