From 69474cea6acc210fa301eb1b7af580c190f3c715 Mon Sep 17 00:00:00 2001 From: kimura Date: Wed, 2 Feb 2022 13:53:00 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=AC=E3=82=B7=E3=83=94=E4=B8=80=E8=A6=A7?= =?UTF-8?q?=E3=81=AB=E3=82=BD=E3=83=BC=E3=83=88=E9=A0=86=E3=82=92=E6=8C=87?= =?UTF-8?q?=E5=AE=9A?= 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, 7 insertions(+), 3 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeSelectDialog.cs b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeSelectDialog.cs index 882695fb..cca70a69 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeSelectDialog.cs +++ b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeSelectDialog.cs @@ -36,9 +36,13 @@ public class RecipeSelectDialog : MonoBehaviour var content = scrollRect.content; content.transform.DestroyAllChildrens(); var productDataList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.ProductDataSheet); - var shopData = SpreadsheetDataManager.Instance.GetBaseDataList(Const.ShopDataSheet); - var shopRecipes = shopData.Where(data => data.Category == ItemCategory.Recipe).Select(data => data.itemId); - var targetList = productDataList.Where(data => data.shopLevel != Const.SpecialShopLevel || shopRecipes.Contains(data.id)).ToList(); + var shopDataList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.ShopDataSheet); + var ownedRecipesList = shopDataList.Where(data => data.Category == ItemCategory.Recipe).Select(data => data.itemId).ToList(); + var targetList = productDataList + .Where(data => data.shopLevel != Const.SpecialShopLevel || ownedRecipesList.Contains(data.id)) + .OrderByDescending(data => gameData.MyRecipes.Contains(data.id)) + .ThenBy(data => ownedRecipesList.Contains(data.id)) + .ToList(); foreach (var productData in targetList) {