From 627d85210b24050e05ad988dd8edaaed4579d44f Mon Sep 17 00:00:00 2001 From: kaedelcb <57870068+kaedelcb@users.noreply.github.com> Date: Fri, 12 Sep 2025 00:09:02 +0800 Subject: [PATCH] =?UTF-8?q?v.4.0=E7=89=88=20=E6=9C=AC=E5=85=A8=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E6=9E=AB=E4=B8=B9=E5=9C=B0=E8=84=89=E8=8A=B1=20025091?= =?UTF-8?q?1=20(#1863)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ### v.4.0版 本全自动枫丹地脉花 0250911 - **优化**： 1. 优化模板匹配浓缩树脂和须臾树脂，改用普通匹配，根据分辨率调整匹配度。 --- repo/js/AutoFontaineLeyLine/README.md | 7 +- .../AutoFontaineLeyLine/assets/model/five.png | Bin 2605 -> 2328 bytes .../AutoFontaineLeyLine/assets/model/four.png | Bin 2696 -> 2119 bytes .../AutoFontaineLeyLine/assets/model/one.png | Bin 2592 -> 1915 bytes .../assets/model/three.png | Bin 2692 -> 2200 bytes .../AutoFontaineLeyLine/assets/model/two.png | Bin 2692 -> 2169 bytes .../AutoFontaineLeyLine/assets/model/zero.png | Bin 2632 -> 2271 bytes repo/js/AutoFontaineLeyLine/main.js | 79 +++++++++++++----- repo/js/AutoFontaineLeyLine/manifest.json | 2 +- 9 files changed, 64 insertions(+), 24 deletions(-) diff --git a/repo/js/AutoFontaineLeyLine/README.md b/repo/js/AutoFontaineLeyLine/README.md index 4b8340d08..26086ec53 100644 --- a/repo/js/AutoFontaineLeyLine/README.md +++ b/repo/js/AutoFontaineLeyLine/README.md @@ -28,7 +28,12 @@ ## 三、更新说明 -### v.3.9版本：20250910 +### v.4.0版 本全自动枫丹地脉花 0250911 + +- **优化**： +1. 优化模板匹配浓缩树脂和须臾树脂，改用普通匹配，根据分辨率调整匹配度。 + +### v.3.9版 本全自动枫丹地脉花 0250910 - **新功能**： 1、添加原石购买体力功能，在设定的树脂使用完的前提下，如设定次数大于0，会继续使用原石购买体力领取奖励。 diff --git a/repo/js/AutoFontaineLeyLine/assets/model/five.png b/repo/js/AutoFontaineLeyLine/assets/model/five.png index d5fea0cadb9a9fef612f5947bc4926d86986a0ff..fb48f36b90e8e3522b6f6089d6d1a527bf5a5a45 100644 GIT binary patch delta 1161 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 b!NHKD$SSG0C&~wy0~tJB{an^LB{Ts5@Mmyg delta 1226 zcmb7DU1(HC6yCpxCZ+_`CJ0G4n^^pt?9Bby`(w7Ky_+U#f@p+_AelQeH@QuA@6Fwt zjRrBGQvX^bUZFt*5i1D(Klq{#ieN&h4~jmN7V=Q~qA^M#EiIJPSxr+4DQq8R&YWT9 zJKy=vIpbBwR_MpKcYIb^zOpvsNu>Vcf82FY)ges8DbX#*%VIyBu(Pi3t%A zP(@7zsv>C|n`yv8M3X5J2~NRaI{Hnfl!u9U-p>?#eXxh+(g^_yGJyZiej--LXov~K z5>22Wg#lUP+%$pbl#*o&6KE2JC<`HJ0CA;cU4*)<1QW65;6d4k!IH9624SXZDU|_L zpbUtjWCB&i5-O0M7oR5!IogD&W3nc<$MKzfkK@LDCq7@xMDmk(^MY|G>-6lx!eQn) z#Q%4|AXe6Fl+Zk-sw7nJ%ew9Dy20MDZ7B-yzWtrp3Q%f2_=xB<*b=QDHlaxg*NA}|q@fg%tMOT@IWBp10Ae>k4qZRc>G;gEqW%lU0aI>FgAQJd-|b!k!jWKn&C z<%wszzI|pXxp00$NCpv1RGDhnY`H>dQx|#m=7jf^)ZHr^`~>blgHt+$_cjO^U1 zG(OAQ-nck+<-+urFZTad{mT*g+TEqrpZ7Ps+Ozj;=8Ko`n*TND8*0mR7&kU|9eN83 COo_1o diff --git a/repo/js/AutoFontaineLeyLine/assets/model/one.png b/repo/js/AutoFontaineLeyLine/assets/model/one.png index da41773c2334bfd5010d5744bde7f0f03c2369a0..541dd87bff516b6c4a90ab9caec51e7b4569f2a3 100644 GIT binary patch delta 723 zcmZ1=@|#bwGr-TCmrII^fq{Y7)59eQNOJPP*SMKE%5cV^2{qP zNz6-5^>ndS0*dHmW~NvfrW%-8m>4DM8k?IZ>zX8)80#jcq*&-08Jn6K7+3;j4NNCb zVb)SHN;OM1Ftsq!HA^)&)-_KyF$5|E>N7DlOHMLNwX{exNSyqLSw$t$!XVW+#VA?V z+{DOC*TBpqO*b*k+(g$bEjh{9)F9O;*(7nY9kaw_9hRxYDPF)Tj_k#QtTvOKSgllu zayo|IpvkQqGLw5aZR?-?V%A|`U^MV_aSYLzm>h7~B;>l$l`E#KO1!cHO&c0J7&Vr+ zsiY@8oDd$dt?=@-wr6E*3s?j)U(A>hX(cu-WUg)b!}s_1uaDdN?$yi#3?>(@9NM>K z&$CBMPdi-vpTID+yVKvY`rV)X_5c4VGp?AkZ{pI`?eUIt5-*Kdu@@Qn!x1Qm~h}WtDX5IWh)M91bqb zWw~h1-#w?Vv(0Q*OuBglU&ocLy^VQ}(_X)Lm)_96YwhCWdsw>#i(+eCPGr82xNWiH z;Mtm=pF-W!^{?o@x}{)$CYoXD?(+A3b(N{IljLOt@^0>a->|yf-sPNt-uK7H&)=>7 z#@gz}7|X{ao;+dBwuSp9?(}!?Nbp!PP45C%a>6eLhOVE=F0aDRNdeO-gQu&X%Q~lo FCIBsI1-JkJ delta 1104 zcmb7DO=uHA6wY6zEw&<5BSj=hg9q(2vpc)loo!QENvu&SQUYE(J2TrZG}&ddM!gtN zK}4|VfI=@8yod)u4}v#AMS9YscWUTAfQ)@CRmZO8>Mzq>d52v^zNc4#K z5baIK^ME)MyV7F<1S=3*P_uL>9>xZ`VMWPX2wRFK-pA5M|6Gql(}FOQV$^cHpi06* z#;uYWp7U!nA{sxOrAQ%^VFWnV9iU+i0ir?zG>(v=5Dj4l#d!Q!R(FU>48s5z5(b#6 znZSe&0w#6x#LyH&r6qE zrABC7oaMDbMun;l;7<8ViAD)4T%``OfuR^2=vdc1O`M8|Nco$1+<_jiOF#_zOAOj`-9Y4$SWKLbr<*pk8D%m!YE!c{un5=+)PbQ=Of+gcMAKW`T7P(fJLA^K zT+yQ!s=OAKi-nA2GsIkGwKb+K_j4`#i@Z()*ALyhdvfQOusJWcd$?R2ubBJk^vb)j z(f-#9>p$1d+;$e9uTPIHd~V9yL@fL9$G$h6>e|TT%a!ksoWU<|=O0{qwl^MGy_fv- T?bVC4go%_(XNylxOke#4$nsWG diff --git a/repo/js/AutoFontaineLeyLine/assets/model/three.png b/repo/js/AutoFontaineLeyLine/assets/model/three.png index 140b9c63bfff529f4393955af8f9d97fc22e5898..3895ed6137dce761162117493ed4dfe57fc35714 100644 GIT binary patch delta 1013 zcmZn>ogrw|8Q|y6%O%Cdz`(%k>ERLtr1^nZgo6o4-d*~^6-aRwctjR6Fz_7#VaBQ2 ze9{aItRFX8`7%!4%$Pg5ol$3UEK?bmrLLi2h@qvGiRt9KOls^fHW#x>0F-TIYM^ak zVP#;Tq)?Gt;OlGUnO9trn3tUD>0+w{6w%AfOtCUCwlp^|wJ_E-Nj5XrH8D3y(oITA zPSiEDFf}nWF*HsxGcubzg;`6*$j~Is%+$nE*UZ?!OxMED1W2SAo9h}Gry83Wq?o4| znJloNAe-Ymu62plgr_QfO|Ns%vSUYHpa6oMvohkv!RsSz@vd%T(eN zFJKji`_F*GezFs*l?qYrM%7q2xrfuXUZ|<|7Xt&6ucwP+h{pNkfQx1e>baCTKMv&FFtD(vl==WJ7n+Hn&sX5_4xSt{}K=%EfeYrSbC_H!W6X zNE)@&A6J=YQ_Gg*<9?oH!DNMFJASjhwXcv!I{bC^_69$unXyrk)$jk+F1T>>v-qM% z!4Ldc7M;ADR`=%%r^eT>ufrD@O?b6ync0H#4NeaFzgXH7SHGKW^7ZcS?+%&^<}Lb^ zH6g1sHd$7gd%^KWxqz#NP1>fLHbn1Eyez-rvY?)$8BbIFm6G1Kv3sALiU0EKZFGlz z`q|io%=b;}cBLPBvi$r!W@k1bsR;p5TS{1!SSE%tJHPt;T>r$wzyJQWFVzlXJj~vm z6)f#;KL5ah4KMyY`n2~qKT|W)qUTp$ZWb)`ym6P;k?on8cG!AWHzpV63)0j0*72;n z$2han^#H>s-o6WFM(*|30^)+}fq~TV>acr1tNSq{pBYAf54ZC>{5xg(`oX@&1#9*! z%D$fO5HjDc+Rn&s=EAkBzdt=4?(nZKwz{V2(8SR2>*n?~UnCY)-EVYeTo}k>*}C+= z0rpSv`zwQk0vE4KX9~=E{bpn7alMLwb90REA3E2{D8cvIJh$=4&Gvrz-12uf%?n@k zuy#+sx3ijm-Irr)Z+pJHdBK3Q+s~rzlSm97@14En_S;wZoW39<*yQk^G5F5nvo$;b+R*e?%&*I{Rx}awM1H*6k5ePGk0$GLU!-< z?lmeEqb1OkTKY3Bl~RA6EPV+mZJ|$=mI`h3rKKRH6-p5V4fv1;DMg*tC_Y4p4|C=) zoH^(FzH`p;&WSGfy;rus)X~1OJ(WszRJN9PsC&6OE81F=ofyA0tFA@S);Aid)Z%5$ zlTLl{Ww&~J|ExQhmb2*%^4)YT*GP5Bd59?zhPK5U$K}2I(6N!i$ zrMw@9HH}8mXuxSRyf{|(dZ`yO(Hm96By3c}NJ~QPVH@+sjauKlbv!W?2V?V>d5A%K z;({`pd!c_JbMt`Sqs_ao_?$j_R~)ECgM)5a+{5`|lluK>53^lhp)F7w;d*jgX6-nG z%;TPc0B76*o^D{k5Hx|Ub3zR@&D1cPpqf9zI2Z})bhI4ueKk=}D&)31NEXEXbFvOW5)?aZ6!m#q2w zrnptT_U(H5(ZxfVlhydfH^bNNl;nneQ_1mP&+JV88vYYECZ7AJapL@uzCQ|+pUv2n zwG$oT&pqd~F6+YYa@TC%uHU}DY8_lWwJNyyfA+206o(foaHj32+X`!{GO)co)xYPR Ey9w-kO8@`> diff --git a/repo/js/AutoFontaineLeyLine/assets/model/two.png b/repo/js/AutoFontaineLeyLine/assets/model/two.png index efbef9fb4d21ef1e58816278bc7c76109373a0d0..00b861825b61199e56141c0334ad7853d68d1d15 100644 GIT binary patch delta 995 zcmZn>{V8D88Q|y6%O%Cdz`(%k>ERLtr1^kYn1cyO>L;x}45T;n55TStO>K7#b$0Bu}2gtfgX>oMez}nwYF>WSNqxYnf`2rfXqpZm4ULnrvufVrglR zmS#Hn5wnW2iMgebS)zrxu4!sg3dqD%-Ncl{R9%ZyOUo2POA`wd-mbFz`Ky@`%~w`P8!%{^%1-{Z?3;W4 z{6EJT>i_+T-B+}B@oN15Nsr9R(!+n*`5T4y*Z;q_qcS=u$}cC$>Vn6Dj}8ax|NlEX z$N2u8V>1t4J6Zg^{@q>y<7?~gKY1j%V97fEE$7bMsyuy7)}hp)aDn5>nLl}M{#3o5 ze~0PQ|9^j@gYPd|mC6yuWDwVg{^0V0AA0L???Oe4ht)9&`IJ??h zK72icw0pU3t?`aa6FPPXFF)tdv#0WPnNyZn^QL8t8aEs~C5%*>&}s-aUuE2}`9MQkE>qT(ByahiAg- z>+75kz4$uY{O;b#XV%P72xFWo#dwvme&Wilr`J?+-{1eA!SKz2gUX2)J6GLu3uw<| znA&vJa@Wt?dz&6#Umx#K8o$4Gwnb{&%B_=yR+&poxyrltt*u$kEw-M}4eI~C_|HpA zN#qY=cTeEu$%;}7UVffYP1R$Ej75oxf{B!?tb}H^q>;-JmHAe+eDkI>B#O+Q@=jQS z&(+US&_VpV`F8)AcHIk?u6=&Ad-{LQ##HTaW1sn!?@v$HXPLUK{Hx)XE#K|x{;<5r k_W8o=W>@z~MB*O9$$+!kKVqzOff<&;)78&qol`;+0GdOJ!TV!c<4{<}KFe5kd!AePm^jwc(5#G2mr zNG4u;eL&p3_?|VIj2Dty;v-3~vk_Gok4f@@_-b-(TI@H(10B!xm_UV9h%KmD2*z)A zZ0LqnS+`VdsY-mgV`$?)$6;t%5K0+`THFsk5)~xZBV#NV)W_mv>i(>3JA`6~0&Hpu z;F_iaqCypLu42ugHZ&C$Z%b{?8n&t{I?{peFbt5Q5nxi20TXkCDKW8vc|4WMW@W`D zl&Uf?Rcr#&&@jNd2;nlt$dOe_bQs@A&6HO1P|7r-QZusljk9_|QlNqWyp#ULbhC(M zrckchz>p0F5Y`yLimd`2Axk9GGQPKsgR{Y3&o$L3-QOD>*Cd&ddZfF;EQBn z*i-`y2~|vkP@r(zusJaeWc)|MB`Yqb^X-hS(BamE`!^FpBi9#Ps9$fgFk;RUuz-Zb zV-X7*1&N2gmmxtg;Zo9mo@>^f5#snZ8wtk!$Zw4MK_>Dux4o2d4`uSp)^S)hbeqeU zxs4(7zYE6c&aI`DG|v*fe>-?f_d8`$`k(cJ(NU|&{(}2RTY+2s@2C5~N(~Wz#B$=t zQbR2p+75Lz8Bm*=z)^&SwhR$46pD#Pg^L<$V{1qFp*!Z*$wbkodp%Z<%Ef{t(2O{) zW38x5+v?}q@)ucyhHenK(_OjNH=C{;6CeGJa&cSL{Pe3YKkq)DxqDUcbLH&ZyQj`} z?f+xnQ*-bC9cw^Ue^u_EmFU`F0^4u%09=-lie(=Zq z-VbKCRwq?&xW@N8b!mgXO{~NmcW`Q Mmv$E4*R diff --git a/repo/js/AutoFontaineLeyLine/assets/model/zero.png b/repo/js/AutoFontaineLeyLine/assets/model/zero.png index 790d193bb6f9228ec00318f3fd69304e0ffd734d..7c44a0ea6ffc02b2786a1ec78c547260c29acb17 100644 GIT binary patch delta 1097 zcmX>ha$nG@Gr-TCmrII^fq{Y7)59eQNDBh7Fb5Nm{CT`^8Ia;E@Q5sCVBk9f!i-b3 z`J@>bSU+yG@@1U7nK5^AJEP9zSf(-_OI<_55F-OCLvt&W$@iI5xZpg4$-K;p0SK

P}hGc(01)y&8!$s)}}*Vxe9OxGmEBw05x z$tX=XIW;ZG%s4qM)yz0$@)Tw*Ws4+3BQulK6kU^4Q$yXfB$Fgv3*)pD-DHcjBy%Gp zv*Z-x$q$*;loJgMj4UmUbuCSSDvXRw%yknD4GeXY%q`6i9x$Z9j$iPcJlD0gG%4Vv7_Av3v$)3(0v+H*|?2Bs;VE{-7@qR9alFNC)# zTC4X@`}Qt)`T0H7-~YY7zW)3?`};eq^Zn{NC(hJ$Y2@ONG+5yfF{|z7Pu1(|?*IAz z{(gPP2O#;@y8JgwOXF7wg)a=IG5ZUJ7rnUivwLUj(!4mvT46Q&%3nN6J92;P>F*b4 zkz*InUm#ttU}jVEL&Mfu{*h2=?%|b})9e3y;neu|`}_NM_d40st~q>Fu)Vsq*I}u^ z=V@yra^F8>Tl zteLwl?>6Vf&o3`Of3zuU!tFP6Z5sKSJNDK8U$|fglV-=4P}6$eX*$uIhJqYcyMLGR z>Pk2rO75R;!79kK%RpCKK9c{!m6yiPYkq!WU6gRI>1f!ubvzq6Gt@c7LACFS!);1=68-r`ExQjUBT(Qyp7M< zGwiP~w!fZfl`Cd&M1f08Co1jngM$wqz1v-WpRwb@Z1eojT&FMm*;qz_7^WJbu<}YwO?M)sNfL z;&Eo~{u7tZv943M&|#AkcF1=>zSQCJ?D~Ks6Bi#>6q>FV&)Q~ZQ@*AA>)x8LQj=Vk zou8AP_qN63y05OR|9so_jN6-X+n47XTxgZN$r`>cu9;(=U9p*x73ZvVisu-9aY^tC zC^tU1{r&xc4Zps=7H_Hkdh6?xEjgyTrphU{3e#3COH9f6v`qK*gN=+O=N}*UUv_@h g>qqa{1DPEel%l1qcukJ=1B(R)Pgg&ebxsLQ0BbPx# delta 1119 zcmb7DTS!zv7(VOnf?7tBrHSRbn%QM^&YU^dRJ3+010}>Bda5~d&d~+ev+N$!mo%aa zkwh?rCL$D3K@jwm(1Q^b_7D~!^w#AidWas1GHkQiyp&+D4a}99@B6?1`{#AxRFQH1 zaNB``{L*|u5DHojM%wvY#CvgW4j)es&VJ!jUgF@EX$T{TWB^x4p9=IvbY zC^V@`)zyG>Ao4WHh6D{+Wlsb3>_Ko7%L^(|Op(R8RDdNB0W4w>5EGdIQB_eyNhPME z{2Ot}hegD}q~#dhu|*|>dNG%4p>9vFo%C#L2`534ByM|lGSv`vl5RXi5{d2@C7J7W zy**Yfv0T%xO?0`Qo9c2CAY3|Sp>G9d=rp8ihbUr=z zt$gE;^xSaGv-LBNa?N`iZl_MZn;e{fa&z+^^WQ%Y|LDI_ zbLQ=fq4C*US8iXrJTUh&{qp_v 2560 ? 0.65 : genshin.width > 1920 ? 0.7 : 0.8; - log.warn(`屏幕分辨率${genshin.width}，识别阈值调整为${Threshold}...`); + log.warn(`屏幕宽度：${genshin.width}，识别阈值调整为${Threshold}...`); - log.warn(`全自动枫丹地脉花: v3.9 - ${SHUV}.${color}.${rawTimes}`);//调试LOG + var Thresholdr = genshin.width > 2560 ? 0.8 + : genshin.width > 1920 ? 0.8 + : 0.9; + + log.warn(`全自动枫丹地脉花: v4.0 - ${SHUV}.${color}.${rawTimes}`);//调试LOG log.warn(`使用树脂类型数量：${rewards.length}`); log.warn(`使用树脂顺序：${golbalRewardText.join(" ->")}`); @@ -872,7 +876,7 @@ condensedResinCount--; break; case 2: - originalResinCount -= 20; + originalResinCount -= 40; break; case 3: fragileResinCount--; @@ -880,13 +884,16 @@ case 4: momentResinCount--; break; + case 5: + originalResinCount -= 20; + break; } if (resinTypes.includes("1")) { shouldExit &= (parseInt(condensedResinCount, 10) <= 0); } - if (resinTypes.includes("2")) + if (resinTypes.includes("2") || resinTypes.includes("5")) { shouldExit &= (parseInt(originalResinCount, 10) < 20); } @@ -928,6 +935,12 @@ if(primogemUseCount > 0 && resinDone){ log.warn("树脂耗尽，尝试使用原石 {0}/{1} ...", primogemUseDone+1, primogemUseCount); + + let SHU = await Textocr("兑换",0,0,0,510,380,800,600); + if (SHU.found) { + resinTypeMap2.length = 0; + log.warn("{t}","原石不足，执行结束..."); + } for (let k = 0; k < resinTypeMap2.length; k++) { let SHU = await Textocr(resinTypeMap2[k],0.1,0,0,510,380,640,600); @@ -971,28 +984,47 @@ var fragileResinCount = 0; // 脆弱树脂 var momentResinCount = 0; //须臾树脂 + // var shuz = [] // 浓缩树脂 var condensedResinCountRa = await imageRecognition(condensedResin,0.2, 0, 0,800,15,700,70,Threshold); - if (condensedResinCountRa.found) { + if (condensedResinCountRa.found) { + //测试用 + // log.info("检测到浓缩树脂图标"); + // await moveMouseTo(condensedResinCountRa.x+condensedResinCountRa.w,condensedResinCountRa.y); + // log.warn("X{0} Y{1} W{2} H{3}",condensedResinCountRa.x,condensedResinCountRa.y,condensedResinCountRa.w,condensedResinCountRa.h,); + // if (Math.abs(condensedResinCountRa.x - 1256) > 5 || condensedResinCountRa.y != 33){ + // throw new Error("浓缩图标错误"); + // } + // log.warn("T{0}",Thresholdr); + // log.warn("L{0}",resinImages.length); for (let i = 0; i < resinImages.length; i++) { - if(i==0){await sleep(1000);} - let countArea = await imageRecognition(resinImages[i],0.1, 0, 0,condensedResinCountRa.x+condensedResinCountRa.w,condensedResinCountRa.y,condensedResinCountRa.w*2,condensedResinCountRa.h,Threshold); - if (countArea.found){ + if(i==0){await sleep(500);} + // log.warn("i{0}",i); + let countArea = await imageRecognition(resinImages[i],0, 0, 0,condensedResinCountRa.x+condensedResinCountRa.w+15,condensedResinCountRa.y,30,32,Thresholdr); + if (countArea.found){ + // await moveMouseTo(countArea.x,countArea.y); condensedResinCount =i; + // shuz.push(i); break; } - if (i==4){log.info("未检测到浓缩数量，强制为1"); condensedResinCount=1;} + if (i==5){log.info("未检测到浓缩数量，强制为1"); condensedResinCount=1;} } - + //测试用 + // log.warn("{0}",shuz); + // if (shuz.length != 1 || shuz[0] != 0){ + // // log.warn("错误"); + // // await sleep(2000); + // throw new Error("错误"); + // } }else{ log.info("未检测到浓缩树脂图标"); - } + } //脆弱树脂 var originalResinCountRa = await imageRecognition(originalResin,0.1, 0, 0,1325,0,100,500,Threshold); if (originalResinCountRa.found) { // await moveMouseTo(originalResinCountRa.x,originalResinCountRa.y); - let countArea = await Textocr("",0.5, 0, 2,originalResinCountRa.x+originalResinCountRa.w,originalResinCountRa.y,originalResinCountRa.w*3,originalResinCountRa.h,Threshold);// + let countArea = await Textocr("",0.5, 0, 2,originalResinCountRa.x+originalResinCountRa.w,originalResinCountRa.y,originalResinCountRa.w*3,originalResinCountRa.h);// if (countArea.found){ log.info("原粹树脂识别数量结果："+ countArea.text); let match = countArea.text.match(/(\d+)\s*[/17]\s*(2|20|200)/); @@ -1019,12 +1051,12 @@ if (momentResinCountRa.found) { for (let i = 0; i < resinImages.length; i++) { - let countArea = await imageRecognition(resinImages[i],0.1, 0, 0,momentResinCountRa.x+momentResinCountRa.w,momentResinCountRa.y,momentResinCountRa.w*2,momentResinCountRa.h,Threshold); + let countArea = await imageRecognition(resinImages[i],0, 0, 0,momentResinCountRa.x+momentResinCountRa.w+10,momentResinCountRa.y,30,35,Thresholdr); if (countArea.found){ momentResinCount =i; break; } - if (i==4){log.info("未检测到须臾数量，强制为1"); momentResinCount=1;} + if (i==5){log.info("未检测到须臾数量，强制为1"); momentResinCount=1;} } fragileResinCount = "1"; @@ -1039,17 +1071,18 @@ if (fragileResinCountRa.found) { // await moveMouseTo(fragileResinCountRa.x+fragileResinCountRa.w+20,fragileResinCountRa.y-15); - let countArea = await Textocr("",0.1, 0, 2,fragileResinCountRa.x+fragileResinCountRa.w,fragileResinCountRa.y,fragileResinCountRa.w*2,fragileResinCountRa.h,Threshold);// + let countArea = await Textocr("",0.1, 0, 2,fragileResinCountRa.x+fragileResinCountRa.w,fragileResinCountRa.y,fragileResinCountRa.w*2,fragileResinCountRa.h);// if (countArea.found){ // log.info("脆弱树脂识别数量结果："+ countArea.text); fragileResinCount = countArea.text } else{ - var oneRa = await imageRecognition(resinImages[0],0.1, 0, 1,fragileResinCountRa.x+fragileResinCountRa.w,fragileResinCountRa.y,60,40,Threshold); + var oneRa = await imageRecognition(resinImages[1],0.1, 0, 1,fragileResinCountRa.x+fragileResinCountRa.w,fragileResinCountRa.y,60,40,Threshold); if (oneRa.found){ fragileResinCount = "1"; }else{ - + fragileResinCount = "1"; + log.info("2未检测到脆弱树脂图标,脆弱树脂识别强制为 1 ");//有图标说明至少为1 } } } @@ -1418,12 +1451,14 @@ return isUpdated; } - // //测试 - // while (true) { - // await getRemainResinStatus(); - // await sleep(500); + //测试 + // var ii=1000; + // while (ii>0) { + // await getRemainResinStatus(); + // // await sleep(500); + // ii--; // } - // return; + // return; // UID获取存在概率不成功，慎用！请更换背景纯色的名片提高OCR成功率 let uidNumbers = nowuidString.match(/\d+/g); diff --git a/repo/js/AutoFontaineLeyLine/manifest.json b/repo/js/AutoFontaineLeyLine/manifest.json index e82bb84aa..7a54e92b8 100644 --- a/repo/js/AutoFontaineLeyLine/manifest.json +++ b/repo/js/AutoFontaineLeyLine/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 1, "name": "全自动枫丹地脉花", - "version": "3.9", + "version": "4.0", "bgi_version": "0.47.1", "description": "枫丹地脉花，蓝花金花通用。生存压力大，请带盾奶；避免纯水输出，请注意说明文件。如有BUG请联系作者QQ:119996800", "tags": [