From 8148819108dc65198da362a6e7b65bbfad010dd5 Mon Sep 17 00:00:00 2001 From: kaedelcb <57870068+kaedelcb@users.noreply.github.com> Date: Sat, 30 Aug 2025 12:03:43 +0800 Subject: [PATCH] =?UTF-8?q?v.2.0=E7=89=88=E6=9C=AC=20=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=B9=BD=E5=A2=83=E5=8D=B1=E6=88=98=2020250830=20(#1770)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ### v.2.0版本:20250830 - **优化**: 1. 改用模板匹配进行浓缩树脂识别,使用颜色遮罩模板,全脚本要求BGI版本提高到0.47.1。 2. 针对2K和4K分辨率,降低匹配度要求,提高识别精度。 --- repo/js/AutoStygianOnslaught/README.md | 6 + .../assets/condensed_resin_count.png | Bin 4806 -> 3755 bytes repo/js/AutoStygianOnslaught/assets/five.png | Bin 0 -> 1756 bytes repo/js/AutoStygianOnslaught/assets/four.png | Bin 0 -> 1781 bytes .../assets/fragile_resin_count.png | Bin 1988 -> 3256 bytes .../assets/moment_resin_count.png | Bin 1974 -> 2406 bytes repo/js/AutoStygianOnslaught/assets/one.png | Bin 2854 -> 1676 bytes .../assets/original_resin_count.png | Bin 5158 -> 3235 bytes repo/js/AutoStygianOnslaught/assets/three.png | Bin 0 -> 1782 bytes repo/js/AutoStygianOnslaught/assets/two.png | Bin 0 -> 1774 bytes .../assets/全自动幽境危战.json | 50 +++---- repo/js/AutoStygianOnslaught/main.js | 136 ++++++++++-------- repo/js/AutoStygianOnslaught/manifest.json | 4 +- 13 files changed, 106 insertions(+), 90 deletions(-) create mode 100644 repo/js/AutoStygianOnslaught/assets/five.png create mode 100644 repo/js/AutoStygianOnslaught/assets/four.png create mode 100644 repo/js/AutoStygianOnslaught/assets/three.png create mode 100644 repo/js/AutoStygianOnslaught/assets/two.png diff --git a/repo/js/AutoStygianOnslaught/README.md b/repo/js/AutoStygianOnslaught/README.md index 9b0bb1a42..614b60ee6 100644 --- a/repo/js/AutoStygianOnslaught/README.md +++ b/repo/js/AutoStygianOnslaught/README.md @@ -41,6 +41,12 @@ ## 三、更新说明 +### v.2.0版本:20250830 + +- **优化**: +1. 改用模板匹配进行浓缩树脂识别,使用颜色遮罩模板,全脚本要求BGI版本提高到0.47.1。 +2. 针对2K和4K分辨率,降低匹配度要求,提高识别精度。 + ### v.1.9版本:20250828 - **新功能**: diff --git a/repo/js/AutoStygianOnslaught/assets/condensed_resin_count.png b/repo/js/AutoStygianOnslaught/assets/condensed_resin_count.png index 295530173161ae23f1930ce083174d8ebfa6a69d..aad15b570ecda6095d832e1a8228aed61b6b0815 100644 GIT binary patch literal 3755 zcmcgv30M)(oXku@gk-`b62Jr0hQ0y2rD5p2^Jr&-=gM_rKpU zGk^2<^ENYn-J*Ko=1xQVGyd zxlas^u8Q#!!!cnn7a_YX0bHYa1c3t8KtPltT&d(5KS1L?5;Bi z1d03s0fwW1i!+M?)0iB9&2^@+m>`4Y1kgbmmkM&IGzJBv@jw>Og$<1T$b>ZO0~^6g9oaHak)w( z$CQAM5t3k=G<-7Q>F5>|Dm|@IJth+&7&Qt~QEASgZc8IT1lHqJoAB@v;|NSe!%+pQ z)Tjw8O^+p15{dNi*U~B!dbC>O8A*6Fwzt=!)#7LsN)15O*d`oCJtGN=Hsg+|H38`F z(!9lT0RQ4DO5ZGjzSs?7h_oXc$EFeSpYgA8L%)=u0$}cdXdh> zu?46Hq(S*)I!Je+fE)?~6oXtI=)waTjv$8zf}>CokwgfjfnEz{@tDki0%M3=8vUnG z1m;OGTmcah%N39erK*&&5o;n5PpDLDASH|nJ@{n8RcE;z;c=yGCQZU3auTJZ6fVeQ zP$VdkUI>TDVM!sBhDey>>pd`dlP>(a^`n)5U@*a<*Nw+?ff+0mp%X*|8?ls2;ebq# z!hjKu1f)s0bS7(@Z6z)ziV+H*$g1-SAs8htbQf5{qEk?b3xmSoG6~mUDNJF45`;^P zP=qTX1Hao9VBr`p!Vp4p#>9D{K;VyKQh7LWLml9~3=nz>STrt+MWH*>bTu=QyF4Gc znuu}qSQV~9BgU@6<-ka~@*r4OQG7D2%LWu7k4?*8Bk0??K1!<%MG4YB$dXZ*8k1_Y z5RSUb2=V_k3#o5%UJXV5vFmi0&Sk=EIt64C%>_i6Fhzn8L4Z&R+l3`zfi4h{xqsmL z#GL(4Tp#0xLm{OMCE7EU{Kn0|m@*Q@C&WSp;SkZ4QC!U@OL0sAKq^(Z9ENm(qed!` zv1X^w89;*pzgNf`?I0*FpCH>rD|#1z|DnA<4bs~c?EgJTRNd2Nv~sBbT2!NBk5MJP zbg>!f;=I?D&)eo8(bjoH_tE#Gf3I_l+QE-M=1M#WDJ{ICW>fe{0%H3mjQnK~E^A$52B5hj=7wlx3 zH{PkcbGxM6+$7N5A=Rnq={Bt8U`X7<%${E0-3otN)OmbKTtY%`MY+wCHts%3@hhyY z=giz6JSu-Ze}237rM-J|$}LyC^Gn?cD&L&swu+p)t*xRmTDJIhm!lv){%q#~Rf}r9 zsU5>A(SZGManHrhZ#L|6<2uCl)ie(q0OF_5+U~Y}?>f)Vx7H_r%^}eXuj!t~+b(>^o&w?0nONFD|dkZ))x+IJ-a66rZwh@yvqdM_vpxW5-Xl1&0hs zsNF6PLh^6}B%L=;CdA{k2RhJvO5DKRo|braTx63^o>P6!J6;Q_6Oa1x19z{E>5{w( zD+#1-DJ_aED#V|CtWth>BY#Emy}SK6^R2_ynY|d=afI+urGi zC0#WRRkymPf1GXIv8%l?WB8}F;y%yR{lTqQYL9z5t<3!PhcgK^cVZt`4DTr5o9wEX;$sVb6we{`|{7Y+lJ-dj(l=Ac%TC?jQ5XE z_xsX9oV=Rj(cS-f%Eh`VWEL~?* z+Wbp(Kn_#!S>f3WB8%CHe0JTr*p`~zp7TON`iIkPGZ{+}Q$a|Sg?m+cq5b0IRW+gm z7avWNp8jk2=5oVlIUyGo8pj_7U!A-4{NPYSTTw}@f80^W;Ems`-1SM^lZV2?CW6*7 z(=F$%1Q*i2eDvgIxqG|uJwEFMU6lVOp2x=9I8uYu%RYKtpfNkJsx5dx}fVdsbN1SlQT;x4BZU z1z8(bPg&ZndEVoElo8{4b$MFDDX#tdn{LhoNHf4)vVPivG zfGihX-6BnMJ5s4^nzWU)dyaJW=dbRQFDZbQf)uD^)}Z#$jO3h!D;{xW$0*r1Yg=vm zOYKt`8cVvzqM(a{T9QF_Ms3h?`n6-FvR=>OxcvJjMuXOI+b_>8)9&rneNGBJ{XC8@ H+pz67*vGEo literal 4806 zcmZ9QiCa@ww}*TGh5OvL%mN|Fna@c=0yu%T_4}$trD|JyZE5vG6hy3u#R-QZID-NT z;y|S+SVvSqP?Q;}G87pC0$~bCAV5MG!jRmxPms1Z&oBEqIZ5`r*V=3Ev({ejU-91` z@Gk|l7`#2;O~L!WKCpxKgAWqszUM#8HFgfJbFz1}vvd9EBj^A5(D}m;om`y-Vh@7E zSeEvr2#zKtEG3hAE|e=4lawbx$!x+&i3sBeN=i|l6e*=C8B2pa=S0aEN(MJ6MnOmx zeLT-{aCLBWcXIMr;D(FDEc}3D6%tkO<0Uijk8bT8@!2 zg7jqJH@rAjF5y6mIk9rMgT9jZeC*(E=j;I#7gwRloRH9zghP^oSds%t z7*9^NkmVE<$x);PT9V`loWU@fB3K4~LxI2pwu`^D{8t~@Em$CA#H5q}U$Jr|MoM5b zF2V^BMvE{;jIm;j<69QPS(4=_h7x0cNrVwX5h)bWBC+kqEQbDqT67@>F}$2zgcP?> zqVQ#4w5*IGX$r$B41@p9_kdU!!a>UtKw?M?$Au!yLx>54xQ7rIcn}^!(EQkVkeI~~ zXr6_WGFG;jQ~0u+7ov#80OH3iCPi~N7%gI97z5*no`o2V;h)H*|GUEX$IqAVUibOY z@4k%QxO&4 zGRQeJLy&WJ0gK1s9v(6r3;p7=r$=|Uq@Nqgzco_VdesD5UsEEp-z8!pb#7u+6r zoT0gQr6()-azv06hlv*1yk`TU=z)=oQ43;l0-_LbG>+yA1U|$(JU*3kx1)d3KfPn9 zD4c9>G0fu7)A3qm^e%*^rrD6f$Q2HUN<#Vm^+)M`#Wa_`eyb0vwEG?Fl05GtrjcN z{A+S@s;|pf@w6`G_#&1D)1X@v9=I4y$9tA7Y!H#4D1ySpnEygqPIRcg^ntmfcB-#! zTGKhz(>kVnGhFpV_dHWqc*D?8Wi?O#g9T8Fb!J#URPi+GYk!zEu!6-gWRwUQ#oHz3 zaGZmi{2f9hTDMeDaxQAD>d~aC!K`jG_q3WCtA>j2XzrfwPmk)qzPJBMWOu?(hKgs_ z>FIg1<}aoOv{i|Ry(n1ZU=&7)&>SHaEI>>Qi(g6-j97#V+`sjc*CZV|TfHW6FbQePhPJGwDeW~`B zK#N}e7vgVMlRc`~psz@g5c)?f5kF--izRR{){_uF*c&+bBGdF|k*Pk<^!kpmJk$8{ zs&%EX)aH%W=8pc6ZLIj!SbWX+JlXU-akMZ&o4H?;v|Sq?s6Dh+vtwER z&gDZ{C#+MG2rxY}u4*6eY&C0oXGS1I(aqZ1m*q6S5uufZVgpzVM1@$in59aNZqwvk zHPk+vXs;S=$TL*lG!|V3ql^Xd#)5N0_m5~VZqps#(7$7uI>cA=%eRy5wa}-& z^%Gq+#?qUH!W3g+;%NR!W6qJm^j+Gc0qPyTn*FOy6?d&OWfYwzvVJUTa0 z{n*s>YNE5*Ix*gua}&moSnqK*7Pv8e=hq!+hcu7VdvnsYFYl`hZfnc(j7`-8g})6v zNigNcnI0V*&e*Mu`$`kD!Bm=UwLrAbn$`6K&rhlEMRlfb@5$JwFU~U7myNeKPV4&W zA7uK#aggD+FE*9l7%R9i z`sn0nZi2b3a&Etv93H8?Iaqv7n}4+X#@>!g;p)eihu##8cQl*Y8%lmnl2fqP@pkbo z?1%8khsFD6e3<%P;&A!>;mQYH1$PY{t>c=$$w94oXwWh?Y8^LPjXJBb*E&969qoi@ z0Hek`iuGlQV3#)cNcWA%*7$9mw-R)fg_FG$4hKEd4JmMx}LXWaRZFed$@v z)3}~H2U;&~uaDc>ly<83W&V_2Yf`mbJG2{~S#u!R-eIQ_qbF?mYQNT`$llv$dvi~# z3lsW^ejQcSO$}?u)V)K>MngxNb!KK}eAqHnKhv2t-IO#tRBxRaFucArSbRdAb4Yb- zPs@ei+St(MtLJ)(^2~aj_H|kK*8zk`Xqztp!Hxl2I{0v>|MIpA5q;UGx*i%gRN0Zr)X+Ca1K-5% zY{^XSuP&J}3^hK=_G*wL$K8EhkB$x2XHTe~ zo7JypO*+f;)P%NWy5qr2^F>Q*>U8%*>$Gvks8SamR9@SxOx@Cw5>k62xc>a!rkjbw z%7!s@&#jn9367EcOxcXGu}BfN(brpfCR~+v;9X`!YsSu&j9uk%K|Rk?W(`d; zeo9?EUY|7a=LK`~6^lVRt*tWmzUa$8T6fyN;mn4nGe0(*4N?AjOqF+YysukTS`g&F z0-hJ>L5$2n;#rW~;=U5*kK@}qFYJ1k7S@vTpEqZJXt?sz&>yKIuhJ*qT^TGA?2i8{o>|b+iU2(+f{E(Gz6Ss6d+*gwjSQ)*#=Vnmd$#vNqy&in)^?b{s zhF`vXmlC46AJca?PWv>iF6GdAzlF#s8wiIynP3PU?tnR9)O*vgurHRWQjfel9^4qY zrvB&E^#=n=!dE@p{;#_~E`JjG@9a%WA8uOwHYT8E|L0lj<;B~Uz6xK~nG!ab8{c&$ zqAP80U3~bqResPdh0MVj9wcEHh9tpEegKFC0@EPBO%DD_lbzg|6xA5D_U+GWY9m*d zg#4>G_>-4Gehv;Qx&_7RwhOPbtGCi;e zQQ+ZALAN*!X(!DB9s0M~Wy3+SAR~#i&~Mc_zjgl>-*POldEfe`sDQ3BTQye?^d;_U zKJ-;b>;~28O{%nr!Gbh>!L{!6Xt1a;VMpi}%b+)s2O$f85poMQ~Najh#hJzMX9|&rn?>}Aq;NZ6QjQGKV zJLX>HtU+xVRht^idVjyvd*@PjR-!T`Cih@yi2rgZJ4pm0SulrZq4W6J$CfhWDX*4S&0+1+D-z}-av=R9sUxd`0;DOdQ&f8}K7 z?BcM%*;VW)pk3TCdq+2WM|T8r5ZF1mA=$gya1Qovfa5`e1y1gObLBw-)RjBx?VpJM I_YubPe@ZK?r2qf` diff --git a/repo/js/AutoStygianOnslaught/assets/five.png b/repo/js/AutoStygianOnslaught/assets/five.png new file mode 100644 index 0000000000000000000000000000000000000000..551f4156717455474b330ac344d0af3462c3912b GIT binary patch literal 1756 zcmcIlU5MON6prmy>aP2u6ttj*RK;2|`J2fkp|fRoX51NUw!?I4*TsjubMKv*u#?=F zWOiovp=hySDF}TK!Ir8hKKRf=MQB-Miy*bw2L(l;LKPoG(G`6vR;VZQ=OXR8F9wp_ z-22_{eCOw$952mGkB{yg^n7Ii=Sd}I^t`BIA+q=WY!YGL1i!aq0f9>+#CP1L7h0W+(B-vY98XIE--SdA8DTOu$j{m( zKFb2irxLn|m88L^&4i*SWlevIS7pVNWJ6LkQC2Kjw^C`oe+ghMAT_I;d%AB6zA{21 zihN6w+U<6tttD7cmlV?k4pmZB5fEaydf~1CLym?xaQw(&9v?HJDr-d<0hIP! zaQz{z7xu#h0h2n&mz0DYyEFjW_Qp`x9iqc1zX(?PdT&b{R+fA!m1)RY0jBvy>P5Q- z#t0tn^;nXt!ZBiFtAqZ23ru+trSlD29@ME|<^v1Wc0YwoDDvUJ;i7E|Pcon?n zpE&Gzgtf!nv7-J4nnMxI2&$~6MA;BExgr}@%Cr=94-90v2eqLN2#V0=z>GMxrOiNX z+bVitggi`(xr_j!5{^SGq$)|A#3@lxK~hainxd)Glt|OaL>ft(ieYwj!Tub>tvGz~ z{$AM@KDn9u5psq3PeP~x%&8Q^Zg2_eTz{eyInzR({v9ll$g7Q*qN z$Ot&D21=%t5O*Vr0) XXMg?7t>>SK|3Ah2Oz!N|{L#Mwg;6=; literal 0 HcmV?d00001 diff --git a/repo/js/AutoStygianOnslaught/assets/four.png b/repo/js/AutoStygianOnslaught/assets/four.png new file mode 100644 index 0000000000000000000000000000000000000000..ac4e17f3d65d28f1a2c3c76191a68dc99a0f9f60 GIT binary patch literal 1781 zcmcIlU1%Id9N!ADwKYl*W0gjhEs9n5`*v@4%^8xrw0G*BF+EI*retnr_HNDX&bqso zy99hG_@HPN6-=WbKKRmN1RrWdu!4x_gHS|$X;BbG(6q(}A=FZ5@5>-<%!>=VJ3I56 z-~adjnEyUEQ9RVY`;OfV!}J&Oxk>sSqWA5)uA|Sf+4qa|bwiLp5;4r4TatSRv;5{> zhUr^(OVjbR{fGsLCjdmsSZI0yMKjFsNHYL%4##X6S6n~CUHs?_$GRxPO=-4d2U%Qo z^NS%qyjU#3#W`pqZsb9BxM@)W566IQdNn_?ni;OeYteBsEpluN63=D0(ZnD-ZBMXS z5@J>pbRNnngH4-)tfwSZzn@hk*%T#1lvQ4mElIbuG~2m2YAr;LHJLluu|>Z!Ts4jZ zOB5T8hR{$25>`anG%1H7Dhf{#e6--lpvn8u{w_lfM=*4Q*d;!jFoH6v#~F?)ZM)zF zJz78Ngoy@BY=S_P1u1c<3$*R6p`O=6NAdVPwbIdhRpO|$5MXf4nMNq^w>`_=mg~>frL6yWLs*-E?(Od3$6Ij_0gP4RRLTcSaO>|jUg?i22 zGv)e-G@=8EqRs}K12N8Uilk_~Wbmp~l1xidEy=u3GAv1ILv30I2*hA}V1is{VLMRU zwhDd}10Ui-F2hk#g6kp+D~e+Rh1HP=LB);rGnb)+msR1ozl*_QCi|)@6SWm*2 z>~EJXB9LmZe;lse+mKt?GQY0!|2F59D_OHU4{ZDvhWArA^>3G?bUWNRR z(mP>=Rp3`J?XV)3I3p&#sGSt?-}!2-ZR%THIBkZ>u-Ap@N3V}#pHhdkOCKLTw?RAn z$wF?ll>dC~8+*^E?2XsYK0A2t`TC_RXM*Fmo;&*D7dOqnv-&VzR|dnE_ucsydv>op z^T&5H17{mQ4K1(yHug3CSy&l(HTpKr?!u$bUwG!oX>Fjsy7Tl?!ob@3*IqgH>*aS( z{<1oC@zg^vtUvMki4T5!Z)3x+y)k1B_Fq^!Xzuea4ON$ZxZBv79x2{+>f@!i<{o?d xr5*8!n?LIdjta|{AAfS~!>~F8(MK}Ne literal 0 HcmV?d00001 diff --git a/repo/js/AutoStygianOnslaught/assets/fragile_resin_count.png b/repo/js/AutoStygianOnslaught/assets/fragile_resin_count.png index 8a000ea84f1484731fd063d97b6a46802b24ece8..a324e5bdefbd433e67a4d714cf57bdda33acc7b4 100644 GIT binary patch delta 1943 zcmb7FX;4#F6iy&4GNJ{+0D?vY72(0-B_Rt21rq@w$X0O$-kL;7@(2+ffdmv6Ky2xw zNL7|jtrhJE))kd17NrO(qNuo_#Vs(X44NWEN~5i|ojM)-ahG%FobNm5J7?xLj6d!? zH7`0U)YituhDM{=hKGq`O()B=CR>}C_OtQ=UC~sgnRU%Up_ER&r29~t=}L<hLAE!@7lNQWYps$LN^vcW!CF`hYjKe~1VUT@ zeD5p}azU!qY_iwCUfzXcsE|-=l(1Ihu28}<+>cbrD7v}pGz7vy1cKOrKOgZ2P!0zL z5JF%wIXs?#;6OZooSJLy?Ew)1AeZA01O5n~0}wEW10enw8^8ns7?;OJQ9k5PeP-_A zfp8%%iUdFaj&RukTfo5q0ZO0%2ShM|$-*%KLOnI#E*XuZJ1b2qN!JS3$Z^$wDt;pm z)x=1bm=c9S5aR*_pWpx}#(@ABf+2v<0Z}%D@Ifd5`d_5C+BGp|Q)etD>NOZ4Oi}zr z45M0w+C+`2Rq41!i(~I_NLT|aaV@S%6S)%_wUPysWQqcX-?;mwt1w>}QzN)9DOYRN zX>v8m(yCeSm3Q|GV$J>_4~EBU6zLzPd7lI8qX{X7MWAF9t>(Nd?}LK>Lner68c3;B zD8}EWJO7OWe~z=7;iw;NLrfzt#MJ0&C9cwji$(4xOkYfa2}e5`Z{pP&g-oG>Q^bGc z_pJ z#keAs%vcM{vW++K5a)Rz5fQ=b0+pA$>volwBxaYFbY`g33p3W`2R8IJcDpt{9D1WO=LS+K>JRZ|%Iv)z$#%mzlLal*?7 z2;pgCR!jJdZ*#1v@D#6R$R! z+LyZMNsc@_V!(|Zc&@d{xpICgvAgsvJyE{J(x5Y3>*(*cFX)QQk$)XpEL!SyZQ1mM z5D%;Iy>a`SBJ-rXXdcoI#Aur|Cj6=-pJ_!(x|~WwQc`W2H^kE!&~Dpl>CtT&Exy7R zU76{1`q-0gpXah89jq3Q%RMx9*PcSSE3bCuk$4GhIVDg_&s^TxkwC8IM&HO-nRfIG z&)9qUpRD8!8>GXhvditB97Fp6Nis>Ne5N!Vy%39b52`vGXQVh){gBXjz2ExR>P3k= z4%IF=Bu;(4jL$n?bo;{nN?*b26MZ*>=NLH-Do~GB--@=+k8_EupCohXy$xM?32#gw zde0>p3JP~OEt_?{cKVuIj~AMIb!BBYYeuqNsGe=-rR_7Kz>Q>2^0IEYB5=&AViGR) z6i>_xxF^`(uBxaySJq}*zG}_d-yN!JrgS#l6G=k1_bo|N)<^BXUveh;72mOCr6|`+ zyfj4bumiumZ^Zom@o`u0)0<`9-`D4id>4PEIw;!7CgOJcplGFwYF5^r!`0s!a~w;p z-2$x7@M7hdqb_Niv}OAKX~fd^kc7!r=5>sv=wex&Q4N%+H|xpsVJLiIjOOu z&e}La-3?S+blgyO=Vj}48d}gwy7JM(mC89)yoz1kLS28#x~O5>LPFf*Rzof}{k61k MNtF0NNb>qW02NaN{r~^~ delta 817 zcmdlXd4ylFGr-TCmrII^fq{Y7)59eQNQ2oNOhA@=XhzUPMR6w9j~lIg87FUM%$?lM zs53d1sf^c5*VrJ$$jHjn$jaDo@&hIXG!b5AxgZoZ+6ER@1_nwB6}bhzzE+-j#U+V( z$*G<$wn{(|z0AxMt5l;jL*wK`Gu<=;Gjm-FW0NFZ%T$9j-9$snBnwmXlr$rw$&;D2 zbuBDRjT6%h({zo^%}sSpEKE#vlTytsbq!3DjV+Rljg5?w%wYETPtN6#RxvO)Gf%cO zNYqU-ut?HPNis3hO)^SK)itw7H8)94HMKBFOPg%REHPP!Wh!xs7qE(;dH5i!&15H5 zD-|MqVKNz;_Mpi-*kvYf;FjklW?R&R&T@8y%nGTEn?c^eJbp>>FYCF&rW{Wu&V2z!MFNd z%ky3r?DKlH?v`zlG}jKU8kwrIea%`2bpPKC)_L6Wy{a!)sM+Z{+x@nS8(TS#O*8kn zRC2!C;ORWRZESkYX3cfX!du-`S3XsJURn4cVD`am{zVctvS0Sy%8J;s;*=BDQnzz8 zQv(Au-)s{Id|~n7lKI9JEe|d!Y{`DKkJZUxO8x1ZURf;X{AKo>zf>~!^qMuo3sMWs zc6sFwu-+sUTPM`Y26~}qja)nLJG%%|98kRke{qoWC@%sfQ z$LG1t3=wd;tiICN=W#~Zy65Ku&v+jcIbF0>W^(=SqQg&%xR)fp_EB_sf1^(@ugm`Q mlZ*$lW-~JvNIb~@BtLn5DH6b3z~JfX=d#Wzp$PyWU^ZO< diff --git a/repo/js/AutoStygianOnslaught/assets/moment_resin_count.png b/repo/js/AutoStygianOnslaught/assets/moment_resin_count.png index 3e3342bea61e7e1cfcc3069c0d35cfdb0de72e09..5f0850d856f7456f6fe9e8a0b336f40fde0c6a22 100644 GIT binary patch delta 1228 zcmdnS|4c}+Gr-TCmrII^fq{Y7)59eQNGkxb90wDSJe1L0w^6Z_$;v|4*dWBf(#pWZ z%Gf~Lz{1MFKuMt@x4_CbwInemu_VzYu_V=2$;iOSRM!AS@#G6ka=fS_znPR&ED}u( zQ<9UDbuCTJl5~wsOpJ6BO$;n`6BA7mQ&UY0%?wj4COa}~shFghnI@T-o9d>SBwFa2 z7?>mi6{Z^KS|p`dnwh5=TUe$VP3~t_QL(f%HZVvvFxNFPw@A}XOEt07wM7#2pciGIeIflZUV~&|jk10?*s(MFY z?wt!PfdZ=HcN`eacQnOJ&<=Ms5EOX#cbeRsv|016?3D^XGGBzMr$hLgst< z6n5?n#** zHnL`4WNj39GvV#pPrY90udP`d#X7m%wk|!VyR>}WndRp;td7eOxxa3jh*rm0hiRK~ zlMWO-C(*3YQ=bnTn9oR8r+TMlFcQuQt-nr&`Q|-$NlS_FF6GF~(vF3f&S=M7w)E9pBp|QP1+M**3``E%}`2LQNu{jzi z9`b$uuUeay84?#1ZO(W_CQ6EMI?i-?zEIgcPEX`X2V-dcPwScIdGe&}Dlg>4Bpp)R zv4Gdz=|a7bD)WHPTV$r8`i zqPH~nBp&<4dPUPx>09U?@hzs)wSp&CJrX|F;&lFsi22foMMZB~zB?8LeY?Hp*S1%k z>!Rjvaa3O?ar%7TAFcXg(bRPl8BZ1Op1)k**7q6@&*$|l)1IaIM`g9AGGFCrKHVL- z|9g_dlK*c{u6xMBuw-IhEN8}hi>kTltJm1SlRcuvYbJ4V7w5^R9=4LJHI^SvTfkhYxN2w za2Px=d=U6UhJo*+P0HIBQresM9=o9Zwf-gN8DDoVF1EK}1rOYoP2FsJ`)FzzhoSuL zlnb2A5?uXed2#vb>-E`^4Mjc_-)FwC_xRC891J`RO$_hfADr*HAc5h1aK^s-)svUn z|EfIwvSXv1-2>+7HyIC@v??5FIPPxCQxte2^|0{%ZU5NHFE#|cUse;xW~6s6x7~#G n`*(|e;Wa#KcH9F(uVl*UTi< z%qTV0z%ns0dGdAUwXVb{R8lA|aV;ycD$hvG!|tt05c!C&{Y$hLI&97Hg_S0ox zV9fS(aSV}|%6iaSpV?7{;ls@TXWo^iuibk4_@ztizDE~psVZ4m?69!dRa8_~@Y!_- zNBI2%tvg;GUr(*0IRRW#9%Cn!=lG@anl+ul@f z166nR-i_@% diff --git a/repo/js/AutoStygianOnslaught/assets/one.png b/repo/js/AutoStygianOnslaught/assets/one.png index c8e6e3f89b069f0c1954c2cc52fe1805cba19212..14d143cea658299a7fc9a6f34c58ea31872f8a33 100644 GIT binary patch literal 1676 zcmcIlONit|7>yYzIA+bw1sW*c^dJ#3|_(jBIg$|mXQ zp1CN32M^*+K|FX65f38bMfRWkZc}a52GLHqh1#+Z$kANP z47-6mUo%{rSne~(B!;h(hHhAx7y)qu$3u%t1#1P5gYC|93tRBjREJfS2f99)Otgum z$zq@zz7HIxZkiYnxZKYwI>lLeddbicB`cD=N@Rv=MjFX+)l@<0+=Vn>(Prf$Ob{@A zN^{-NNbS-R7=}kf({zO{tBpOdve0{5;LZa$GR6u_v!Mal$9)p@(zBimRH{7LAwyNl0{$2(K1n6OBQ5;*XXHBNyg=*JXsr{cU5bTibL?BOha=*}4sAGudhtvb?C(f6uESUFpO-C{3^-O13L+A5 z#%%+$h&3=bZ3{;Raj<7HpV};nsqHM;UMvzgIdpWGwN}M}kyD!+u1_#CEeqSs7C53F z!zRRz#}@S(gsOkAR@P`8D6B3hf=f{R79C9@d?AszIO*#ih%BF78Ox2L1lIx?1tT)b!LDC(SYEC zs+dYcG@_!0Scy>+dm7LN5Mnt#Afm=psxb=0gn$r)iiK$J@>ppPKH8*v&g{&+^WE?N z@Ap4uCTDTvd=GaYcY#3Qq1A*(finb-DXt^Hf2CpTdT?^HYF2Op!6+~L;UsvkV1hv4 zdcqhT%g5?o!wAM4gp-V(3bL8404)&A4zXErB9Y=DJ(XazsD*8(%Y~4UR10HdI#g#3 zqYOq(8cQuri;O1H5(yP444DJXwqbz4Oz}8mGn*_NW>X9McrkEopGJgGAB0a-3q$P& zp;+BwD2!n#NERfA36WF@DO5osxfGSi10gXgQX!}k5lLWFgrRawrho>1LST(0X)G#y z-heGIQVR_{Z^aNKB_$;&MH0lY35ZCg0vuvQEQSFB=29&@Zi6kH{~$v+#SyI0${QIA zWM{ z7K%}^3`Ui(1dT>j7%Ib1NdT(EP_!Sa14%^UJU%Q~iAlx(24+Yjo%&oTNnkX?nsFep z(Tpchh}DwNXHBQWv=)xXEd-?vR||owK}I8qp<-Gkm8fV~C8Nc#NF|lRI4TywG^vp3 z^{7%zi^YTM!x0+ynBQUyj7snQFfCw9Xa z6T|8l5@;?NIFO)*e_^ch*w591h`Pr+F#Gy#bJ+$=<% z<~)ZdKihS=NUT@NKrTonxE>}5sS4JkBo6Ck3I#4z&{7dD8{GP^t`E)G|HbtISqTGf zNuWS`Mubn@48d5EDRxLKtT>B$a7bG zAP_k3)`o{hYpQFm^(=bhrExCSN3V3bY+s?@cEy!@rQzce?Z}O}hK-A zc?AVbsMEOK(+}G+?|&s9cWPI#X4BYtXkjF6=s9=oGE)XESylXl>J}M=9ICqShG&%R zKJj(V8xLH+)PHiYb;so|Hf@Zni&3O7$KOAe=wE|%?o2qf-d>P|D@3XY-}{vY%>iZLv&B|LN`Gi9asmZP`xmf0o#>`Xt<3 zwcOl%&3lI8;S$C1`hx+d_qjR8m3x)4cYiC->NOD4Zxnv*M7Rcu48FPU&VPDbaKx`e zTV44(j|FWTr-mpS+NI7R7loCA8ZYgS6_zXEhWe`dgJUY=gMU5K{o=j?wBlW&?tI&) zJ=?WwN9-#cvmnd3XW^Z{_#Mc0^0CYhC`n?q_o2~HzWL>auvdVn_05u4ee8q6&_C>9-=10EIqh8Wlqzjz zGaa@fudB1^;a7+O+vHmtUppoKUg;mFdU~CmaJ}&Z!MnYyTJKD1x^jHoY<2gAV*#PZ zTO@~adrS6qt9LPbI$Qt7zeg%}b+h zu8B(sQ*Mt^a(j*ToCh zytBOa|NY?RZ4b|se%@SLmo_Hzz2cr*zcl uQBvnQ*`7tIfu0)g4KsSnKWuQjKV7lRcURlD>xA~t2yH}U__4Y18~z3QBc}%d literal 5158 zcmb`L`Bzj&7RP)3hM6DcoG9QiQG0p&>y6$N!H7$vg18Vj9D?G(6-hu0>ZoCiV?^T; z5SJv*xG)+);|@_ch&$K;1wjOf2t<^np=p+yTkmy0x@qt*=S-i=$`~>(L2Y)K~`;+Xi;AOJ+e-{3Exl#V|kNhWmO#{UmD8@juCWhBa1rs~5r?Hv9D2y^OoEaOBjg`FE>Gs|_M+YbZ#;V3Cco_WvjRhrolGYKlhNRSP zgBTk{sVVGTMpIgvbQwcw8CvV|5Qs6QbuqD20FIM$DjH}Y42EuiOA;hYsAy725DJ1+ zC<%pfkcTD(opKczr64FdK}%jC#9~uP&|pH3Tc_U`rGkV^3N+qGfg}}$FE4j-Aoen) zic+dbx5w85Q&E(H#AFF84nc&=@rb}MQxWhnMZkPxZAM5Vp~N&_!y;7#O;Q}q@Eot< zc@3x5@EUBKR>Nu3jGCudmY^9Wi7zjZ2Lf>{3Sa_IML|BzG;e}wfi(KkpodZs97St+ zb+E~_INZ7^Zs~#4gv{-mGIyqCq;1LA@zr-*l2YQ9e>Q8zq(GCJ=7Bswb1M`_A(JUZ zAZH>;j>MCua+@d>a!9ZgqgQJpLPOFMV;}vT(e$LCtELn+)u6WxsHqk;zd()8QNy#Y zsz=R_Z(csJe_eExL8}AJkm`Zyb(3W>PzYHiRg3@xrk4SbquHsGEW0->um0tT^L070 zx1i2e)Z2sl`%yna_V++Tj&{`X9=&fu%~hzW?0wnoJxOaO8ciI@(Bce>Kq0*{8O@nV zQcWtzK{T<+kc`D(yzotuz2*t(Z0~znhT2+Cdn4*-Lfv*GzFHemOFimw;#OZD9z|1i zSJmAUI}*)$BS+9!s$_CfCL?J*i5HERJh2Ju(4f=riI0ALDa%<_;LQJ_HRrpg!faG` zx4)*qZoAlB`xrSoFbcf=oeK+1XBTR!a8wkee;KdmbuOtm&#P+1k3lMKdZ2iM!SMZC;h-Ibfx zeQkGF`T5F=|ERmVyYu!ghwXITnZ%acNBW%(XQ%z`%jY$}l{~jSsjnz+sjceiXhTj| zXT61&FX&i}m{stC&fyXZIys7skDPJ%^BIR$Sg)l0tvG8jn8Zu>O@Dyvvr*lH5eYJk|t(?d2#EfLc~mqkpAi<+Led{*j;xv4865~9Nkj%~V;7O^9K!J>#+2A=0gnufgxFHT|J z6eOdf&02lLOzYyv1w6@$3WwJT_lGgiv~2c__<3Q+*F>I*4ZV>zKYxF8;o-Ok8LRVl z&P!Y}(;94<9%R-qETlus6fg&2fln(bMlhh^=Fqu?YiN0G^1SJ1mIhy38JZhyDo%^B zm*w;~6!+HVzb`skmht(8E%VJf{h&!1k}1j-QNuGKs|%-vURg6cJ5qak4s#=EVaLn+ z{jZ9hPqH0FM|z&$dUNmWp|x|g96v%P>^2f@7@d&VF}AHyRq2VSxu@ zN9FzA;xowUaI`e$Ze3#3XeE>s4D6^Lt9KAnRO_SDs13aPZG2^V%*%`~QEM&gd<#2z zU+Ja3vOLt+-&}g@@5^Su(?UXd1|C?~9plS{9v`Mj8~9-F+NwhSVN#9uWeSF2fSbI?hdYOmX>d|W( z>VAjX8y|qA z0eV;6_1m>yQ$Dlk1BYhtk^FGKNT9`-9@dtc# zl1g%RaL}`(TRZZzYWBr9|0@CA-G%Oa{Wd4z>DNoHu8#~ho4s|yek&QdRXvehJ>vhmaar|ZS#Zl_%_|=c;B-L z$XGZvq%b+E<;IEEXVaRqlk0w1U7EJkmb&a%?ChnptwBZ$NAon)6a!d%*cc8Xq9hNw zg)^99@cqV;^s1Rt9`4!LaWAK7VxUMVMh~|-A>y~eiS#)g8qU!xgt;N^M(-YUvpKa0^ z;Mpw6`vAxDEqtc7z_A)KOvpXwhlCk}>}hB&NFNv!XowBBo{O{AXC`;r3j5yF_0(2W zAKa9-I84KE|2tDjL3K2d<}AX=+G}M=*S%kUNo3Tp-A%4>VXO(g}zN03e*H8o_V_0#op zXC_33ZCo5>4GMxUf0!xqppuoI0|R6j$l$SH6|SmC_=X45JNCLcJo7m?7O^k|0vzj9j`jnr z($8NtZUV2O;5P{%TNu_%QF@9{lS+Woq#W1KFa)>ZV&2mzsO?8)A``Fz8L*J&@e|Y} zW1?A1#vWp*!l6usAwd0)O+%4d4-ZWZJz@i;lzSk40mR3ju;UeKxk{&^;1?SsK^p~cAm{-jX@lF~T`3+q g7?@80x@?r6e3YL8JoJcuH0~L~q<#oSZZg?_0fZ;u1ONa4 diff --git a/repo/js/AutoStygianOnslaught/assets/three.png b/repo/js/AutoStygianOnslaught/assets/three.png new file mode 100644 index 0000000000000000000000000000000000000000..869e2f674119d2e4211c3f5c2d74f5f359b0d1bc GIT binary patch literal 1782 zcmcIlTWB0r7@n;PF}8+!!B|j-iK0^Hx;vAdv73_YuGvL5hIC_7M4B__oY@_+GiNeq zlHE;xkRo__6TE;_O&@$w^g$4mqCtY~gSRIurgubYFy3CeM|+#cTv?#(lU z9Cy=}Tb_w#N>5mjcoIOw#!|xz7@Fgb9Bl*u&f$o+amDpB!qsyt0`H=Xa9l4br67x| zZec0J$Cf6_aA^*jNH{veA8A;Oz{3&X8(z()RwE;{cr7-Lr)7a}L87^gFd7@=XG)WN zmV}tsB}0U2D$Ng@l4_)sr11!^DXJ+eX<1E*ifSo_r4RF+OJLSQb29ZmAK4t_qS%@+MQ`&aH z3wpFZ?SzR1Om2WcRwX5NsS7NXc87Xi4^5-|BD2!bdre|mZU$JM!jvq85a$=M9}RVl zA=uj+EQGa|rwGcphCK$OOqkj;6;w$?Xq8;YkKS_6o50G37(^s26H@CYYO>41Ys_o@ zq2sQPNS!_$E9z{(IS}EDpedRzDrqsPloiuriA$vqD``tn+RzfK0|X+lH!wl2)7%TR zRI-XbjerkvF_#gTD9Lq^<(N1HoRlIap>2u|N~t2Sfg?JasXL|((>l^yy4e04feUf? z;{ENiMFcXAUW6>D>p;P#Bib4o7O{~6qMbyxh%p@2kfK9XGrDX~hAulfpth4WR)rWN z#>g2~?X(C{k_m!LpQ%Gzgk~B6q(fabOo2zxa!BX_Rwu3pDp(HuiopM)CQE80ED^+F zp4>TK%w{J;;7cOkRHrl_c?7wm7h4o8M-}}nRjlZtWKmUL?aC&m>@^c^Dw(ri*2Uq!x6Q>51 zKhgH5chRkBVQg8FIA`MZXCLPeCYImZTwlG|xA9DU{_yyv^B=n@O27SLzJWXO z`WVLz{qB~^QQ3OX#I%t>Hm#6EyWul5$L&AZ_7R>T5vY)=>!tY1D2LOqKA$3^r{3-~q6|Z8Cxei4bTv>RxEJQ+$WlWaD^R{1_SS(`%}jR880vUAKzPwzE}!_vG@#3Bi4Gr%M}N4#iH z-|p!9pes4ovwq8qu&uuj9vHdEkw2rUQZ^8k8ul_Y+mOi418cB=3+8UVJt~0+C zsAZXXFN~0fNj{U}nW%*8+9paOT#*SB99cyIkyTAFpaum9E0`p8)wZGD(Z%*>C~n5# zi}!cS)~1+o3?gJ=18It?$%5`cM?e)-5h{x02zXq!RRih@f^whjp}=J)2h}&S#;R<_ zsHzfCFhK&A6kX7;stS5imjq|Lq9KS4UDgdA*w}Pv&_JwC+y<%=(f6u6_(x5e)@fi- zo5ft&IG<0a3juZ9I$H>fhbBQjo7SMAX@Z=9aoIB&%-x(DvK-I%4$@&V+Z)wg(5X%n z;rLLbcpO&)vH9M#dyOz}&7m%Bt40{5$N5&xa9&f12))rYfY7!L93fh3Vm2t>tg;UwV1{;?nTGpVnJnzI6L8P<*cZ*jW4g^zOw| zBcFfwb@bsdw>onw$bUMvwz%ue8>LH6{Yv&PG#PkoPOqSgCRm| literal 0 HcmV?d00001 diff --git a/repo/js/AutoStygianOnslaught/assets/全自动幽境危战.json b/repo/js/AutoStygianOnslaught/assets/全自动幽境危战.json index b82813740..034212515 100644 --- a/repo/js/AutoStygianOnslaught/assets/全自动幽境危战.json +++ b/repo/js/AutoStygianOnslaught/assets/全自动幽境危战.json @@ -1,26 +1,26 @@ -{ - "info": { - "name": "全自动幽境危战", - "type": "collect", - "author": "LCB-茶包", - "version": "1.0", - "description": "", - "bgi_version": "0.44.8" - }, - "positions": [ - { - "id": 1, - "x": -194.198, - "y": 984.095, - "move_mode": "walk", - "type": "teleport" - }, - { - "id": 2, - "x": -194.25293, - "y": 980.6616, - "move_mode": "walk", - "type": "target" - } - ] +{ + "info": { + "name": "全自动幽境危战", + "type": "collect", + "author": "LCB-茶包", + "version": "1.0", + "description": "", + "bgi_version": "0.44.8" + }, + "positions": [ + { + "id": 1, + "x": -194.198, + "y": 984.095, + "move_mode": "walk", + "type": "teleport" + }, + { + "id": 2, + "x": -194.25293, + "y": 980.6616, + "move_mode": "walk", + "type": "target" + } + ] } \ No newline at end of file diff --git a/repo/js/AutoStygianOnslaught/main.js b/repo/js/AutoStygianOnslaught/main.js index 313cd6f55..f91e70ed8 100644 --- a/repo/js/AutoStygianOnslaught/main.js +++ b/repo/js/AutoStygianOnslaught/main.js @@ -1,5 +1,10 @@ (async function () { + var Threshold = genshin.width > 2560 ? 0.65 + : genshin.width > 1920 ? 0.7 + : 0.8; + log.warn(`屏幕分辨率${genshin.width},识别阈值调整为${Threshold}...`); + let challengeNum = settings.challengeNum;//挑战次数 if (challengeNum === undefined || challengeNum === ""){challengeNum = 15; }//挑战次数 let challengeName = settings.challengeName;//挑战BOSS @@ -63,10 +68,17 @@ var originalResin = "assets/original_resin_count.png"; var fragileResin = "assets/fragile_resin_count.png"; var momentResin = "assets/moment_resin_count.png"; - var oneResin = "assets/one.png"; var enterButton = "assets/enter.png"; var rewardsButton = "assets/rewards.png"; + var resinImages = [ + "assets/model/one.png", + "assets/model/two.png", + "assets/model/three.png", + "assets/model/four.png", + "assets/model/five.png" + ]; + //文字识别封装函数 async function Textocr(wenzi="空参数",chaotime=10,clickocr=0,debugcode=0,x=0,y=0,w=1920,h=1080) { const startTime = new Date(); @@ -107,9 +119,15 @@ } // 图片识别封装函数 - async function imageRecognition(imagefilePath="空参数",timeout=10,afterBehavior=0,debugmodel=0,xa=0,ya=0,wa=1920,ha=1080) { + async function imageRecognition(imagefilePath="空参数",timeout=10,afterBehavior=0,debugmodel=0,xa=0,ya=0,wa=1920,ha=1080,tt=0.8) { const startTime = new Date(); - const Imagidentify = RecognitionObject.TemplateMatch(file.ReadImageMatSync(imagefilePath)); + + const Imagidentify = RecognitionObject.TemplateMatch(file.ReadImageMatSync(imagefilePath),true); + if (tt !== 0.8){ + Imagidentify.Threshold=tt; + Imagidentify.InitTemplate(); + } + for (let ii = 0; ii < 10; ii++) { captureRegion = captureGameRegion(); // 获取一张截图 res = captureRegion.DeriveCrop(xa, ya, wa, ha).Find(Imagidentify); @@ -135,13 +153,30 @@ async function getRemainResinStatus() { var condensedResinCount = 0; // 浓缩树脂 var originalResinCount = 0; // 原粹树脂 - var fragileResinCount = 0; // 脆弱树脂 - var momentResinCount = 0; // 须臾树脂 + var fragileResinCount = 0; // 脆弱树脂 + var momentResinCount = 0; //须臾树脂 - var originalResinCountRa = await imageRecognition(originalResin,0.3, 0, 0,1500,0,200,90); + // 浓缩树脂 + var condensedResinCountRa = await imageRecognition(condensedResin,0.2, 0, 0,800,15,700,70,Threshold); + if (condensedResinCountRa.found) { + for (let i = 0; i < resinImages.length; i++) { + if(i==0){await sleep(1000);} + let countArea = await imageRecognition(resinImages[i],0.2, 0, 0,condensedResinCountRa.x+condensedResinCountRa.w*0.9,condensedResinCountRa.y,condensedResinCountRa.w*2,condensedResinCountRa.h,Threshold); + if (countArea.found){ + condensedResinCount =i+1; + break; + } + if (i==4){log.info("未检测到浓缩数量,强制为1"); condensedResinCount=1;} + } + + }else{ + log.info("未检测到浓缩树脂图标"); + } + + var originalResinCountRa = await imageRecognition(originalResin,0.1, 0, 0,1555,0,100,100,Threshold); if (originalResinCountRa.found) { // await moveMouseTo(originalResinCountRa.x,originalResinCountRa.y); - let countArea = await Textocr("",1, 0, 2,originalResinCountRa.x+originalResinCountRa.w,originalResinCountRa.y,originalResinCountRa.w*3,originalResinCountRa.h);// + let countArea = await Textocr("",0.5, 0, 2,originalResinCountRa.x+originalResinCountRa.w,originalResinCountRa.y,originalResinCountRa.w*3,originalResinCountRa.h,Threshold);// if (countArea.found){ log.info("原粹树脂识别数量结果:"+ countArea.text); let match = countArea.text.match(/(\d+)\s*[/17]\s*(2|20|200)/); @@ -149,11 +184,13 @@ originalResinCount = match[1]; // log.info("脆弱树脂识别数量提取:"+ originalResinCount); } - else{ + else + { log.info("原粹树脂识别数量提取失败"); } } - else{ + else + { log.info("原粹树脂识别数量结果::无"); } @@ -161,81 +198,51 @@ log.info("未检测到原粹树脂图标"); } - // 浓缩树脂 - var condensedResinCountRa = await imageRecognition(condensedResin,0.1, 0, 0,960,0,800,100); - if (condensedResinCountRa.found) { - // await moveMouseTo(condensedResinCountRa.x,condensedResinCountRa.y); - let countArea = await Textocr("",0.5, 0, 2,condensedResinCountRa.x+condensedResinCountRa.w,condensedResinCountRa.y,condensedResinCountRa.w,condensedResinCountRa.h);// - if (countArea.found){ - // log.info("浓缩树脂识别数量结果: "+ countArea.text); - condensedResinCount = countArea.text - if (countArea.text == "") - { - log.info("浓缩树脂识别强制为: 1");// - condensedResinCount = "1"; + var momentResinCountRa = await imageRecognition(momentResin,0.2, 0, 1,1170,0,500,100,0.7,Threshold); + if (momentResinCountRa.found) { + + for (let i = 0; i < resinImages.length; i++) { + let countArea = await imageRecognition(resinImages[i],0.2, 0, 0,momentResinCountRa.x+momentResinCountRa.w,momentResinCountRa.y,momentResinCountRa.w*2,momentResinCountRa.h,Threshold); + if (countArea.found){ + momentResinCount =i+1; + break; } - } - else{ - condensedResinCount = "1"; - log.info("浓缩树脂识别数量结果:1");//不知道为什么,1无法识别,0是不显示图标的,所以就当时1了,反正也没啥影响 - } - - } else { - log.info("未检测到浓缩树脂图标"); - } - - var momentResinCountRa = await imageRecognition(momentResin,0.1, 0, 1,1170,0,300,100); - if (momentResinCountRa.found) { - // await moveMouseTo(momentResinCountRa.x,momentResinCountRa.y); - let countArea = await Textocr("",0.5, 0, 2,momentResinCountRa.x+momentResinCountRa.w+20,momentResinCountRa.y-15,60,40);// - if (countArea.found){ - //log.info("须臾树脂识别数量结果:"+ countArea.text); - momentResinCount = countArea.text - } - else{ - var oneRa = await imageRecognition(oneResin,0.1, 0, 1,momentResinCountRa.x+momentResinCountRa.w+20,momentResinCountRa.y-15,60,40); - if (oneRa.found){ - momentResinCount = "1"; - }else{ - log.info("须臾树脂强制为 1 "); - momentResinCount = "1"; - } - } - log.info("脆弱树脂强制为 1 ");//须臾树脂出现,脆弱树脂不显示,强制设置为1,情况非常少,大不了打多一次 + if (i==4){log.info("未检测到须臾图标,强制为1"); momentResinCount=1;} + } + fragileResinCount = "1"; + log.info("未检测到脆弱树脂图标,可能被须臾图标覆盖,脆弱树脂强制为 1 ");//有图标说明至少为1 + }else { - var fragileResinCountRa = await imageRecognition(fragileResin,0.1, 0, 1,1170,0,300,100); + log.info("未检测到须臾树脂图标"); + + var fragileResinCountRa = await imageRecognition(fragileResin,0.1, 0, 1,1170,0,300,100,Threshold); if (fragileResinCountRa.found) { - // await moveMouseTo(fragileResinCountRa.x+fragileResinCountRa.w+20,fragileResinCountRa.y-15); - let countArea = await Textocr("",0.5, 0, 2,fragileResinCountRa.x+fragileResinCountRa.w+20,fragileResinCountRa.y-15,60,40);// + // await moveMouseTo(fragileResinCountRa.x+fragileResinCountRa.w+20,fragileResinCountRa.y-15); + let countArea = await Textocr("",0.5, 0, 2,fragileResinCountRa.x+fragileResinCountRa.w,fragileResinCountRa.y,fragileResinCountRa.w*2,fragileResinCountRa.h,Threshold);// if (countArea.found){ // log.info("脆弱树脂识别数量结果:"+ countArea.text); fragileResinCount = countArea.text - if (countArea.text == "") - { - log.info("脆弱树脂识别强制为: 1");// - fragileResinCount = "1"; - } } else{ - var oneRa = await imageRecognition(oneResin,0.1, 0, 1,fragileResinCountRa.x+fragileResinCountRa.w+20,fragileResinCountRa.y-15,60,40); + var oneRa = await imageRecognition(resinImages[0],0.1, 0, 1,fragileResinCountRa.x+fragileResinCountRa.w,fragileResinCountRa.y,60,40,Threshold); if (oneRa.found){ fragileResinCount = "1"; }else{ - fragileResinCount = "1"; - log.info("脆弱树脂识别强制为 1 ");//有图标说明至少为1 + } } } else { - log.info("未检测到脆弱树脂图标"); + fragileResinCount = "1"; + log.info("未检测到脆弱树脂图标,脆弱树脂识别强制为 1 ");//有图标说明至少为1 } } log.info("树脂状态:浓缩{0} 原粹{1} 脆弱{2} 须臾{3}", condensedResinCount, originalResinCount, fragileResinCount,momentResinCount) return {condensedResinCount,originalResinCount,fragileResinCount,momentResinCount} - } + } //征讨之花领奖寻找函数 @@ -505,6 +512,9 @@ log.info(`${resinTypeMap[rewards[i]]} 获取奖励...`); await Textocr("锁定辅助",10,0,0,1768,0,115,90); + + await sleep(500); + let { condensedResinCount, originalResinCount, fragileResinCount , momentResinCount} = await getRemainResinStatus(); let shouldExit = true; @@ -591,7 +601,7 @@ } - log.warn("自动幽境危战版本:v1.9"); + log.warn("自动幽境危战版本:v2.0"); log.warn("请保证队伍战斗实力,战斗失败或执行错误,会重试两次..."); log.warn("使用前请在 <<幽境危战>> 中配置好战斗队伍..."); log.info("使用树脂类型数量:{0} ", rewards.length) diff --git a/repo/js/AutoStygianOnslaught/manifest.json b/repo/js/AutoStygianOnslaught/manifest.json index 179e20b3b..36e0713f1 100644 --- a/repo/js/AutoStygianOnslaught/manifest.json +++ b/repo/js/AutoStygianOnslaught/manifest.json @@ -1,11 +1,11 @@ { "manifest_version": 1, "name": "自动幽境危战", - "version": "1.9", + "version": "2.0", "tags": [ "幽境危战" ], - "bgi_version": "0.44.8", + "bgi_version": "0.47.1", "description": "请先配置好秘境内的队伍,幽境危战战斗失败或执行错误会重试一次,请保证队伍实力", "authors": [ {