From a79d8b188459a3a512f967b9e87a75314ca7a769 Mon Sep 17 00:00:00 2001
From: kimura <kimura@usaya.jp>
Date: Mon, 13 Dec 2021 11:57:51 +0900
Subject: [PATCH] =?UTF-8?q?=E3=83=9F=E3=83=83=E3=82=B7=E3=83=A7=E3=83=B3?=
 =?UTF-8?q?=E3=82=AB=E3=82=A6=E3=83=B3=E3=82=BF=E3=83=BC=E3=83=AA=E3=82=BB?=
 =?UTF-8?q?=E3=83=83=E3=83=88=E3=82=92=E8=BF=BD=E5=8A=A0=E3=83=BB=E3=83=AC?=
 =?UTF-8?q?=E3=82=B7=E3=83=94=E8=BF=BD=E5=8A=A0=E3=82=BF=E3=82=A4=E3=83=9F?=
 =?UTF-8?q?=E3=83=B3=E3=82=B0=E3=82=92=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Scenes/Main/Scripts/KitchenManager.cs     |  3 +++
 .../Scenes/marketing/Scripts/ShopLevelUp.cs   | 20 +++++++++++++------
 .../recipe/Scripts/RecipeSelectDialog.cs      | 12 -----------
 3 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs
index 5565eba6..869b0a3c 100644
--- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs
+++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs
@@ -51,6 +51,9 @@ public class KitchenManager : MonoBehaviour
                     gameData.Material.Add(materialData);
                 }
                 materialData.Amount++;
+                // ミッションカウンターリセット
+                GameDataManager.GameData.ResetNormalTotalCount();
+                GameDataManager.GameData.ResetDailyTotalCount();
                 
                 // 店舗レベル1達成表示
                 ShopLevelUp.ShowDialog(1, () =>
diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ShopLevelUp.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ShopLevelUp.cs
index 7a3b6b28..690aeb5b 100644
--- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ShopLevelUp.cs
+++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ShopLevelUp.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using MyGame.Scenes.Main.Scripts;
 using TMPro;
@@ -28,10 +29,23 @@ public class ShopLevelUp : MonoBehaviour
         shopLevel = LocalCacheManager.Load<int>(DataTag);
         var scriptList = SpreadsheetDataManager.Instance.GetBaseDataList<BrotherScriptData>(Const.ScriptDataSheet);
         var targetScriptList = scriptList.Where(data => data.id == shopLevel).ToList();
+        var productList = SpreadsheetDataManager.Instance.GetBaseDataList<ProductData>(Const.ProductDataSheet);
+        var shopLevelList = SpreadsheetDataManager.Instance.GetBaseDataList<ShopLevelData>(Const.ShopLevelDataSheet);
+        var productData = productList.FirstOrDefault(data => data.shopLevel == shopLevel);
+        shopLevelText.text = shopLevel.ToString();
+        achievementText.text = shopLevelList.FirstOrDefault(data => data.shopLevel == shopLevel)?.achievement ?? "";
+        recipeNameText.text = productData?.name ?? "";
+        
         closeButton.OnClickAsObservable().Take(1).Subscribe(_ =>
         {
             GameDataManager.GameData.ViewedShopLevel = shopLevel;
             GameDataManager.GameData.OrderConditionCount = 0;
+            // レシピ開放
+            if (productData != null)
+            {
+                GameDataManager.GameData.MyRecipes = new List<int>(GameDataManager.GameData.MyRecipes){productData.id}.Distinct().ToArray();
+                GameDataManager.GameData.DailyRecipeGetCount++;
+            }
             GameDataManager.SaveGameData();
             
             transform.SetLocalScale(0);
@@ -55,12 +69,6 @@ public class ShopLevelUp : MonoBehaviour
             });
         }).AddTo(this);
 
-        var productList = SpreadsheetDataManager.Instance.GetBaseDataList<ProductData>(Const.ProductDataSheet);
-        var shopLevelList = SpreadsheetDataManager.Instance.GetBaseDataList<ShopLevelData>(Const.ShopLevelDataSheet);
-        shopLevelText.text = shopLevel.ToString();
-        achievementText.text = shopLevelList.FirstOrDefault(data => data.shopLevel == shopLevel)?.achievement ?? "";
-        recipeNameText.text = productList.FirstOrDefault(data => data.shopLevel == shopLevel)?.name ?? "";
-
         summaryObject.SetActive(false);
         this.CallWaitForSeconds(1f, () =>
         {
diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeSelectDialog.cs b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeSelectDialog.cs
index 602159dd..882695fb 100644
--- a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeSelectDialog.cs
+++ b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeSelectDialog.cs
@@ -45,19 +45,7 @@ public class RecipeSelectDialog : MonoBehaviour
             var view = Instantiate(recipePrefab, content.transform);
             view.SetRecipe(productData);
             // 所持レシピ確認
-            var hasRecipe = false;
             if (gameData.MyRecipes.Contains(productData.id))
-            {
-                hasRecipe = true;
-            }
-            else if (productData.shopLevel <= gameData.ViewedShopLevel)
-            {
-                // レシピ開放
-                gameData.MyRecipes = new List<int>(gameData.MyRecipes){productData.id}.ToArray();
-                gameData.DailyRecipeGetCount++;
-                hasRecipe = true;
-            }
-            if (hasRecipe)
             {
                 view.SetLockPanel(false);
                 view.RecipeClickObservable.ThrottleFirst(TimeSpan.FromSeconds(.3f)).Subscribe(_ =>