From 2b29cf4e5587be7a15ee78b553fd2bfcfb4192fb Mon Sep 17 00:00:00 2001 From: kimura Date: Fri, 3 Jun 2022 19:53:04 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=E3=83=88=E3=83=83=E3=83=94=E3=83=B3?= =?UTF-8?q?=E3=82=B0=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{package_salt_ butter.prefab => package_salt_butter.prefab} | 0 ...e_salt_ butter.prefab.meta => package_salt_butter.prefab.meta} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename popcorn/Assets/MyGame/Resources/PopcornToppings/{package_salt_ butter.prefab => package_salt_butter.prefab} (100%) rename popcorn/Assets/MyGame/Resources/PopcornToppings/{package_salt_ butter.prefab.meta => package_salt_butter.prefab.meta} (100%) diff --git a/popcorn/Assets/MyGame/Resources/PopcornToppings/package_salt_ butter.prefab b/popcorn/Assets/MyGame/Resources/PopcornToppings/package_salt_butter.prefab similarity index 100% rename from popcorn/Assets/MyGame/Resources/PopcornToppings/package_salt_ butter.prefab rename to popcorn/Assets/MyGame/Resources/PopcornToppings/package_salt_butter.prefab diff --git a/popcorn/Assets/MyGame/Resources/PopcornToppings/package_salt_ butter.prefab.meta b/popcorn/Assets/MyGame/Resources/PopcornToppings/package_salt_butter.prefab.meta similarity index 100% rename from popcorn/Assets/MyGame/Resources/PopcornToppings/package_salt_ butter.prefab.meta rename to popcorn/Assets/MyGame/Resources/PopcornToppings/package_salt_butter.prefab.meta From 3818458d9abc2487674eeb706e354d5eb6e3f809 Mon Sep 17 00:00:00 2001 From: kimura Date: Fri, 3 Jun 2022 20:00:31 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=80=E6=99=82=E7=9A=84=E3=81=AB?= =?UTF-8?q?=E3=83=AC=E3=82=B7=E3=83=94=E5=85=A8=E9=96=8B=E6=94=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyGame/Scenes/recipe/Scripts/RecipeSelectDialog.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeSelectDialog.cs b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeSelectDialog.cs index cca70a69..3d16788f 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeSelectDialog.cs +++ b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeSelectDialog.cs @@ -49,7 +49,7 @@ public class RecipeSelectDialog : MonoBehaviour var view = Instantiate(recipePrefab, content.transform); view.SetRecipe(productData); // 所持レシピ確認 - if (gameData.MyRecipes.Contains(productData.id)) + // if (gameData.MyRecipes.Contains(productData.id)) { view.SetLockPanel(false); view.RecipeClickObservable.ThrottleFirst(TimeSpan.FromSeconds(.3f)).Subscribe(_ => @@ -58,10 +58,10 @@ public class RecipeSelectDialog : MonoBehaviour RecipeDetailView.ShowDialog(); }).AddTo(this); } - else - { - view.SetLockPanel(true); - } + // else + // { + // view.SetLockPanel(true); + // } } LayoutRebuilder.ForceRebuildLayoutImmediate(content); scrollRect.verticalNormalizedPosition = 1;