From 0804eed360bd4ddc2a178d37988e59bb5a43e5a4 Mon Sep 17 00:00:00 2001
From: DuKong <649740559@qq.com>
Date: Sat, 22 Apr 2023 17:19:47 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81=E8=AF=86=E5=88=AB?=
 =?UTF-8?q?=E5=B9=B6=E9=80=89=E6=8B=A9=E4=B8=B4=E6=97=B6=E6=8B=9B=E5=8B=9F?=
 =?UTF-8?q?=E5=B9=B2=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resource/roguelike/copilot.json               |  63 ++--
 resource/roguelike/recruitment.json           | 274 +++++++++++++++---
 resource/roguelike/stage_encounter.json       |  10 +-
 resource/tasks.json                           |  10 +
 .../template/Roguelike@TempRecruitFlag.png    | Bin 0 -> 4516 bytes
 .../Roguelike/RoguelikeRecruitConfig.cpp      |  17 +-
 .../Config/Roguelike/RoguelikeRecruitConfig.h |   6 +-
 .../Roguelike/RoguelikeRecruitTaskPlugin.cpp  |  26 +-
 .../RoguelikeRecruitImageAnalyzer.cpp         |   1 +
 9 files changed, 330 insertions(+), 77 deletions(-)
 create mode 100644 resource/template/Roguelike@TempRecruitFlag.png

diff --git a/resource/roguelike/copilot.json b/resource/roguelike/copilot.json
index 8a90ca4c94..51e238663c 100644
--- a/resource/roguelike/copilot.json
+++ b/resource/roguelike/copilot.json
@@ -125,9 +125,9 @@
         ],
         "deploy_plan": [
             {
-                "groups": [ "百嘉", "基石", "地面C", "号角", "挡人先锋", "重装", "其他地面", "异德", "刺客" ],
-                "location": [ 6, 3 ],
-                "direction": "left"
+                "groups": [ "控制", "召唤", "高台C", "术师", "狙击", "辅助" ],
+                "location": [ 5, 1 ],
+                "direction": "down"
             },
             {
                 "groups": [ "控制", "召唤", "高台C", "术师", "狙击", "辅助" ],
@@ -135,24 +135,29 @@
                 "direction": "left"
             },
             {
-                "groups": [ "百嘉", "基石", "地面C", "玛恩纳", "号角", "地刺", "刺客", "重装", "挡人先锋" ],
-                "location": [ 7, 3 ],
+                "groups": [ "百嘉", "基石", "地面C", "号角", "挡人先锋", "重装", "其他地面", "异德", "刺客" ],
+                "location": [ 6, 3 ],
                 "direction": "left"
             },
             {
-                "groups": [ "单奶", "群奶" ],
+                "groups": [ "百嘉", "基石", "地面C", "玛恩纳", "号角", "地刺", "刺客", "重装", "挡人先锋" ],
+                "location": [ 4, 4 ],
+                "direction": "up"
+            },
+            {
+                "groups": [ "单奶", "群奶", "召唤", "高台C", "控制", "术师", "狙击", "辅助", "其他高台" ],
                 "location": [ 6, 1 ],
                 "direction": "down"
             },
             {
-                "groups": [ "召唤", "高台C", "控制", "术师", "狙击", "辅助", "其他高台" ],
-                "location": [ 5, 1 ],
+                "groups": [ "地面C", "异德", "地刺", "刺客", "挡人先锋", "其他地面" ],
+                "location": [ 5, 4 ],
                 "direction": "down"
             },
             {
-                "groups": [ "地面C", "异德", "地刺", "刺客", "挡人先锋", "其他地面" ],
-                "location": [ 4, 4 ],
-                "direction": "up"
+                "groups": [ "百嘉", "基石", "地面C", "玛恩纳", "号角", "地刺", "刺客", "重装", "挡人先锋" ],
+                "location": [ 7, 3 ],
+                "direction": "left"
             }
         ]
     },
