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) {