@bettergi/utils 0.1.27 → 0.1.28

package/dist/ocr.d.ts

@@ -112,11 +112,10 @@ export type ListView = {
  * @param condition 查找条件
  * @param listView 列表视图参数
  * @param retryOptions 重试选项
- * @param sampling 区域采样函数，通过采样区域画面变化判断列表是否触底（默认：底半区）
- * @param threshold 采样区域匹配阈值（默认：0.9）
+ * @param threshold 列表视图变化匹配阈值（默认：0.9）
  * @returns 如果找到匹配的区域，则返回该区域，否则返回 undefined
  */
-export declare const findWithinListView: (condition: (listViewRegion: ImageRegion) => Region | undefined, listView: ListView, retryOptions?: RetryOptions, sampling?: (listViewRegion: ImageRegion) => ImageRegion, threshold?: number) => Promise<Region | undefined>;
+export declare const findWithinListView: (condition: (listViewRegion: ImageRegion) => Region | undefined, listView: ListView, retryOptions?: RetryOptions, threshold?: number) => Promise<Region | undefined>;
 /**
  * 在列表视图中滚动搜索文本
  * @param text 待搜索文本
@@ -124,19 +123,17 @@ export declare const findWithinListView: (condition: (listViewRegion: ImageRegio
  * @param matchOptions 搜索选项
  * @param retryOptions 重试选项
  * @param config 识别对象配置
- * @param sampling 区域采样函数，通过采样区域画面变化判断列表是否触底（默认：底半区）
- * @param threshold 采样区域匹配阈值（默认：0.9）
+ * @param threshold 列表视图变化匹配阈值（默认：0.9）
  * @returns 如果找到匹配的文本区域，则返回该区域，否则返回 undefined
  */
-export declare const findTextWithinListView: (text: string, listView: ListView, matchOptions?: TextMatchOptions, retryOptions?: RetryOptions, config?: ROConfig, sampling?: (listViewRegion: ImageRegion) => ImageRegion, threshold?: number) => Promise<Region | undefined>;
+export declare const findTextWithinListView: (text: string, listView: ListView, matchOptions?: TextMatchOptions, retryOptions?: RetryOptions, config?: ROConfig, threshold?: number) => Promise<Region | undefined>;
 /**
  * 在列表视图中查找图像
  * @param image 图片路径 或 图片Mat
  * @param listView 列表视图参数
  * @param retryOptions 重试选项
  * @param config 识别对象配置
- * @param sampling 区域采样函数，通过采样区域画面变化判断列表是否触底（默认：底半区）
- * @param threshold 采样区域匹配阈值（默认：0.9）
+ * @param threshold 列表视图变化匹配阈值（默认：0.9）
  * @returns 如果找到匹配的区域，则返回该区域，否则返回 undefined
  */
-export declare const findImageWithinListView: (image: string | ImageMat, listView: ListView, retryOptions?: RetryOptions, config?: ROConfig, sampling?: (listViewRegion: ImageRegion) => ImageRegion, threshold?: number) => Promise<Region | undefined>;
+export declare const findImageWithinListView: (image: string | ImageMat, listView: ListView, retryOptions?: RetryOptions, config?: ROConfig, threshold?: number) => Promise<Region | undefined>;

package/dist/ocr.js

@@ -1,17 +1,14 @@
 import { mouseScrollDownLines } from "./mouse";
 import { waitForAction } from "./workflow";
+const scaleTo1080P = (n) => {
+    return genshin.scaleTo1080PRatio <= 1 ? n : n / Math.floor(genshin.scaleTo1080PRatio);
+};
 const directionToBounds = (direction) => {
     const x = direction.includes("east") ? genshin.width / 2 : 0;
     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;
-    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 };
-    }
+    return { x: scaleTo1080P(x), y: scaleTo1080P(y), w: scaleTo1080P(w), h: scaleTo1080P(h) };
 };
 /**
  * 在整个画面内搜索图片
@@ -202,36 +199,34 @@ export const findTextInDirection = (text, direction, options, config = {}) => {
  * @param condition 查找条件
  * @param listView 列表视图参数
  * @param retryOptions 重试选项
- * @param sampling 区域采样函数，通过采样区域画面变化判断列表是否触底（默认：底半区）
- * @param threshold 采样区域匹配阈值（默认：0.9）
+ * @param threshold 列表视图变化匹配阈值（默认：0.9）
  * @returns 如果找到匹配的区域，则返回该区域，否则返回 undefined
  */