@@ -192,12 +197,12 @@
                 "direction": "down"
             },
             {
-                "groups": [ "召唤", "高台C", "控制", "术师", "狙击", "辅助" ],
+                "groups": [ "高台C", "召唤", "控制", "术师", "狙击", "辅助" ],
                 "location": [ 2, 4 ],
                 "direction": "down"
             },
             {
-                "groups": [ "单奶", "群奶" ],
+                "groups": [ "单奶", "群奶", "高台C", "召唤", "控制", "术师", "狙击", "辅助" ],
                 "location": [ 2, 3 ],
                 "direction": "right"
             },
@@ -206,6 +211,11 @@
                 "location": [ 4, 3 ],
                 "direction": "right"
             },
+            {
+                "groups": [ "高台C", "召唤", "控制", "术师", "狙击", "辅助" ],
+                "location": [ 3, 6 ],
+                "direction": "left"
+            },
             {
                 "groups": [ "地面C", "玛恩纳", "号角", "异德", "地刺", "刺客", "挡人先锋", "其他地面" ],
                 "location": [ 3, 2 ],
@@ -270,6 +280,11 @@
             }
         ],
         "deploy_plan": [
+            {
+                "groups": [ "异德", "刺客" ],
+                "location": [ 6, 1 ],
+                "direction": "right"
+            },
             {
                 "groups": [ "挡人先锋", "投锋", "重装" ],
                 "location": [ 6, 4 ],
@@ -281,7 +296,7 @@
                 "direction": "left"
             },
             {
-                "groups": [ "单奶", "群奶" ],
+                "groups": [ "单奶", "群奶", "高台C", "控制", "召唤", "术师", "狙击", "辅助" ],
                 "location": [ 7, 5 ],
                 "direction": "left"
             },
@@ -301,11 +316,10 @@
                 "direction": "down"
             },
             {
-                "groups": [ "基石", "地面C", "刺客" ],
+                "groups": [ "基石", "地面C", "刺客", "其他地面" ],
                 "location": [ 6, 6 ],
                 "direction": "right"
             },
-
             {
                 "groups": [ "召唤", "高台C", "控制", "术师", "狙击", "辅助", "其他高台" ],
                 "location": [ 5, 6 ],
@@ -434,28 +448,33 @@
             },
             {
                 "groups": [ "玛恩纳" ],
-                "location": [ 7, 5 ],
+                "location": [ 7, 4 ],
                 "direction": "left"
             },
             {
-                "groups": [ "号角" ],
-                "location": [ 10, 4 ],
+                "groups": [ "号角", "百嘉", "基石", "地面C", "挡人先锋", "重装", "其他地面" ],
+                "location": [ 9, 4 ],
                 "direction": "left"
             },
             {
                 "groups": [ "高台C", "控制", "召唤", "术师", "狙击", "辅助", "其他高台" ],
-                "location": [ 8, 7 ],
+                "location": [ 7, 6 ],
                 "direction": "up"
             },
             {
                 "groups": [ "高台C", "控制", "召唤", "术师", "狙击", "辅助", "其他高台" ],
-                "location": [ 8, 6 ],
+                "location": [ 7, 7 ],
                 "direction": "up"
             },
             {
                 "groups": [ "地刺", "地面C", "挡人先锋", "其他地面" ],
                 "location": [ 7, 4 ],
                 "direction": "left"
+            },
+            {
+                "groups": [ "百嘉", "基石", "地面C", "挡人先锋", "重装", "其他地面", "号角", "异德", "刺客" ],
+                "location": [ 9, 5 ],
+                "direction": "left"
             }
         ]
     },
