Merge pull request #1513 from DGP-Studio/feat/cultivation_stat_finished

This commit is contained in:
DismissedLight
2024-03-28 11:00:33 +08:00
committed by GitHub
2 changed files with 17 additions and 9 deletions

View File

@@ -174,12 +174,20 @@
</ItemContainer.Resources>
<shvcp:HorizontalCard>
<shvcp:HorizontalCard.Left>
<shvco:ItemIcon
Grid.Column="0"
Width="40"
Height="40"
Icon="{Binding Inner.Icon, Converter={StaticResource ItemIconConverter}}"
Quality="{Binding Inner.RankLevel}"/>
<Grid Grid.Column="0">
<shvco:ItemIcon
Width="40"
Height="40"
Icon="{Binding Inner.Icon, Converter={StaticResource ItemIconConverter}}"
Opacity="{Binding IsFinished, Converter={StaticResource BoolToOpacityConverter}}"
Quality="{Binding Inner.RankLevel}"/>
<FontIcon
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontSize="24"
Glyph="&#xE73E;"
Visibility="{Binding IsFinished, Converter={StaticResource BoolToVisibilityConverter}}"/>
</Grid>
</shvcp:HorizontalCard.Left>
<shvcp:HorizontalCard.Right>
<Grid Margin="16,0">

View File

@@ -28,7 +28,7 @@ internal sealed class StatisticsCultivateItem
public Material Inner { get; }
/// <summary>
/// 对应背包物品的个数
/// 对应需求物品的个数
/// </summary>
public uint Count { get; set; }
@@ -40,10 +40,10 @@ internal sealed class StatisticsCultivateItem
/// <summary>
/// 是否完成
/// </summary>
public bool IsFinished { get => Count >= TotalCount; }
public bool IsFinished { get => TotalCount >= Count; }
/// <summary>
/// 格式化总数
/// </summary>
public string CountFormatted { get => $"{Count}/{TotalCount}"; }
public string CountFormatted { get => $"{TotalCount}/{Count}"; }
}