Skip to content

js：联机狗粮1.6.1 #2307

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 4, 2025
Merged

js：联机狗粮1.6.1 #2307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
affc900
js：联机狗粮1.6.1
Bedrockx Nov 4, 2025
4134ec4
js：锄地一条龙
Bedrockx Nov 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed repo/js/ArtifactsGroupPurchasing/assets/RecognitionObject/revival.png
View file
Open in desktop
Binary file not shown.
Binary file removed repo/js/ArtifactsGroupPurchasing/assets/RecognitionObject/revival1.png
View file
Open in desktop
Binary file not shown.
Binary file added repo/js/ArtifactsGroupPurchasing/assets/RecognitionObject/复苏.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 9 additions & 4 deletions repo/js/ArtifactsGroupPurchasing/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
}
}
Expand Down Expand Up @@ -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;
Expand All @@ -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 {
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion repo/js/ArtifactsGroupPurchasing/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"manifest_version": 1,
"name": "AAA狗粮联机团购",
"version": "1.5.18",
"version": "1.6.1",
"tags": [
"狗粮"
],
Expand Down
2 changes: 1 addition & 1 deletion repo/js/AutoHoeingOneDragon/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"manifest_version": 1,
"name": "锄地一条龙",
"version": "1.10.2",
"version": "1.10.3",
"description": "一站式解决自动化锄地，支持只拾取狗粮，请仔细阅读README.md后使用",
"authors": [
{
Expand Down
2 changes: 1 addition & 1 deletion repo/js/AutoHoeingOneDragon/pathing/0-汐酱/1-精英/418【沙暴】须弥沙漠三运河之地（600_1，200_2）.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": "",
Expand Down