@bettergi/utils 0.1.5 → 0.1.7

package/README.md

@@ -35,6 +35,11 @@ await setTimeTo(12, 35);
 
 // 调整游戏时间段
 await setTime("evening");
+
+// tab 翻页到指定页面
+await navigateToTab(() => {
+  return findTextWithinBounds("小道具", 0, 0, 220, 96) !== undefined;
+});
 ```
 
 ### 图文识别
@@ -178,4 +183,7 @@ const uuid = generateUUID(false);
 // 数组洗牌
 const arr = [1, 2, 3, 4, 5];
 const shuffled = shuffleArray(arr);
+
+// 深度合并多个对象：{ x: 1, y: { a: 2, b: 4, c: 5 }, d: 6 }
+const result = deepMerge({ x: 1, y: { a: 2, b: 3 } }, { y: { b: 4, c: 5 }, d: 6 });
 ```

package/dist/game.js

@@ -92,13 +92,14 @@ export const setTimeTo = async (hour, minute, options) => {
     // 1.打开时间页面
     await openMenu("时间", true);
     // 2.计算调整时钟的路径点
-    const { centerX = 1440, centerY = 502, offsetHours = 6, radius = 154, smooth = 3 } = options || {};
+    const { centerX = 1440, centerY = 502, offsetHours = 6, radius = 150, smooth = 4 } = options || {};
     const radian = ((((hour + offsetHours) * 60 + minute) % 1440) / 1440) * Math.PI * 2;
+    const trackRadius = radius + 150; // 增加拨动半径，提高准确度
     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(rad => ({ x: radius * Math.cos(rad), y: radius * Math.sin(rad) }))
+        .map(rad => ({ x: trackRadius * Math.cos(rad), y: trackRadius * Math.sin(rad) }))
         // 计算绝对坐标
         .map(p => ({ x: Math.round(p.x + centerX), y: Math.round(p.y + centerY) })));
     // 3.调整时间

package/dist/misc.d.ts

@@ -9,3 +9,9 @@ export declare const generateUUID: (withDashes?: boolean) => string;
  * @returns 洗牌后的新数组
  */
 export declare const shuffleArray: <T>(array: T[]) => T[];
+/**
+ * 深度合并多个对象
+ * @param objects 多个对象
+ * @returns 合并后的对象副本
+ */
+export declare const deepMerge: (...objects: any[]) => any;

package/dist/misc.js

@@ -24,3 +24,18 @@ export const shuffleArray = (array) => {
     }
     return shuffled;
 };
+/**
+ * 深度合并多个对象
+ * @param objects 多个对象
+ * @returns 合并后的对象副本
+ */
+export const deepMerge = (...objects) => {
+    const isPlainObject = (input) => input?.constructor === Object;
+    return objects.reduce((result, obj) => {
+        return Object.entries(obj).reduce((acc, [key, value]) => {
+            const recursive = isPlainObject(acc[key]) && isPlainObject(value);
+            acc[key] = recursive ? deepMerge(acc[key], value) : value;
+            return acc;
+        }, result);
+    }, {});
+};

package/dist/store.d.ts

@@ -5,3 +5,9 @@
  * @param name 存储对象的名称，将作为文件名（不包扩展名）
  */
 export declare const useStore: <T extends Record<string, any>>(name: string) => T;
+/**
+ * 创建一个带有默认值的持久化存储对象，用于管理应用状态数据
+ * @param name 存储对象的名称，将作为文件名（不包扩展名）
+ * @param defaults 默认值数据对象
+ */
+export declare const useStoreWithDefaults: <T extends Record<string, any>>(name: string, defaults: Partial<T>) => T;

package/dist/store.js

@@ -1,3 +1,4 @@
+import { deepMerge } from "./misc";
 /**
  * 创建一个持久化存储对象，用于管理应用状态数据
  * 该函数会创建一个代理对象，对该对象的所有属性的修改都会自动同步到相应的JSON文件（脚本的 `store` 目录下）中。
@@ -50,3 +51,13 @@ export const useStore = (name) => {
     };
     return createProxy(obj);
 };
+/**
+ * 创建一个带有默认值的持久化存储对象，用于管理应用状态数据
+ * @param name 存储对象的名称，将作为文件名（不包扩展名）
+ * @param defaults 默认值数据对象
+ */
+export const useStoreWithDefaults = (name, defaults) => {
+    const store = useStore(name);
+    Object.assign(store, deepMerge(defaults, store));
+    return store;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bettergi/utils",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "开发 BetterGI 脚本常用工具集",
   "type": "module",
   "author": "Bread Grocery<https://github.com/breadgrocery>",
@@ -30,10 +30,11 @@
   ],
   "scripts": {
     "dev": "tsc --watch",
-    "build": "tsc"
+    "build": "rimraf dist && tsc"
   },
   "devDependencies": {
     "@bettergi/types": "^0.1.3",
+    "rimraf": "^6.0.1",
     "typescript": "^5.9.3"
   }
 }