feat: 自动公招/公开招募功能支持3星使用1:00招募时间

This commit is contained in:
uye
2023-06-08 13:53:34 +08:00
parent 07bb11a900
commit 6b64500fc7
12 changed files with 138 additions and 31 deletions

View File

@@ -79,6 +79,7 @@ namespace MaaWpfGui.Constants
public const string ChooseLevel6 = "Recruit.ChooseLevel6";
public const string AutoSetTime = "Recruit.AutoSetTime";
public const string Level3UseShortTime = "Recruit.IsLevel3UseShortTime";
public const string Level3UseShortTime2 = "Recruit.IsLevel3UseShortTime2";
public const string RecruitmentShowPotential = "Recruit.ShowPotential";
public const string DormThreshold = "Infrast.DormThreshold";
@@ -117,6 +118,7 @@ namespace MaaWpfGui.Constants
public const string RecruitMaxTimes = "AutoRecruit.MaxTimes";
public const string RefreshLevel3 = "AutoRecruit.RefreshLevel3";
public const string IsLevel3UseShortTime = "AutoRecruit.IsLevel3UseShortTime";
public const string IsLevel3UseShortTime2 = "AutoRecruit.IsLevel3UseShortTime2";
public const string NotChooseLevel1 = "AutoRecruit.NotChooseLevel1";
public const string RecruitChooseLevel3 = "AutoRecruit.ChooseLevel3";
public const string RecruitChooseLevel4 = "AutoRecruit.ChooseLevel4";

View File

@@ -1375,8 +1375,10 @@ namespace MaaWpfGui.Main
/// <param name="use_expedited">是否使用加急许可。</param>
/// <param name="skip_robot">是否在识别到小车词条时跳过。</param>
/// <param name="is_level3_use_short_time">三星Tag是否使用短时间7:40</param>
/// <param name="is_level3_use_short_time2">三星Tag是否使用短时间1:00</param>
/// <returns>是否成功。</returns>
public bool AsstAppendRecruit(int max_times, int[] select_level, int[] confirm_level, bool need_refresh, bool use_expedited, bool skip_robot, bool is_level3_use_short_time)
public bool AsstAppendRecruit(int max_times, int[] select_level, int[] confirm_level, bool need_refresh, bool use_expedited,
bool skip_robot, bool is_level3_use_short_time, bool is_level3_use_short_time2 = false)
{
var task_params = new JObject
{
@@ -1396,6 +1398,13 @@ namespace MaaWpfGui.Main
["3"] = 460, // 7:40
};
}
else if (is_level3_use_short_time2)
{
task_params["recruitment_time"] = new JObject
{
["3"] = 60, // 1:00
};
}
task_params["report_to_penguin"] = true;
task_params["report_to_yituliu"] = true;
@@ -1588,9 +1597,21 @@ namespace MaaWpfGui.Main
["report_to_penguin"] = true,
["report_to_yituliu"] = true,
};
task_params["recruitment_time"] = Instances.RecognizerViewModel.IsLevel3UseShortTime ?
new JObject { { "3", 460 } } :
new JObject { { "3", 540 } };
int recruitmentTime;
if (Instances.RecognizerViewModel.IsLevel3UseShortTime)
{
recruitmentTime = 460;
}
else if (Instances.RecognizerViewModel.IsLevel3UseShortTime2)
{
recruitmentTime = 60;
}
else
{
recruitmentTime = 540;
}
task_params["recruitment_time"] = new JObject { { "3", recruitmentTime } };
task_params["penguin_id"] = Instances.SettingsViewModel.PenguinId;
task_params["yituliu_id"] = Instances.SettingsViewModel.PenguinId; // 一图流说随便传个uuid就行让client自己生成所以先直接嫖一下企鹅的
task_params["server"] = Instances.SettingsViewModel.ServerType;

View File

