@bettergi/utils 0.1.3 → 0.1.5

package/dist/game.d.ts

@@ -53,4 +53,29 @@ export declare const setTimeTo: (hour: number, minute: number, options?: ClockOp
  * @param options 时钟参数
  */
 export declare const setTime: (period: "night" | "morning" | "noon" | "evening", options?: ClockOptions) => Promise<void>;
+/** tab 翻页配置 */
+type TabNavigationOptions = {
+    /** 标签页图标宽度（默认：96） */
+    tabIconWidth?: number;
+    /** 翻页按钮垂直偏移（默认：540） */
+    verticalOffset?: number;
+    /** 翻页按钮左侧内边距（默认：72） */
+    paddingLeft?: number;
+    /** 翻页按钮右侧内边距（默认：72） */
+    paddingRight?: number;
+    /** 是否向前翻页（默认：false） */
+    backwards?: boolean;
+    /** 最大尝试次数（默认：屏幕宽度 / 标签页图标宽度） */
+    maxAttempts?: number;
+    /** 每次尝试间隔时间（毫秒，默认：1000） */
+    retryInterval?: number;
+};
+/**
+ * 导航到指定标签页
+ * @param condition 导航成功的条件
+ * @param options 翻页配置
+ * @returns - true  条件满足
+ *          - false 达到最大重试次数
+ */
+export declare const navigateToTab: (condition: () => boolean, options?: TabNavigationOptions) => Promise<boolean>;
 export {};

package/dist/game.js

@@ -10,13 +10,13 @@ import { findTextInDirection, findTextWithinBounds, findTextWithinListView } fro
  * @param action 执行动作
  */
 export const withGameMetrics = async (w, h, dpi, action) => {
-    const { width, height, screenDpiScale } = genshin;
+    const [_w, _h, _dpi] = globalThis["getGameMetrics"] ? getGameMetrics() : [];
     try {
         setGameMetrics(w, h, dpi);
         return await action();
     }
     finally {
-        setGameMetrics(width, height, screenDpiScale);
+        globalThis["getGameMetrics"] && setGameMetrics(_w, _h, _dpi);
     }
 };
 /**
@@ -39,13 +39,13 @@ export const openMenu = async (name, stepBackwards = false, options = {}) => {
     await openPaimonMenu();
     // 2.步进搜索菜单按钮
     const { navWidth = 95, steps: step = 30 } = options;
-    const findTooltip = () => findTextWithinBounds(name, navWidth, 0, 20 + name.length * 20, genshin.height);
+    const findTooltip = () => findTextWithinBounds(name, navWidth, 0, 20 + name.length * 20, 1080);
     const tooltip = await withGameMetrics(1920, 1080, 1.5, async () => {
         let result = undefined;
-        const steps = Math.ceil(genshin.height / step);
+        const steps = Math.ceil(1080 / step);
         for (let i = 0; i < steps; i++) {
             const o = i * step;
-            const y = stepBackwards ? genshin.height - o : o;
+            const y = stepBackwards ? 1080 - o : o;
             moveMouseTo(Math.round(navWidth / 2), y);
             await sleep(30); // 等待提示文字出现
             if ((result = findTooltip()) !== undefined)
@@ -130,3 +130,23 @@ export const setTime = async (period, options) => {
             return setTimeTo(18, 5, options);
     }
 };
+/**
+ * 导航到指定标签页
+ * @param condition 导航成功的条件
+ * @param options 翻页配置
+ * @returns - true  条件满足
+ *          - false 达到最大重试次数
+ */
+export const navigateToTab = async (condition, options) => {
+    const { tabIconWidth = 96, verticalOffset = 540, paddingLeft = 72, paddingRight = 72, backwards = false, retryInterval = 1000 } = options || {};
+    const attempts = Math.floor(options?.maxAttempts ?? 1920 / tabIconWidth);
+    for (let i = 0; i < attempts; i++) {
+        if (i === 0 && condition())
+            return true; // fast path
+        click(backwards ? paddingLeft : 1920 - paddingRight, verticalOffset); // prev or next
+        await sleep(retryInterval);
+        if (condition())
+            return true;
+    }
+    return false;
+};

package/dist/ocr.js

@@ -13,7 +13,13 @@ const directionToBounds = (direction) => {
     const y = direction.includes("south") ? genshin.height / 2 : 0;
     const w = direction === "north" || direction === "south" ? genshin.width : genshin.width / 2;
     const h = direction === "west" || direction === "east" ? genshin.height : genshin.height / 2;
-    return { x, y, w, h };
+    const scale = genshin.width / 1920;
+    if (scale <= 1) {
+        return { x, y, w, h };
+    }
+    else {
+        return { x: x / scale, y: y / scale, w: w / scale, h: h / scale };
+    }
 };
 /**
  * 在整个画面内搜索图片
@@ -21,13 +27,16 @@ const directionToBounds = (direction) => {
  * @returns 如果找到匹配的图片区域，则返回该区域
  */
 export const findImage = (path) => {
+    const ir = captureGameRegion();
     try {
-        const ir = captureGameRegion();
         const ro = RecognitionObject.templateMatch(file.readImageMatSync(path));
         return findFirst(ir, ro, region => region.isExist());
     }
     catch (err) {
-        err?.message && log.warn(`${err.message}`);
+        log.warn(`${err.message || err}`);
+    }
+    finally {
+        ir.dispose();
     }
 };
 /**
@@ -40,13 +49,16 @@ export const findImage = (path) => {
  * @returns 如果找到匹配的图片区域，则返回该区域
  */
 export const findImageWithinBounds = (path, x, y, w, h) => {
+    const ir = captureGameRegion();
     try {
-        const ir = captureGameRegion();
         const ro = RecognitionObject.templateMatch(file.readImageMatSync(path), x, y, w, h);
         return findFirst(ir, ro, region => region.isExist());
     }
     catch (err) {
-        err?.message && log.warn(`${err.message}`);
+        log.warn(`${err.message || err}`);
+    }
+    finally {
+        ir.dispose();
     }
 };
 /**
@@ -69,12 +81,20 @@ export const findText = (text, options) => {
     const { ignoreCase = true, contains = false } = options || {};
     const searchText = ignoreCase ? text.toLowerCase() : text;
     const ir = captureGameRegion();
-    const ro = RecognitionObject.ocrThis;
-    return findFirst(ir, ro, region => {
-        const itemText = ignoreCase ? region.text.toLowerCase() : region.text;
-        const isMatch = contains ? itemText.includes(searchText) : itemText === searchText;
-        return isMatch && region.isExist();
-    });
+    try {
+        const ro = RecognitionObject.ocrThis;
+        return findFirst(ir, ro, region => {
+            const itemText = ignoreCase ? region.text.toLowerCase() : region.text;
+            const isMatch = contains ? itemText.includes(searchText) : itemText === searchText;
+            return isMatch && region.isExist();
+        });
+    }
+    catch (err) {
+        log.warn(`${err.message || err}`);
+    }
+    finally {
+        ir.dispose();
+    }
 };
 /**
  * 在指定区域内搜索文本
@@ -90,12 +110,20 @@ export const findTextWithinBounds = (text, x, y, w, h, options) => {
     const { ignoreCase = true, contains = false } = options || {};
     const searchText = ignoreCase ? text.toLowerCase() : text;
     const ir = captureGameRegion();
-    const ro = RecognitionObject.ocr(x, y, w, h);
-    return findFirst(ir, ro, region => {
-        const itemText = ignoreCase ? region.text.toLowerCase() : region.text;
-        const isMatch = contains ? itemText.includes(searchText) : itemText === searchText;
-        return isMatch && region.isExist();
-    });
+    try {
+        const ro = RecognitionObject.ocr(x, y, w, h);
+        return findFirst(ir, ro, region => {
+            const itemText = ignoreCase ? region.text.toLowerCase() : region.text;
+            const isMatch = contains ? itemText.includes(searchText) : itemText === searchText;
+            return isMatch && region.isExist();
+        });
+    }
+    catch (err) {
+        log.warn(`${err.message || err}`);
+    }
+    finally {
+        ir.dispose();
+    }
 };
 /**
  * 在指定方向上搜索文本

package/dist/time.js

@@ -19,7 +19,7 @@ export const getNextMonday4AM = () => {
     result.setHours(4, 0, 0, 0);
     // 如果当前为周一且时间在4点前，则返回今天4点，否则返回下一个周一的4点
     const currentDay = now.getDay();
-    const daysUntilNextMonday = currentDay === 1 && now.getHours() < 4 ? 0 : (8 - currentDay) % 7;
+    const daysUntilNextMonday = currentDay === 1 && now.getHours() < 4 ? 0 : 8 - currentDay;
     result.setDate(now.getDate() + daysUntilNextMonday);
     return result;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bettergi/utils",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "开发 BetterGI 脚本常用工具集",
   "type": "module",
   "author": "Bread Grocery<https://github.com/breadgrocery>",
@@ -33,7 +33,7 @@
     "build": "tsc"
   },
   "devDependencies": {
-    "@bettergi/types": "^0.1.1",
+    "@bettergi/types": "^0.1.3",
     "typescript": "^5.9.3"
   }
 }