From 80faf71f4058024c2e9c7eef9a9061c9c8d30bf2 Mon Sep 17 00:00:00 2001 From: kimura Date: Tue, 6 Sep 2022 18:19:38 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=AA=E3=82=B6=E3=83=AB=E3=83=88=E3=81=A7?= =?UTF-8?q?=E3=81=AE=E3=82=A8=E3=83=A9=E3=83=BC=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scenes/MiniGame/Scripts/ResultManager.cs | 33 ++++++++++--------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/ResultManager.cs b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/ResultManager.cs index 28830d5b..0e64ce2c 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/ResultManager.cs +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/ResultManager.cs @@ -157,28 +157,31 @@ namespace MyGame.Scenes.MiniGame.Scripts } // 前回獲得時の必要スコアを取得 - var prevNeedScore = sortedPlaceList.LastOrDefault(data => data.NeedScore < progressList[0].needScore)?.NeedScore ?? 0; - - foreach (var placeData in sortedPlaceList.Where(data => data.NeedScore > placeScoreData.Score)) + var prevNeedScore = 0; + if (progressList.Count > 0) { - if (placeData.recipeId != 0 && !gameData.MyRecipes.Contains(placeData.recipeId)) + prevNeedScore = sortedPlaceList.LastOrDefault(data => data.NeedScore < progressList[0].needScore)?.NeedScore ?? 0; + } + + // 次回報酬 + var nextAchievement = sortedPlaceList.FirstOrDefault(data => data.NeedScore > placeScoreData.Score); + if (nextAchievement != null) + { + if (nextAchievement.recipeId != 0 && !gameData.MyRecipes.Contains(nextAchievement.recipeId)) { - var shopData = shopDataList.FirstOrDefault(data => data.itemId == placeData.recipeId && data.Category == ItemCategory.Recipe); - if (shopData is null) + var shopData = shopDataList.FirstOrDefault(data => data.itemId == nextAchievement.recipeId && data.Category == ItemCategory.Recipe); + if (shopData != null) { - continue; + // progressList.Add((shopData.Name, shopData.GetPrefab(), placeData.NeedScore, true)); + progressList.Add((shopData.Name, recipeMalaImagePrefab, nextAchievement.NeedScore, true)); } - // progressList.Add((shopData.Name, shopData.GetPrefab(), placeData.NeedScore, true)); - progressList.Add((shopData.Name, recipeMalaImagePrefab, placeData.NeedScore, true)); - } - else if (placeData.customizeId != 0) + } else if (nextAchievement.customizeId != 0) { - var customizeData = customizeDataList.FirstOrDefault(data => data.id == placeData.customizeId); - if (customizeData is null) + var customizeData = customizeDataList.FirstOrDefault(data => data.id == nextAchievement.customizeId); + if (customizeData != null) { - continue; + progressList.Add((customizeData.Name, customizeData.GetIconPrefab(), nextAchievement.NeedScore, false)); } - progressList.Add((customizeData.Name, customizeData.GetIconPrefab(), placeData.NeedScore, false)); } }