js:联机狗粮1.6.1 (#2307)

* js:联机狗粮1.6.1

1.识别队伍编号增加重试和回到主界面判定
2.自动模式下仅当勾选额外且当过房主且成功放进至少一人时,才会执行额外

* js:锄地一条龙

回调汐酱修改的路线信息
This commit is contained in:
mno
2025-11-04 14:51:06 +08:00
committed by GitHub
parent 8d8798e348
commit 7d9ba12445
7 changed files with 12 additions and 7 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

View File

@@ -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;
}

View File

@@ -1,7 +1,7 @@
{
"manifest_version": 1,
"name": "AAA狗粮联机团购",
"version": "1.5.18",
"version": "1.6.1",
"tags": [
"狗粮"
],

View File

@@ -1,7 +1,7 @@
{
"manifest_version": 1,
"name": "锄地一条龙",
"version": "1.10.2",
"version": "1.10.3",
"description": "一站式解决自动化锄地支持只拾取狗粮请仔细阅读README.md后使用",
"authors": [
{

View File

@@ -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": "",