From affc9005825e7fbb2b4b9adf63d71bad629556e1 Mon Sep 17 00:00:00 2001 From: mno <718135749@qq.com> Date: Tue, 4 Nov 2025 10:51:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?js=EF=BC=9A=E8=81=94=E6=9C=BA=E7=8B=97?= =?UTF-8?q?=E7=B2=AE1.6.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1.识别队伍编号增加重试和回到主界面判定 2.自动模式下仅当勾选额外且当过房主且成功放进至少一人时,才会执行额外 --- .../assets/RecognitionObject/revival.png | Bin 8468 -> 0 bytes .../assets/RecognitionObject/revival1.png | Bin 4583 -> 0 bytes .../\345\244\215\350\213\217.png" | Bin 0 -> 3199 bytes repo/js/ArtifactsGroupPurchasing/main.js | 13 +++++++++---- repo/js/ArtifactsGroupPurchasing/manifest.json | 2 +- 5 files changed, 10 insertions(+), 5 deletions(-) delete mode 100644 repo/js/ArtifactsGroupPurchasing/assets/RecognitionObject/revival.png delete mode 100644 repo/js/ArtifactsGroupPurchasing/assets/RecognitionObject/revival1.png create mode 100644 "repo/js/ArtifactsGroupPurchasing/assets/RecognitionObject/\345\244\215\350\213\217.png" diff --git a/repo/js/ArtifactsGroupPurchasing/assets/RecognitionObject/revival.png b/repo/js/ArtifactsGroupPurchasing/assets/RecognitionObject/revival.png deleted file mode 100644 index ea655a2e3231905c809ef02dc7623ecf2a530f3e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8468 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
l@M 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 Rjkf>*002ovPDHLkV1nBR=l%cy diff --git "a/repo/js/ArtifactsGroupPurchasing/assets/RecognitionObject/\345\244\215\350\213\217.png" "b/repo/js/ArtifactsGroupPurchasing/assets/RecognitionObject/\345\244\215\350\213\217.png" new file mode 100644 index 0000000000000000000000000000000000000000..06f8eb68c16ee99ae7ae1c2304a361f4967b2a9f GIT binary patch literal 3199 zcmV-_41n{AP)X1^@s6b5wmq00001b5ch_0Itp) z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D3=~O3K~z{reVFTS zTxEX8Kj%5OnKPcT9ed)$*rahFmu>DWX;~ly%FUpJn?NaSqY#Rgz62rh2Xv)2ZKcwd zs$vQ7BB)|PT}r~G#13i0ZnJ5eKmv_6Bq0|tiS5MW%lOQkbDm3IJmUeEs*f}potZh$ zJm25*z5Jfzoc;7SChxcaD17_whxopaa$M3h#gjGuzoAVs=i2i;!Z1WBMZI1pQ7NA1 zkqcYM<#JT38Cq*F9>y57iSaxS$8nHS;&~pP=i$08T5FUH5kjD~LoZ6x zX$b?I{|iXw`cx_v5@jeBixgZvXQ4q5%(-@i1VC$z)*8og<^U0aogd>Ngg}TqaU65? z$|P|dlgVk?+uP~v>}=krwPtd1l1imQns`J}L{CpQQ4|r^#!*V)`vNH?fdkI@6TdZ% z(j-ZO@LK?IqYnQ3=RfD-@MXHYyLtTK`&hPY8B*GcxNc)%jiH4z=h_Qglu{V2sm{#c zc?x3;QND#V%V;TdGCe)b8*jYHiQ~t~WSx~OSF&Tr4vaD6b2-v1WME(b*U8h< z+siY5_B8o?9z%^ZO%XyPgrLzK0rqzoA1Nh%;NZG0#?Fv!7crKJv&TV^wI6riy?~f!=Ry&@;aU5JX<(i&rsMo8F zYnMxxE|DZw#4__xN-?nSV@{qtNh<5CS+j;MTegrSNdu(e(4j*dIdTMW=<4d?vBw@o zDMeHeBuPShdx?&Yc?7i?3nX>(96WfCU%vgWt-Mzx%QB4iDHICG%yM#eIL=&A1VLme z;G_s4SbxI`o_OMk=FSKq$g+%Fu7xlRNfW{3*0x#u2~QYd8$ zbKt-MKKke*gm785Y#EO~{>K!HMZ%mRO;ge|MhHPcrWVNIFV3**)m>=gQZASIcDO)c5I&4tJ zK`F(54ISp_(W7{tM{8><4?XlyBS)-5R;yL=`8>H?(8wLD5g{~EN^(gJ51_ZVmqm*f zvFY}^n3=aZ2T}fI?Ab2r;t*zV8H@LM@Lag;ku$3jFn1-B&o4v$r7YWa2y9? zG-;X=34!y~7l%ydm8|_r7#bR4*DJdlp=T>JGgJBgx_>||p+d4O!}BFdDc0Svgr}Z* z3Z-T!6bdM1f&cyA{Uc}2oIy#uBT8A2Zn21z5~LM<&M|1M@iEqlg-aNQI7+d7`*v0@ zU5x9xmJ@g^V!(lu9MKySoV@fs%HC#+V;a%VZv8 zjTspk;ctKO&m>7gE)0oEC4zi`BuS7a!*@MU4Itk+#dnQb5CmMle3@OZ?jqAQf*@#8 zN+~r5NaVN9sp$Ik>k-28dltBql6*c-nx?$=+G_yZbI-l3UcDL`dExsG-QC?djzbhh zXwMck%QBQwBwBIm)G0&~)7jaHFj;d~EfDDt6JYS)eCXSV@eg<#-@>g6P9RuJ$ zfBhf);f*)&^@VfDv<@PmR4CvHjq50a&_!l7s;R>B0x%i7-+Y_yjv~)J`y6e>Jc$7p ztVV*s+L{o8`Sa(~-{0Rz;OXWLg<(ibOAA5>!Z5U5af7cx5Kt%-sMTtmKYyOXhY$1Z zx8G8WZFA@QKAz`s=FAy}hK7)hR(;FnEnK>Mi8zj%UGIt&E9MkydV0F~o#Qy9Y0Bv6 zD6hQo3S(nqO^rBTeR0Ut^gO~a#PdAjIA&nqe%^ooeY9@05PYW#$8ngNnj)Xi|yV~AOPj| zR(9^(NoZ2r_Q;F_2M+Mco&$KEN8a~nX=!0%N$~WJ9!v`OHz|Xcn)X+$par$?s*t>TxV`F0oG#mb41Fq}y*=L_IdTEps z@&r8#d$@h$?I@*~o}T8|v11%Na*Wzc1>aS80&cqXC-mQc3sDrIvIO7v(b}i0+(jV@ zxbx0C>Fw>s7{#7F?=dx1#YyUPwzqN9jXx#|d{UEv17Vb-QjaNWg{K@Ab+mJBM>|hH zxr6)ex|`!CK4VS8ES#^tIAku3!OopKNs@%6OP8`~({Q2_$ zgki|al`A=W_AKM$;|L*ebjtem>$&T$P4x8ifSA>mr5b7;T5FPInkb3@*uQ^2@4dH= zG)-wKIBbqsnug%dg&$3e|42wE#{Bzyn}}yewb3JfXp(Iv`!cV z2zk{4k*1ZQp&|PE`Y4r3iuAa0&>X~()dcDq-u`w=Oyx8o2#;;z* zxKT5W%jGhQ7cZt#sc`!AXYP1%%{aD<$h;7@pQEX}F*s){m-u(tymeJeW%cf16ShsF%(+z_lU}9o| zZLA6`VeOnvszaN~IFL zy}fvzM=qDc^E{MeAIHolw=woSK;w|*D0>)^GHtlugw2MWPft$|M!TeG%A0S##oD!N zSiO2RX_}JDg(Qis{_NaR{_u%Rt(Fjm0YMNn%tJTZC}Rx1$QnD6>1JhS1B}MG!*LvF zJT96Y^}5x7*LeOUGy9xMYl$%i$8nl-%xWpiGU7PK_w8YAHsE~Ur&_Jz`+oDD*+qW; l|9szXfX_8|WOjH0{s-alhVr&b!ae{1002ovPDHLkV1l$pJF5Ty literal 0 HcmV?d00001 diff --git a/repo/js/ArtifactsGroupPurchasing/main.js b/repo/js/ArtifactsGroupPurchasing/main.js index 3efbe6c3f5..118d4914fa 100644 --- a/repo/js/ArtifactsGroupPurchasing/main.js +++ b/repo/js/ArtifactsGroupPurchasing/main.js @@ -9,6 +9,7 @@ let rollingDelay = 50; let state; let gameRegion; let TMthreshold = +settings.TMthreshold || 0.9; +let doRunExtra = false; (async function () { setGameMetrics(1920, 1080, 1); @@ -120,8 +121,8 @@ let TMthreshold = +settings.TMthreshold || 0.9; await runGroupPurchasing(false); settings.forceGroupNumber = 0;//解除强制指定 } - //如果勾选了额外,在结束后再执行一次额外路线 - if (settings.runExtra) { + //如果勾选了额外,且本次自动运行当过房主成功进人,在结束后再执行一次额外路线 + if (settings.runExtra && doRunExtra) { await runGroupPurchasing(runExtra); } } @@ -690,6 +691,7 @@ async function autoEnter(autoEnterSettings) { while (attempts++ < 5) { if (permissionMode === "无条件通过") { if (await findAndClick(allowEnterRo)) { + doRunExtra = true; await waitForMainUI(true, 20 * 1000); enterCount++; break; @@ -703,6 +705,7 @@ async function autoEnter(autoEnterSettings) { enteredPlayers = [...new Set([...enteredPlayers, result])]; log.info(`允许 ${result} 加入`); notification.send(`允许 ${result} 加入`); + doRunExtra = true; if (await isYUI()) { keyPress("VK_ESCAPE"); await sleep(500); await genshin.returnMainUi(); } break; } else { @@ -923,6 +926,8 @@ async function getPlayerSign() { if (p2.isExist()) { log.info("识别结果为2P"); return 2; } if (p3.isExist()) { log.info("识别结果为3P"); return 3; } if (p4.isExist()) { log.info("识别结果为4P"); return 4; } + await genshin.returnMainUi(); + await sleep(250); } log.warn("超时仍未识别到队伍编号"); return -1; @@ -1127,7 +1132,7 @@ async function runPath(fullPath, targetItemPath) { })(); const errorProcessTask = (async () => { - const revivalRo1 = RecognitionObject.TemplateMatch(file.ReadImageMatSync("assets/RecognitionObject/revival1.png")); + const revivalRo = RecognitionObject.TemplateMatch(file.ReadImageMatSync("assets/RecognitionObject/复苏.png")); const readingRo = RecognitionObject.TemplateMatch(file.ReadImageMatSync("assets/RecognitionObject/readingUI.png"), 72, 22, 133 - 72, 79 - 22); const dialogueRo = RecognitionObject.TemplateMatch(file.ReadImageMatSync("assets/RecognitionObject/dialogueUI.png"), 187, 26, 233 - 130, 69); let errorCheckCount = 9; @@ -1137,7 +1142,7 @@ async function runPath(fullPath, targetItemPath) { if (errorCheckCount > 50) { errorCheckCount = 0; - if (await findAndClick(revivalRo1, 1)) { + if (await findAndClick(revivalRo, 1)) { log.info("识别到复苏按钮,点击复苏"); errorCheckCount = 50; } diff --git a/repo/js/ArtifactsGroupPurchasing/manifest.json b/repo/js/ArtifactsGroupPurchasing/manifest.json index b25bea0d6d..59e828fe75 100644 --- a/repo/js/ArtifactsGroupPurchasing/manifest.json +++ b/repo/js/ArtifactsGroupPurchasing/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 1, "name": "AAA狗粮联机团购", - "version": "1.5.18", + "version": "1.6.1", "tags": [ "狗粮" ], From 4134ec415b7d66e041c9f38228ed40550d365339 Mon Sep 17 00:00:00 2001 From: mno <718135749@qq.com> Date: Tue, 4 Nov 2025 11:04:53 +0800 Subject: [PATCH 2/2] =?UTF-8?q?js=EF=BC=9A=E9=94=84=E5=9C=B0=E4=B8=80?= =?UTF-8?q?=E6=9D=A1=E9=BE=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 回调汐酱修改的路线信息 --- repo/js/AutoHoeingOneDragon/manifest.json | 2 +- ...\234\260\357\274\210600_1\357\274\214200_2\357\274\211.json" | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/repo/js/AutoHoeingOneDragon/manifest.json b/repo/js/AutoHoeingOneDragon/manifest.json index 621da3d41a..40cdc2250a 100644 --- a/repo/js/AutoHoeingOneDragon/manifest.json +++ b/repo/js/AutoHoeingOneDragon/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 1, "name": "锄地一条龙", - "version": "1.10.2", + "version": "1.10.3", "description": "一站式解决自动化锄地,支持只拾取狗粮,请仔细阅读README.md后使用", "authors": [ { diff --git "a/repo/js/AutoHoeingOneDragon/pathing/0-\346\261\220\351\205\261/1-\347\262\276\350\213\261/418\343\200\220\346\262\231\346\232\264\343\200\221\351\241\273\345\274\245\346\262\231\346\274\240\344\270\211\350\277\220\346\262\263\344\271\213\345\234\260\357\274\210600_1\357\274\214200_2\357\274\211.json" "b/repo/js/AutoHoeingOneDragon/pathing/0-\346\261\220\351\205\261/1-\347\262\276\350\213\261/418\343\200\220\346\262\231\346\232\264\343\200\221\351\241\273\345\274\245\346\262\231\346\274\240\344\270\211\350\277\220\346\262\263\344\271\213\345\234\260\357\274\210600_1\357\274\214200_2\357\274\211.json" index 879b0f46df..a55a2c60a0 100644 --- "a/repo/js/AutoHoeingOneDragon/pathing/0-\346\261\220\351\205\261/1-\347\262\276\350\213\261/418\343\200\220\346\262\231\346\232\264\343\200\221\351\241\273\345\274\245\346\262\231\346\274\240\344\270\211\350\277\220\346\262\263\344\271\213\345\234\260\357\274\210600_1\357\274\214200_2\357\274\211.json" +++ "b/repo/js/AutoHoeingOneDragon/pathing/0-\346\261\220\351\205\261/1-\347\262\276\350\213\261/418\343\200\220\346\262\231\346\232\264\343\200\221\351\241\273\345\274\245\346\262\231\346\274\240\344\270\211\350\277\220\346\262\263\344\271\213\345\234\260\357\274\210600_1\357\274\214200_2\357\274\211.json" @@ -7,7 +7,7 @@ } ], "bgi_version": "0.45.0", - "description": " 路线信息:该路线预计用时131.36秒,包含以下怪物:1只遗迹重机、2只遗迹巡弋者、1只伸缩风蕈兽。", + "description": " 路线信息:该路线预计用时131.36秒,包含以下怪物:1只遗迹重机、2只遗迹巡弋者、0.5只伸缩风蕈兽。", "enable_monster_loot_split": false, "last_modified_time": 1762170381245, "map_match_method": "",