@@ -1,4 +1,7 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:system="clr-namespace:System;assembly=mscorlib">
<ResourceDictionary
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:system="clr-namespace:System;assembly=mscorlib">
<!-- Settings -->
<system:String x:Key="Settings">Settings</system:String>
<system:String x:Key="GeneralSettings">General</system:String>
@@ -80,7 +83,7 @@
<system:String x:Key="StartingRoles">Starting Roles</system:String>
<system:String x:Key="StartingCoreChar">Starting Oper (single, CN name only)</system:String>
<system:String x:Key="StartingCoreCharTip">Only supports the CN name of a single oper, default if not filled.</system:String>
<system:String x:Key="RoguelikeUseSupportUnit">Select "Starting Oper" from support unit list</system:String>
<system:String x:Key="RoguelikeUseSupportUnit">Select &quot;Starting Oper&quot; from support unit list</system:String>
<system:String x:Key="RoguelikeUseNonFriendSupport">Enable nonfirend support</system:String>
<system:String x:Key="DeploymentWithPause" xml:space="preserve">Deployment with Pause (Works for IS, Copilot and SSS) (Beta function, Not recommended yet)</system:String>
<system:String x:Key="AdbLiteEnabled">Use ADB Lite (Experimental)</system:String>
@@ -233,7 +236,7 @@ Please do not check it when the stage OF-1 is not unlocked.</system:String>
<system:String x:Key="MainViewButtonFeature">Variable function button</system:String>
<system:String x:Key="CustomStageCode">Manual entry of level names</system:String>
<system:String x:Key="CustomStageCodeTip" xml:space="preserve">Support most main stage names + stage names from the original list (e.g. 4-10, AP-5, H10-1-Hard, etc.)
At the end of the level, enter "Normal/Hard" to switch between Normal and Tough difficulty</system:String>
At the end of the level, enter &quot;Normal/Hard&quot; to switch between Normal and Tough difficulty</system:String>
<system:String x:Key="AutoDetectConnection">Auto detect connection</system:String>
<system:String x:Key="AutoDetectConnectionTip">The checkbox will be automatically unchecked after each detect is completed, and can be checked again if you need to re-detect</system:String>
<system:String x:Key="AlwaysAutoDetectConnection">Re-detect every times</system:String>
@@ -347,7 +350,7 @@ At the end of the level, enter "Normal/Hard" to switch between Normal and Tough
<system:String x:Key="RecruitmentRecognitionTip">Tip: This recognition is independent from main tab (Farming); need open up in game recruit tag selection screen then begin ~</system:String>
<system:String x:Key="AutoSettingTime">Auto setting time</system:String>
<system:String x:Key="RecruitmentShowPotential">Show Potential</system:String>
<system:String x:Key="RecruitmentShowPotentialTips">Please use the "Operator" to get information.</system:String>
<system:String x:Key="RecruitmentShowPotentialTips">Please use the &quot;Operator&quot; to get information.</system:String>
<system:String x:Key="AutoSelectLevel3Tags">Auto select 3 ★ Tags</system:String>
<system:String x:Key="AutoSelectLevel4Tags">Auto select 4 ★ Tags</system:String>
<system:String x:Key="AutoSelectLevel5Tags">Auto select 5 ★ Tags</system:String>
@@ -373,7 +376,7 @@ At the end of the level, enter "Normal/Hard" to switch between Normal and Tough
<system:String x:Key="VideoRecognition">Video</system:String>
<system:String x:Key="StartToVideoRecognition">Start to identify</system:String>
<system:String x:Key="OpenVideoRecognitionResult">Open Directory</system:String>
<system:String x:Key="VideoRecognitionTips" xml:space="preserve">For video recognition, please open the "Copilot" page and drag the strategy video into it.
<system:String x:Key="VideoRecognitionTips" xml:space="preserve">For video recognition, please open the &quot;Copilot&quot; page and drag the strategy video into it.
The video resolution is required to be 16:9, and there are no interference factors such as black borders, emulator borders, and special-shaped screen corrections.</system:String>
<!-- Video Recognition -->
@@ -415,17 +418,17 @@ The video resolution is required to be 16:9, and there are no interference facto
<system:String x:Key="ThanksForLikeWebJson">Thanks for the likes!\nThe comment section is already open on the web page, please feel free to leave your comment!</system:String>
<system:String x:Key="AutoSquad">Auto squad</system:String>
<system:String x:Key="LoopTimes">LoopTimes</system:String>
<system:String x:Key="AutoSquadTip">The operator of "special focus" cannot be identified at this time</system:String>
<system:String x:Key="AutoSquadTip">The operator of &quot;special focus&quot; cannot be identified at this time</system:String>
<system:String x:Key="Start">Start</system:String>
<system:String x:Key="VideoLink">Video Link</system:String>
<!-- Logs -->
<system:String x:Key="CopilotTip">
Tips: \n\n
1. Please use this function only when "Start" is visible in game.\n\n
2. You need turn off the "Auto squad" if using friend support unit, then start with your support unit selected.\n\n
3. For Paradox Simulation, you need to turn off "Auto squad" and select the skill before, then start in game "start" screen.\n\n
1. Please use this function only when &quot;Start&quot; is visible in game.\n\n
2. You need turn off the &quot;Auto squad&quot; if using friend support unit, then start with your support unit selected.\n\n
3. For Paradox Simulation, you need to turn off &quot;Auto squad&quot; and select the skill before, then start in game &quot;start&quot; screen.\n\n
4. For SSS, There are multiple built-in files under the resource/copilot folder.\n
Please start on the "Start Deployment" screen after manual formation (can be used with "Loop times")\n\n
Please start on the &quot;Start Deployment&quot; screen after manual formation (can be used with &quot;Loop times&quot;)\n\n
5. Video recognition is now supported, please drag the guide video to use. \n
The video resolution is required to be 16:9, and there are no distracting elements such as black borders, emulator borders, and special-shaped screen corrections.\n\n
</system:String>
@@ -551,6 +554,7 @@ The video resolution is required to be 16:9, and there are no interference facto
<system:String x:Key="AutoRefresh">Auto refresh 3 ★ Tags</system:String>
<system:String x:Key="AutoUseExpedited">Auto use Expedited*</system:String>
<system:String x:Key="Level3UseShortTime">Set 7:40 instead of 9:00 of 3 ★ Tags</system:String>
<system:String x:Key="Level3UseShortTime2">Set 1:00 instead of 9:00 of 3 ★ Tags</system:String>
<system:String x:Key="Level3UseShortTimeTip">No interference with other stars</system:String>
<system:String x:Key="RecruitMaxTimes">Recruit max times</system:String>
<system:String x:Key="ManuallySelectLevel1">Manually confirm Robot</system:String>
@@ -561,7 +565,7 @@ The video resolution is required to be 16:9, and there are no interference facto
<system:String x:Key="Level1Tip">If checked, 1 ★ recruit will be skipped. If not checked, 1 ★ entry with be ignored.</system:String>
<!-- AutoRecruitSettings -->
<!-- EasterEggs -->
<system:String x:Key="BuyWineOnAprilFoolsDay">Dear doctor, ever heard of the new listings of "isopropyl alcohol" in Ms. Closure's store? let's check it out?</system:String>
<system:String x:Key="BuyWineOnAprilFoolsDay">Dear doctor, ever heard of the new listings of &quot;isopropyl alcohol&quot; in Ms. Closure's store? let's check it out?</system:String>
<system:String x:Key="Burping">Ugh……Ehem</system:String>
<system:String x:Key="DrunkAndStaggering">Ah, doctor. Why do you sway, so much in your movement today?</system:String>
<system:String x:Key="Hangover">I can not drink…drink so much next time……</system:String>

