From 2a3077092cc2113cd6eaacc1d715caed52259c53 Mon Sep 17 00:00:00 2001 From: uye <2396806385@qq.com> Date: Mon, 6 Feb 2023 00:24:34 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E9=87=8D=E5=91=BD=E5=90=8D=E6=88=98?= =?UTF-8?q?=E6=96=97=E8=AE=BE=E7=BD=AE=E7=9B=B8=E5=85=B3=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MaaWpfGui/MaaWpfGui.csproj | 6 +++--- src/MaaWpfGui/Res/Localizations/zh-cn.xaml | 2 +- src/MaaWpfGui/Res/Localizations/zh-tw.xaml | 2 +- src/MaaWpfGui/Views/SettingsView.xaml | 2 +- .../Views/UserControl/AboutUserControl.xaml.cs | 2 +- .../Views/UserControl/GameClientUserControl.xaml.cs | 5 +---- ...ontrol.xaml => OtherCombatSettingsUserControl.xaml} | 2 +- ....xaml.cs => OtherCombatSettingsUserControl.xaml.cs} | 10 +++++----- .../VersionUpdateSettingsUserControl.xaml.cs | 2 +- 9 files changed, 15 insertions(+), 18 deletions(-) rename src/MaaWpfGui/Views/UserControl/{PenguinReportSettingsUserControl.xaml => OtherCombatSettingsUserControl.xaml} (98%) rename src/MaaWpfGui/Views/UserControl/{PenguinReportSettingsUserControl.xaml.cs => OtherCombatSettingsUserControl.xaml.cs} (63%) diff --git a/src/MaaWpfGui/MaaWpfGui.csproj b/src/MaaWpfGui/MaaWpfGui.csproj index ea4e98f4be..a61d81e8d2 100644 --- a/src/MaaWpfGui/MaaWpfGui.csproj +++ b/src/MaaWpfGui/MaaWpfGui.csproj @@ -173,8 +173,8 @@ FightSettingsUserControl.xaml - - PenguinReportSettingsUserControl.xaml + + OtherCombatSettingsUserControl.xaml AboutUserControl.xaml @@ -257,7 +257,7 @@ Designer MSBuild:Compile - + Designer MSBuild:Compile diff --git a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml index a7c4e8a52d..a31d0096a8 100644 --- a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml +++ b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml @@ -11,7 +11,7 @@ 肉鸽设置 自动公招 信用相关 - 理智设置 + 战斗设置 连接设置 启动设置 定时执行 diff --git a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml index da12c0cc6a..f7f1afdc4f 100644 --- a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml +++ b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml @@ -10,7 +10,7 @@ 肉鴿設定 自動公招 信用相關 - 理智設定 + 戰鬥設定 連接設定 啟動設定 定時執行 diff --git a/src/MaaWpfGui/Views/SettingsView.xaml b/src/MaaWpfGui/Views/SettingsView.xaml index 6d119f1131..88f404b177 100644 --- a/src/MaaWpfGui/Views/SettingsView.xaml +++ b/src/MaaWpfGui/Views/SettingsView.xaml @@ -120,7 +120,7 @@ Foreground="Gray" Style="{StaticResource TextBlockDefault}" Text="{Binding ListTitle[5]}" /> - diff --git a/src/MaaWpfGui/Views/UserControl/AboutUserControl.xaml.cs b/src/MaaWpfGui/Views/UserControl/AboutUserControl.xaml.cs index 9fc061a8bb..9b579a9e62 100644 --- a/src/MaaWpfGui/Views/UserControl/AboutUserControl.xaml.cs +++ b/src/MaaWpfGui/Views/UserControl/AboutUserControl.xaml.cs @@ -19,7 +19,7 @@ using System.Windows.Documents; namespace MaaWpfGui { /// - /// PenguinReportSettingsUserControl.xaml 的交互逻辑 + /// OtherCombatSettingsUserControl.xaml 的交互逻辑 /// public partial class AboutUserControl : UserControl { diff --git a/src/MaaWpfGui/Views/UserControl/GameClientUserControl.xaml.cs b/src/MaaWpfGui/Views/UserControl/GameClientUserControl.xaml.cs index 8b6b700377..28b36f0087 100644 --- a/src/MaaWpfGui/Views/UserControl/GameClientUserControl.xaml.cs +++ b/src/MaaWpfGui/Views/UserControl/GameClientUserControl.xaml.cs @@ -11,15 +11,12 @@ // but WITHOUT ANY WARRANTY // -using System.Diagnostics; -using System.Windows; using System.Windows.Controls; -using System.Windows.Documents; namespace MaaWpfGui { /// - /// PenguinReportSettingsUserControl.xaml 的交互逻辑 + /// GameClientUserControl.xaml 的交互逻辑 /// public partial class GameClientUserControl : UserControl { diff --git a/src/MaaWpfGui/Views/UserControl/PenguinReportSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/OtherCombatSettingsUserControl.xaml similarity index 98% rename from src/MaaWpfGui/Views/UserControl/PenguinReportSettingsUserControl.xaml rename to src/MaaWpfGui/Views/UserControl/OtherCombatSettingsUserControl.xaml index 5ad3b1acb2..2483ddcc21 100644 --- a/src/MaaWpfGui/Views/UserControl/PenguinReportSettingsUserControl.xaml +++ b/src/MaaWpfGui/Views/UserControl/OtherCombatSettingsUserControl.xaml @@ -1,5 +1,5 @@  +// // MaaWpfGui - A part of the MaaCoreArknights project // Copyright (C) 2021 MistEO and Contributors // @@ -16,14 +16,14 @@ using System.Windows.Controls; namespace MaaWpfGui { /// - /// PenguinReportSettingsUserControl.xaml 的交互逻辑 + /// OtherCombatSettingsUserControl.xaml 的交互逻辑 /// - public partial class PenguinReportSettingsUserControl : UserControl + public partial class OtherCombatSettingsUserControl : UserControl { /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// - public PenguinReportSettingsUserControl() + public OtherCombatSettingsUserControl() { InitializeComponent(); } diff --git a/src/MaaWpfGui/Views/UserControl/VersionUpdateSettingsUserControl.xaml.cs b/src/MaaWpfGui/Views/UserControl/VersionUpdateSettingsUserControl.xaml.cs index 22f730d7c9..a255870081 100644 --- a/src/MaaWpfGui/Views/UserControl/VersionUpdateSettingsUserControl.xaml.cs +++ b/src/MaaWpfGui/Views/UserControl/VersionUpdateSettingsUserControl.xaml.cs @@ -16,7 +16,7 @@ using System.Windows.Controls; namespace MaaWpfGui { /// - /// PenguinReportSettingsUserControl.xaml 的交互逻辑 + /// OtherCombatSettingsUserControl.xaml 的交互逻辑 /// public partial class VersionUpdateSettingsUserControl : UserControl {