yangwu
/
popcorn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/1.4.0' of bitbucket.org:usaya/popcorn into feature/1.4.0

This commit is contained in:
koya_15 2022-06-03 20:01:59 +09:00
parent 63fcfb1eeb 3818458d9a
commit 0199bb7ebd
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
popcorn/Assets/MyGame/Resources/PopcornToppings/package_salt_ butter.prefab → popcorn/Assets/MyGame/Resources/PopcornToppings/package_salt_butter.prefab
View File

0
popcorn/Assets/MyGame/Resources/PopcornToppings/package_salt_ butter.prefab.meta → popcorn/Assets/MyGame/Resources/PopcornToppings/package_salt_butter.prefab.meta
View File

10
popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeSelectDialog.cs
View File

@ -49,7 +49,7 @@ public class RecipeSelectDialog : MonoBehaviour
var view = Instantiate(recipePrefab, content.transform); var view = Instantiate(recipePrefab, content.transform);
view.SetRecipe(productData); view.SetRecipe(productData);
// 所持レシピ確認 // 所持レシピ確認
if (gameData.MyRecipes.Contains(productData.id)) // if (gameData.MyRecipes.Contains(productData.id))
{ {
view.SetLockPanel(false); view.SetLockPanel(false);
view.RecipeClickObservable.ThrottleFirst(TimeSpan.FromSeconds(.3f)).Subscribe(_ => view.RecipeClickObservable.ThrottleFirst(TimeSpan.FromSeconds(.3f)).Subscribe(_ =>
@ -58,10 +58,10 @@ public class RecipeSelectDialog : MonoBehaviour
RecipeDetailView.ShowDialog(); RecipeDetailView.ShowDialog();
}).AddTo(this); }).AddTo(this);
} }
else // else
{ // {
view.SetLockPanel(true); // view.SetLockPanel(true);
} // }
} }
LayoutRebuilder.ForceRebuildLayoutImmediate(content); LayoutRebuilder.ForceRebuildLayoutImmediate(content);
scrollRect.verticalNormalizedPosition = 1; scrollRect.verticalNormalizedPosition = 1;