@@ -3647,7 +3666,7 @@
             {
                 "groups": [ "高台C", "控制", "狙击", "术师", "召唤", "辅助", "其他高台" ],
                 "location": [ 6, 3 ],
-                "direction": "up"
+                "direction": "left"
             },
             {
                 "groups": [ "单奶", "群奶" ],
diff --git a/resource/roguelike/recruitment.json b/resource/roguelike/recruitment.json
index 4550a49890..d1c4327bae 100644
--- a/resource/roguelike/recruitment.json
+++ b/resource/roguelike/recruitment.json
@@ -43,7 +43,7 @@
                 "threshold": 1
             },
             {
-                "groups": [ "重装", "刺客" ],
+                "groups": [ "刺客", "重装" ],
                 "threshold": 1
             },
             {
@@ -151,7 +151,7 @@
                         {
                             "groups": [ "百嘉", "基石", "召唤", "号角", "地面C" ],
                             "threshold": 1,
-                            "offset": -300
+                            "offset": -400
                         }
                     ]
                 },
@@ -165,7 +165,7 @@
                         {
                             "groups": [ "百嘉", "基石", "召唤", "号角", "地面C" ],
                             "threshold": 1,
-                            "offset": -300
+                            "offset": -400
                         }
                     ]
                 },
@@ -179,7 +179,7 @@
                         {
                             "groups": [ "百嘉", "基石", "召唤", "号角", "地面C" ],
                             "threshold": 1,
-                            "offset": -300
+                            "offset": -400
                         }
                     ]
                 },
@@ -193,14 +193,13 @@
                         {
                             "groups": [ "百嘉", "基石", "召唤", "号角", "地面C" ],
                             "threshold": 1,
-                            "offset": -300
+                            "offset": -400
                         }
                     ]
                 },
                 {
                     "name": "Mon3tr",
-                    "Doc": "召唤物虽然不被招募，但也需要在作战中找到自己的group",
-                    "skill": 0
+                    "Doc": "召唤物虽然不被招募，但也需要在作战中找到自己的group"
                 }
             ]
         },
@@ -234,32 +233,17 @@
                         }
                     ]
                 },
-                {
-                    "name": "凯尔希",
-                    "skill": 2,
-                    "recruit_priority": 770,
-                    "promote_priority": 700,
-                    "is_key": true,
-                    "is_start": true,
-                    "recruit_priority_offsets": [
-                        {
-                            "groups": [ "百嘉", "基石", "召唤", "号角", "地面C", "玛恩纳" ],
-                            "threshold": 2,
-                            "offset": -400
-                        }
-                    ]
-                },
                 {
                     "name": "令",
                     "skill": 1,
-                    "recruit_priority": 680,
+                    "recruit_priority": 620,
                     "promote_priority": 600,
                     "is_start": true,
                     "recruit_priority_offsets": [
                         {
                             "groups": [ "百嘉", "基石", "召唤", "号角", "地面C" ],
                             "threshold": 1,
-                            "offset": -300
+                            "offset": -400
                         }
                     ]
                 },
@@ -314,8 +298,8 @@
                     "promote_priority": 999,
                     "recruit_priority_offsets": [
                         {
-                            "groups": [ "玛恩纳", "控制", "刺客" ],
-                            "threshold": 3,
+                            "groups": [ "控制", "刺客" ],
+                            "threshold": 2,
                             "offset": -200
                         }
                     ]
@@ -349,7 +333,7 @@
                     "recruit_priority_offsets": [
                         {
                             "groups": [ "高台C", "玛恩纳", "号角" ],
-                            "threshold": 2,
+                            "threshold": 3,
                             "offset": -200
                         }
                     ]
@@ -426,7 +410,7 @@
                     "name": "仇白",
                     "skill": 3,
                     "alternate_skill": 2,
-                    "recruit_priority": 800,
+                    "recruit_priority": 705,
                     "promote_priority": 899,
                     "is_start": true,
                     "recruit_priority_offsets": [
@@ -469,7 +453,7 @@
                 {
                     "name": "煌",
                     "skill": 2,
-                    "recruit_priority": 708,
+                    "recruit_priority": 701,
                     "promote_priority": 500,
                     "is_start": true,
                     "recruit_priority_offsets": [
@@ -480,6 +464,112 @@
                         }
                     ]
                 },
