diff --git a/resource/tasks.json b/resource/tasks.json index 5cd3263cb5..8965e5a514 100644 --- a/resource/tasks.json +++ b/resource/tasks.json @@ -4067,10 +4067,14 @@ }, "FightSeries-Indicator": { "roi": [ - 950, - 180, - 50, - 400 + 940, + 190, + 80, + 380 + ], + "maskRange": [ + 1, + 255 ] }, "FightSeries-Open": { @@ -4079,7 +4083,8 @@ "action": "ClickSelf", "sub": [ "FightSeries-Indicator" - ] + ], + "postDelay": 500 }, "FightSeries-List-1": { "algorithm": "JustReturn", diff --git a/resource/template/FightSeries-Indicator.png b/resource/template/FightSeries-Indicator.png index 2db9a2e45a..965cd93966 100644 Binary files a/resource/template/FightSeries-Indicator.png and b/resource/template/FightSeries-Indicator.png differ diff --git a/src/MaaCore/Task/Fight/FightTimesPlugin.cpp b/src/MaaCore/Task/Fight/FightTimesPlugin.cpp index e592509aec..b9cf628006 100644 --- a/src/MaaCore/Task/Fight/FightTimesPlugin.cpp +++ b/src/MaaCore/Task/Fight/FightTimesPlugin.cpp @@ -16,17 +16,17 @@ bool asst::FightTimesPlugin::_run() { const static std::string FightSeriesOpenTask = "FightSeries-Indicator"; const static std::string FightSeriesValidTask = "FightSeries-Icon"; - auto img = ctrler()->get_image(); - // 目前也可以做成subtask,但是给以后糊屎留个地方 - auto check_status_task = ProcessTask(*this, { FightSeriesOpenTask, FightSeriesValidTask }); - check_status_task.set_reusable_image(img).set_retry_times(0); - if (!check_status_task.run()) { // 认为是外服,无法使用连续战斗 + auto img = ctrler()->get_image(); + auto is_valid_task = ProcessTask(*this, { FightSeriesOpenTask, FightSeriesValidTask }); + is_valid_task.set_reusable_image(img).set_retry_times(0); + + if (!is_valid_task.run()) { // 认为是外服,无法使用连续战斗 inited = true; return true; } - if (check_status_task.get_last_task_name() == FightSeriesValidTask) { // 连续战斗次数选择列表未打开 + if (is_valid_task.get_last_task_name() == FightSeriesValidTask) { // 连续战斗次数选择列表未打开 auto task = ProcessTask(*this, { "FightSeries-Open" }); task.set_reusable_image(img); if (!task.run()) {