From a41b7e4a01a12cdd8ccf43738337afebe6942c15 Mon Sep 17 00:00:00 2001
From: mfkvfhpdx <mfkvfhpdx@126.com>
Date: Sun, 3 May 2026 18:34:04 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=A2=9E=E9=87=8F=E5=87=8F?=
 =?UTF-8?q?=E9=87=8F=E6=9D=90=E6=96=99=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../UI/Xaml/View/Page/CultivationPage.xaml    | 18 +++++++++---------
 .../Cultivation/StatisticsCultivateItem.cs    | 19 +++++++++++--------
 2 files changed, 20 insertions(+), 17 deletions(-)

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}}">
-                                    <TextBlock VerticalAlignment="Center" Text="{Binding DisplayCurrent, Mode=OneWay}"/>
-                                    <TextBlock
-                                        VerticalAlignment="Center"
-                                        Foreground="{ThemeResource AccentTextFillColorPrimaryBrush}"
-                                        Text="{Binding RawInventoryParenthetical, Mode=OneWay}"
-                                        Visibility="{Binding MergeInventoryParenUseBlue, Converter={StaticResource BoolToVisibilityConverter}}"/>
                                     <TextBlock
                                         VerticalAlignment="Center"
                                         Foreground="{ThemeResource SystemFillColorCriticalBrush}"
-                                        Text="{Binding RawInventoryParenthetical, Mode=OneWay}"
-                                        Visibility="{Binding MergeInventoryParenUseRed, Converter={StaticResource BoolToVisibilityConverter}}"/>
-                                    <TextBlock VerticalAlignment="Center" Text="{Binding SlashCountSuffix, Mode=OneWay}"/>
+                                        Text="{Binding DisplayCurrent, Mode=OneWay}"
+                                        Visibility="{Binding MergeDisplayLeadUseRed, Converter={StaticResource BoolToVisibilityConverter}}"/>
+                                    <TextBlock
+                                        VerticalAlignment="Center"
+                                        Foreground="{ThemeResource SystemFillColorSuccessBrush}"
+                                        Text="{Binding DisplayCurrent, Mode=OneWay}"
+                                        Visibility="{Binding MergeDisplayLeadUseGreen, Converter={StaticResource BoolToVisibilityConverter}}"/>
+                                    <TextBlock VerticalAlignment="Center" Text="{Binding RawInventoryParenthetical, Mode=OneWay}"/>
+                                    <TextBlock VerticalAlignment="Center" Text="{Binding SlashCountSuffixForParen, Mode=OneWay}"/>
                                 </StackPanel>
                             </StackPanel>
                         </Grid>
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
     /// <summary>已合并但合成前后有效持有量与背包数一致，不显示括号，仅「合并后 / 需求」加空格。</summary>
     public bool ShowMergeSpacedWithoutParen { get => MergeAdjustedCurrent.HasValue && DisplayCurrent == Current; }
 
-    /// <summary>合并后有效持有与背包原数不同，显示「(背包原数)」并着色。</summary>
+    /// <summary>合并后有效持有与背包原数不同，显示「合并后 (背包原数)」。</summary>
     public bool ShowMergeInventoryParen { get => MergeAdjustedCurrent.HasValue && DisplayCurrent != Current; }
 
-    /// <summary>合并后 &gt; 背包原数：括号用强调色（蓝系）。</summary>
-    public bool MergeInventoryParenUseBlue { get => MergeAdjustedCurrent.HasValue && DisplayCurrent > Current; }
+    /// <summary>首位合并显示量 &gt; 背包原数时着红色（相对原库存变多）。</summary>
+    public bool MergeDisplayLeadUseRed { get => MergeAdjustedCurrent.HasValue && DisplayCurrent > Current; }
 
-    /// <summary>合并后 &lt; 背包原数：括号用警告色（红系，低级被向上消耗）。</summary>
-    public bool MergeInventoryParenUseRed { get => MergeAdjustedCurrent.HasValue && DisplayCurrent < Current; }
+    /// <summary>首位合并显示量 &lt; 背包原数时着绿色（相对原库存变少，如低档被向上消耗）。</summary>
+    public bool MergeDisplayLeadUseGreen { get => MergeAdjustedCurrent.HasValue && DisplayCurrent < Current; }
 
-    /// <summary>背包同步原数，带前导空格与括号。</summary>
-    public string RawInventoryParenthetical { get => $" ({Current})"; }
+    /// <summary>背包原数，紧接在合并后数字后，如 <c>(44)</c>。</summary>
+    public string RawInventoryParenthetical { get => $"({Current})"; }
 
-    /// <summary>「 / 需求数」段，含前导空格。</summary>
+    /// <summary>有括号行：「/需求」紧接括号，如 <c>/55</c>。</summary>
+    public string SlashCountSuffixForParen { get => $"/{Count}"; }
+
+    /// <summary>无括号行：「 / 需求」含空格。</summary>
     public string SlashCountSuffix { get => $" / {Count}"; }
 
     public bool IsToday { get => Inner.IsItemOfToday(offset, true); }