From 628af3ea859cf7d34f7c639b235f56d1f250de04 Mon Sep 17 00:00:00 2001
From: zzyyyl <aysyxx53@hotmail.com>
Date: Sat, 23 Jul 2022 18:37:50 +0800
Subject: [PATCH 01/10] =?UTF-8?q?docs:=20=E4=BF=AE=E5=A4=8D=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=E5=BB=BA=E8=AE=AE=20issue=20=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E4=B8=8D=E5=B8=A6=20label=20=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/ISSUE_TEMPLATE/-----feature-request-.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/-----feature-request-.yaml b/.github/ISSUE_TEMPLATE/-----feature-request-.yaml
index eb3084347d..e7158589da 100644
--- a/.github/ISSUE_TEMPLATE/-----feature-request-.yaml
+++ b/.github/ISSUE_TEMPLATE/-----feature-request-.yaml
@@ -1,6 +1,6 @@
 name: 需求建议（Feature request）
 description: 新功能、建议等
-labels: ['feature']
+labels: ['enhancement']
 body:
   - type: textarea
     id: describe

From d2190d6e248476d31d3e2c23cf21ffcdd0cb1223 Mon Sep 17 00:00:00 2001
From: MistEO <mistereo@hotmail.com>
Date: Sun, 24 Jul 2022 16:27:07 +0800
Subject: [PATCH 02/10] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=82=89?=
 =?UTF-8?q?=E9=B8=BD=E7=BC=96=E9=98=9F=E4=B8=8D=E8=83=BD=E8=AF=86=E5=88=AB?=
 =?UTF-8?q?=E7=B2=BE=E4=BA=8C=E5=B9=B2=E5=91=98=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resource/tasks.json                           |   2 +-
 resource/template/Roguelike1FormationOper.png | Bin 6021 -> 16983 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/resource/tasks.json b/resource/tasks.json
index e10c5948c2..9720d27f65 100644
--- a/resource/tasks.json
+++ b/resource/tasks.json
@@ -7029,7 +7029,7 @@
             1,
             255
         ],