+                {
+                    "name": "银灰",
+                    "skill": 3,
+                    "alternate_skill": 1,
+                    "recruit_priority": 620,
+                    "promote_priority": 870,
+                    "is_start": true,
+                    "recruit_priority_offsets": [
+                        {
+                            "groups": [ "百嘉", "基石", "玛恩纳", "号角", "地面C" ],
+                            "threshold": 2,
+                            "offset": -300
+                        }
+                    ]
+                },
+                {
+                    "name": "艾丽妮",
+                    "skill": 3,
+                    "alternate_skill": 1,
+                    "recruit_priority": 520,
+                    "promote_priority": 875,
+                    "is_start": true,
+                    "recruit_priority_offsets": [
+                        {
+                            "groups": [ "百嘉", "基石", "玛恩纳", "号角", "地面C" ],
+                            "threshold": 2,
+                            "offset": -300
+                        }
+                    ]
+                },
+                {
+                    "name": "史尔特尔",
+                    "skill": 3,
+                    "alternate_skill": 2,
+                    "recruit_priority": 602,
+                    "promote_priority": 920,
+                    "recruit_priority_offsets": [
+                        {
+                            "groups": [ "百嘉", "基石", "玛恩纳", "号角", "地面C" ],
+                            "threshold": 2,
+                            "offset": -300
+                        }
+                    ]
+                },
+                {
+                    "name": "芳汀",
+                    "skill": 2,
+                    "recruit_priority": 402
+                },
+                {
+                    "name": "断崖",
+                    "skill": 2,
+                    "recruit_priority": 370
+                },
+                {
+                    "name": "刻刀",
+                    "skill": 2,
+                    "recruit_priority": 405
+                },
+                {
+                    "name": "柏喙",
+                    "skill": 2,
+                    "recruit_priority": 405
+                },
+                {
+                    "name": "铸铁",
+                    "skill": 2,
+                    "recruit_priority": 305
+                },
+                {
+                    "name": "布洛卡",
+                    "skill": 2,
+                    "recruit_priority": 412
+                },
+                {
+                    "name": "星极",
+                    "skill": 2,
+                    "recruit_priority": 411
+                },
+                {
+                    "name": "泡普卡",
+                    "skill": 2,
+                    "recruit_priority": 460,
+                    "is_key": true
+                },
+                {
+                    "name": "月见夜",
+                    "skill": 2,
+                    "recruit_priority": 466,
+                    "is_key": true
+                },
+                {
+                    "name": "拉普兰德",
+                    "skill": 2,
+                    "recruit_priority": 440
+                },
+                {
+                    "name": "艾斯黛尔",
+                    "skill": 2,
+                    "recruit_priority": 320
+                },
+                {
+                    "name": "霜叶",
+                    "skill": 2,
+                    "recruit_priority": 318
+                },
                 {
                     "name": "阿米娅-WARRIOR",
                     "skill": 1,
@@ -554,7 +644,7 @@
                     "name": "灵知",
                     "skill": 1,
                     "is_key": true,
-                    "recruit_priority": 830,
+                    "recruit_priority": 633,
                     "promote_priority": 790,
                     "recruit_priority_offsets": [
                         {
@@ -568,6 +658,7 @@
                     "name": "寒芒克洛丝",
                     "skill": 2,
                     "is_key": true,
+                    "is_start": true,
                     "recruit_priority": 920,
                     "promote_priority": 591,
                     "recruit_priority_offsets": [
@@ -638,6 +729,21 @@
                         }
                     ]
                 },
+                {
+                    "name": "凯尔希",
+                    "skill": 2,
+                    "recruit_priority": 770,
+                    "promote_priority": 700,
+                    "is_key": true,
+                    "is_start": true,
+                    "recruit_priority_offsets": [
+                        {
+                            "groups": [ "百嘉", "基石", "召唤", "号角", "地面C", "玛恩纳" ],
+                            "threshold": 2,
+                            "offset": -400
+                        }
+                    ]
+                },
                 {
                     "name": "桑葚",
                     "skill": 2,
@@ -680,6 +786,20 @@
                         }
                     ]
                 },
