From 7b7136fd4dcaf6f45117e006b33470a3e231dfab Mon Sep 17 00:00:00 2001
From: uye <99072975+ABA2396@users.noreply.github.com>
Date: Thu, 11 Sep 2025 14:18:47 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=B8=AD=E7=9A=84=E5=BE=BD=E6=A0=87=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=92=8C=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/MaaWpfGui/Res/Localizations/en-us.xaml    |   2 +-
 src/MaaWpfGui/Res/Localizations/ja-jp.xaml    |   2 +-
 src/MaaWpfGui/Res/Localizations/ko-kr.xaml    |   2 +-
 src/MaaWpfGui/Res/Localizations/zh-cn.xaml    |   2 +-
 src/MaaWpfGui/Res/Localizations/zh-tw.xaml    |   2 +-
 .../VersionUpdateSettingsUserControl.xaml     | 137 +++++++++++-------
 6 files changed, 87 insertions(+), 60 deletions(-)

diff --git a/src/MaaWpfGui/Res/Localizations/en-us.xaml b/src/MaaWpfGui/Res/Localizations/en-us.xaml
index 7d0dbc2313..e901186f73 100644
--- a/src/MaaWpfGui/Res/Localizations/en-us.xaml
+++ b/src/MaaWpfGui/Res/Localizations/en-us.xaml
@@ -29,7 +29,7 @@
     <system:String x:Key="AchievementSettings">Achievements</system:String>
     <system:String x:Key="AboutUs">About us</system:String>
     <system:String x:Key="IssueReport">Issue Report</system:String>
-    <system:String x:Key="MaaVersion">MAA Version</system:String>
+    <system:String x:Key="MaaVersion">Software Version</system:String>
     <system:String x:Key="BuildDateTime">Build Date</system:String>
     <system:String x:Key="CoreVersion">Core Version</system:String>
     <system:String x:Key="UiVersion">UI Version</system:String>
diff --git a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml
index 06b2728ae0..4e6c75c7a0 100644
--- a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml
+++ b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml
@@ -29,7 +29,7 @@
     <system:String x:Key="AchievementSettings">実績設定</system:String>
     <system:String x:Key="AboutUs">About us</system:String>
     <system:String x:Key="IssueReport">問題報告</system:String>
-    <system:String x:Key="MaaVersion">MAA バージョン</system:String>
+    <system:String x:Key="MaaVersion">Software バージョン</system:String>
     <system:String x:Key="BuildDateTime">ビルド日付</system:String>
     <system:String x:Key="CoreVersion">Core バージョン</system:String>
     <system:String x:Key="UiVersion">UI バージョン</system:String>
diff --git a/src/MaaWpfGui/Res/Localizations/ko-kr.xaml b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml
index 31645ac0aa..1573872370 100644
--- a/src/MaaWpfGui/Res/Localizations/ko-kr.xaml
+++ b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml
@@ -29,7 +29,7 @@
     <system:String x:Key="AchievementSettings">도전과제</system:String>
     <system:String x:Key="AboutUs">정보</system:String>
     <system:String x:Key="IssueReport">문제 보고</system:String>
-    <system:String x:Key="MaaVersion">MAA 버전</system:String>
+    <system:String x:Key="MaaVersion">소프트웨어 버전</system:String>
     <system:String x:Key="BuildDateTime">빌드 날짜</system:String>
     <system:String x:Key="CoreVersion">Core 버전</system:String>
     <system:String x:Key="UiVersion">UI 버전</system:String>
diff --git a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
index aedcbf404e..4b4e2be49f 100644
--- a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
+++ b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
@@ -29,7 +29,7 @@
     <system:String x:Key="AchievementSettings">成就设置</system:String>
     <system:String x:Key="AboutUs">关于我们</system:String>
     <system:String x:Key="IssueReport">问题反馈</system:String>
-    <system:String x:Key="MaaVersion">MAA 版本</system:String>
+    <system:String x:Key="MaaVersion">软件版本</system:String>
     <system:String x:Key="BuildDateTime">构建日期</system:String>
     <system:String x:Key="CoreVersion">核心版本</system:String>
     <system:String x:Key="UiVersion">界面版本</system:String>
