From e033ce0aac72668dccdd3aa423b31e8e89a0470e Mon Sep 17 00:00:00 2001 From: status102 Date: Sat, 16 Dec 2023 15:21:26 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=83=85=E5=86=B5=E4=B8=8B=E8=BF=9E=E7=BB=AD=E6=88=98=E6=96=97?= =?UTF-8?q?=E6=AC=A1=E6=95=B0=E6=97=A0=E6=B3=95=E6=AD=A3=E7=A1=AE=E8=B0=83?= =?UTF-8?q?=E4=B8=BA1=E5=B9=B6=E5=AF=BC=E8=87=B4=E5=8D=A1=E5=9C=A8?= =?UTF-8?q?=E8=AF=A5=E6=B5=81=E7=A8=8B=E7=9A=84=E9=94=99=E8=AF=AF=20(#7646?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/tasks.json | 15 ++++++++++----- resource/template/FightSeries-Indicator.png | Bin 779 -> 3590 bytes src/MaaCore/Task/Fight/FightTimesPlugin.cpp | 12 ++++++------ 3 files changed, 16 insertions(+), 11 deletions(-) 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 2db9a2e45a70f5738b2b46e75f58403434e6bcfc..965cd93966052cc5505097333e23a3cfa3fa194d 100644 GIT binary patch literal 3590 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 literal 779 zcmV+m1N8ifP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0-#AmK~y+TZB)@} zQ$Y|tySY(O+P;*&_+mAv|D!Mdjh`W+4}yXSB5F*mwPL{{N^B{LNFwNqu@-5IH8s@a zuIJ3|CTZ)mliA&S&Ya!3bJzK~GXa$fP^kjWBlrqj5y$YF7mR$)abDx<03np%5BLMe z-)vg>pLsZDp#?z3ZUElj>pX=9@Lw7_x>ZcfA66zjseB- z*q7?Zf_=#Gh$JhyjZf_kZr{C!#?niC+4zaweZKgrh$1iv;}Oz;=NQskYwNgn>kgi+ zyusEVo=@E_H7aqFN6k5hx!GA@#c@U^>Xz(BW;QU$S(lOHL|9NL`@78al5{=+&xv_GRiWFD)W zoYj&_I*%z`zi~4>deXq_w=Hb_(pC~!)nbg5)0(PB7wPnTEp#`2#7wG?vQ0oa=Wyyzjwid^xtjZat!jkKOWr)$G2fCHUw-5>0?T*L~MMz_dsn13v z#biEiBLStN+euBCi4zLu9QzF9ahNZ1+ru!*ir&2get_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()) {