From d4ea31016ebe92fc6022bb7d563c13c9238a553e Mon Sep 17 00:00:00 2001 From: kimura Date: Thu, 3 Feb 2022 13:28:27 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=AC=E3=83=99=E3=83=AB=E3=82=A2=E3=83=83?= =?UTF-8?q?=E3=83=97=E6=BC=94=E5=87=BA=E6=99=82=E3=81=AB=E3=83=98=E3=83=83?= =?UTF-8?q?=E3=83=80=E3=83=BC=E3=81=AE=E3=83=AC=E3=83=99=E3=83=AB=E3=82=82?= =?UTF-8?q?=E4=B8=8A=E3=81=8C=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scenes/marketing/Scripts/ShopLevelUp.cs | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ShopLevelUp.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ShopLevelUp.cs index 774819a4..e2a3ca30 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ShopLevelUp.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ShopLevelUp.cs @@ -36,18 +36,19 @@ public class ShopLevelUp : MonoBehaviour achievementText.text = shopLevelList.FirstOrDefault(data => data.shopLevel == shopLevel)?.Achievement ?? ""; recipeNameText.text = productData?.Name ?? ""; + GameDataManager.GameData.ViewedShopLevel = shopLevel; + GameDataManager.GameData.OrderConditionCount = 0; + // レシピ開放 + if (productData != null) + { + GameDataManager.GameData.MyRecipes = new List(GameDataManager.GameData.MyRecipes){productData.id}.Distinct().ToArray(); + GameDataManager.GameData.DailyRecipeGetCount++; + } + GameDataManager.SaveGameData(); + HeartMeter.Instance.SetShopLevel(GameDataManager.GameData.ViewedShopLevel, true); + closeButton.OnClickAsObservable().Take(1).Subscribe(_ => { - GameDataManager.GameData.ViewedShopLevel = shopLevel; - GameDataManager.GameData.OrderConditionCount = 0; - // レシピ開放 - if (productData != null) - { - GameDataManager.GameData.MyRecipes = new List(GameDataManager.GameData.MyRecipes){productData.id}.Distinct().ToArray(); - GameDataManager.GameData.DailyRecipeGetCount++; - } - GameDataManager.SaveGameData(); - transform.SetLocalScale(0); backgroundAnimator.SetTrigger(CloseTrigger); this.CallWaitForSeconds(.25f, () => @@ -83,14 +84,12 @@ public class ShopLevelUp : MonoBehaviour { UpdateDialog.ShowDialog(() => { - HeartMeter.Instance.SetShopLevel(GameDataManager.GameData.ViewedShopLevel, true); LocalCacheManager.Load(CallbackTag, null)?.Invoke(); LocalCacheManager.Remove(CallbackTag); }); } else { - HeartMeter.Instance.SetShopLevel(GameDataManager.GameData.ViewedShopLevel, true); LocalCacheManager.Load(CallbackTag, null)?.Invoke(); LocalCacheManager.Remove(CallbackTag); }