Add condition handling for AllSong OdaiType on dani page
This commit is contained in:
shiibe
parent
de1a50682e
commit
e090ec08ab
@ -11,14 +11,15 @@
|
||||
<MudGrid Class="my-4 pb-10">
|
||||
<MudItem xs="12">
|
||||
<MudPaper Elevation="0" Outlined="true">
|
||||
<MudTabs ActivePanelIndex="0" Rounded="true" Border="true">
|
||||
<MudTabs ActivePanelIndex="0" Rounded="true" Border="true" PanelClass="pa-8">
|
||||
@for (uint i = 1; i <= 19; i++)
|
||||
{
|
||||
var danId = i;
|
||||
var danData = GameDataService.GetDanDataById(danId);
|
||||
|
||||
<MudTabPanel Text="@GetDanTitle(danData.Title)" Icon="@GetDanResultIcon(danId)">
|
||||
<MudGrid Class="pa-8 d-flex">
|
||||
<MudText Typo="Typo.h5" Class="mb-4">Details</MudText>
|
||||
<MudGrid Class="d-flex">
|
||||
<MudItem xs="12" sm="12" md="3" Class="pb-1">
|
||||
<MudCard Outlined="true" Style="height:100%;">
|
||||
<MudCardHeader Class="pb-0">
|
||||
@ -112,12 +113,15 @@
|
||||
}
|
||||
</MudGrid>
|
||||
</MudItem>
|
||||
</MudGrid>
|
||||
|
||||
<MudText Typo="Typo.h5" Class="mt-10 mb-4">Conditions</MudText>
|
||||
<MudGrid>
|
||||
<MudItem xs="12" Class="dani-results">
|
||||
<MudGrid>
|
||||
<MudItem xs="12" md="3">
|
||||
<MudCard Outlined="true" Class="pa-2">
|
||||
<MudCardHeader Class="pb-0">
|
||||
<MudCardHeader>
|
||||
<CardHeaderContent>
|
||||
<MudText Typo="Typo.h6">Soul Gauge</MudText>
|
||||
</CardHeaderContent>
|
||||
@ -181,55 +185,130 @@
|
||||
{
|
||||
var border = danData.OdaiBorderList[j];
|
||||
|
||||
<MudCard Outlined="true" Class="pa-2">
|
||||
<MudCardHeader>
|
||||
<CardHeaderContent>
|
||||
<MudText Typo="Typo.h6">
|
||||
@GetDanRequirementTitle(border)
|
||||
</MudText>
|
||||
</CardHeaderContent>
|
||||
</MudCardHeader>
|
||||
<MudCardContent>
|
||||
@{
|
||||
var borderType = (DanBorderType)border.BorderType;
|
||||
}
|
||||
@if (borderType == DanBorderType.All)
|
||||
{
|
||||
<MudText>@GetDanRequirementAll(border)</MudText>
|
||||
@if (bestDataMap.ContainsKey(danId))
|
||||
<MudCard Outlined="true" Class="pa-2">
|
||||
<MudCardHeader>
|
||||
<CardHeaderContent>
|
||||
<MudText Typo="Typo.h6">
|
||||
@GetDanRequirementTitle(border)
|
||||
</MudText>
|
||||
</CardHeaderContent>
|
||||
</MudCardHeader>
|
||||
<MudCardContent>
|
||||
@{
|
||||
var borderType = (DanBorderType)border.BorderType;
|
||||
}
|
||||
@if (borderType == DanBorderType.All)
|
||||
{
|
||||
<MudStack Spacing="8">
|
||||
@{
|
||||
var redRequirement = border.RedBorderTotal;
|
||||
var goldRequirement = border.GoldBorderTotal;
|
||||
var barClass = "bar-default";
|
||||
var resultText = "Failed";
|
||||
}
|
||||
<MudStack Spacing="1">
|
||||
<MudText Typo="Typo.subtitle2" Style="font-weight:bold;">Result</MudText>
|
||||
@if (bestDataMap.ContainsKey(danId))
|
||||
{
|
||||
var danBestData = bestDataMap[danId];
|
||||
var bestData = GetAllBestFromData((DanConditionType)border.OdaiType, danBestData);
|
||||
|
||||
if ((DanConditionType)border.OdaiType is DanConditionType.BadCount)
|
||||
{
|
||||
if (bestData <= redRequirement)
|
||||
{
|
||||
barClass = "bar-pass-red";
|
||||
resultText = "Passed";
|
||||
}
|
||||
|
||||
if (bestData <= goldRequirement)
|
||||
{
|
||||
barClass = "bar-pass-gold";
|
||||
resultText = "Gold";
|
||||
}
|
||||
|
||||
<MudProgressLinear Class="@barClass" Rounded="true" Size="Size.Large" Max="@redRequirement" Value="@(redRequirement - bestData)">
|
||||
<MudText Typo="Typo.caption">@bestData</MudText>
|
||||
</MudProgressLinear>
|
||||
<MudText Typo="Typo.caption" Style="text-align: right">@resultText</MudText>
|
||||
}
|
||||
else
|
||||
{
|
||||
if (bestData >= redRequirement)
|
||||
{
|
||||
barClass = "bar-pass-red";
|
||||
resultText = "Passed";
|
||||
}
|
||||
|
||||
if (bestData >= goldRequirement)
|
||||
{
|
||||
barClass = "bar-pass-gold";
|
||||
resultText = "Gold";
|
||||
}
|
||||
|
||||
<MudProgressLinear Class="@barClass" Rounded="true" Size="Size.Large" Max="goldRequirement" Value="@bestData">
|
||||
<MudText Typo="Typo.caption">@bestData</MudText>
|
||||
</MudProgressLinear>
|
||||
<MudText Typo="Typo.caption" Style="text-align: right">@resultText</MudText>
|
||||
}
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
<MudProgressLinear Class="@barClass" Rounded="true" Size="Size.Large" Max="100" Value="0">
|
||||
<MudText Typo="Typo.caption">0</MudText>
|
||||
</MudProgressLinear>
|
||||
<MudText Typo="Typo.caption" Style="text-align: right">N/A</MudText>
|
||||
}
|
||||
</MudStack>
|
||||
@{
|
||||
string conditionOperator = ">";
|
||||
if ((DanConditionType)border.OdaiType is DanConditionType.BadCount)
|
||||
{
|
||||
conditionOperator = "<";
|
||||
}
|
||||
}
|
||||
<MudStack Spacing="1">
|
||||
<MudText Typo="Typo.subtitle2" Style="font-weight:bold">Conditions</MudText>
|
||||
<MudStack Row="true" Spacing="16">
|
||||
<MudStack Spacing="0">
|
||||
<MudText Typo="Typo.caption">Red</MudText>
|
||||
<MudText Typo="Typo.body1" Style="font-weight: bold">@conditionOperator @redRequirement</MudText>
|
||||
</MudStack>
|
||||
<MudStack Spacing="0">
|
||||
<MudText Typo="Typo.caption">Gold</MudText>
|
||||
<MudText Typo="Typo.body1" Style="font-weight: bold">@conditionOperator @goldRequirement</MudText>
|
||||
</MudStack>
|
||||
</MudStack>
|
||||
</MudStack>
|
||||
</MudStack>
|
||||
}
|
||||
else
|
||||
{
|
||||
<MudStack Row="true">
|
||||
@for (var k = 0; k < 3; k++)
|
||||
{
|
||||
var bestData = bestDataMap[danId];
|
||||
var songNumber = k;
|
||||
<MudText>
|
||||
Best: @GetAllBestFromData((DanConditionType)border.OdaiType, bestData)
|
||||
@GetDanRequirementPerSong(border, songNumber)
|
||||
</MudText>
|
||||
@if (!bestDataMap.ContainsKey(danId))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
var bestData = bestDataMap[danId];
|
||||
if (k >= bestData.DanBestStageDataList.Count)
|
||||
{
|
||||
break;
|
||||
}
|
||||
<MudText>
|
||||
Best: @GetSongBestFromData((DanConditionType)border.OdaiType, bestData, songNumber)
|
||||
</MudText>
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
<MudStack Row="true">
|
||||
@for (var k = 0; k < 3; k++)
|
||||
{
|
||||
var songNumber = k;
|
||||
<MudText>
|
||||
@GetDanRequirementPerSong(border, songNumber)
|
||||
</MudText>
|
||||
@if (!bestDataMap.ContainsKey(danId))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
var bestData = bestDataMap[danId];
|
||||
if (k >= bestData.DanBestStageDataList.Count)
|
||||
{
|
||||
break;
|
||||
}
|
||||
<MudText>
|
||||
Best: @GetSongBestFromData((DanConditionType)border.OdaiType, bestData, songNumber)
|
||||
</MudText>
|
||||
}
|
||||
</MudStack>
|
||||
}
|
||||
</MudCardContent>
|
||||
</MudCard>
|
||||
</MudStack>
|
||||
}
|
||||
</MudCardContent>
|
||||
</MudCard>
|
||||
}
|
||||
</MudStack>
|
||||
</MudItem>
|
||||
|
||||
@ -65,14 +65,7 @@ public partial class DaniDojo
|
||||
{
|
||||
var danConditionType = (DanConditionType)data.OdaiType;
|
||||
|
||||
string danConditionTitle = GetDanRequirementString(danConditionType);
|
||||
|
||||
return (DanBorderType)data.BorderType switch
|
||||
{
|
||||
DanBorderType.All => $"{danConditionTitle} (All stages)",
|
||||
DanBorderType.PerSong => $"{danConditionTitle} (Per stage)",
|
||||
_ => throw new ArgumentOutOfRangeException(nameof(data))
|
||||
};
|
||||
return GetDanRequirementString(danConditionType);
|
||||
}
|
||||
|
||||
private static string GetDanRequirementAll(DanData.OdaiBorder odaiBorder)
|
||||
@ -115,21 +108,19 @@ public partial class DaniDojo
|
||||
_ => throw new ArgumentOutOfRangeException(nameof(odaiBorder))
|
||||
};
|
||||
}
|
||||
|
||||
private static string GetAllBestFromData(DanConditionType type, DanBestData data)
|
||||
|
||||
private static long GetAllBestFromData(DanConditionType type, DanBestData data)
|
||||
{
|
||||
return type switch
|
||||
{
|
||||
DanConditionType.SoulGauge => throw new ArgumentException("Soul gauge should not be here"),
|
||||
DanConditionType.GoodCount => data.DanBestStageDataList.Sum(stageData => stageData.GoodCount).ToString(),
|
||||
DanConditionType.OkCount => data.DanBestStageDataList.Sum(stageData => stageData.OkCount).ToString(),
|
||||
DanConditionType.BadCount => data.DanBestStageDataList.Sum(stageData => stageData.BadCount).ToString(),
|
||||
DanConditionType.ComboCount => data.ComboCountTotal.ToString(),
|
||||
DanConditionType.DrumrollCount => data.DanBestStageDataList.Sum(stageData => stageData.DrumrollCount)
|
||||
.ToString(),
|
||||
DanConditionType.Score => data.DanBestStageDataList.Sum(stageData => stageData.PlayScore).ToString(),
|
||||
DanConditionType.TotalHitCount => data.DanBestStageDataList.Sum(stageData => stageData.TotalHitCount)
|
||||
.ToString(),
|
||||
DanConditionType.GoodCount => data.DanBestStageDataList.Sum(stageData => stageData.GoodCount),
|
||||
DanConditionType.OkCount => data.DanBestStageDataList.Sum(stageData => stageData.OkCount),
|
||||
DanConditionType.BadCount => data.DanBestStageDataList.Sum(stageData => stageData.BadCount),
|
||||
DanConditionType.ComboCount => data.ComboCountTotal,
|
||||
DanConditionType.DrumrollCount => data.DanBestStageDataList.Sum(stageData => stageData.DrumrollCount),
|
||||
DanConditionType.Score => data.DanBestStageDataList.Sum(stageData => stageData.PlayScore),
|
||||
DanConditionType.TotalHitCount => data.DanBestStageDataList.Sum(stageData => stageData.TotalHitCount),
|
||||
_ => throw new ArgumentOutOfRangeException(nameof(type), type, null)
|
||||
};
|
||||
}
|
||||
|
||||
@ -58,7 +58,7 @@
|
||||
</Column>
|
||||
<Column T="SongBestData" Field="@nameof(SongBestData.SongId)" Title="Level" Sortable="false">
|
||||
<CellTemplate>
|
||||
<MudStack Row="true" Spacing="0" AlignItems="AlignItems.Center">
|
||||
<MudStack Row="true" Spacing="1" AlignItems="AlignItems.Center">
|
||||
<MudIcon Icon="@Icons.Filled.Star" Size="Size.Small" />
|
||||
<MudText Typo="Typo.caption" Style="line-height:1;margin-top:2px;margin-right:2px;">@GameDataService.GetMusicStarLevel(@context.Item.SongId, difficulty)</MudText>
|
||||
</MudStack>
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
}
|
||||
|
||||
.mud-progress-linear.bar-pass-red .mud-progress-linear-bars .mud-progress-linear-bar {
|
||||
background-color: #FF3C05;
|
||||
background-color: #ff584d;
|
||||
}
|
||||
|
||||
.mud-progress-linear.bar-default .mud-progress-linear-bars .mud-progress-linear-bar {
|
||||
@ -17,5 +17,5 @@
|
||||
.mud-progress-linear.bar-pass-gold .mud-typography,
|
||||
.mud-progress-linear.bar-pass-red .mud-typography {
|
||||
font-weight: bold;
|
||||
color: white;
|
||||
color: #333;
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user