From 095fc37edecc0afc082f55831748195b407c0ad7 Mon Sep 17 00:00:00 2001 From: wangli <342970955@qq.com> Date: Sat, 31 Dec 2022 18:36:35 +0800 Subject: [PATCH] =?UTF-8?q?WpfGUI=20=E6=B7=BB=E5=8A=A0=E8=82=89=E9=B8=BD?= =?UTF-8?q?=E5=8A=A9=E6=88=98=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MaaWpfGui/Main/AsstProxy.cs | 6 +++- src/MaaWpfGui/Main/SettingsViewModel.cs | 30 +++++++++++++++++++ src/MaaWpfGui/Main/TaskQueueViewModel.cs | 3 +- 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 ++ .../RoguelikeSettingsUserControl.xaml | 18 +++++++++++ 9 files changed, 65 insertions(+), 2 deletions(-) diff --git a/src/MaaWpfGui/Main/AsstProxy.cs b/src/MaaWpfGui/Main/AsstProxy.cs index 584f6dcb73..3bf83a6b61 100644 --- a/src/MaaWpfGui/Main/AsstProxy.cs +++ b/src/MaaWpfGui/Main/AsstProxy.cs @@ -1431,10 +1431,12 @@ namespace MaaWpfGui /// TODO. /// TODO. /// TODO. + /// 是否core_char使用好友助战 + /// 是否允许使用非好友助战 /// 肉鸽名字。["Phantom", "Mizuki"] /// 是否成功。 public bool AsstAppendRoguelike(int mode, int starts, bool investment_enabled, int invests, bool stop_when_full, - string squad, string roles, string core_char, string theme) + string squad, string roles, string core_char, bool use_support, bool enable_nonfriend_support, string theme) { var task_params = new JObject(); task_params["mode"] = mode; @@ -1457,6 +1459,8 @@ namespace MaaWpfGui { task_params["core_char"] = core_char; } + task_params["use_support"] = use_support; + task_params["use_nonfriend_support"] = enable_nonfriend_support; AsstTaskId id = AsstAppendTaskWithEncoding("Roguelike", task_params); _latestTaskId[TaskType.Roguelike] = id; diff --git a/src/MaaWpfGui/Main/SettingsViewModel.cs b/src/MaaWpfGui/Main/SettingsViewModel.cs index e93a785e76..a6a556daf2 100644 --- a/src/MaaWpfGui/Main/SettingsViewModel.cs +++ b/src/MaaWpfGui/Main/SettingsViewModel.cs @@ -1078,6 +1078,36 @@ namespace MaaWpfGui } } + private string _roguelikeUseSupportUnit = ViewStatusStorage.Get("Roguelike.RoguelikeUseSupportUnit", false.ToString()); + + /// + /// Is core char a support unit + /// + public bool RoguelikeUseSupportUnit + { + get => bool.Parse(_roguelikeUseSupportUnit); + set + { + SetAndNotify(ref _roguelikeUseSupportUnit, value.ToString()); + ViewStatusStorage.Set("Roguelike.RoguelikeUseSupportUnit", value.ToString()); + } + } + + private string _roguelikeEnableNonfriendSupport = ViewStatusStorage.Get("Roguelike.RoguelikeEnableNonfriendSupport", false.ToString()); + + /// + /// Can roguelike support unit belong to nonfriend + /// + public bool RoguelikeEnableNonfriendSupport + { + get => bool.Parse(_roguelikeEnableNonfriendSupport); + set + { + SetAndNotify(ref _roguelikeEnableNonfriendSupport, value.ToString()); + ViewStatusStorage.Set("Roguelike.RoguelikeEnableNonfriendSupport", value.ToString()); + } + } + private string _roguelikeStartsCount = ViewStatusStorage.Get("Roguelike.StartsCount", "9999999"); /// diff --git a/src/MaaWpfGui/Main/TaskQueueViewModel.cs b/src/MaaWpfGui/Main/TaskQueueViewModel.cs index 57af4e0c5a..a0666adb46 100644 --- a/src/MaaWpfGui/Main/TaskQueueViewModel.cs +++ b/src/MaaWpfGui/Main/TaskQueueViewModel.cs @@ -899,7 +899,8 @@ namespace MaaWpfGui return asstProxy.AsstAppendRoguelike( mode, settings.RoguelikeStartsCount, settings.RoguelikeInvestmentEnabled, settings.RoguelikeInvestsCount, settings.RoguelikeStopWhenInvestmentFull, - settings.RoguelikeSquad, settings.RoguelikeRoles, settings.RoguelikeCoreChar, settings.RoguelikeTheme); + settings.RoguelikeSquad, settings.RoguelikeRoles, settings.RoguelikeCoreChar, settings.RoguelikeUseSupportUnit, + settings.RoguelikeEnableNonfriendSupport, settings.RoguelikeTheme); } [DllImport("User32.dll", EntryPoint = "FindWindow")] diff --git a/src/MaaWpfGui/Res/Localizations/en-us.xaml b/src/MaaWpfGui/Res/Localizations/en-us.xaml index 569321179b..a252794288 100644 --- a/src/MaaWpfGui/Res/Localizations/en-us.xaml +++ b/src/MaaWpfGui/Res/Localizations/en-us.xaml @@ -74,6 +74,8 @@ Starting Roles Starting Oper (single, CN name only) Only supports the CN name of a single oper, default if not filled. + Select "Starting Oper" from support unit list + Enable nonfirend support Deployment with Pause (Works for IS, Copilot and 保全派驻) Default diff --git a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml index 9d084c1ac0..4a36a93a04 100644 --- a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml +++ b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml @@ -66,6 +66,8 @@ 最初の職業 最初のオペレーター（一人だけ、中国名のみを入力可能） 一人のオペレーターの中国名のみをサポートします。入力されていない場合はデフォルトになります。 + 開幕戦の幹部は助戦を使った + フレンド以外のアシストを使用できます デフォルト （ミヅキ）心胜于物分队 diff --git a/src/MaaWpfGui/Res/Localizations/ko-kr.xaml b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml index 7aede83571..3eb9d44f40 100644 --- a/src/MaaWpfGui/Res/Localizations/ko-kr.xaml +++ b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml @@ -73,6 +73,8 @@ 모집 조합 시작 오퍼레이터 (1명) 단일 오퍼레이터의 중국어 이름만 지원하며, 입력하지 않으면 기본값이 선택됩니다 + 오프닝 요원은 전투를 돕기 위해 사용합니다 + 친구가 아닌 친구를 사용하여 전투를 도울 수 있습니다 일시정지 상태로 배치하기 (통합전략, 자동 작전, 보전파견에 적용) 기본값 diff --git a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml index a65f97a484..53de1c8081 100644 --- a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml +++ b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml @@ -74,6 +74,8 @@ 开局职业组 开局干员 (单个) 仅支持单个干员中文名，不填写则默认选择 + “开局干员”使用助战 + 可以使用非好友助战 暂停下干员（同时影响肉鸽、自动战斗、保全） 默认分队 diff --git a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml index 13ae3a3de2..4d08005799 100644 --- a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml +++ b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml @@ -65,6 +65,8 @@ 開局職業組 開局幹員(單個) 僅支持單個幹員中文名，不填寫則默認選擇 + 開局幹員使用助戰 + 可以使用非好友助戰 默認分隊 心勝於物分隊 diff --git a/src/MaaWpfGui/Views/UserControl/RoguelikeSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/RoguelikeSettingsUserControl.xaml index 99975350eb..e0cd4781d8 100644 --- a/src/MaaWpfGui/Views/UserControl/RoguelikeSettingsUserControl.xaml +++ b/src/MaaWpfGui/Views/UserControl/RoguelikeSettingsUserControl.xaml @@ -164,6 +164,24 @@ TextWrapping="Wrap" ToolTip="{DynamicResource StartingCoreCharTip}" /> + + + + \ No newline at end of file