From 2fe1ceb40f2dfe118c87edcd521cbd30ab0fa1ee Mon Sep 17 00:00:00 2001
From: Howard302 <Howard302@users.noreply.github.com>
Date: Fri, 7 Aug 2026 05:52:41 +0000
Subject: [PATCH] =?UTF-8?q?=E5=B0=86"=E5=9C=A8=E6=AD=A3=E7=89=88=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E6=97=B6=E9=AA=8C=E8=AF=81=20SSL=20=E8=AF=81=E4=B9=A6?=
 =?UTF-8?q?"=E9=80=89=E9=A1=B9=E4=BB=8E"=E4=B8=8B=E8=BD=BD"=E5=8D=A1?=
 =?UTF-8?q?=E7=89=87=E7=A7=BB=E5=8A=A8=E5=88=B0"=E5=90=AF=E5=8A=A8?=
 =?UTF-8?q?=E9=80=89=E9=A1=B9"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #9119

将"在正版登录时验证 SSL 证书"选项从 设置-其他 的"下载"卡片移动到
设置-启动 的"启动选项"卡片中，因为该选项与下载无关，而与启动游戏
时的正版登录相关，在语义上更符合。
---
 Plain Craft Launcher 2/Pages/PageSetup/PageSetupLaunch.xaml | 5 +++++
 Plain Craft Launcher 2/Pages/PageSetup/PageSetupSystem.xaml | 4 ----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Plain Craft Launcher 2/Pages/PageSetup/PageSetupLaunch.xaml b/Plain Craft Launcher 2/Pages/PageSetup/PageSetupLaunch.xaml
index 22d873b..c1b69c6 100644
--- a/Plain Craft Launcher 2/Pages/PageSetup/PageSetupLaunch.xaml	
+++ b/Plain Craft Launcher 2/Pages/PageSetup/PageSetupLaunch.xaml	
@@ -27,6 +27,8 @@
                             <RowDefinition Height="28" />
                             <RowDefinition Height="9" />
                             <RowDefinition Height="28" />
+                            <RowDefinition Height="9" />
+                            <RowDefinition Height="Auto" />
                         </Grid.RowDefinitions>
                         <TextBlock Grid.Row="0" VerticalAlignment="Center" HorizontalAlignment="Left" Text="默认版本隔离" Margin="0,0,25,0" />
                         <local:MyComboBox local:SettingService.Key="LaunchArgumentIndieV2" x:Name="ComboArgumentIndieV2"
@@ -104,6 +106,9 @@
                                 </local:MyTextBox.ValidateRules>
                             </local:MyTextBox>
                         </Grid>
+                        <local:MyCheckBox Margin="0,8,0,4" Text="在正版登录时验证 SSL 证书" Grid.Row="12" Height="22" Grid.ColumnSpan="2"
+                                          x:Name="CheckDownloadCert" local:SettingService.Key="ToolDownloadCert"
+                                          ToolTip="开启验证可以提高安全性，但可能会导致正版登录失败（见 #3018）。&#xa;若登录因为 “未能为 SSL/TLS 安全通道建立信任关系” 失败，请考虑关闭此选项。" />
                     </Grid>
                 </StackPanel>
             </local:MyCard>
diff --git a/Plain Craft Launcher 2/Pages/PageSetup/PageSetupSystem.xaml b/Plain Craft Launcher 2/Pages/PageSetup/PageSetupSystem.xaml
index e792554..f0d09e5 100644
--- a/Plain Craft Launcher 2/Pages/PageSetup/PageSetupSystem.xaml	
+++ b/Plain Craft Launcher 2/Pages/PageSetup/PageSetupSystem.xaml	
@@ -22,7 +22,6 @@
                             <RowDefinition Height="27" />
                             <RowDefinition Height="27" />
                             <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
                         </Grid.RowDefinitions>
                         <TextBlock VerticalAlignment="Center" HorizontalAlignment="Left" Text="文件下载源" Margin="0,0,25,0" />
                         <local:MyComboBox x:Name="ComboDownloadSource" Grid.ColumnSpan="2" local:SettingService.Key="ToolDownloadSource" Grid.Column="1">
@@ -44,9 +43,6 @@
                                         ToolTip="设置下载的速度上限，以避免在下载时导致其他需要联网的程序卡死" />
                         <TextBlock VerticalAlignment="Top" Grid.Row="6" HorizontalAlignment="Left" Text="目标文件夹" Margin="0,5,25,5" />
                         <TextBlock Margin="0,5" HorizontalAlignment="Left" Text="请在 启动 → 版本选择 → 文件夹列表 中更改下载目标文件夹。&#xa;在某个文件夹或游戏版本上右键，即可选择打开对应文件夹。" Grid.Row="6" Grid.Column="1" VerticalAlignment="Center" Opacity="0.5" />
-                        <local:MyCheckBox Margin="0,2,0,4" Text="在正版登录时验证 SSL 证书" Grid.Row="7" Height="22" Grid.ColumnSpan="2"
-                                          x:Name="CheckDownloadCert" local:SettingService.Key="ToolDownloadCert" 
-                                          ToolTip="开启验证可以提高安全性，但可能会导致正版登录失败（见 #3018）。&#xa;若登录因为 “未能为 SSL/TLS 安全通道建立信任关系” 失败，请考虑关闭此选项。" />
                     </Grid>
                 </StackPanel>
             </local:MyCard>