-export const findWithinListView = async (condition, listView, retryOptions, sampling, threshold = 0.9) => {
+export const findWithinListView = async (condition, listView, retryOptions, threshold = 0.9) => {
     const { x, y, w, h, lineHeight, scrollLines = 1, paddingX = 10, paddingY = 10 } = listView;
     const { maxAttempts = 99, retryInterval = 1200 } = retryOptions || {};
-    sampling ??= r => r.deriveCrop(1, r.height * 0.5, r.width - 1, r.height * 0.5);
     const captureListViewRegion = () => captureGameRegion().deriveCrop(x, y, w, h);
     const isReachedBottom = (() => {
+        let captured;
         let lastCaptured;
         return () => {
-            const newRegion = captureListViewRegion();
-            if (!newRegion?.isExist())
-                return true;
             try {
+                captured = captureListViewRegion();
                 if (!lastCaptured)
                     return false;
-                const oldRegion = sampling(lastCaptured);
-                if (!oldRegion?.isExist())
-                    return true;
-                // 根据采样区域画面是否变化，判断列表是否触底
-                const ro = RecognitionObject.templateMatch(oldRegion.srcMat);
+                // 根据列表视图区域画面是否变化，判断列表是否触底
+                const lc = lastCaptured.deriveCrop(1, 1, lastCaptured.width - 2, lastCaptured.height - 2);
+                const ro = RecognitionObject.templateMatch(lc.srcMat);
                 ro.threshold = threshold;
                 ro.use3Channels = true;
                 ro.initTemplate();
-                return newRegion.find(ro)?.isExist();
+                return captured.find(ro).isExist();
+            }
+            catch {
+                return true;
             }
             finally {
-                lastCaptured = newRegion;
+                lastCaptured = captured;
             }
         };
     })();
@@ -241,17 +236,12 @@ export const findWithinListView = async (condition, listView, retryOptions, samp
         return targetRegion?.isExist() || isReachedBottom();
     }, async () => {
         moveMouseTo(x + w - paddingX, y + paddingY); // 移动到滚动条附近
-        await sleep(50);
+        await sleep(200); // 等待画面稳定
         await mouseScrollDownLines(scrollLines, lineHeight); // 滚动指定行数
     }, { maxAttempts, retryInterval });
     if (targetRegion?.isExist()) {
         const { item1, item2 } = targetRegion.convertPositionToGameCaptureRegion(0, 0);
-        const scale = genshin.width / 1920;
-        const [x, y] = [
-            Math.floor(scale <= 1 ? item1 : item1 / scale),
-            Math.floor(scale <= 1 ? item2 : item2 / scale)
-        ];
-        Object.assign(targetRegion, { x, y });
+        Object.assign(targetRegion, { x: scaleTo1080P(item1), y: scaleTo1080P(item2) });
         return targetRegion;
     }
 };