+                {
+                    "name": "絮雨",
+                    "skill": 3,
+                    "alternate_skill": 1,
+                    "recruit_priority": 722,
+                    "promote_priority": 410,
+                    "recruit_priority_offsets": [
+                        {
+                            "groups": [ "单奶", "群奶" ],
+                            "threshold": 2,
+                            "offset": -300
+                        }
+                    ]
+                },
                 {
                     "name": "华法琳",
                     "skill": 1,
@@ -809,6 +929,24 @@
                     "recruit_priority": 405,
                     "promote_priority": 0,
                     "is_alternate": true
+                },
+                {
+                    "name": "末药"
+                },
+                {
+                    "name": "嘉维尔"
+                },
+                {
+                    "name": "图耶"
+                },
+                {
+                    "name": "亚叶"
+                },
+                {
+                    "name": "锡兰"
+                },
+                {
+                    "name": "闪灵"
                 }
             ]
         },
@@ -993,7 +1131,7 @@
                 {
                     "name": "翎羽",
                     "skill": 1,
-                    "recruit_priority": 510,
+                    "recruit_priority": 310,
                     "promote_priority": 0,
                     "recruit_priority_offsets": [
                         {
@@ -1002,6 +1140,33 @@
                             "offset": -300
                         }
                     ]
+                },
+                {
+                    "name": "讯使"
+                },
+                {
+                    "name": "清道夫"
+                },
+                {
+                    "name": "贾维"
+                },
+                {
+                    "name": "推进之王"
+                },
+                {
+                    "name": "嵯峨"
+                },
+                {
+                    "name": "凛冬"
+                },
+                {
+                    "name": "格拉尼"
+                },
+                {
+                    "name": "苇草"
+                },
+                {
+                    "name": "野鬃"
                 }
             ]
         },
@@ -1024,12 +1189,12 @@
                     "name": "麒麟X夜刀",
                     "skill": 2,
                     "is_key": true,
-                    "recruit_priority": 888,
+                    "recruit_priority": 911,
                     "promote_priority": 955,
                     "recruit_priority_offsets": [
                         {
                             "groups": [ "异德", "刺客" ],
-                            "threshold": 2,
+                            "threshold": 3,
                             "offset": -100
                         }
                     ]
@@ -1074,6 +1239,21 @@
                         }
                     ]
                 },
+                {
+                    "name": "伊内丝",
+                    "skill": 3,
+                    "alternate_skill": 2,
+                    "recruit_priority": 709,
+                    "promote_priority": 830,
+                    "is_key": true,
+                    "recruit_priority_offsets": [
+                        {
+                            "groups": [ "异德", "刺客" ],
+                            "threshold": 1,
+                            "offset": -200
+                        }
+                    ]
+                },
                 {
                     "name": "傀影",
                     "skill": 2,
@@ -1368,7 +1548,6 @@
                     "skill": 0,
                     "recruit_priority": 460,
                     "promote_priority": 0,
-                    "recruit_priority_when_team_full": 0,
                     "is_alternate": true
                 },
                 {
@@ -1385,6 +1564,27 @@
                             "offset": 282
                         }
                     ]
+                },
+                {
+                    "name": "泡泡"
+                },
+                {
+                    "name": "角峰"
+                },
+                {
+                    "name": "可颂"
+                },
+                {
+                    "name": "拜松"
+                },
+                {
+                    "name": "闪击"
+                },
+                {
+                    "name": "吽"
+                },
+                {
+                    "name": "暴雨"
                 }
             ]
         },
