From b838e26686e44be39e82fe2eded58b9ac3786bb4 Mon Sep 17 00:00:00 2001 From: status102 Date: Wed, 13 Dec 2023 20:08:32 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=9C=A8=E6=88=98?= =?UTF-8?q?=E6=96=97=E5=88=97=E8=A1=A8=E5=B1=95=E5=BC=80=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E9=83=A8=E5=88=86=E6=83=85=E5=BD=A2=E4=B8=8B=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E6=AD=A3=E7=A1=AE=E5=85=B3=E9=97=AD=E6=88=98=E6=96=97=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/tasks.json | 89 +++++++++++++++----- resource/template/FightSeries-Default-1.png | Bin 2251 -> 0 bytes resource/template/FightSeries-Indicator.png | Bin 0 -> 779 bytes resource/template/FightSeries-List-1.png | Bin 2503 -> 0 bytes src/MaaCore/Task/Fight/FightTimesPlugin.cpp | 21 ++++- src/MaaCore/Task/Fight/FightTimesPlugin.h | 3 +- 6 files changed, 88 insertions(+), 25 deletions(-) delete mode 100644 resource/template/FightSeries-Default-1.png create mode 100644 resource/template/FightSeries-Indicator.png delete mode 100644 resource/template/FightSeries-List-1.png diff --git a/resource/tasks.json b/resource/tasks.json index be5de00793..8134208a10 100644 --- a/resource/tasks.json +++ b/resource/tasks.json @@ -4069,40 +4069,89 @@ "StartButton1" ] }, - "FightSeries-Default-1": { - "action": "DoNothing", - "roi": [ - 945, - 580, - 100, - 50 - ] - }, "FightSeries-Icon": { - "action": "ClickSelf", "roi": [ 945, 580, 100, 50 - ], - "next": [ - "FightSeries-List-1" ] }, - "FightSeries-List": { - "template": "empty.png", - "action": "ClickSelf", + "FightSeries-Indicator": { "roi": [ 950, 180, - 100, + 50, 400 ] }, + "FightSeries-Open": { + "baseTask": "FightSeries-Icon", + "template": "FightSeries-Icon.png", + "action": "ClickSelf", + "sub": [ + "FightSeries-Indicator" + ] + }, "FightSeries-List-1": { - "baseTask": "FightSeries-List", - "template": "FightSeries-List-1.png" + "algorithm": "JustReturn", + "action": "ClickRect", + "specificRect": [ + 965, + 505, + 70, + 55 + ] + }, + "FightSeries-List-2": { + "algorithm": "JustReturn", + "action": "ClickRect", + "specificRect": [ + 965, + 445, + 70, + 55 + ] + }, + "FightSeries-List-3": { + "algorithm": "JustReturn", + "action": "ClickRect", + "specificRect": [ + 965, + 383, + 70, + 55 + ] + }, + "FightSeries-List-4": { + "algorithm": "JustReturn", + "action": "ClickRect", + "specificRect": [ + 965, + 320, + 70, + 55 + ] + }, + "FightSeries-List-5": { + "algorithm": "JustReturn", + "action": "ClickRect", + "specificRect": [ + 965, + 260, + 70, + 55 + ] + }, + "FightSeries-List-6": { + "algorithm": "JustReturn", + "action": "ClickRect", + "specificRect": [ + 965, + 200, + 70, + 50 + ] }, "StartButton1": { "doc": "绑定插件调整连战次数", @@ -16333,4 +16382,4 @@ "Stop" ] } -} \ No newline at end of file +} diff --git a/resource/template/FightSeries-Default-1.png b/resource/template/FightSeries-Default-1.png deleted file mode 100644 index 1ec13473bfe6a9f39bacb9b06a7454970126fddf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2251 zcmV;+2sHPJP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D2w+J>K~!i%?V8U7fCCO`l`n3{j+%1-z0-rfIRpS_9w=U@M9m1}j``LrvQYE^3WnlzhD z=|xOS%U$+>`T()WJ^i{|DY*5;kIEJK^W8f+IzE<0qhSk+#bTZEe<(@2dwWt>a_Wt` zm6m=&lFm)km6xI}V%L|JT9D+|6eT8=O3B2;gp7`k%GlUgPaBd~Q&l}yDJ+$WQm;Fb z|91#-Ywb(Y`1rWY%*-f3(~?flv`I=RNePL^_Z6pII1ic%;Pw4tjx{L$;|W&tcl)WZ7>5#?h3?YWMo9^^qyAB$k|i% z-QC@lPoF+Xxm@lc^((kXI)v?E{SQT(q{VDj*VmHi>1iVjueG%`xpwWEsTyFh?%Q2^Zcs7T z<|-1Zh7d|!vrUq9QlNU9>NyLA&t|WHAJ=fzNLpWCHUz%K@=D5*5?js2l?NYcO5 zR7&mFv`kJ-NnBOWRvRoBJN4%uf0zo^>#lEysH;R0lSbWc+_+&SnM|6;!mc0<#efCgP08H+yxB3v2~`!FwYR$`zyJPH4s@KWLXulU%uL0|)YQ}lHl?P~ z_R-;?d9iw}CfjOH-l?j5{`^@gl}dME5!5w8Kh%Cm4AREn6G|N4jLSok$#Ih+?(=GA z7(~VoCJE1e>((t;$RI{+BO~q&9IB2;w;`E*^8C!dbxl*kwpX z>OD~q0zo9=zHJzi?%lg5w{PFJv7bGACXXIHGE)(5p3Ra3miTD?6t#Hta1oB8|AVN-T?cC7s@c>MUWJb(UN zo<4ml8yg$);>8Q&;46~&ol;R-US5{8il4uB@(Ds^fyo-VyToC0Scv zleL>SC8rXRXh-=c0dhWSJ_u3XYqAjL>On$Hh(XL2V!&P+hzB1$cp&%h-#3CFn{j(c z@(-f0Go&WT3)&~fBw4&c)V9SA#O>D; z>{&lx%rWpjN%y!YWkwRlvtFxP@aMDrK{#O@Jt!4R@?Hr)Jang&Cd&FpUvfmB7oPO2 z5V&f*7}DawTn`Qodh$U?Le(!5MiMa+!Pv;?**zOTB2EJ8w7tD$39<(^V_1R!F-+7* zW5|*Ga4a_CvQwYVQ|IP1$Qw_#f1M3ykto#e{rmSu6sm`cu{d(WVZbv2sTZI_8S%u{gv3z-E=9e~xJDl3EGjb~Mz!e6>ToWfr^`JEjlsOlt(dxkNx*f=B+ zQXs>7G1Lvuw!gn`L}C*!6CFt+u)}39W*57L?-Gb2FvEKx2^{5m_dP5@05XtD$cnmo zB$YO7)UYAIX;3xqP87Yrp#h~&QJ{y`;g-?|N;WS9FtmOF7asFFA|4u5z)rMzzlANmO zjqM3QlCvwW!XJBhmGUGX6c6Opt5U)9-bQe$ih}tP$9(0Zrv@my@zg`njZ*PAzPlG$|O5O$0ZroNr*)b%Ir-`n?T&VC9V7~fW}3fC4oWfIEgyizUud*NV>L^Z-wf> zg30B`m3;9BXm~BW9rqv|^yBRM_~=-QrJ@CRWc9~^s|V*L3H0<0JJ8UV$;(G)+x}>qwj+H_C5d-)cs>Xs*gHwJqU#xa=Kzwxz=m&!*ss6* zqxEj{gEZPx#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&2Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D30z4;K~!i%&6>+{ zQ&$#-mn7T4Hw@TZ3aUC3$%HBx=Q2r8$rPRf#tfvfGE3P`e(plZ+MzD;jj(Ksqo+x=#=Yc%#PSu!~6?LkVY z6VT8_rsCu@q>!t-9}1EYA6}NpMQPIeG6s8UwGkQ6uuGRN+5P(u?8%cS_W1E*yLa!N z!BsWM(e!9SAgzY9LPktP=mLR?Ty8v~&dXKN)Yx9Gw96F+P8_5)nkeR~DG;Mr)Am#e zX-)>UD8~myX(i*lpFXvbn#iiz*yxCTHioA)b?cT*PM^1iybFHthUw{P zyLt0-`|`^#Y)a`+Eg2xt2Gwhbz!|1B^ zQ*38%gZMq|Y3@-XVUPU-D4hvyus39C=%)vhUe|uco<^RwsrlfEb1%V=kuZep{$b`gh1=JHw%J(N<`HBvlq;vkBpH9x;-n;RQawCMy* zj8C}d&77b1cASn|TU)lcxah&n%0{`yK`hDT!{2?-%nng&(3uC5t zwzuuWhY$Ag<43B=>Mwpno^51u<5K^k!@WMsKqWinNfZ+T}!Cqj4`^|Y6+tW}gq zfW)B@7pLbnT{mXZ@y?^+o`-T16BAxPGc)6NHT1+I-B@Vj(-|aza8v}T-0Ol+?s3@* z+dz?%r?v`Bk?EdEzf?Um;_~SUIM_Bfw{3Z8(Y7|%bS(+x$H&j9O%qt_xNHre1A@f9^Ohn|D+f{ z#BpM-tgPr%-LQp)1zjmV+S+>E*8fqKN+Wn>ib)D(o=AG2&?{OYmU2q#ndJ~$NPO_8~2 z>#Hlel5FbO--^8lHT9t#x)-zEBk1Yl@bq`wg4|Y{2;L$xpeRp81Q^Pp4Xuiy5eEUw z%gcTTD_(g7UTfAj_S_@q=YO}F)vZ>EuY4d6(m3fFeiA|iz7(;0BBeasph(wLK_J~m zIQ6MbQCIv$og-(8f`i~f^S4Nz9h@8ys8?4vhPREXPFq$guj(28;;t+nNsML0Tw!*1 zw(Zwn|7}10^iTWkxBtY7^A_GJ{ve7Dd~%@P)8+c`R$}szZf~Pd@nuZiae;2Vx+T4P z)^~#Txc~TP5XasYJ$LJR!PkpKCeXKPDa$*s6G)BHexP_z+dOy=cy-S<^JD{p})ydcGgq6M?x;8`PB6cw>Z8VWfIP@^ps# z9TM42Tt^Sz8bbDPi7V9Tv><8GO&RyTF%*tGF|XZa0x>exrZ}aFY%eoYgHnI!YITfq za_p&WA@Q0xMB)k?Ksl2%I7|_~6d2X(S^1q?IVWvT2M8}FY}^Ryl+`x2aM)PLr%$!2 zO#;I5E}))XSFKbv)L~*i4ce41XVUOT(SmLxB5+JgI4-!c4~4_{Lh^&6xsNC6{?~|s zvW?NM1(u!1=}}8WAt}cocjMb(ChADUg=j&E&Vi4ELJlZrN-~cs-n;7&UPuxvT88EU za;_z}eFS<$oYAR4)Ns$-)76NHpoIt*#RnP(TEYY}JzE}*)ZJ0YEf*#nReonz9EY1p z;W6$>?1aYyr3J>7(NPNe-@x;-#xC)?rtRXv$Wj)2#lPV zG{!k`=aZxFQfwMSY3;6b{iBXF3t5 zv+e+Kh|8f3-3nzmw)?#&N?OPT2P#S^$vZIK&~UPmMcgS=R#$p+!E`C75Cu-zeQ3~u zYSo$aPvVmRL)j>ckPAget_image(); // 目前也可以做成subtask,但是给以后糊屎留个地方 - bool result = ProcessTask(*this, { "FightSeries-Default-1", "FightSeries-Icon", "Stop" }).run(); + auto check_status_task = ProcessTask(*this, { FightSeriesOpenTask, FightSeriesValidTask }); + check_status_task.set_reusable_image(img).set_retry_times(0); - if (!result) { - return false; + if (!check_status_task.run()) { // 认为是外服,无法使用连续战斗 + inited = true; + return true; } + if (check_status_task.get_last_task_name() == FightSeriesValidTask) { // 连续战斗次数选择列表未打开 + auto task = ProcessTask(*this, { "FightSeries-Open" }); + task.set_reusable_image(img); + if (!task.run()) { + return false; + } + } + ProcessTask(*this, { "FightSeries-List-1" }).run(); + inited = true; return true; } diff --git a/src/MaaCore/Task/Fight/FightTimesPlugin.h b/src/MaaCore/Task/Fight/FightTimesPlugin.h index 5f70a0033f..a636927e0c 100644 --- a/src/MaaCore/Task/Fight/FightTimesPlugin.h +++ b/src/MaaCore/Task/Fight/FightTimesPlugin.h @@ -14,7 +14,6 @@ namespace asst virtual bool _run() override; private: - // 是否成功初始化为1次 - bool inited = false; + bool inited = false; // 是否成功初始化为1次,初始化后后续不再检测 (实现调整次数后移除此变量 }; }