View File

@@ -1,4 +1,7 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:system="clr-namespace:System;assembly=mscorlib">
<ResourceDictionary
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:system="clr-namespace:System;assembly=mscorlib">
<!-- 設定 -->
<system:String x:Key="Settings">設定</system:String>
<system:String x:Key="GeneralSettings">一般設定</system:String>
@@ -80,7 +83,7 @@
<system:String x:Key="StartingRoles">最初の職業</system:String>
<system:String x:Key="StartingCoreChar">最初のオペレーター(一人だけ、中国名のみを入力可能)</system:String>
<system:String x:Key="StartingCoreCharTip">一人のオペレーターの中国名のみをサポートします。入力されていない場合はデフォルトになります。</system:String>
<system:String x:Key="RoguelikeUseSupportUnit">"最初のオペレーター"をサポートから選択</system:String>
<system:String x:Key="RoguelikeUseSupportUnit">&quot;最初のオペレーター&quot;をサポートから選択</system:String>
<system:String x:Key="RoguelikeUseNonFriendSupport">フレンド以外のサポートの使用を許可</system:String>
<system:String x:Key="DeploymentWithPause">統合戦略/保全駐在でポーズトリックを使用します(ベータ機能のため非推奨です)</system:String>
<system:String x:Key="AdbLiteEnabled">軽量ADBを使用(実験機能)</system:String>
@@ -228,7 +231,7 @@
<system:String x:Key="MainViewButtonFeature">スタート画面に表示する便利ボタン</system:String>
<system:String x:Key="CustomStageCode">ステージ名を入力する</system:String>
<system:String x:Key="CustomStageCodeTip" xml:space="preserve">(テスト機能)ステージ名と番号(例: 4-10、AP-5、H10-1-Hardなど
の両方がサポートされています。レベルの最後に"Normal/Hard"を入力することで、標準から強襲/厄難に難易度を切り替えることができます</system:String>
の両方がサポートされています。レベルの最後に&quot;Normal/Hard&quot;を入力することで、標準から強襲/厄難に難易度を切り替えることができます</system:String>
<system:String x:Key="AutoDetectConnection">接続自動認識</system:String>
<system:String x:Key="AutoDetectConnectionTip">このチェックボックスは、検出が完了するたびに自動的にチェックが外れますが、再検出が必要な場合は再度チェックを入れることができます</system:String>
<system:String x:Key="AlwaysAutoDetectConnection">毎回再検出する</system:String>
@@ -544,6 +547,7 @@
<system:String x:Key="AutoRefresh">星3タグを自動的に更新する</system:String>
<system:String x:Key="AutoUseExpedited">緊急招集票を自動的に使用*</system:String>
<system:String x:Key="Level3UseShortTime">星3タグを7:40に設定する</system:String>
<system:String x:Key="Level3UseShortTime2">星3タグを1:00に設定する</system:String>
<system:String x:Key="Level3UseShortTimeTip">他のレアリティには影響しない</system:String>
<system:String x:Key="RecruitMaxTimes">1回の実行あたりの求人の最大回数</system:String>
<system:String x:Key="ManuallySelectLevel1">ロボットを手動的に確認する</system:String>

View File

@@ -1,4 +1,7 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:system="clr-namespace:System;assembly=mscorlib">
<ResourceDictionary
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:system="clr-namespace:System;assembly=mscorlib">
<!-- 설정 -->
<system:String x:Key="Settings">설정</system:String>
<system:String x:Key="GeneralSettings">일반 설정</system:String>
@@ -228,7 +231,7 @@ OF-1을 해금하지 않았다면 선택하지 말아 주세요.</system:String>
<system:String x:Key="MainViewButtonFeature">메인 화면 버튼의 기능</system:String>
<system:String x:Key="CustomStageCode">스테이지 코드 수동 입력</system:String>
<system:String x:Key="CustomStageCodeTip" xml:space="preserve">대부분의 메인 스테이지와 원래 목록(예: 4-10, AP-5, H10-1-Hard)에 있는 스테이지 이름을 지원합니다.
레벨 끝에서 "Normal / Hard"를 입력하여 일반 및 터프 난이도 간 전환</system:String>
레벨 끝에서 &quot;Normal / Hard&quot;를 입력하여 일반 및 터프 난이도 간 전환</system:String>
<system:String x:Key="AutoDetectConnection">연결 자동 감지</system:String>
<system:String x:Key="AutoDetectConnectionTip">이 체크박스는 감지가 끝나면 자동으로 체크가 해제됩니다. 다시 감지하려면 다시 체크해주세요</system:String>
<system:String x:Key="AlwaysAutoDetectConnection">매번 재감지</system:String>
@@ -545,6 +548,7 @@ OF-1을 해금하지 않았다면 선택하지 말아 주세요.</system:String>
<system:String x:Key="AutoRefresh">★3 태그를 자동 새로고침하기</system:String>
<system:String x:Key="AutoUseExpedited">즉시 완료 허가증을 자동 사용*</system:String>
<system:String x:Key="Level3UseShortTime">★3 태그 9:00 대신 7:40 설정</system:String>
<system:String x:Key="Level3UseShortTime2">★3 태그 9:00 대신 1:00 설정</system:String>
<system:String x:Key="Level3UseShortTimeTip">다른 등급에는 적용되지 않습니다</system:String>
<system:String x:Key="RecruitMaxTimes">시행 시의 최대 모집횟수</system:String>
<system:String x:Key="ManuallySelectLevel1">로봇 수동 모집</system:String>

View File

@@ -1,4 +1,7 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:system="clr-namespace:System;assembly=mscorlib">
<ResourceDictionary
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:system="clr-namespace:System;assembly=mscorlib">
<!-- 设置 -->
<system:String x:Key="Settings">设置</system:String>
<system:String x:Key="GeneralSettings">常规设置</system:String>
@@ -233,7 +236,7 @@
<system:String x:Key="MainViewButtonFeature">主界面可选择按钮功能</system:String>
<system:String x:Key="CustomStageCode">手动输入关卡名</system:String>
<system:String x:Key="CustomStageCodeTip" xml:space="preserve">支持大部分主线关卡名与原列表的关卡名如4-10、AP-5、H10-1-Hard
可在关卡结尾输入"Normal/Hard"表示需要切换标准与磨难难度</system:String>
可在关卡结尾输入&quot;Normal/Hard&quot;表示需要切换标准与磨难难度</system:String>
<system:String x:Key="AutoDetectConnection">自动检测连接</system:String>
<system:String x:Key="AutoDetectConnectionTip">每次检测完成后会自动取消勾选,若需要重新检测可再次勾选,若反复连接失败可勾选始终自动检测连接</system:String>
<system:String x:Key="AlwaysAutoDetectConnection">每次重新检测</system:String>
@@ -551,6 +554,7 @@
<system:String x:Key="AutoRefresh">自动刷新 3 星 Tags</system:String>
<system:String x:Key="AutoUseExpedited">自动使用加急许可*</system:String>
<system:String x:Key="Level3UseShortTime">3 星设置 7:40 而非 9:00</system:String>
<system:String x:Key="Level3UseShortTime2">3 星设置 1:00 而非 9:00</system:String>
<system:String x:Key="Level3UseShortTimeTip">不影响其他星级 Tags</system:String>
<system:String x:Key="RecruitMaxTimes">每次执行时最大招募次数</system:String>
<system:String x:Key="ManuallySelectLevel1">手动确认“支援机械”</system:String>

View File

@@ -1,4 +1,7 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:system="clr-namespace:System;assembly=mscorlib">
<ResourceDictionary
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:system="clr-namespace:System;assembly=mscorlib">
<!-- 設定 -->
<system:String x:Key="Settings">設定</system:String>
<system:String x:Key="GeneralSettings">常規設定</system:String>
@@ -228,7 +231,7 @@
<system:String x:Key="MainViewButtonFeature">主介面可選擇按鈕功能</system:String>
<system:String x:Key="CustomStageCode">手動輸入關卡代名</system:String>
<system:String x:Key="CustomStageCodeTip" xml:space="preserve">支持大部分主線關卡名與原列表的關卡名(如:4-10、AP-5、H10-1-Hard
可在關卡結尾輸入 "Normal/Hard" 表示需要切換標準與磨難難度</system:String>
可在關卡結尾輸入 &quot;Normal/Hard&quot; 表示需要切換標準與磨難難度</system:String>
<system:String x:Key="AutoDetectConnection">自動檢測連接</system:String>
<system:String x:Key="AutoDetectConnectionTip">每次檢測完成後會自動取消勾選,若需要重新檢測可再次勾選</system:String>
<system:String x:Key="AlwaysAutoDetectConnection">每次重新檢測</system:String>
@@ -545,6 +548,7 @@
<system:String x:Key="AutoRefresh">自動刷新 3 星 Tags</system:String>
<system:String x:Key="AutoUseExpedited">自動使用加急許可*</system:String>
<system:String x:Key="Level3UseShortTime">3 星設定 7:40 而非 9:00</system:String>
<system:String x:Key="Level3UseShortTime2">3 星設定 1:00 而非 9:00</system:String>
<system:String x:Key="Level3UseShortTimeTip">不影響其他星級 Tags</system:String>
<system:String x:Key="RecruitMaxTimes">每次執行時最大招募次數</system:String>
<system:String x:Key="ManuallySelectLevel1">手動確認“支援機械”</system:String>

View File

@@ -174,11 +174,36 @@ namespace MaaWpfGui.ViewModels.UI
get => _isLevel3UseShortTime;
set
{
if (value)
{
IsLevel3UseShortTime2 = false;
}
SetAndNotify(ref _isLevel3UseShortTime, value);
ConfigurationHelper.SetValue(ConfigurationKeys.Level3UseShortTime, value.ToString());
}
}
private bool _isLevel3UseShortTime2 = Convert.ToBoolean(ConfigurationHelper.GetValue(ConfigurationKeys.Level3UseShortTime2, bool.FalseString));
/// <summary>
/// Gets or sets a value indicating whether to shorten the time for level 3.
/// </summary>
public bool IsLevel3UseShortTime2
{
get => _isLevel3UseShortTime2;
set
{
if (value)
{
IsLevel3UseShortTime = false;
}
SetAndNotify(ref _isLevel3UseShortTime2, value);
ConfigurationHelper.SetValue(ConfigurationKeys.Level3UseShortTime2, value.ToString());
}
}
private bool _recruitCaught = false;
/// <summary>

View File

@@ -1811,11 +1811,36 @@ namespace MaaWpfGui.ViewModels.UI
get => _isLevel3UseShortTime;
set
{
if (value)
{
IsLevel3UseShortTime2 = false;
}
SetAndNotify(ref _isLevel3UseShortTime, value);
ConfigurationHelper.SetValue(ConfigurationKeys.IsLevel3UseShortTime, value.ToString());
}
}
private bool _isLevel3UseShortTime2 = Convert.ToBoolean(ConfigurationHelper.GetValue(ConfigurationKeys.IsLevel3UseShortTime2, bool.FalseString));
/// <summary>
/// Gets or sets a value indicating whether to shorten the time for level 3.
/// </summary>
public bool IsLevel3UseShortTime2
{
get => _isLevel3UseShortTime2;
set
{
if (value)
{
IsLevel3UseShortTime = false;
}
SetAndNotify(ref _isLevel3UseShortTime2, value);
ConfigurationHelper.SetValue(ConfigurationKeys.IsLevel3UseShortTime2, value.ToString());
}
}
private bool _notChooseLevel1 = Convert.ToBoolean(ConfigurationHelper.GetValue(ConfigurationKeys.NotChooseLevel1, bool.TrueString));
/// <summary>