@@ -1424,7 +1624,6 @@
                     "skill": 0,
                     "recruit_priority": 305,
                     "promote_priority": 0,
-                    "recruit_priority_when_team_full": 0,
                     "is_alternate": true
                 },
                 {
@@ -1611,7 +1810,7 @@
                 {
                     "name": "黑角",
                     "skill": 0,
-                    "recruit_priority": 561,
+                    "recruit_priority": 361,
                     "promote_priority": 0,
                     "is_key": true,
                     "recruit_priority_offsets": [
@@ -1672,8 +1871,7 @@
                     "promote_priority": 0
                 },
                 {
-                    "name": "“打字机”",
-                    "skill": 0
+                    "name": "“打字机”"
                 }
             ]
         }
diff --git a/resource/roguelike/stage_encounter.json b/resource/roguelike/stage_encounter.json
index 256ad427da..930dc22223 100644
--- a/resource/roguelike/stage_encounter.json
+++ b/resource/roguelike/stage_encounter.json
@@ -168,6 +168,14 @@
             "option_num": 4,
             "choose": 4
         },
+        "深蓝仪式": {
+            "option_num": 2,
+            "choose": 2
+        },
+        "升华": {
+            "option_num": 3,
+            "choose": 1
+        },
         "赞歌": {
             "option_num": 1,
             "choose": 1
@@ -367,4 +375,4 @@
             "choose": 1
         }
     }
-}
\ No newline at end of file
+}
diff --git a/resource/tasks.json b/resource/tasks.json
index e298e9251a..eb7e265767 100644
--- a/resource/tasks.json
+++ b/resource/tasks.json
@@ -7248,6 +7248,16 @@
             "Roguelike@ChooseOper"
         ]
     },