@@ -262,11 +252,10 @@ export const findWithinListView = async (condition, listView, retryOptions, samp
  * @param matchOptions 搜索选项
  * @param retryOptions 重试选项
  * @param config 识别对象配置
- * @param sampling 区域采样函数，通过采样区域画面变化判断列表是否触底（默认：底半区）
- * @param threshold 采样区域匹配阈值（默认：0.9）
+ * @param threshold 列表视图变化匹配阈值（默认：0.9）
  * @returns 如果找到匹配的文本区域，则返回该区域，否则返回 undefined
  */
-export const findTextWithinListView = async (text, listView, matchOptions, retryOptions, config = {}, sampling, threshold = 0.9) => {
+export const findTextWithinListView = async (text, listView, matchOptions, retryOptions, config = {}, threshold = 0.9) => {
     const ro = RecognitionObject.ocrThis;
     if (Object.keys(config).length > 0) {
         Object.assign(ro, config) && ro.initTemplate();
@@ -275,7 +264,7 @@ export const findTextWithinListView = async (text, listView, matchOptions, retry
         return findFirstRegion(lvr, ro, region => {
             return region.isExist() && textMatch(region.text, text, matchOptions);
         });
-    }, listView, retryOptions, sampling, threshold);
+    }, listView, retryOptions, threshold);
 };
 /**
  * 在列表视图中查找图像
@@ -283,11 +272,10 @@ export const findTextWithinListView = async (text, listView, matchOptions, retry
  * @param listView 列表视图参数
  * @param retryOptions 重试选项
  * @param config 识别对象配置
- * @param sampling 区域采样函数，通过采样区域画面变化判断列表是否触底（默认：底半区）
- * @param threshold 采样区域匹配阈值（默认：0.9）
+ * @param threshold 列表视图变化匹配阈值（默认：0.9）
  * @returns 如果找到匹配的区域，则返回该区域，否则返回 undefined
  */
-export const findImageWithinListView = async (image, listView, retryOptions, config = {}, sampling, threshold = 0.9) => {
+export const findImageWithinListView = async (image, listView, retryOptions, config = {}, threshold = 0.9) => {
     const mat = typeof image === "string" ? file.readImageMatSync(image) : image;
     const ro = RecognitionObject.templateMatch(mat);
     if (Object.keys(config).length > 0) {
@@ -296,5 +284,5 @@ export const findImageWithinListView = async (image, listView, retryOptions, con
     return findWithinListView(ir => {
         const region = ir.find(ro);
         return region.isExist() ? region : undefined;
-    }, listView, retryOptions, sampling, threshold);
+    }, listView, retryOptions, threshold);
 };

package/dist/store.js

@@ -7,8 +7,8 @@ import { deepMerge } from "./misc";
  */
 export const useStore = (name) => {
     const filePath = `store/${name}.json`;
-    // 读取文件数据
-    const obj = (() => {
+    // 从文件读取数据
+    const storeData = (() => {
         try {
             const storeFiles = [...file.readPathSync("store")].map(path => path.replace(/\\/g, "/"));
             if (!storeFiles.includes(filePath))
@@ -21,22 +21,22 @@ export const useStore = (name) => {
         }
     })();
     // 创建代理函数
-    const createProxy = (target, parentPath = []) => {
-        if (typeof target !== "object" || target === null) {
-            return target;
+    const createProxy = (targetObject, parentPath = []) => {
+        if (typeof targetObject !== "object" || targetObject === null) {
+            return targetObject;
         }
-        return new Proxy(target, {
+        return new Proxy(targetObject, {
             get: (target, key) => {
                 const value = Reflect.get(target, key);
                 return typeof value === "object" && value !== null
-                    ? createProxy(value, [...parentPath, key]) // 递归创建代理
+                    ? createProxy(value, [...parentPath, key])
                     : value;
             },
             set: (target, key, value) => {
                 const success = Reflect.set(target, key, value);
                 if (success) {
                     Promise.resolve().then(() => {
-                        file.writeTextSync(filePath, JSON.stringify(obj, null, 2));
+                        file.writeTextSync(filePath, JSON.stringify(storeData, null, 2));
                     });
                 }
                 return success;
@@ -45,14 +45,14 @@ export const useStore = (name) => {
                 const success = Reflect.deleteProperty(target, key);
                 if (success) {
                     Promise.resolve().then(() => {
-                        file.writeTextSync(filePath, JSON.stringify(obj, null, 2));
+                        file.writeTextSync(filePath, JSON.stringify(storeData, null, 2));
                     });
                 }
                 return success;
             }
         });
     };
-    return createProxy(obj);
+    return createProxy(storeData);
 };
 /**
  * 创建一个带有默认值的持久化存储对象，用于管理应用状态数据

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bettergi/utils",
-  "version": "0.1.27",
+  "version": "0.1.28",
   "description": "开发 BetterGI 脚本常用工具集",
   "type": "module",
   "author": "Bread Grocery<https://github.com/breadgrocery>",