diff --git a/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Page/CultivationPage.xaml b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Page/CultivationPage.xaml index 783e278..4825003 100644 --- a/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Page/CultivationPage.xaml +++ b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Page/CultivationPage.xaml @@ -276,18 +276,18 @@ Orientation="Horizontal" Spacing="0" Visibility="{Binding ShowMergeInventoryParen, Converter={StaticResource BoolToVisibilityConverter}}"> - - - + Text="{Binding DisplayCurrent, Mode=OneWay}" + Visibility="{Binding MergeDisplayLeadUseRed, Converter={StaticResource BoolToVisibilityConverter}}"/> + + + diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/Cultivation/StatisticsCultivateItem.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/Cultivation/StatisticsCultivateItem.cs index afb5aaf..ff64dc0 100644 --- a/src/Snap.Hutao/Snap.Hutao/ViewModel/Cultivation/StatisticsCultivateItem.cs +++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/Cultivation/StatisticsCultivateItem.cs @@ -46,19 +46,22 @@ internal sealed class StatisticsCultivateItem /// 已合并但合成前后有效持有量与背包数一致,不显示括号,仅「合并后 / 需求」加空格。 public bool ShowMergeSpacedWithoutParen { get => MergeAdjustedCurrent.HasValue && DisplayCurrent == Current; } - /// 合并后有效持有与背包原数不同,显示「(背包原数)」并着色。 + /// 合并后有效持有与背包原数不同,显示「合并后 (背包原数)」。 public bool ShowMergeInventoryParen { get => MergeAdjustedCurrent.HasValue && DisplayCurrent != Current; } - /// 合并后 > 背包原数:括号用强调色(蓝系)。 - public bool MergeInventoryParenUseBlue { get => MergeAdjustedCurrent.HasValue && DisplayCurrent > Current; } + /// 首位合并显示量 > 背包原数时着红色(相对原库存变多)。 + public bool MergeDisplayLeadUseRed { get => MergeAdjustedCurrent.HasValue && DisplayCurrent > Current; } - /// 合并后 < 背包原数:括号用警告色(红系,低级被向上消耗)。 - public bool MergeInventoryParenUseRed { get => MergeAdjustedCurrent.HasValue && DisplayCurrent < Current; } + /// 首位合并显示量 < 背包原数时着绿色(相对原库存变少,如低档被向上消耗)。 + public bool MergeDisplayLeadUseGreen { get => MergeAdjustedCurrent.HasValue && DisplayCurrent < Current; } - /// 背包同步原数,带前导空格与括号。 - public string RawInventoryParenthetical { get => $" ({Current})"; } + /// 背包原数,紧接在合并后数字后,如 (44) + public string RawInventoryParenthetical { get => $"({Current})"; } - /// 「 / 需求数」段,含前导空格。 + /// 有括号行:「/需求」紧接括号,如 /55 + public string SlashCountSuffixForParen { get => $"/{Count}"; } + + /// 无括号行:「 / 需求」含空格。 public string SlashCountSuffix { get => $" / {Count}"; } public bool IsToday { get => Inner.IsItemOfToday(offset, true); }