From ef458b41fdb751a93fac9a1a5331d89d5ad0aabd Mon Sep 17 00:00:00 2001
From: 70CentsApple <63957117+70CentsApple@users.noreply.github.com>
Date: Mon, 3 Jun 2024 22:36:18 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=85=AC=E6=8B=9B=20`m=5Ffirst=5Ftag`?=
 =?UTF-8?q?=20=E5=8C=B9=E9=85=8D=E4=B8=AA=E6=95=B0=E5=B0=91=E4=BA=8E=203?=
 =?UTF-8?q?=20=E4=B8=AA=E6=97=B6=E7=9A=84=E9=9D=9E=E9=A2=84=E6=9C=9F?=
 =?UTF-8?q?=E6=83=85=E5=86=B5=20(#9258)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

* docs: 添加刷新前提描述
---
 src/MaaCore/Task/Miscellaneous/AutoRecruitTask.cpp | 4 +++-
 src/MaaWpfGui/Res/Localizations/zh-cn.xaml         | 2 +-
 tools/AutoLocalization/example/en-us_force.xaml    | 2 +-
 tools/AutoLocalization/example/zh-cn.xaml          | 2 +-
 tools/AutoLocalization/example/zh-cn_new.xaml      | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/MaaCore/Task/Miscellaneous/AutoRecruitTask.cpp b/src/MaaCore/Task/Miscellaneous/AutoRecruitTask.cpp
index 4e04f975b3..0103bc3c3e 100644
--- a/src/MaaCore/Task/Miscellaneous/AutoRecruitTask.cpp
+++ b/src/MaaCore/Task/Miscellaneous/AutoRecruitTask.cpp
@@ -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) {
diff --git a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
index b5736fd94c..a0ac00fb64 100644
--- a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
+++ b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
@@ -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>
diff --git a/tools/AutoLocalization/example/en-us_force.xaml b/tools/AutoLocalization/example/en-us_force.xaml
index 68185f46f6..4387cfa39d 100644
--- a/tools/AutoLocalization/example/en-us_force.xaml
+++ b/tools/AutoLocalization/example/en-us_force.xaml
@@ -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>
diff --git a/tools/AutoLocalization/example/zh-cn.xaml b/tools/AutoLocalization/example/zh-cn.xaml
index adfdbab324..e5a6bd70c1 100644
--- a/tools/AutoLocalization/example/zh-cn.xaml
+++ b/tools/AutoLocalization/example/zh-cn.xaml
@@ -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>
diff --git a/tools/AutoLocalization/example/zh-cn_new.xaml b/tools/AutoLocalization/example/zh-cn_new.xaml
index 2c003c82c1..8505320f97 100644
--- a/tools/AutoLocalization/example/zh-cn_new.xaml
+++ b/tools/AutoLocalization/example/zh-cn_new.xaml
@@ -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>