diff --git a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml
index 8c4f2eb2f7..f7b077c913 100644
--- a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml
+++ b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml
@@ -28,7 +28,7 @@
     <system:String x:Key="UpdateSettings">更新設定</system:String>
     <system:String x:Key="AboutUs">關於我們</system:String>
     <system:String x:Key="IssueReport">問題回饋</system:String>
-    <system:String x:Key="MaaVersion">MAA 版本</system:String>
+    <system:String x:Key="MaaVersion">軟體版本</system:String>
     <system:String x:Key="BuildDateTime">構建日期</system:String>
     <system:String x:Key="CoreVersion">Core 版本</system:String>
     <system:String x:Key="UiVersion">UI 版本</system:String>
diff --git a/src/MaaWpfGui/Views/UserControl/Settings/VersionUpdateSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/Settings/VersionUpdateSettingsUserControl.xaml
index 6885eaadd8..e1b3dc715f 100644
--- a/src/MaaWpfGui/Views/UserControl/Settings/VersionUpdateSettingsUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/Settings/VersionUpdateSettingsUserControl.xaml
@@ -17,15 +17,20 @@
     d:DesignWidth="550"
     s:View.ActionTarget="{Binding}"
     mc:Ignorable="d">
-    <StackPanel>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition />
+            <RowDefinition />
+        </Grid.RowDefinitions>
         <controls:TextBlock
+            Grid.Row="0"
             HorizontalAlignment="Center"
             FontWeight="Bold"
             Text="{DynamicResource GlobalConfigTip}"
             TextAlignment="Center"
             Visibility="{c:Binding 'ConfigurationList.Count > 1',
                                    Source={x:Static helper:Instances.SettingsViewModel}}" />
-        <Grid>
+        <Grid Grid.Row="1">
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
                 <RowDefinition />
@@ -142,10 +147,10 @@
                             <controls:TextBlock
                                 MaxWidth="150"
                                 Margin="0,5,0,0"
-                                Visibility="{c:Binding MirrorChyanCdkFetchFailed}"
                                 Foreground="{DynamicResource ErrorLogBrush}"
                                 Text="{DynamicResource MirrorChyanCdkFetchFailed}"
-                                TextWrapping="Wrap" />
+                                TextWrapping="Wrap"
+                                Visibility="{c:Binding MirrorChyanCdkFetchFailed}" />
                             <controls:TextBlock
                                 MaxWidth="150"
                                 Margin="0,5,0,0"
@@ -167,7 +172,7 @@
                     </StackPanel>
                 </StackPanel>
             </StackPanel>
-            <StackPanel
+            <Grid
                 Grid.Row="0"
                 Grid.Column="1"
                 Margin="3"
@@ -199,33 +204,22 @@
                         hc:InfoElement.Placeholder="&lt;IP&gt;:&lt;Port&gt;"
                         InputMethod.IsInputMethodEnabled="False"
                         Text="{Binding Proxy}" />
-                    <StackPanel Grid.Row="2">
-                        <hc:Shield
-                            Height="NaN"
-                            Margin="0,5"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Center"
-                            hc:FloatingBlock.Content="{Binding ResourceVersion}"
-                            PreviewMouseDown="ResourceVersionClick"
-                            Subject="{DynamicResource ResourceVersion}"
-                            Color="#6969AA">
-                            <TextBlock
-                                MaxWidth="150"
-                                Margin="0,3,0,3"
-                                d:MinWidth="50"
-                                Foreground="White"
-                                Text="{Binding ResourceVersion, Mode=OneWay}"
-                                TextWrapping="Wrap" />
-                        </hc:Shield>
-                        <Grid HorizontalAlignment="Center">
+                    <Grid Grid.Row="2">
+                        <Grid.RowDefinitions>
+                            <RowDefinition />
+                            <RowDefinition />
+                        </Grid.RowDefinitions>
+
+                        <Grid Grid.Row="0" HorizontalAlignment="Center">
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="Auto" />
-                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition />
                             </Grid.ColumnDefinitions>
                             <Grid.RowDefinitions>
                                 <RowDefinition />
                                 <RowDefinition />
                                 <RowDefinition />
