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); }