-        "templThreshold": 0.7
+        "templThreshold": 0.9
     },
     "Roguelike1FormationOperSelected": {
         "template": "empty.png",
diff --git a/resource/template/Roguelike1FormationOper.png b/resource/template/Roguelike1FormationOper.png
index 06e1afeb7c1e0c309c00f2ad3148aa83ad564760..5aaee6d9686823c20f46a187dd6858470e7c81e0 100644
GIT binary patch
literal 16983
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
BentQQ

literal 6021
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
alB_hZC53Igp&N|XA@{TlHS5%!Q2z%mEKJV;


From f36e1a7a788116093b7f7f809cfeec39b0281b02 Mon Sep 17 00:00:00 2001
From: MistEO <mistereo@hotmail.com>
Date: Sun, 24 Jul 2022 16:37:42 +0800
Subject: [PATCH 03/10] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E6=88=98=E6=96=97=E9=80=89=E6=8B=A9=E4=BA=86`?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=BC=96=E9=98=9F`=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E7=BC=96=E9=98=9F=E5=87=BA=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1266
---
 resource/template/BattleQuickFormation.png | Bin 23620 -> 16270 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/resource/template/BattleQuickFormation.png b/resource/template/BattleQuickFormation.png
index ca795adad72ab3ba4e895f0c4a794e0448c5831d..f9b3fab0bdd52ffb5d9a6ee15667eda143837b4d 100644
GIT binary patch
delta 1601
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

delta 9323
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%0Dd>_Ru{i{L(c%h#9kV7`1z7veqkXWKYui<#8Ts0
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


From fc3915a6edc1bf2e3afd1958055fdeefc5d9ddaa Mon Sep 17 00:00:00 2001
From: MistEO <mistereo@hotmail.com>
Date: Sun, 24 Jul 2022 16:41:58 +0800
Subject: [PATCH 04/10] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=82=89?=
 =?UTF-8?q?=E9=B8=BD=E5=87=8C=E6=99=A8=204=20=E7=82=B9=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E5=90=8E=E4=B8=8D=E8=83=BD=E5=9B=9E=E5=8E=BB=E6=8E=A5=E7=9D=80?=
 =?UTF-8?q?=E6=89=93=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1260
---
 resource/tasks.json | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/resource/tasks.json b/resource/tasks.json
index 9720d27f65..83ff9c3528 100644
--- a/resource/tasks.json
+++ b/resource/tasks.json
@@ -7430,6 +7430,16 @@
             "Roguelike1StageCambatDps",
             "Roguelike1StageEmergencyDps",
             "Roguelike1StageDreadfulFoe",
+            "TodaysSuppliesToRoguelike1",
+            "TerminalToRoguelike1",
+            "CloseAnnoToRoguelike1",
+            "Roguelike1TodoEnter",
+            "Roguelike1Continue",
+            "ReturnToRoguelike1",
+            "ReturnToRoguelike1Confirm",
+            "OfflineConfirmToRoguelike1",
+            "StartToWakeUpToRoguelike1",
+            "StartUpConnectingToRoguelike1",
             "Roguelike1ClickToStartPoint"
         ]
     },

From 847270cd7849012eb3df9be27da8eed8d11e6f0f Mon Sep 17 00:00:00 2001
From: MistEO <mistereo@hotmail.com>
Date: Sun, 24 Jul 2022 16:51:24 +0800
Subject: [PATCH 05/10] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E6=88=98=E6=96=97=E5=9C=A8=E5=B9=B2=E5=91=98=E8=BF=87?=
 =?UTF-8?q?=E5=A4=9A=EF=BC=8814=E4=B8=AA=E5=8F=8A=E4=BB=A5=E4=B8=8A?=
 =?UTF-8?q?=EF=BC=89=E6=97=B6=E7=9A=84=E5=B4=A9=E6=BA=83=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1122
---
 src/MeoAssistant/BattleImageAnalyzer.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/MeoAssistant/BattleImageAnalyzer.cpp b/src/MeoAssistant/BattleImageAnalyzer.cpp
index c16ca1f49f..025ea258fd 100644
--- a/src/MeoAssistant/BattleImageAnalyzer.cpp
+++ b/src/MeoAssistant/BattleImageAnalyzer.cpp
@@ -132,6 +132,9 @@ bool asst::BattleImageAnalyzer::opers_analyze()
     for (const MatchRect& flag_mrect : flags_analyzer.get_result()) {
         BattleRealTimeOper oper;
         oper.rect = flag_mrect.rect.move(click_move);
+        if (oper.rect.x + oper.rect.width >= m_image.cols) {
+            oper.rect.width = m_image.cols - oper.rect.x;
+        }
         oper.avatar = m_image(utils::make_rect<cv::Rect>(oper.rect));
 
         Rect available_rect = flag_mrect.rect.move(avlb_move);
@@ -147,6 +150,9 @@ bool asst::BattleImageAnalyzer::opers_analyze()
 #endif
 
         Rect cooling_rect = flag_mrect.rect.move(cooling_move);
+        if (cooling_rect.x + cooling_rect.width >= m_image.cols) {
+            cooling_rect.width = m_image.cols - cooling_rect.x;
+        }
         oper.cooling = oper_cooling_analyze(cooling_rect);
         if (oper.cooling && oper.available) {
             Log.error("oper is available, but with cooling");

From 81378be27e8275b0f0cdc92d62873c568378b1b8 Mon Sep 17 00:00:00 2001
From: MistEO <mistereo@hotmail.com>
Date: Sun, 24 Jul 2022 16:57:28 +0800
Subject: [PATCH 06/10] =?UTF-8?q?docs:=20=E6=9B=B4=E6=96=B0CHANGELOG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7842b3550e..c13bdc8aac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,14 +1,11 @@
-- 新增支持 国际服 (EN) 肉鸽 @cookie223 @MistEO
-- 新增支持 日服肉鸽 @natt3
-- 新增支持 肉鸽 设置开始次数、投资次数、投资完结束任务 @MistEO
-- 新增支持 肉鸽 从选择关卡后 `Enter` 界面继续任务 @MistEO
-- 新增支持 日服自动公招 @natt3
-- 优化 肉鸽 编队策略，会清空并重新选等级最高的 @MistEO
-- 优化 肉鸽 部分代码及识别错误 @horror-proton @zzyyyl @MistEO
-- 修复 肉鸽 一直朝右的问题 @horror-proton @MistEO
-- 修复 自动战斗 部分干员识别错误 @ABA2396
-- 修复 刷理智 偶现掉落识别错误 @MistEO
-- 修复 信用购物 偶现信用收取失败问题 @horror-proton @MistEO
-- 修复 日服访问好友 的错误 @natt3
-- 修复 B 服登陆时卡住的问题 @zzyyyl
-- 优化并修复 部分界面问题 @lhhxxxxx @ABA2396 @LeoQ7 @zzyyyl
+- 新增支持 繁中服自动公招 @rockerhank
+- 修复 肉鸽 编队人数过多时出现的一些问题 @MistEO
+- 修复 肉鸽 偶现掉线后、凌晨 4 点更新后无法继续的问题 @MistEO
+- 修复 肉鸽 在部分模拟器上战斗画面识别错误问题 @MistEO
+- 修复 EN 服肉鸽 招募干员、进入安全屋、领取关卡奖励的问题 @MistEO
+- 修复 刷理智 偶现掉落识别问题 @MistEO
+- 修复 自动战斗 选择了 `删除编队` 时任务报错的问题 @MistEO
+- 修复 自动战斗 存在 14 个及以上干员时的崩溃问题 @MistEO
+- 修复 界面 崩溃问题 @MistEO
+- 新增 core `AsstGetUUID`, `AsstGetTasksList` 接口 @MistEO
+- 更新 各种文档 @LYZhelloworld @zzyyyl @ABA2396

From 543f25d42cee66a06f839c81a4665cfd3f4a1d39 Mon Sep 17 00:00:00 2001
From: MistEO <mistereo@hotmail.com>
Date: Sun, 24 Jul 2022 17:00:38 +0800
Subject: [PATCH 07/10] docs: fix typo

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c13bdc8aac..e8a362a3b8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 - 修复 肉鸽 编队人数过多时出现的一些问题 @MistEO
 - 修复 肉鸽 偶现掉线后、凌晨 4 点更新后无法继续的问题 @MistEO
 - 修复 肉鸽 在部分模拟器上战斗画面识别错误问题 @MistEO
-- 修复 EN 服肉鸽 招募干员、进入安全屋、领取关卡奖励的问题 @MistEO
+- 修复 EN 服肉鸽 招募干员、进入安全屋、领取关卡奖励时卡住的问题 @MistEO
 - 修复 刷理智 偶现掉落识别问题 @MistEO
 - 修复 自动战斗 选择了 `删除编队` 时任务报错的问题 @MistEO
 - 修复 自动战斗 存在 14 个及以上干员时的崩溃问题 @MistEO

From 79fda421060f79fdf8ced46006e7f0db38cdb95b Mon Sep 17 00:00:00 2001
From: MistEO <mistereo@hotmail.com>
Date: Sun, 24 Jul 2022 17:08:03 +0800
Subject: [PATCH 08/10] =?UTF-8?q?docs:=20=E6=9B=B4=E6=96=B0=E5=A4=96?=
 =?UTF-8?q?=E6=9C=8D=E6=94=AF=E6=8C=81=E7=9B=B8=E5=85=B3=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README-en.md                       |  4 ++--
 README.md                          |  6 +++---
 resource/global/YoStarEN/readme.md |  6 +++---
 resource/global/YoStarJP/readme.md | 14 +++++++-------
 resource/global/txwy/readme.md     |  4 +++-
 src/MeoAssistant/DebugTask.cpp     |  8 +++++---
 tools/TestCaller/main.cpp          | 14 +++++++-------
 7 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/README-en.md b/README-en.md
index e5e5cde3c2..c74e496d33 100644
--- a/README-en.md
+++ b/README-en.md
@@ -75,9 +75,9 @@ Please refer to: [FAQ](docs/en/FAQ.md)
 ## Supports for overseas clients
 
 - Global(EN) Client  
-  Supports basic features like Combat, Recruitment calculate, Visiting, Collocting, Auto Roguelike(beta), etc. See also [README](resource/global/YoStarEN/readme.md)
+  Supports basic features like Combat, Visiting, Collocting, Auto Roguelike(beta), Recruitment calculate, etc. See also [README](resource/global/YoStarEN/readme.md)
 - JP Client  
-  Supports basic features like Combat, Recruitment calculate, Visiting, Collocting, Auto Recruiting, Auto Roguelike(beta), etc. See also [README](resource/global/YoStarJP/readme.md)
+  Supports basic features like Combat, Auto Recruiting, Visiting, Collocting, Auto Roguelike(beta), Recruitment calculate, etc. See also [README](resource/global/YoStarJP/readme.md)
 - KR Client  
   Supports basic features like Combat, etc.  See also [README](resource/global/YoStarKR/readme.md)
 - ZH_CHT Client  
diff --git a/README.md b/README.md
index 1bd54efd5f..c171949e0a 100644
--- a/README.md
+++ b/README.md
@@ -86,13 +86,13 @@ MAA 的意思是 MAA Assistant Arknights
 ## 外服支持
 
 - 国际服（美服）  
-  支持基本的刷理智、公招识别、访问好友、领取奖励功能，支持肉鸽功能（测试版本），请参考 [说明](resource/global/YoStarEN/readme.md)
+  支持基本的刷理智、访问好友、领取奖励、自动肉鸽（测试版本）、公招识别，请参考 [说明](resource/global/YoStarEN/readme.md)
 - 日服  
-  支持基本的刷理智、公招识别、访问好友、领取奖励，自动公招，支持肉鸽功能（测试版本），请参考 [说明](resource/global/YoStarJP/readme.md)
+  支持基本的刷理智、自动公招、访问好友、领取奖励、自动肉鸽（测试版本）、公招识别，请参考 [说明](resource/global/YoStarJP/readme.md)
 - 韩服  
   支持基本的刷理智功能，请参考 [说明](resource/global/YoStarKR/readme.md)
 - 繁中服  
-  支持基本的刷理智功能，请参考 [说明](resource/global/txwy/readme.md)
+  支持基本的刷理智、自动公招、公招识别功能，请参考 [说明](resource/global/txwy/readme.md)
 
 由于外服用户较少及项目人手不足的问题，外服目前都仅适配了基本的功能。若您有强需求，欢迎在 [讨论区](https://github.com/MaaAssistantArknights/MaaAssistantArknights/discussions) 催更，~~或加入我们一起建设 MAA~~
 
diff --git a/resource/global/YoStarEN/readme.md b/resource/global/YoStarEN/readme.md
index defd044834..be878dc765 100644
--- a/resource/global/YoStarEN/readme.md
+++ b/resource/global/YoStarEN/readme.md
@@ -9,10 +9,10 @@
 - 刷理智（仅支持选择`当前关卡`）
 - 使用理智药恢复理智
 - 使用源石恢复理智
-- 指定次数
-- 公招计算
+- 刷理智指定
 - 访问好友
 - 领取日常奖励
+- 公招计算
 - 无限刷肉鸽（测试功能）
 
 ## Global (EN)
@@ -25,7 +25,7 @@ Now supports:
 - Restore with potion
 - Restore with Originite
 - Set the max number of auto battles
-- Recruitment calculate
 - Friends visit
 - Award collect
+- Recruitment calculate
 - Auto Roguelike (beta)
diff --git a/resource/global/YoStarJP/readme.md b/resource/global/YoStarJP/readme.md
index 6e96d20e58..81478c8230 100644
--- a/resource/global/YoStarJP/readme.md
+++ b/resource/global/YoStarJP/readme.md
@@ -9,11 +9,11 @@
 - 刷理智（仅支持选择`当前关卡`）
 - 使用理智药恢复理智
 - 使用源石恢复理智
-- 指定次数
-- 公招计算
+- 刷理智指定次数
+- 自动公招
 - 访问好友
 - 领取日常奖励
-- 自动公招
+- 公招计算
 - 无限刷肉鸽（测试功能）
 
 ## Japanese
@@ -26,10 +26,10 @@ Now supports:
 - Restore with potion
 - Restore with Originite
 - Set the max number of auto battles
-- Recruitment calculate
+- Auto Recruiting
 - Friends visit
 - Award collect
-- Auto Recruiting
+- Recruitment calculate
 - Auto Roguelike (beta)
 
 ## 日本
@@ -42,8 +42,8 @@ Now supports:
 - ポーションで復元
 - Originiteで復元
 - 自動戦闘の最大数を設定します
-- 採用計算
+- 自動採用
 - 友達が訪問
 - アワードコレクト
-- 自動採用
+- 採用計算
 - 自動ローグライク（ベータ版）
diff --git a/resource/global/txwy/readme.md b/resource/global/txwy/readme.md
index 7480cf66b4..6a64a43018 100644
--- a/resource/global/txwy/readme.md
+++ b/resource/global/txwy/readme.md
@@ -9,4 +9,6 @@
 - 刷理智（仅支持选择`当前关卡`）
 - 使用理智药恢复理智
 - 使用源石恢复理智
-- 指定次数
+- 刷理智指定次数
+- 自动公招
+- 公招识别
diff --git a/src/MeoAssistant/DebugTask.cpp b/src/MeoAssistant/DebugTask.cpp
index 34e8cab6c0..de4db54ba8 100644
--- a/src/MeoAssistant/DebugTask.cpp
+++ b/src/MeoAssistant/DebugTask.cpp
@@ -3,7 +3,7 @@
 //#include "RoguelikeSkillSelectionTaskPlugin.h"
 
 #include "StageDropsTaskPlugin.h"
-#include "DepotImageAnalyzer.h"
+#include "RoguelikeFormationImageAnalyzer.h"
 
 asst::DebugTask::DebugTask(const AsstCallback& callback, void* callback_arg)
     : PackageTask(callback, callback_arg, TaskType)
@@ -15,7 +15,9 @@ asst::DebugTask::DebugTask(const AsstCallback& callback, void* callback_arg)
 
 bool asst::DebugTask::run()
 {
-    cv::Mat image = cv::imread("depot2.png");
-    DepotImageAnalyzer analyzer(image);
+    cv::Mat image = cv::imread("err/2.png");
+    cv::Mat resized;
+    cv::resize(image, resized, cv::Size(1280, 720), 0, 0, cv::INTER_AREA);
+    RoguelikeFormationImageAnalyzer analyzer(resized);
     return analyzer.analyze();
 }
diff --git a/tools/TestCaller/main.cpp b/tools/TestCaller/main.cpp
index 4283a10372..3b04ef9823 100644
--- a/tools/TestCaller/main.cpp
+++ b/tools/TestCaller/main.cpp
@@ -39,13 +39,13 @@ int main([[maybe_unused]] int argc, char** argv)
 
     /* 详细参数可参考 docs / 集成文档.md */
 
-    AsstAppendTask(ptr, "StartUp", nullptr);
+    //AsstAppendTask(ptr, "StartUp", nullptr);
 
-    AsstAppendTask(ptr, "Fight", R"(
-    {
-        "stage": "1-7"
-    }
-    )");
+    //AsstAppendTask(ptr, "Fight", R"(
+    //{
+    //    "stage": "1-7"
+    //}
+    //)");
 
     //AsstAppendTask(ptr, "Recruit", R"(
     //{
@@ -88,7 +88,7 @@ int main([[maybe_unused]] int argc, char** argv)
     //}
     //)");
 
-    //AsstAppendTask(ptr, "Debug", nullptr);
+    AsstAppendTask(ptr, "Debug", nullptr);
 
     AsstStart(ptr);
 

From ecf16c425d90d50f9257c2e8489a2d180fce0b09 Mon Sep 17 00:00:00 2001
From: MistEO <mistereo@hotmail.com>
Date: Sun, 24 Jul 2022 17:08:58 +0800
Subject: [PATCH 09/10] =?UTF-8?q?docs:=20=E8=A1=A5=E5=85=85CHANGELOG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e8a362a3b8..e3d5fbb3bd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,8 @@
-- 新增支持 繁中服自动公招 @rockerhank
+- 新增支持 繁中服 自动公招、公招识别 @rockerhank
 - 修复 肉鸽 编队人数过多时出现的一些问题 @MistEO
 - 修复 肉鸽 偶现掉线后、凌晨 4 点更新后无法继续的问题 @MistEO
 - 修复 肉鸽 在部分模拟器上战斗画面识别错误问题 @MistEO
-- 修复 EN 服肉鸽 招募干员、进入安全屋、领取关卡奖励时卡住的问题 @MistEO
+- 修复 EN 服 肉鸽 招募干员、进入安全屋、领取关卡奖励时卡住的问题 @MistEO
 - 修复 刷理智 偶现掉落识别问题 @MistEO
 - 修复 自动战斗 选择了 `删除编队` 时任务报错的问题 @MistEO
 - 修复 自动战斗 存在 14 个及以上干员时的崩溃问题 @MistEO

From ab0b7043527a35a8bc9a4f3e3eead74973e9d73f Mon Sep 17 00:00:00 2001
From: MistEO <mistereo@hotmail.com>
Date: Sun, 24 Jul 2022 17:15:51 +0800
Subject: [PATCH 10/10] =?UTF-8?q?revert:=20=E5=9B=9E=E6=BB=9A=E8=AF=AF?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=9A=84=20debug=20=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/MeoAssistant/DebugTask.cpp |  7 +++----
 tools/TestCaller/main.cpp      | 14 +++++++-------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/MeoAssistant/DebugTask.cpp b/src/MeoAssistant/DebugTask.cpp
index de4db54ba8..980d7075a1 100644
--- a/src/MeoAssistant/DebugTask.cpp
+++ b/src/MeoAssistant/DebugTask.cpp
@@ -2,8 +2,7 @@
 
 //#include "RoguelikeSkillSelectionTaskPlugin.h"
 
-#include "StageDropsTaskPlugin.h"
-#include "RoguelikeFormationImageAnalyzer.h"
+#include "StageDropsImageAnalyzer.h"
 
 asst::DebugTask::DebugTask(const AsstCallback& callback, void* callback_arg)
     : PackageTask(callback, callback_arg, TaskType)
@@ -15,9 +14,9 @@ asst::DebugTask::DebugTask(const AsstCallback& callback, void* callback_arg)
 
 bool asst::DebugTask::run()
 {
-    cv::Mat image = cv::imread("err/2.png");
+    cv::Mat image = cv::imread("err/1.png");
     cv::Mat resized;
     cv::resize(image, resized, cv::Size(1280, 720), 0, 0, cv::INTER_AREA);
-    RoguelikeFormationImageAnalyzer analyzer(resized);
+    StageDropsImageAnalyzer analyzer(resized);
     return analyzer.analyze();
 }
diff --git a/tools/TestCaller/main.cpp b/tools/TestCaller/main.cpp
index 3b04ef9823..4283a10372 100644
--- a/tools/TestCaller/main.cpp
+++ b/tools/TestCaller/main.cpp
@@ -39,13 +39,13 @@ int main([[maybe_unused]] int argc, char** argv)
 
     /* 详细参数可参考 docs / 集成文档.md */
 
-    //AsstAppendTask(ptr, "StartUp", nullptr);
+    AsstAppendTask(ptr, "StartUp", nullptr);
 
-    //AsstAppendTask(ptr, "Fight", R"(
-    //{
-    //    "stage": "1-7"
-    //}
-    //)");
+    AsstAppendTask(ptr, "Fight", R"(
+    {
+        "stage": "1-7"
+    }
+    )");
 
     //AsstAppendTask(ptr, "Recruit", R"(
     //{
@@ -88,7 +88,7 @@ int main([[maybe_unused]] int argc, char** argv)
     //}
     //)");
 
-    AsstAppendTask(ptr, "Debug", nullptr);
+    //AsstAppendTask(ptr, "Debug", nullptr);
 
     AsstStart(ptr);