+                                <RowDefinition />
                             </Grid.RowDefinitions>
                             <Border
                                 Grid.Row="0"
@@ -248,18 +242,17 @@
                                 Grid.Row="0"
                                 Grid.Column="1"
                                 Margin="0,5,0,5"
-                                Background="#6969AA"
+                                hc:FloatingBlock.Content="{Binding UiVersion}"
+                                Background="{DynamicResource PallasBrush}"
                                 CornerRadius="0,3,3,0"
+                                PreviewMouseDown="MaaVersionClick"
                                 Visibility="{c:Binding 'UiVersion == CoreVersion'}">
                                 <TextBlock
-                                    MaxWidth="400"
                                     Padding="5,3,5,3"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
                                     d:MinWidth="50"
-                                    hc:FloatingBlock.Content="{Binding UiVersion}"
                                     Foreground="White"
-                                    PreviewMouseDown="MaaVersionClick"
                                     Text="{Binding UiVersionDisplay, Mode=OneWay}"
                                     TextWrapping="Wrap" />
                             </Border>
@@ -284,17 +277,17 @@
                                 Grid.Row="1"
                                 Grid.Column="1"
                                 Margin="0,5,0,5"
-                                Background="#6969AA"
+                                hc:FloatingBlock.Content="{Binding UiVersion}"
+                                Background="{DynamicResource PallasBrush}"
                                 CornerRadius="0,3,3,0"
+                                PreviewMouseDown="UiVersionClick"
                                 Visibility="{c:Binding 'UiVersion != CoreVersion'}">
                                 <TextBlock
                                     Padding="5,3,5,3"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
                                     d:MinWidth="50"
-                                    hc:FloatingBlock.Content="{Binding UiVersion}"
                                     Foreground="White"
-                                    PreviewMouseDown="UiVersionClick"
                                     Text="{Binding UiVersionDisplay, Mode=OneWay}"
                                     TextWrapping="Wrap" />
                             </Border>
@@ -319,23 +312,56 @@
                                 Grid.Row="2"
                                 Grid.Column="1"
                                 Margin="0,5,0,5"
-                                Background="#6969AA"
+                                hc:FloatingBlock.Content="{Binding CoreVersion}"
+                                Background="{DynamicResource PallasBrush}"
                                 CornerRadius="0,3,3,0"
+                                PreviewMouseDown="CoreVersionClick"
                                 Visibility="{c:Binding 'UiVersion != CoreVersion'}">
                                 <TextBlock
                                     Padding="5,3,5,3"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
                                     d:MinWidth="50"
-                                    hc:FloatingBlock.Content="{Binding CoreVersion}"
                                     Foreground="White"
-                                    PreviewMouseDown="CoreVersionClick"
                                     Text="{Binding CoreVersionDisplay, Mode=OneWay}"
                                     TextWrapping="Wrap" />
                             </Border>
+                            <Border
+                                Grid.Row="3"
+                                Grid.Column="0"
+                                Margin="0,5,0,5"
+                                Background="#555555"
+                                CornerRadius="3,0,0,3">
+                                <TextBlock
+                                    Padding="5,3,5,3"
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    hc:FloatingBlock.Content="{Binding ResourceVersion}"
+                                    Foreground="White"
+                                    PreviewMouseDown="ResourceVersionClick"
+                                    Text="{DynamicResource ResourceVersion}"
+                                    TextWrapping="Wrap" />
+                            </Border>
+                            <Border
+                                Grid.Row="3"
+                                Grid.Column="1"
+                                Margin="0,5,0,5"
+                                hc:FloatingBlock.Content="{Binding ResourceVersion}"
+                                Background="{DynamicResource PallasBrush}"
+                                CornerRadius="0,3,3,0"
+                                PreviewMouseDown="ResourceVersionClick">
+                                <TextBlock
+                                    Padding="5,3,5,3"
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    d:MinWidth="50"
+                                    Foreground="White"
+                                    Text="{Binding ResourceVersion, Mode=OneWay}"
+                                    TextWrapping="Wrap" />
+                            </Border>
                         </Grid>
 
