fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-18 18:20:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: 界面支持公招三星设置短时间

Browse Source 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/pull/1519
This commit is contained in:
MistEO
2022-08-12 22:57:33 +08:00
parent 17b42bd600
commit 673c823d40
10 changed files with 48 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/MeoAsstGui/Helper/AsstProxy.cs
View File

@@ -1121,7 +1121,7 @@ namespace MeoAsstGui
/// <param name="use_expedited">是否使用加急许可。</param>
/// <param name="skip_robot">是否在识别到小车词条时跳过。</param>
/// <returns>是否成功。</returns>
public bool AsstAppendRecruit(int max_times, int[] select_level, int required_len, int[] confirm_level, int confirm_len, bool need_refresh, bool use_expedited, bool skip_robot)
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)
{
var task_params = new JObject();
task_params["refresh"] = need_refresh;
@@ -1132,6 +1132,12 @@ namespace MeoAsstGui
task_params["expedite"] = use_expedited;
task_params["expedite_times"] = max_times;
task_params["skip_robot"] = skip_robot;
if (is_level3_use_short_time)
{
task_params["recruitment_time"] = new JObject();
task_params["recruitment_time"]["3"] = 460; // 7:40
}
TaskId id = AsstAppendTaskWithEncoding("Recruit", task_params);
_latestTaskId[TaskType.Recruit] = id;
return id != 0;

2
src/MeoAsstGui/Resources/Localizations/en-us.xaml
View File

@@ -364,6 +364,8 @@
<!-- AutoRecruitSettings -->
<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="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 1 ★</system:String>
<system:String x:Key="AutoSelectLevel3">Auto confirm 3 ★</system:String>

2
src/MeoAsstGui/Resources/Localizations/ja-jp.xaml
View File

@@ -364,6 +364,8 @@
<!-- AutoRecruitSettings -->
<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="Level3UseShortTimeTip">他の星との干渉がない</system:String>
<system:String x:Key="RecruitMaxTimes">1回の実行あたりの求人の最大回数</system:String>
<system:String x:Key="ManuallySelectLevel1">星1を手動的に確認する</system:String>
<system:String x:Key="AutoSelectLevel3">星3を自動的に確認する</system:String>

2
src/MeoAsstGui/Resources/Localizations/ko-kr.xaml
View File

@@ -364,6 +364,8 @@
<!-- AutoRecruitSettings -->
<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="Level3UseShortTimeTip">다른 별과의 간섭 없음</system:String>
<system:String x:Key="RecruitMaxTimes">실행할 때 최대 모집횟수</system:String>
<system:String x:Key="ManuallySelectLevel1">★ 1 수동 확인</system:String>
<system:String x:Key="AutoSelectLevel3">★ 3 자동 확인</system:String>

4
src/MeoAsstGui/Resources/Localizations/pallas.xaml
View File

@@ -123,7 +123,7 @@
<system:String x:Key="StartTimesLimit">🍻🍷🍸🍷</system:String>
<system:String x:Key="GoldTimesLimit">🍺🍻🍺🍺</system:String>
<system:String x:Key="StopOnGoldLimit">🍸🍸🍻🍸🍷🍺</system:String>
<system:String x:Key="InvestmentEnabled">💃🍷🍺🍺🍸🍷🕺🍷</system:String>
<system:String x:Key="InvestmentEnabled">🍸🕺🍺💃🍸🍻🕺🍺🍸</system:String>
<system:String x:Key="PenguinID">🍻🕺🍷🍻🕺🍸🍻🍻</system:String>
@@ -364,6 +364,8 @@
<!-- AutoRecruitSettings -->
<system:String x:Key="AutoRefresh">🕺🍸🍺🍻🍸🍺💃</system:String>
<system:String x:Key="AutoUseExpedited">🍸🍷🍸🍻🍻</system:String>
<system:String x:Key="Level3UseShortTime">🍷🍷🍸🍻🍷🍻🍺🍻💃🍸🍺🍸🍸🍷🍺🕺🕺🍻🍺</system:String>
<system:String x:Key="Level3UseShortTimeTip">🍻🍸💃💃🍸🍺🍺🍸🍺🍸🍸🍸🍺</system:String>
<system:String x:Key="RecruitMaxTimes">🍸🍺💃🍸🕺🍺</system:String>
<system:String x:Key="ManuallySelectLevel1">🍺🍸🍷🍺💃</system:String>
<system:String x:Key="AutoSelectLevel3">🍸🍸🍻🍸🍻</system:String>

2
src/MeoAsstGui/Resources/Localizations/zh-cn.xaml
View File

@@ -364,6 +364,8 @@
<!-- AutoRecruitSettings -->
<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="Level3UseShortTimeTip">不影响其他星级 Tags</system:String>
<system:String x:Key="RecruitMaxTimes">每次执行时最大招募次数</system:String>
<system:String x:Key="ManuallySelectLevel1">手动确认 1 星</system:String>
<system:String x:Key="AutoSelectLevel3">自动确认 3 星</system:String>

2
src/MeoAsstGui/Resources/Localizations/zh-tw.xaml
View File

@@ -364,6 +364,8 @@
<!-- AutoRecruitSettings -->
<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="Level3UseShortTimeTip">不影響其他星級 Tags</system:String>
<system:String x:Key="RecruitMaxTimes">每次執行時最大招募次數</system:String>
<system:String x:Key="ManuallySelectLevel1">手動確認 1 星</system:String>
<system:String x:Key="AutoSelectLevel3">自動確認 3 星</system:String>

13
src/MeoAsstGui/UserControl/AutoRecruitSettingsUserControl.xaml
View File

@@ -8,7 +8,7 @@
xmlns:s="https://github.com/canton7/Stylet"
xmlns:vm="clr-namespace:MeoAsstGui;assembly=MeoAsstGui"
d:DataContext="{d:DesignInstance {x:Type vm:SettingsViewModel}}"
d:DesignHeight="150"
d:DesignHeight="180"
d:DesignWidth="400"
mc:Ignorable="d">
<Grid>
@@ -21,7 +21,7 @@
</Grid.ColumnDefinitions>
<Grid
Height="125"
Height="180"
HorizontalAlignment="Stretch"
VerticalAlignment="Center">
<StackPanel
@@ -39,9 +39,15 @@
Content="{DynamicResource AutoUseExpedited}"
IsChecked="{Binding UseExpedited}"
ToolTip="{DynamicResource CheckBoxesNotSaved}" />
<CheckBox
Margin="10"
HorizontalAlignment="Left"
Content="{DynamicResource Level3UseShortTime}"
IsChecked="{Binding IsLevel3UseShortTime}"
ToolTip="{DynamicResource Level3UseShortTimeTip}" />
</StackPanel>
<StackPanel
Margin="0,85,0,0"
Margin="0,110,0,0"
HorizontalAlignment="Center"
VerticalAlignment="Top"
Orientation="Horizontal">
@@ -60,7 +66,6 @@
InputMethod.IsInputMethodEnabled="False"
Text="{Binding RecruitMaxTimes}" />
</StackPanel>
</Grid>
<StackPanel

16
src/MeoAsstGui/ViewModels/SettingsViewModel.cs
View File

@@ -1279,6 +1279,22 @@ namespace MeoAsstGui
set { SetAndNotify(ref _useExpedited, value); }
}
private bool _isLevel3UseShortTime = Convert.ToBoolean(ViewStatusStorage.Get("AutoRecruit.IsLevel3UseShortTime", bool.FalseString));
public bool IsLevel3UseShortTime
{
get
{
return _isLevel3UseShortTime;
}
set
{
SetAndNotify(ref _isLevel3UseShortTime, value);
ViewStatusStorage.Set("AutoRecruit.IsLevel3UseShortTime", value.ToString());
}
}
private bool _notChooseLevel1 = Convert.ToBoolean(ViewStatusStorage.Get("AutoRecruit.NotChooseLevel1", bool.TrueString));
/// <summary>

7
src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs
View File

@@ -943,12 +943,11 @@ namespace MeoAsstGui
cfmList.Add(5);
}
bool need_refresh = settings.RefreshLevel3;
bool use_expedited = settings.UseExpedited;
var asstProxy = _container.Get<AsstProxy>();
return asstProxy.AsstAppendRecruit(
max_times, reqList.ToArray(), reqList.Count, cfmList.ToArray(), cfmList.Count, need_refresh, use_expedited, settings.NotChooseLevel1);
max_times, reqList.ToArray(), cfmList.ToArray(),
settings.RefreshLevel3, settings.UseExpedited,
settings.NotChooseLevel1, settings.IsLevel3UseShortTime);
}
private bool appendRoguelike()