From 8baa58a7ec229e778bfb48a073212be85dc16763 Mon Sep 17 00:00:00 2001 From: kimura Date: Wed, 6 Jul 2022 10:23:52 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=E3=83=AC=E3=82=B7=E3=83=94=E7=8D=B2?= =?UTF-8?q?=E5=BE=97=E9=80=9A=E7=9F=A5=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- popcorn/Assets/MyGame/Scenes/shopping/Scripts/Shopping.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Scripts/Shopping.cs b/popcorn/Assets/MyGame/Scenes/shopping/Scripts/Shopping.cs index 62044d39..50243cb4 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Scripts/Shopping.cs +++ b/popcorn/Assets/MyGame/Scenes/shopping/Scripts/Shopping.cs @@ -193,9 +193,11 @@ public class Shopping : MonoBehaviour public static bool CheckEarnedRecipe() { - var shopDataList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.ShopDataSheet); + var shopDataList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.ShopDataSheet) + .Where(data => !data.IsHide) + .Where(data => data.Category == ItemCategory.Recipe); var adCount = GameDataManager.GameData.adCount; - foreach (var shopData in shopDataList.Where(data => data.Category == ItemCategory.Recipe)) + foreach (var shopData in shopDataList) { if (GetItemAmount(shopData) > 0) continue; if (shopData.price <= adCount) From 77836e075cfcea12fa52aff202bf6d9a677c24d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B0=B4=E8=B0=B7=E5=9C=AD=E5=90=BE?= Date: Wed, 6 Jul 2022 10:49:02 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=E3=82=B9=E3=83=97=E3=83=AC=E3=83=83?= =?UTF-8?q?=E3=83=89=E3=82=B7=E3=83=BC=E3=83=88=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- popcorn/Assets/Resources/I2Languages.asset | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/popcorn/Assets/Resources/I2Languages.asset b/popcorn/Assets/Resources/I2Languages.asset index 80b7be17..723f62a9 100644 --- a/popcorn/Assets/Resources/I2Languages.asset +++ b/popcorn/Assets/Resources/I2Languages.asset @@ -1683,10 +1683,10 @@ MonoBehaviour: Description: Languages: - ui_button_icon_Footer_MaterialProcurement_logo - - Material_zh/UI/ui_button_icon_Footer_MaterialProcurement_logo_zh[ui_button_icon_Footer_MaterialProcurement_logo_zh] - - Material_zh/UI/ui_button_icon_Footer_MaterialProcurement_logo_zh[ui_button_icon_Footer_MaterialProcurement_logo_zh] - - Material_ko/UI/ui_button_icon_Footer_MaterialProcurement_logo_ko[ui_button_icon_Footer_MaterialProcurement_logo_ko] - - Material_en/UI/ui_button_icon_Footer_MaterialProcurement_logo_en[ui_button_icon_Footer_MaterialProcurement_logo_en] + - + - + - + - Flags: 0000000000 Languages_Touch: [] - Term: ui_button_icon_Footer_MaterialProcurement_logo_key @@ -1694,10 +1694,10 @@ MonoBehaviour: Description: Languages: - ui_button_icon_Footer_MaterialProcurement_logo_key - - Material_zh/UI/ui_button_icon_Footer_MaterialProcurement_logo_key_zh[ui_button_icon_Footer_MaterialProcurement_logo_key_zh] - - Material_zh/UI/ui_button_icon_Footer_MaterialProcurement_logo_key_zh[ui_button_icon_Footer_MaterialProcurement_logo_key_zh] - - Material_ko/UI/ui_button_icon_Footer_MaterialProcurement_logo_key_ko[ui_button_icon_Footer_MaterialProcurement_logo_key_ko] - - Material_en/UI/ui_button_icon_Footer_MaterialProcurement_logo_key_en[ui_button_icon_Footer_MaterialProcurement_logo_key_en] + - + - + - + - Flags: 0000000000 Languages_Touch: [] - Term: ui_button_icon_movie_logo_Procurement