View File

@@ -1028,9 +1028,8 @@ namespace MaaWpfGui.ViewModels.UI
}
return Instances.AsstProxy.AsstAppendRecruit(
max_times, reqList.ToArray(), cfmList.ToArray(),
Instances.SettingsViewModel.RefreshLevel3, Instances.SettingsViewModel.UseExpedited,
Instances.SettingsViewModel.NotChooseLevel1, Instances.SettingsViewModel.IsLevel3UseShortTime);
max_times, reqList.ToArray(), cfmList.ToArray(), Instances.SettingsViewModel.RefreshLevel3, Instances.SettingsViewModel.UseExpedited,
Instances.SettingsViewModel.NotChooseLevel1, Instances.SettingsViewModel.IsLevel3UseShortTime, Instances.SettingsViewModel.IsLevel3UseShortTime2);
}
private bool AppendRoguelike()

View File

@@ -69,6 +69,14 @@
ToolTip="{DynamicResource Level3UseShortTimeTip}">
<controls:TextBlock Text="{DynamicResource Level3UseShortTime}" TextWrapping="Wrap" />
</CheckBox>
<CheckBox
MaxWidth="170"
Margin="5"
HorizontalAlignment="Left"
IsChecked="{Binding IsLevel3UseShortTime2}"
ToolTip="{DynamicResource Level3UseShortTimeTip}">
<controls:TextBlock Text="{DynamicResource Level3UseShortTime2}" TextWrapping="Wrap" />
</CheckBox>
<CheckBox
MaxWidth="200"
Margin="5"
@@ -81,25 +89,25 @@
<StackPanel Margin="40,0,40,0" VerticalAlignment="Center">
<CheckBox
Margin="0,2"
Margin="5"
HorizontalAlignment="Left"
VerticalAlignment="Bottom"
Content="{DynamicResource AutoSelectLevel3Tags}"
IsChecked="{Binding ChooseLevel3}" />
<CheckBox
Margin="0,2"
Margin="5"
HorizontalAlignment="Left"
VerticalAlignment="Bottom"
Content="{DynamicResource AutoSelectLevel4Tags}"
IsChecked="{Binding ChooseLevel4}" />
<CheckBox
Margin="0,2"
Margin="5"
HorizontalAlignment="Left"
VerticalAlignment="Bottom"
Content="{DynamicResource AutoSelectLevel5Tags}"
IsChecked="{Binding ChooseLevel5}" />
<CheckBox
Margin="0,2"
Margin="5"
HorizontalAlignment="Left"
VerticalAlignment="Bottom"
Content="{DynamicResource AutoSelectLevel6Tags}"

View File

@@ -43,6 +43,13 @@
ToolTip="{DynamicResource Level3UseShortTimeTip}">
<controls:TextBlock Text="{DynamicResource Level3UseShortTime}" TextWrapping="Wrap" />
</CheckBox>
<CheckBox
Margin="0,10"
HorizontalAlignment="Left"
IsChecked="{Binding IsLevel3UseShortTime2}"
ToolTip="{DynamicResource Level3UseShortTimeTip}">
<controls:TextBlock Text="{DynamicResource Level3UseShortTime2}" TextWrapping="Wrap" />
</CheckBox>
<CheckBox
Margin="0,10"
Content="{DynamicResource ManuallySelectLevel1}"