@bettergi/utils 0.1.16 → 0.1.18

package/README.md

@@ -103,7 +103,7 @@ await assertRegionDisappearing(findButton, "点击购买按钮超时", () => fin
 
 ```ts
 // 鼠标从 (745, 610) 平滑自然地移动 (1920, 1080)
-await naturalMouseMove(0, 0, 1920, 1080);
+await naturalMouseMove(745, 610, 1920, 1080);
 
 // 鼠标从 (745, 610) 拖拽到 (1280, 610)
 await mouseDrag(745, 610, 1280, 610);
@@ -129,7 +129,7 @@ await mouseScrollDownLines(1, 115);
 // 创建/读取存储对象，保存到存储文件 store/my-data.json 中
 const store = useStore<{ lastUsedTime?: number; count: number }>("my-data");
 // 默认值版本
-// const state = useStoreWithDefaults("my-data", { lastUsedTime: 0, count: 0 });
+// const store = useStoreWithDefaults("my-data", { lastUsedTime: 0, count: 0 });
 
 if (store?.lastUsedTime) {
   log.info(`欢迎回来！上次使用时间: ${store.lastUsedTime}，计数器已累计至: ${store.count}`);

package/dist/game.d.ts

@@ -39,6 +39,8 @@ export type ClockOptions = {
     radius?: number;
     /** 平滑度（默认: 3） */
     smooth?: number;
+    /** 容差（单位：分钟，默认: 2） */
+    tolerance?: number;
 };
 /**
  * 调整游戏时间到指定时分

package/dist/game.js

@@ -92,12 +92,13 @@ export const setTimeTo = async (hour, minute, options) => {
     // 1.打开时间页面
     await openMenu("时间", true);
     // 2.计算调整时钟的路径点
-    const { centerX = 1440, centerY = 502, offsetHours = 6, radius = 150, smooth = 4 } = options || {};
+    const { centerX = 1440, centerY = 502, offsetHours = 6, radius = 150, smooth = 4, tolerance = 2 } = options || {};
     const radian = ((((hour + offsetHours) * 60 + minute) % 1440) / 1440) * Math.PI * 2;
     const trackRadius = radius + 150; // 增加拨动半径，提高准确度
+    const toleranceRadian = (tolerance / (60 * 24)) * Math.PI * 2; // 容差弧度
     const waypoints = [{ x: centerX, y: centerY }].concat(Array.from({ length: Math.max(smooth, 3) })
         // 计算弧度
-        .map((_, i) => radian + (1 + i / (Math.max(smooth, 3) - 1)) * Math.PI)
+        .map((_, i) => radian + (1 + i / (Math.max(smooth, 3) - 1)) * Math.PI + toleranceRadian)
         // 计算相对圆点坐标
         .map(rad => ({ x: trackRadius * Math.cos(rad), y: trackRadius * Math.sin(rad) }))
         // 计算绝对坐标

package/dist/ocr.js

@@ -1,13 +1,5 @@
 import { mouseScrollDownLines } from "./mouse";
 import { waitForAction } from "./workflow";
-const findFirst = (ir, ro, predicate) => {
-    const candidates = ir.findMulti(ro);
-    for (let i = 0; i < candidates.count; i++) {
-        if (predicate(candidates[i]))
-            return candidates[i];
-    }
-    return undefined;
-};
 const directionToBounds = (direction) => {
     const x = direction.includes("east") ? genshin.width / 2 : 0;
     const y = direction.includes("south") ? genshin.height / 2 : 0;
@@ -35,7 +27,8 @@ export const findImage = (image, config = {}) => {
         if (Object.keys(config).length > 0) {
             Object.assign(ro, config) && ro.initTemplate();
         }
-        return findFirst(ir, ro, region => region.isExist());
+        const region = ir.find(ro);
+        return region.isExist() ? region : undefined;
     }
     catch (err) {
         log.warn(`${err.message || err}`);
@@ -62,7 +55,8 @@ export const findImageWithinBounds = (image, x, y, w, h, config = {}) => {
         if (Object.keys(config).length > 0) {
             Object.assign(ro, config) && ro.initTemplate();
         }
-        return findFirst(ir, ro, region => region.isExist());
+        const region = ir.find(ro);
+        return region.isExist() ? region : undefined;
     }
     catch (err) {
         log.warn(`${err.message || err}`);
@@ -95,6 +89,14 @@ export const findImageInDirection = (image, direction, config = {}) => {
     const { x, y, w, h } = directionToBounds(direction);
     return findImageWithinBounds(image, x, y, w, h, config);
 };
+const findFirst = (ir, ro, predicate) => {
+    const candidates = ir.findMulti(ro);
+    for (let i = 0; i < candidates.count; i++) {
+        if (predicate(candidates[i]))
+            return candidates[i];
+    }
+    return undefined;
+};
 /**
  * 在整个画面内搜索文本
  * @param text 待搜索文本

package/package.json

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