From 973384ccfd30a94939cc31b8dcd2c8028afe9eba Mon Sep 17 00:00:00 2001 From: kimura Date: Thu, 3 Feb 2022 10:28:42 +0900 Subject: [PATCH 1/7] =?UTF-8?q?addstock=E3=82=92ProductStockData=E3=81=AB?= =?UTF-8?q?=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scenes/Cooking/Scripts/CookingResult.cs | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs index 1cd5a492..4a124990 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs @@ -212,15 +212,25 @@ public class CookingResult : MonoBehaviour public static void AddStock(ProductData productData, ProductRarity rarity = ProductRarity.Normal) { + AddStock(new ProductStockData{FlavorId = productData.id, Stock = productData.volume, Rarity = rarity}); + GameDataManager.SaveGameData(); + } + + public static void AddStock(ProductStockData productStockData) + { + if (productStockData.Stock == 0) + { + return; + } var gameData = GameDataManager.GameData; // 店頭の空きに追加 - var remain = productData.volume; + var remain = productStockData.Stock; var shopSpace = Market.ShopStockCount - gameData.ShopStock.Count; var stockCount = Mathf.Min(shopSpace, remain); gameData.ShopStock.AddRange(Enumerable.Repeat(new ProductStockData { - FlavorId = productData.id, - Rarity = rarity, + FlavorId = productStockData.FlavorId, + Rarity = productStockData.Rarity, }, stockCount)); remain -= stockCount; // ShopStockに補充された場合、DisplayFlavors更新 @@ -235,7 +245,7 @@ public class CookingResult : MonoBehaviour // 空きのタンクを確認 gameData.StorageTanks .Select((tank, i) => (tank, i)) - .Where(x => x.tank.IsEmpty || x.tank.FlavorId == productData.id && !x.tank.IsFull) + .Where(x => x.tank.IsEmpty || x.tank.FlavorId == productStockData.FlavorId && !x.tank.IsFull) .Select(x => (x.i, space: x.tank.Capacity - x.tank.Stock)) .OrderBy(x => x.space) .ToList() @@ -248,14 +258,13 @@ public class CookingResult : MonoBehaviour // タンクが空ならフレーバー設定 if (gameData.StorageTanks[x.i].IsEmpty) { - gameData.StorageTanks[x.i].FlavorId = productData.id; + gameData.StorageTanks[x.i].FlavorId = productStockData.FlavorId; } // タンクに追加 stockCount = Mathf.Min(x.space, remain); - gameData.StorageTanks[x.i].AddStock(rarity, stockCount); + gameData.StorageTanks[x.i].AddStock(productStockData.Rarity, stockCount); remain -= stockCount; }); - GameDataManager.SaveGameData(); } } From 0477913ee5bb5b7c99a300eba8583c0b207c56df Mon Sep 17 00:00:00 2001 From: kimura Date: Thu, 3 Feb 2022 10:50:24 +0900 Subject: [PATCH 2/7] =?UTF-8?q?=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88?= =?UTF-8?q?=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 | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs index 4a124990..f1c1992d 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs @@ -45,6 +45,7 @@ public class CookingResult : MonoBehaviour result.Value = resultData; SetData(productData, rarityData, viewType); + // チュートリアル時 if (!GameDataManager.GameData.FinishedFlags.HasFlag(TutorialFlag.FirstPlay)) { // ボタン非表示 @@ -64,6 +65,8 @@ public class CookingResult : MonoBehaviour }).AddTo(this); return; } + + // ボタン表示 successAction?.Invoke(); okButton.gameObject.SetActive(true); okButton.OnClickAsObservable().Take(1).Subscribe(_ => @@ -75,16 +78,17 @@ public class CookingResult : MonoBehaviour return; } - result.Subscribe(r => + // UI用 + result.Subscribe(cornResult => { - SetUI(r, viewType, CheckMakeOne(r, productData)); - if (r != CornResult.Failure) + SetUI(cornResult, viewType, CheckMakeOne(cornResult, productData)); + if (cornResult != CornResult.Failure) { successAction?.Invoke(); } }).AddTo(this); - // 各種ボタン押下後、獲得処理 + // 獲得する if (viewType == ProductViewType.Default) { Market.Instance.IsPause.Value = true; @@ -113,6 +117,7 @@ public class CookingResult : MonoBehaviour }).AddTo(this); } + // 大成功にする perfectButton.OnClickAsObservable().ThrottleFirst(TimeSpan.FromSeconds(.3f)).Subscribe(_ => { // 広告視聴後、結果上書き @@ -121,11 +126,15 @@ public class CookingResult : MonoBehaviour result.Value = CornResult.Perfect; }); }).AddTo(this); + + // 破棄する destructionButton.OnClickAsObservable().Take(1).Subscribe(_ => { // 遷移 TransitionManager.Instance.LoadScene(GameScenes.Main); }).AddTo(this); + + // もう一度作る makeOneButton.OnClickAsObservable().Take(1).Subscribe(_ => { // 獲得、遷移 From 1108e17eb6069929072913a8453f1fd1b47b35cb Mon Sep 17 00:00:00 2001 From: kimura Date: Thu, 3 Feb 2022 12:09:48 +0900 Subject: [PATCH 3/7] =?UTF-8?q?=E3=82=BF=E3=82=B9=E3=82=AF=E3=82=AD?= =?UTF-8?q?=E3=83=AB=E5=BE=A9=E5=B8=B0=E7=94=A8=E3=81=AE=E3=83=9D=E3=83=83?= =?UTF-8?q?=E3=83=97=E3=82=B3=E3=83=BC=E3=83=B3=E5=8A=A0=E7=AE=97=E5=87=A6?= =?UTF-8?q?=E7=90=86=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs | 6 ++++++ popcorn/Assets/MyGame/Scripts/GameDataManager.cs | 7 +++++-- popcorn/Assets/MyGame/Scripts/InitializeUnitySettings.cs | 2 ++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs index f1c1992d..519f2f61 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs @@ -219,6 +219,12 @@ public class CookingResult : MonoBehaviour return hasSpace && hasMaterials; } + public static void MoveStock(ProductStockData productStockData) + { + AddStock(productStockData); + productStockData.Stock = 0; + } + public static void AddStock(ProductData productData, ProductRarity rarity = ProductRarity.Normal) { AddStock(new ProductStockData{FlavorId = productData.id, Stock = productData.volume, Rarity = rarity}); diff --git a/popcorn/Assets/MyGame/Scripts/GameDataManager.cs b/popcorn/Assets/MyGame/Scripts/GameDataManager.cs index c6c44f18..81b65cbe 100644 --- a/popcorn/Assets/MyGame/Scripts/GameDataManager.cs +++ b/popcorn/Assets/MyGame/Scripts/GameDataManager.cs @@ -142,8 +142,10 @@ public sealed class GameData { public int WaitAddCoin; [DataMember(Name = "Data41")] public int WaitAddHeart; - - // mission + [DataMember(Name = "Data42")] + public ProductStockData WaitAddStock; + + // mission [DataMember(Name = "Data1001")] public int TotalAddCoin { get; private set; } [DataMember(Name = "Data1002")] @@ -387,6 +389,7 @@ public sealed class GameData { dailyMissionIdArray = dailyMissionIdArray ?? new int[0]; dailyMissionAchievedIdArray = dailyMissionAchievedIdArray ?? new int[0]; DailyTotalSalesList = DailyTotalSalesList ?? new List(); + WaitAddStock = WaitAddStock ?? new ProductStockData{Rarity = ProductRarity.Normal}; } private Dictionary ArrayToDictionary(KeyValueOfintint[] array){ var dictionary = new Dictionary(); diff --git a/popcorn/Assets/MyGame/Scripts/InitializeUnitySettings.cs b/popcorn/Assets/MyGame/Scripts/InitializeUnitySettings.cs index cd7ed8de..cf3f0ee7 100644 --- a/popcorn/Assets/MyGame/Scripts/InitializeUnitySettings.cs +++ b/popcorn/Assets/MyGame/Scripts/InitializeUnitySettings.cs @@ -30,6 +30,8 @@ public sealed class InitializeUnitySettings : MonoBehaviour { // 遅延させていたパラメータを追加 GameDataManager.GameData.MoveAllWaitValue(); + // 調理後リザルトでの仮獲得データを反映（タスクキル対策） + CookingResult.MoveStock(GameDataManager.GameData.WaitAddStock); GameDataManager.SaveGameData(); } } From 8032d161757834922d46d4669b833601401d86c2 Mon Sep 17 00:00:00 2001 From: kimura Date: Thu, 3 Feb 2022 12:12:08 +0900 Subject: [PATCH 4/7] =?UTF-8?q?=E6=9D=90=E6=96=99=E6=B6=88=E8=B2=BB?= =?UTF-8?q?=E3=82=BF=E3=82=A4=E3=83=9F=E3=83=B3=E3=82=B0=E3=82=92=E8=AA=BF?= =?UTF-8?q?=E7=90=86=E3=83=AA=E3=82=B6=E3=83=AB=E3=83=88=E3=81=AB=E5=A4=89?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scenes/Cooking/Scripts/CookingResult.cs | 51 ++++++++++++++----- .../Scenes/recipe/Scripts/RecipeDetailView.cs | 2 - 2 files changed, 39 insertions(+), 14 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs index 519f2f61..9d124a18 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs @@ -44,6 +44,39 @@ public class CookingResult : MonoBehaviour var (rarityData, resultData, successAction) = LocalCacheManager.Load<(RarityData, CornResult, Action)>(PopcornGameManager.CookingResultDataTag); result.Value = resultData; SetData(productData, rarityData, viewType); + + // 材料消費&仮獲得 + RecipeDetailView.ConsumeMaterial(productData); + if (viewType == ProductViewType.Default) + { + result.Subscribe(cornResult => + { + // 仮獲得データ登録 + GameDataManager.GameData.WaitAddStock.FlavorId = productData.id; + GameDataManager.GameData.WaitAddStock.Stock = cornResult == CornResult.Failure ? 0 : productData.volume; + GameDataManager.GameData.WaitAddStock.Rarity = cornResult == CornResult.Perfect ? rarityData.Rarity : ProductRarity.Normal; + GameDataManager.SaveGameData(); + }).AddTo(this); + } + else + { + // 大量注文時処理 + var materialNumber = LocalCacheManager.Load(BulkOrder.MaterialNumberTag); + result.Where(x => x != CornResult.Failure ).Subscribe(cornResult => + { + if (!(GameDataManager.GameData.CompletedProductList.FirstOrDefault(data => data.Number == materialNumber) is BulkOrderResultData bulkOrderResultData)) + { + bulkOrderResultData = new BulkOrderResultData + { + Number = materialNumber + }; + GameDataManager.GameData.CompletedProductList.Add(bulkOrderResultData); + } + // レア上書き + bulkOrderResultData.Rarity = cornResult == CornResult.Perfect ? rarityData.Rarity : ProductRarity.Normal; + GameDataManager.SaveGameData(); + }).AddTo(this); + } // チュートリアル時 if (!GameDataManager.GameData.FinishedFlags.HasFlag(TutorialFlag.FirstPlay)) @@ -72,7 +105,8 @@ public class CookingResult : MonoBehaviour okButton.OnClickAsObservable().Take(1).Subscribe(_ => { // 獲得、遷移 - AddStock(productData, resultData == CornResult.Perfect ? rarityData.Rarity : ProductRarity.Normal); + MoveStock(GameDataManager.GameData.WaitAddStock); + GameDataManager.SaveGameData(); TransitionManager.Instance.LoadScene(GameScenes.Main); }).AddTo(this); return; @@ -95,7 +129,8 @@ public class CookingResult : MonoBehaviour okButton.OnClickAsObservable().Take(1).Subscribe(_ => { // 獲得、遷移 - AddStock(productData, result.Value == CornResult.Perfect ? rarityData.Rarity : ProductRarity.Normal); + MoveStock(GameDataManager.GameData.WaitAddStock); + GameDataManager.SaveGameData(); Market.Instance.IsPause.Value = false; TransitionManager.Instance.LoadScene(GameScenes.Main); }).AddTo(this); @@ -103,16 +138,8 @@ public class CookingResult : MonoBehaviour else { // 大量注文時処理 - var materialNumber = LocalCacheManager.Load(BulkOrder.MaterialNumberTag); okButton.OnClickAsObservable().Take(1).Subscribe(_ => { - // 獲得、遷移 - if (!GameDataManager.GameData.CompletedProductList.Exists(data => data.Number == materialNumber)) - { - var rarity = result.Value == CornResult.Perfect ? rarityData.Rarity : ProductRarity.Normal; - GameDataManager.GameData.CompletedProductList.Add(new BulkOrderResultData(){Number = materialNumber, Rarity = rarity}); - GameDataManager.SaveGameData(); - } TransitionManager.Instance.LoadScene(GameScenes.Main); }).AddTo(this); } @@ -138,8 +165,8 @@ public class CookingResult : MonoBehaviour makeOneButton.OnClickAsObservable().Take(1).Subscribe(_ => { // 獲得、遷移 - AddStock(productData, result.Value == CornResult.Perfect ? rarityData.Rarity : ProductRarity.Normal); - RecipeDetailView.ConsumeMaterial(productData); + MoveStock(GameDataManager.GameData.WaitAddStock); + GameDataManager.SaveGameData(); Market.Instance.IsPause.Value = false; SoundManager.Instance.ChangeVolumeUniqueBGM(1f); TransitionManager.Instance.UnloadScene(GameScenes.CookingResults); diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs index 4c073292..5c12e7a2 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs +++ b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs @@ -67,8 +67,6 @@ public class RecipeDetailView : MonoBehaviour nextButton.OnClickAsObservable().Take(1).Subscribe(_ => { LocalCacheManager.Save(PopcornGameManager.PanDataTag, panSelector.SelectedPanData.Value); - // 消費 - ConsumeMaterial(data); TransitionManager.Instance.LoadScene(GameScenes.Cooking); }).AddTo(this); From e7f8dd8cc258d74535b348cc739fb0bd5abcc8d9 Mon Sep 17 00:00:00 2001 From: kimura Date: Thu, 3 Feb 2022 12:16:35 +0900 Subject: [PATCH 5/7] =?UTF-8?q?=E3=83=AA=E3=83=95=E3=82=A1=E3=82=AF?= =?UTF-8?q?=E3=82=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scenes/Cooking/Scripts/CookingResult.cs | 47 +++++++++---------- 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs index 9d124a18..14654c4c 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs @@ -121,6 +121,16 @@ public class CookingResult : MonoBehaviour successAction?.Invoke(); } }).AddTo(this); + + // 大成功にする + perfectButton.OnClickAsObservable().ThrottleFirst(TimeSpan.FromSeconds(.3f)).Subscribe(_ => + { + // 広告視聴後、結果上書き + GetRewardDialog.ShowPerfectPopcornDialog(() => + { + result.Value = CornResult.Perfect; + }); + }).AddTo(this); // 獲得する if (viewType == ProductViewType.Default) @@ -134,6 +144,18 @@ public class CookingResult : MonoBehaviour Market.Instance.IsPause.Value = false; TransitionManager.Instance.LoadScene(GameScenes.Main); }).AddTo(this); + + // もう一度作る + makeOneButton.OnClickAsObservable().Take(1).Subscribe(_ => + { + // 獲得、遷移 + MoveStock(GameDataManager.GameData.WaitAddStock); + GameDataManager.SaveGameData(); + Market.Instance.IsPause.Value = false; + SoundManager.Instance.ChangeVolumeUniqueBGM(1f); + TransitionManager.Instance.UnloadScene(GameScenes.CookingResults); + LocalCacheManager.Load(PopcornGameManager.RestartCallbackTag, null)?.Invoke(); + }).AddTo(this); } else { @@ -143,35 +165,12 @@ public class CookingResult : MonoBehaviour TransitionManager.Instance.LoadScene(GameScenes.Main); }).AddTo(this); } - - // 大成功にする - perfectButton.OnClickAsObservable().ThrottleFirst(TimeSpan.FromSeconds(.3f)).Subscribe(_ => - { - // 広告視聴後、結果上書き - GetRewardDialog.ShowPerfectPopcornDialog(() => - { - result.Value = CornResult.Perfect; - }); - }).AddTo(this); - + // 破棄する destructionButton.OnClickAsObservable().Take(1).Subscribe(_ => { - // 遷移 TransitionManager.Instance.LoadScene(GameScenes.Main); }).AddTo(this); - - // もう一度作る - makeOneButton.OnClickAsObservable().Take(1).Subscribe(_ => - { - // 獲得、遷移 - MoveStock(GameDataManager.GameData.WaitAddStock); - GameDataManager.SaveGameData(); - Market.Instance.IsPause.Value = false; - SoundManager.Instance.ChangeVolumeUniqueBGM(1f); - TransitionManager.Instance.UnloadScene(GameScenes.CookingResults); - LocalCacheManager.Load(PopcornGameManager.RestartCallbackTag, null)?.Invoke(); - }).AddTo(this); } private void SetData(ProductData recipe, RarityData rarity, ProductViewType viewType) From d924f2741d366831a9bca5692230c59e148ffe34 Mon Sep 17 00:00:00 2001 From: kimura Date: Thu, 3 Feb 2022 12:17:19 +0900 Subject: [PATCH 6/7] =?UTF-8?q?=E3=83=81=E3=83=A5=E3=83=BC=E3=83=88?= =?UTF-8?q?=E3=83=AA=E3=82=A2=E3=83=AB=E6=99=82=E3=81=AE=E3=83=87=E3=83=BC?= =?UTF-8?q?=E3=82=BF=E5=88=9D=E6=9C=9F=E5=8C=96=E8=BF=BD=E8=A8=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs index 7dd5290c..624295f0 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs @@ -83,9 +83,11 @@ public class KitchenManager : MonoBehaviour gameData.Material.Add(materialData); } materialData.Amount++; + gameData.StorageTanks.Clear(); + gameData.ShopStock.Clear(); // ミッションカウンターリセット - GameDataManager.GameData.ResetNormalTotalCount(); - GameDataManager.GameData.ResetDailyTotalCount(); + gameData.ResetNormalTotalCount(); + gameData.ResetDailyTotalCount(); // 店舗レベル1達成表示 ShopLevelUp.ShowDialog(1, () => From d4ea31016ebe92fc6022bb7d563c13c9238a553e Mon Sep 17 00:00:00 2001 From: kimura Date: Thu, 3 Feb 2022 13:28:27 +0900 Subject: [PATCH 7/7] =?UTF-8?q?=E3=83=AC=E3=83=99=E3=83=AB=E3=82=A2?= =?UTF-8?q?=E3=83=83=E3=83=97=E6=BC=94=E5=87=BA=E6=99=82=E3=81=AB=E3=83=98?= =?UTF-8?q?=E3=83=83=E3=83=80=E3=83=BC=E3=81=AE=E3=83=AC=E3=83=99=E3=83=AB?= =?UTF-8?q?=E3=82=82=E4=B8=8A=E3=81=8C=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= =?UTF-8?q?=E4=BF=AE=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); }