+    "Roguelike@TempRecruitFlag": {
+        "action": "DoNothing",
+        "roi": [
+            587,
+            76,
+            100,
+            20
+        ],
+        "templThreshold": 0.5
+    },
     "Roguelike@ClickToDrops": {
         "algorithm": "JustReturn",
         "action": "ClickRect",
diff --git a/resource/template/Roguelike@TempRecruitFlag.png b/resource/template/Roguelike@TempRecruitFlag.png
new file mode 100644
index 0000000000000000000000000000000000000000..3252518d37e7381733156eeca5d3e119f18edc2a
GIT binary patch
literal 4516
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

literal 0
HcmV?d00001

diff --git a/src/MaaCore/Config/Roguelike/RoguelikeRecruitConfig.cpp b/src/MaaCore/Config/Roguelike/RoguelikeRecruitConfig.cpp
index 93d7d915de..c0105ef3e8 100644
--- a/src/MaaCore/Config/Roguelike/RoguelikeRecruitConfig.cpp
+++ b/src/MaaCore/Config/Roguelike/RoguelikeRecruitConfig.cpp
@@ -6,15 +6,18 @@
 #include <meojson/json.hpp>
 
 const asst::RoguelikeOperInfo& asst::RoguelikeRecruitConfig::get_oper_info(const std::string& theme,
-                                                                           const std::string& name) const noexcept
+                                                                           const std::string& name) noexcept
 {
     auto& opers = m_all_opers.at(theme);
-    if (auto find_iter = opers.find(name); find_iter != opers.cend()) {
-        return find_iter->second;
+    if (opers.contains(name)) {
+        return opers.at(name);
     }
     else {
-        static RoguelikeOperInfo empty;
-        return empty;
+        RoguelikeOperInfo info;
+        info.name = name;
+        info.group_id = get_group_id(theme, name);
+        opers.emplace(name, std::move(info));
+        return opers.at(name);
     }
 }
 
@@ -85,8 +88,8 @@ bool asst::RoguelikeRecruitConfig::parse(const json::value& json)
                 info.recruit_priority = oper_info.get("recruit_priority", 0);
                 info.promote_priority = oper_info.get("promote_priority", 0);
                 info.is_alternate = oper_info.get("is_alternate", false);
-                info.skill = oper_info.at("skill").as_integer();
-                info.alternate_skill = oper_info.get("alternate_skill", 0);
+                info.skill = oper_info.get("skill", 1);
+                info.alternate_skill = oper_info.get("alternate_skill", 1);
                 info.skill_usage = static_cast<battle::SkillUsage>(oper_info.get("skill_usage", 1));
                 info.alternate_skill_usage = static_cast<battle::SkillUsage>(oper_info.get("alternate_skill_usage", 1));
 
diff --git a/src/MaaCore/Config/Roguelike/RoguelikeRecruitConfig.h b/src/MaaCore/Config/Roguelike/RoguelikeRecruitConfig.h
index 59eca65fdc..56b12f12be 100644
--- a/src/MaaCore/Config/Roguelike/RoguelikeRecruitConfig.h
+++ b/src/MaaCore/Config/Roguelike/RoguelikeRecruitConfig.h
@@ -23,7 +23,7 @@ namespace asst
     struct RoguelikeOperInfo
     {
         std::string name;
-        int group_id;                                             // 干员组id
+        int group_id = 0;                                         // 干员组id
         int recruit_priority = 0;                                 // 招募优先级 (0-1000)
         int promote_priority = 0;                                 // 晋升优先级 (0-1000)
         int recruit_priority_when_team_full = 0;                  // 队伍满时的招募优先级 (0-1000)
@@ -34,7 +34,7 @@ namespace asst
         bool is_start = false;                                    // 是否为开局干员
         std::vector<RecruitPriorityOffset> recruit_priority_offsets;
         bool is_alternate = false; // 是否后备干员 (允许重复招募、划到后备干员时不再往右划动)
-        int skill = 0;
+        int skill = 1;
         int alternate_skill = 0;
         battle::SkillUsage skill_usage = battle::SkillUsage::Possibly;
         battle::SkillUsage alternate_skill_usage = battle::SkillUsage::Possibly;
@@ -45,7 +45,7 @@ namespace asst
     public:
         virtual ~RoguelikeRecruitConfig() override = default;
 
-        const RoguelikeOperInfo& get_oper_info(const std::string& theme, const std::string& name) const noexcept;
+        const RoguelikeOperInfo& get_oper_info(const std::string& theme, const std::string& name) noexcept;
         const std::vector<std::pair<int, int>> get_role_info(const std::string& theme,
                                                              const battle::Role& role) const noexcept; // [deprecated]
         const std::vector<std::string> get_group_info(const std::string& theme) const noexcept;
diff --git a/src/MaaCore/Task/Roguelike/RoguelikeRecruitTaskPlugin.cpp b/src/MaaCore/Task/Roguelike/RoguelikeRecruitTaskPlugin.cpp
index d2ab70fffc..7540b01030 100644
--- a/src/MaaCore/Task/Roguelike/RoguelikeRecruitTaskPlugin.cpp
+++ b/src/MaaCore/Task/Roguelike/RoguelikeRecruitTaskPlugin.cpp
@@ -9,6 +9,7 @@
 #include "Utils/Logger.hpp"
 #include "Utils/NoWarningCV.h"
 #include "Vision/OcrImageAnalyzer.h"
+#include "Vision/MatchImageAnalyzer.h"
 #include "Vision/Roguelike/RoguelikeRecruitImageAnalyzer.h"
 #include "Vision/Roguelike/RoguelikeRecruitSupportAnalyzer.h"
 
@@ -160,12 +161,19 @@ bool asst::RoguelikeRecruitTaskPlugin::_run()
     // 开始识别前先往前翻两页，是方舟的bug，有可能进招募界面时不是从最左边开始
     swipe_to_the_left_of_operlist();
 
+    bool temp_recruit_exist = false; // 检测是否存在临时招募
+    auto image = ctrler()->get_image();
+    MatchImageAnalyzer temp_recruit_analyzer(image);
+    temp_recruit_analyzer.set_task_info("Roguelike@TempRecruitFlag");
+    temp_recruit_exist = temp_recruit_analyzer.analyze();
+    Log.trace(__FUNCTION__, "temp_recruit_exist", temp_recruit_exist);
+
     // 翻页找出所有候选干员
     for (; i != SwipeTimes; ++i) {
         if (need_exit()) {
             return false;
         }
-        auto image = ctrler()->get_image();
+        image = ctrler()->get_image();
         RoguelikeRecruitImageAnalyzer analyzer(image);
         if (!analyzer.analyze()) {
             Log.trace(__FUNCTION__, "| Page", i, "recruit list analyse failed");
@@ -183,6 +191,7 @@ bool asst::RoguelikeRecruitTaskPlugin::_run()
 
         int max_oper_x = 0;
         for (const auto& oper_info : oper_list) {
+            Log.info(__FUNCTION__, "| Operator", oper_info.name);
             oper_names.emplace(oper_info.name);
 
             max_oper_x = std::max(max_oper_x, oper_info.rect.x);
@@ -209,10 +218,6 @@ bool asst::RoguelikeRecruitTaskPlugin::_run()
 
             // 查询招募配置
             auto& recruit_info = RoguelikeRecruit.get_oper_info(rogue_theme, oper_info.name);
-            if (recruit_info.name.empty()) {
-                continue;
-            }
-
             int priority = 0;
 
             // 查询编队是否已持有该干员
@@ -228,6 +233,10 @@ bool asst::RoguelikeRecruitTaskPlugin::_run()
                     // 干员待晋升
                     priority = team_full_without_rookie ? recruit_info.promote_priority_when_team_full
                                                         : recruit_info.promote_priority;
+                    if (temp_recruit_exist) { // 临时招募干员的进阶优先级略微提高
+                        priority += 150;
+                        temp_recruit_exist = false;
+                    }
                 }
             }
             else {
@@ -250,6 +259,11 @@ bool asst::RoguelikeRecruitTaskPlugin::_run()
                               oper_info.level);
                 }
 
+                if (temp_recruit_exist) { // 临时招募干员具有极高抓取优先级
+                    priority += 1800;
+                    temp_recruit_exist = false;
+                }
+
                 if (!recruit_info.is_alternate) {
                     // __________________will-be-removed-begin__________________
                     const battle::Role oper_role = get_oper_role(oper_info.name);
@@ -348,7 +362,7 @@ bool asst::RoguelikeRecruitTaskPlugin::_run()
             swipe_to_the_left_of_operlist(i + 1);
         }
 
-        auto image = ctrler()->get_image();
+        image = ctrler()->get_image();
         RoguelikeRecruitImageAnalyzer analyzer(image);
         if (!analyzer.analyze()) {
             Log.error(__FUNCTION__, "| Random recruitment analyse failed");
diff --git a/src/MaaCore/Vision/Roguelike/RoguelikeRecruitImageAnalyzer.cpp b/src/MaaCore/Vision/Roguelike/RoguelikeRecruitImageAnalyzer.cpp
index ccb6cf68af..f89adb028b 100644
--- a/src/MaaCore/Vision/Roguelike/RoguelikeRecruitImageAnalyzer.cpp
+++ b/src/MaaCore/Vision/Roguelike/RoguelikeRecruitImageAnalyzer.cpp
@@ -28,6 +28,7 @@ bool asst::RoguelikeRecruitImageAnalyzer::analyze()
         cv::merge(std::array { blue, blue, blue }, bbb_image);
     }
 
+    analyzer.sort_result_vertical();
     for (const auto& [_, rect, name] : analyzer.get_result()) {
         int elite = match_elite(rect);
         int level = match_level(bbb_image, rect);