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

リザルトでのエラーを修正

This commit is contained in:
kimura 2022-09-06 18:19:38 +09:00
parent 931fcd566b
commit 80faf71f40
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/ResultManager.cs
View File

@ -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)
{
prevNeedScore = sortedPlaceList.LastOrDefault(data => data.NeedScore < progressList[0].needScore)?.NeedScore ?? 0;
}
foreach (var placeData in sortedPlaceList.Where(data => data.NeedScore > placeScoreData.Score))
// 次回報酬
var nextAchievement = sortedPlaceList.FirstOrDefault(data => data.NeedScore > placeScoreData.Score);
if (nextAchievement != null)
{
if (placeData.recipeId != 0 && !gameData.MyRecipes.Contains(placeData.recipeId))
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, placeData.NeedScore, true));
progressList.Add((shopData.Name, recipeMalaImagePrefab, nextAchievement.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));
}
}