リザルトでのエラーを修正
This commit is contained in:
parent
931fcd566b
commit
80faf71f40
|
@ -157,28 +157,31 @@ namespace MyGame.Scenes.MiniGame.Scripts
|
||||||
}
|
}
|
||||||
|
|
||||||
// 前回獲得時の必要スコアを取得
|
// 前回獲得時の必要スコアを取得
|
||||||
var prevNeedScore = sortedPlaceList.LastOrDefault(data => data.NeedScore < progressList[0].needScore)?.NeedScore ?? 0;
|
var prevNeedScore = 0;
|
||||||
|
if (progressList.Count > 0)
|
||||||
foreach (var placeData in sortedPlaceList.Where(data => data.NeedScore > placeScoreData.Score))
|
|
||||||
{
|
{
|
||||||
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);
|
var shopData = shopDataList.FirstOrDefault(data => data.itemId == nextAchievement.recipeId && data.Category == ItemCategory.Recipe);
|
||||||
if (shopData is null)
|
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));
|
} else if (nextAchievement.customizeId != 0)
|
||||||
progressList.Add((shopData.Name, recipeMalaImagePrefab, placeData.NeedScore, true));
|
|
||||||
}
|
|
||||||
else if (placeData.customizeId != 0)
|
|
||||||
{
|
{
|
||||||
var customizeData = customizeDataList.FirstOrDefault(data => data.id == placeData.customizeId);
|
var customizeData = customizeDataList.FirstOrDefault(data => data.id == nextAchievement.customizeId);
|
||||||
if (customizeData is null)
|
if (customizeData != null)
|
||||||
{
|
{
|
||||||
continue;
|
progressList.Add((customizeData.Name, customizeData.GetIconPrefab(), nextAchievement.NeedScore, false));
|
||||||
}
|
}
|
||||||
progressList.Add((customizeData.Name, customizeData.GetIconPrefab(), placeData.NeedScore, false));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue