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

fix: 公招 m_first_tag 匹配个数少于 3 个时的非预期情况 (#9258)

Browse Source 
* fix: `m_first_tag` 匹配个数少于 3 个时的非预期情况

* docs: 添加刷新前提描述
This commit is contained in:
70CentsApple
2024-06-03 22:36:18 +08:00
committed by GitHub
parent f9a216ed2f
commit ef458b41fd
5 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/MaaCore/Task/Miscellaneous/AutoRecruitTask.cpp
View File

@@ -691,6 +691,7 @@ asst::AutoRecruitTask::calc_task_result_type
return result;
}
// get selections
auto final_select = get_select_tags(result_vec, tag_ids);
// select tags
@@ -862,12 +863,13 @@ std::vector<std::string> asst::AutoRecruitTask::get_select_tags(
return select;
}
}
return select;
}
}
if (m_select_extra_tags_mode == ExtraTagsMode::NoExtra) {
return combinations.front().tags;
}
if (m_select_extra_tags_mode == ExtraTagsMode::Extra) {
else if (m_select_extra_tags_mode == ExtraTagsMode::Extra) {
while (select.size() < 3) {
for (const asst::RecruitCombs& comb : combinations) {
for (const std::string& tag : comb.tags) {

2
src/MaaWpfGui/Res/Localizations/zh-cn.xaml
View File

@@ -731,7 +731,7 @@
<system:String x:Key="Issue">问题反馈</system:String>
<!-- !About -->
<!-- AutoRecruitSettings -->
<system:String x:Key="AutoRefresh">自动刷新 3 星 Tags</system:String>
<system:String x:Key="AutoRefresh">无倾向 Tag 时自动刷新 3 星 Tags</system:String>
<system:String x:Key="ForceRefresh">无招聘许可时继续尝试刷新 Tags</system:String>
<system:String x:Key="AutoUseExpedited">自动使用加急许可*</system:String>
<system:String x:Key="Level3UseShortTime">3 星设置 7:40 而非 9:00</system:String>

2
tools/AutoLocalization/example/en-us_force.xaml
View File

@@ -304,7 +304,7 @@
<ResourceDictionary x:Uid="RecruitingSettings">
<!--$RecruitingSettings:-->
<s:String x:Key="AutoRefresh">自动刷新 3 星 Tags</s:String>
<s:String x:Key="AutoRefresh">无倾向 Tag 时自动刷新 3 星 Tags</s:String>
<s:String x:Key="AutoUseExpedited">自动使用加急许可*</s:String>
<s:String x:Key="Level3UseShortTime">3 星设置 7:40 而非 9:00</s:String>
<s:String x:Key="Level3UseShortTimeTip">不影响其他星级 Tags</s:String>

2
tools/AutoLocalization/example/zh-cn.xaml
View File

@@ -293,7 +293,7 @@
</ResourceDictionary>
<ResourceDictionary x:Uid="RecruitingSettings">
<s:String x:Key="AutoRefresh">自动刷新 3 星 Tags</s:String>
<s:String x:Key="AutoRefresh">无倾向 Tag 时自动刷新 3 星 Tags</s:String>
<s:String x:Key="AutoUseExpedited">自动使用加急许可*</s:String>
<s:String x:Key="Level3UseShortTime">3 星设置 7:40 而非 9:00</s:String>
<s:String x:Key="Level3UseShortTimeTip">不影响其他星级 Tags</s:String>

2
tools/AutoLocalization/example/zh-cn_new.xaml
View File

@@ -296,7 +296,7 @@
</ResourceDictionary>
<ResourceDictionary x:Uid="RecruitingSettings">
<s:String x:Key="AutoRefresh">自动刷新 3 星 Tags</s:String>
<s:String x:Key="AutoRefresh">无倾向 Tag 时自动刷新 3 星 Tags</s:String>
<s:String x:Key="AutoUseExpedited">自动使用加急许可*</s:String>
<s:String x:Key="Level3UseShortTime">3 星设置 7:40 而非 9:00</s:String>
<s:String x:Key="Level3UseShortTimeTip">不影响其他星级 Tags</s:String>