-                        <Grid HorizontalAlignment="Center">
+                        <Grid Grid.Row="1" HorizontalAlignment="Center">
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="Auto" />
                                 <ColumnDefinition Width="Auto" />
@@ -355,29 +381,30 @@
                                     Padding="5,3,5,3"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    hc:FloatingBlock.Content="{Binding ResourceDateTimeCurrentCultureString}"
+                                    hc:FloatingBlock.Content="{Binding BuildDateTimeCurrentCultureString}"
                                     Foreground="White"
-                                    PreviewMouseDown="ResourceVersionClick"
-                                    Text="{DynamicResource ResourceDateTime}"
+                                    PreviewMouseDown="MaaVersionClick"
+                                    Text="{DynamicResource BuildDateTime}"
                                     TextWrapping="Wrap" />
                             </Border>
                             <Border
                                 Grid.Row="0"
                                 Grid.Column="1"
                                 Margin="0,5,0,5"
-                                Background="#6969AA"
-                                CornerRadius="0,3,3,0">
+                                hc:FloatingBlock.Content="{Binding BuildDateTimeCurrentCultureString}"
+                                Background="{DynamicResource PallasBrush}"
+                                CornerRadius="0,3,3,0"
+                                PreviewMouseDown="MaaVersionClick">
                                 <TextBlock
                                     Padding="5,3,5,3"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
                                     d:MinWidth="50"
-                                    hc:FloatingBlock.Content="{Binding ResourceDateTimeCurrentCultureString}"
                                     Foreground="White"
-                                    PreviewMouseDown="ResourceVersionClick"
-                                    Text="{Binding ResourceDateTimeCurrentCultureString, Mode=OneWay}"
+                                    Text="{Binding BuildDateTimeCurrentCultureString, Mode=OneWay}"
                                     TextWrapping="Wrap" />
                             </Border>
+
                             <Border
                                 Grid.Row="1"
                                 Grid.Column="0"
@@ -388,31 +415,31 @@
                                     Padding="5,3,5,3"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    hc:FloatingBlock.Content="{Binding BuildDateTimeCurrentCultureString}"
+                                    hc:FloatingBlock.Content="{Binding ResourceDateTimeCurrentCultureString}"
                                     Foreground="White"
-                                    PreviewMouseDown="MaaVersionClick"
-                                    Text="{DynamicResource BuildDateTime}"
+                                    PreviewMouseDown="ResourceVersionClick"
+                                    Text="{DynamicResource ResourceDateTime}"
                                     TextWrapping="Wrap" />
                             </Border>
                             <Border
                                 Grid.Row="1"
                                 Grid.Column="1"
                                 Margin="0,5,0,5"
-                                Background="#6969AA"
-                                CornerRadius="0,3,3,0">
+                                hc:FloatingBlock.Content="{Binding ResourceDateTimeCurrentCultureString}"
+                                Background="{DynamicResource PallasBrush}"
+                                CornerRadius="0,3,3,0"
+                                PreviewMouseDown="ResourceVersionClick">
                                 <TextBlock
                                     Padding="5,3,5,3"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
                                     d:MinWidth="50"
-                                    hc:FloatingBlock.Content="{Binding BuildDateTimeCurrentCultureString}"
                                     Foreground="White"
-                                    PreviewMouseDown="MaaVersionClick"
-                                    Text="{Binding BuildDateTimeCurrentCultureString, Mode=OneWay}"
+                                    Text="{Binding ResourceDateTimeCurrentCultureString, Mode=OneWay}"
                                     TextWrapping="Wrap" />
                             </Border>
                         </Grid>
-                    </StackPanel>
+                    </Grid>
                     <StackPanel
                         Grid.Row="3"
                         Margin="5"
@@ -445,7 +472,7 @@
                         </controls:TextBlock>
                     </StackPanel>
                 </Grid>
-            </StackPanel>
+            </Grid>
         </Grid>
-    </StackPanel>
+    </Grid>
 </UserControl>