feat: 小优化,不影响运行 (#2954)

This commit is contained in:
躁动的氨气
2026-03-03 21:47:38 +08:00
committed by GitHub
parent 8b1a892032
commit 69db76fc75
2 changed files with 18 additions and 6 deletions

View File

@@ -280,7 +280,9 @@ async function waitUntilImgAppear(
const start = Date.now();
while (Date.now() - start <= timeout) {
await action();
if (action) {
await action();
}
const res = await findImg(target, x, y, w, h, interval);
if (res) return res;
await sleep(interval);
@@ -316,7 +318,9 @@ async function waitUntilImgDisappear(
const start = Date.now();
while (Date.now() - start <= timeout) {
await action();
if (action) {
await action();
}
const res = await findImg(target, x, y, w, h, interval);
if (!res) return true;
await sleep(interval);
@@ -352,8 +356,9 @@ async function waitUntilTextAppear(
const start = Date.now();
while (Date.now() - start <= attempts * interval) {
await action();
if (action) {
await action();
}
const res = await findText(text, x, y, w, h, 1, interval);
if (res) return res;
@@ -390,7 +395,9 @@ async function waitUntilTextDisappear(
const start = Date.now();
while (Date.now() - start <= attempts * interval) {
await action();
if (action) {
await action();
}
const res = await findText(text, x, y, w, h, 1, interval); // 每次只试 1 次 OCR
if (!res) return true;
await sleep(interval);

View File

@@ -3,12 +3,14 @@ import {
findTextAndClick,
findImgAndClick,
waitUntilTextAppear,
waitUntilImgDisappear
waitUntilImgDisappear,
waitUntilImgAppear
} from "../../../packages/utils/tool";
import fold_triangle from "assets/fold_triangle.png";
import check_box from "assets/check_box.png";
import exit_room from "assets/exit_room.png";
import paimon from "../../../packages/assets/imgs/paimon_menu.png";
const duration = 1000; // 默认点击等待延时
@@ -380,6 +382,9 @@ async function exitToTeyvat() {
await findTextAndClick("返回", 960, 0, 960, 100);
await sleep(duration);
await findTextAndClick("确认", 960, 600, 960, 400);
await waitUntilImgAppear(paimon);
// 有镜头拉近动画
await sleep(duration);
}
(async function () {