@bettergi/types 0.1.8 → 0.1.10

package/index.d.ts

@@ -19,14 +19,12 @@
 // 消息通知
 /// <reference path="./objects/notification.d.ts" />
 
-// 键鼠回调
-/// <reference path="./objects/keyMouseHook.d.ts" />
-
 // 任务调用
 /// <reference path="./objects/dispatcher.d.ts" />
 
 // 实时任务
 /// <reference path="./types/BetterGenshinImpact/Core/Script/Dependence/Model/RealtimeTimer.d.ts" />
+/// <reference path="./types/BetterGenshinImpact/GameTask/AutoSkip/AutoSkipConfig.d.ts" />
 
 // 独立任务
 /// <reference path="./types/BetterGenshinImpact/Core/Script/Dependence/Model/SoloTask.d.ts" />
@@ -59,5 +57,8 @@
 /// <reference path="./types/BetterGenshinImpact/GameTask/AutoDomain/AutoDomainParam.d.ts" />
 /// <reference path="./types/BetterGenshinImpact/GameTask/AutoFight/AutoFightParam.d.ts" />
 
+// 键鼠回调
+/// <reference path="./types/BetterGenshinImpact/Core/Script/Dependence/KeyMouseHook.d.ts" />
+
 /// 设置
 /// <reference path="./objects/settings.d.ts" />

package/objects/file.d.ts

@@ -1,4 +1,4 @@
-import { Mat } from "mirada/dist/src/types/opencv";
+import type { Mat } from "mirada/dist/src/types/opencv";
 
 declare global {
   /** @since 0.32.3 */

package/objects/genshin.d.ts

@@ -1,5 +1,5 @@
-import { Point2f } from "mirada/dist/src/types/opencv";
-import { Area, BigMap, Country } from "../enums/country";
+import type { Point2f } from "mirada/dist/src/types/opencv";
+import type { Area, BigMap, Country } from "../enums/country";
 
 declare global {
   /** @since 0.32.0 */

package/objects/globalMethod.d.ts

@@ -1,5 +1,5 @@
 import "../types/BetterGenshinImpact/GameTask/Model/Area/ImageRegion";
-import { KeyCode } from "../types/BetterGenshinImpact/Helpers/User32Helper";
+import type { KeyCode } from "../types/BetterGenshinImpact/Helpers/User32Helper";
 
 declare global {
   /**

package/objects/keyMouseHook.d.ts

@@ -1,4 +1,4 @@
-import { type KeyCodeString, type KeyDataString } from "../types/System/Windows/Forms/Keys";
+import type { KeyCodeString, KeyDataString } from "../types/System/Windows/Forms/Keys";
 
 type MouseButton = "Left" | "Right" | "Middle" | "XButton1" | "XButton2";
 
@@ -44,7 +44,7 @@ declare global {
      * @param callback 回调函数
      * @param interval 回调节流间隔（单位：毫秒，默认值：200）
      */
-    function onMouseMove(callback: (x: number, y: number) => void, interval: number = 200): void;
+    function onMouseMove(callback: (x: number, y: number) => void, interval?: number): void;
 
     /**
      * 注册鼠标滚轮事件回调

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bettergi/types",
-  "version": "0.1.8",
+  "version": "0.1.10",
   "description": "BetterGI TypeScript 类型定义",
   "type": "module",
   "author": "Bread Grocery<https://github.com/breadgrocery>",

package/types/BetterGenshinImpact/Core/Recognition/RecognitionObject.d.ts

@@ -1,4 +1,4 @@
-import {
+import type {
   ColorConversionCodes,
   Mat,
   Rect,

package/types/BetterGenshinImpact/Core/Script/Dependence/KeyMouseHook.d.ts

@@ -0,0 +1,76 @@
+import type { KeyCodeString, KeyDataString } from "../../../../System/Windows/Forms/Keys";
+
+type MouseButton = "Left" | "Right" | "Middle" | "XButton1" | "XButton2";
+
+declare global {
+  namespace BetterGenshinImpact.Core.Script.Dependence {
+    class KeyMouseHook {
+      /**
+       * 注册键盘按下事件回调
+       * @param callback 回调函数
+       * @param useCodeOnly 是否仅返回 KeyCode，否则返回 KeyData（默认为 true）
+       * @since 0.55.0
+       */
+      onKeyDown(callback: (keyCode: KeyCodeString) => void, useCodeOnly?: true): void;
+      // overload
+      onKeyDown(callback: (keyData: KeyDataString) => void, useCodeOnly: false): void;
+
+      /**
+       * 注册键盘释放事件回调
+       * @param callback 回调函数
+       * @param useCodeOnly 是否仅返回 KeyCode，否则返回 KeyData（默认为 true）
+       * @since 0.55.0
+       */
+      onKeyUp(callback: (keyCode: KeyCodeString) => void, useCodeOnly?: true): void;
+      // overload
+      onKeyUp(callback: (keyData: KeyDataString) => void, useCodeOnly: false): void;
+
+      /**
+       * 注册鼠标移动事件回调
+       * @param callback 回调函数
+       * @since 0.55.0
+       */
+      onMouseDown(callback: (button: MouseButton) => void): void;
+
+      /**
+       * 注册鼠标释放事件回调
+       * @param callback 回调函数
+       * @since 0.55.0
+       */
+      onMouseUp(callback: (keyCode: MouseButton) => void): void;
+
+      /**
+       * 注册鼠标移动事件回调
+       * @param callback 回调函数
+       * @param interval 回调节流间隔（单位：毫秒，默认值：200）
+       */
+      onMouseMove(callback: (x: number, y: number) => void): void;
+      // overload
+      onMouseMove(callback: (x: number, y: number) => void, interval: number): void;
+
+      /**
+       * 注册鼠标滚轮事件回调
+       * @param callback 回调函数
+       * @since 0.55.0
+       */
+      onMouseWheel(callback: (delta: number, x: number, y: number) => void): void;
+
+      /**
+       * 清空回调列表
+       * @since 0.55.0
+       */
+      removeAllListeners(): void;
+
+      /**
+       * 取消所有注册键鼠事件回调
+       * @since 0.55.0
+       */
+      dispose(): void;
+
+      constructor();
+    }
+  }
+  export import KeyMouseHook = BetterGenshinImpact.Core.Script.Dependence.KeyMouseHook;
+}
+
+export {};

package/types/BetterGenshinImpact/GameTask/AutoFight/Model/Avatar.d.ts

@@ -1,4 +1,4 @@
-import { Rect } from "mirada/dist/src/types/opencv";
+import type { Rect } from "mirada/dist/src/types/opencv";
 import "../../../../System/DateTime";
 import "../../../../System/Exception";
 import "../../../../System/Threading/CancellationToken";

package/types/BetterGenshinImpact/GameTask/AutoSkip/AutoSkipConfig.d.ts

@@ -0,0 +1,106 @@
+declare global {
+  namespace BetterGenshinImpact.GameTask.AutoSkip {
+    class AutoSkipConfig {
+      /** 触发器是否启用 启用后： 1. 快速跳过对话 2. 自动点击一个识别到的选项 3. 黑屏过长自动点击跳过 */
+      enabled: boolean;
+
+      /**
+       * 快速跳过对话
+       * @default true
+       */
+      quicklySkipConversationsEnabled: boolean;
+
+      /**
+       * 选择选项前的延迟（毫秒）
+       * @default 0
+       */
+      afterChooseOptionSleepDelay: number;
+
+      /**
+       * 点击对话框前的延迟（毫秒）
+       * @default 0
+       */
+      beforeClickConfirmDelay: number;
+
+      /**
+       * 自动领取每日委托奖励
+       * @default true
+       */
+      autoGetDailyRewardsEnabled: boolean;
+
+      /**
+       * 自动重新派遣
+       * @default true
+       */
+      autoReExploreEnabled: boolean;
+
+      /** 自动重新派遣使用角色配置，逗号分割 */
+      autoReExploreCharacter: string;
+
+      /**
+       * - 优先选择第一个选项
+       * - 优先选择最后一个选项
+       * - 自定义优先选项
+       * - 不选择选项
+       */
+      clickChatOption: string;
+
+      /** 自定义优先选项文本，每行一个或用分号分隔 */
+      customPriorityOptions: string;
+
+      /**
+       * 启用自动邀约
+       * @default false
+       */
+      autoHangoutEventEnabled: boolean;
+
+      /** 自动邀约分支选择 */
+      autoHangoutEndChoose: string;
+
+      /**
+       * 自动邀约选择选项前的延迟（毫秒）
+       * @default 0
+       */
+      autoHangoutChooseOptionSleepDelay: number;
+
+      /**
+       * 自动邀约自动点击跳过按钮
+       * @default true
+       */
+      autoHangoutPressSkipEnabled: boolean;
+
+      /**
+       * 后台运行
+       * @default false
+       */
+      runBackgroundEnabled: boolean;
+
+      /**
+       * 提交物品
+       * @default true
+       */
+      submitGoodsEnabled: boolean;
+
+      /**
+       * 游戏失焦时显示画中画
+       * @default false
+       */
+      pictureInPictureEnabled: boolean;
+
+      /**
+       * 画中画的源图像类型 TriggerDispatcher：来自于截图器50ms一次 CaptureLoop：主动获取（60帧）
+       * @default 'CaptureLoop'
+       */
+      pictureInPictureSourceType: string;
+
+      /**
+       * 关闭弹出层
+       * @default true
+       */
+      closePopupPagedEnabled: boolean;
+    }
+  }
+  export import AutoSkipConfig = BetterGenshinImpact.GameTask.AutoSkip.AutoSkipConfig;
+}
+
+export {};

package/types/BetterGenshinImpact/GameTask/Model/Area/DesktopRegion.d.ts

@@ -1,17 +1,45 @@
-import { Mat } from "mirada/dist/src/types/opencv";
+import type { Mat, Rect } from "mirada/dist/src/types/opencv";
 import "../../../../Fischless/WindowsInput/IMouseSimulator";
+import "../Area/Region";
 
 declare global {
   namespace BetterGenshinImpact.GameTask.Model.Area {
     class DesktopRegion extends BetterGenshinImpact.GameTask.Model.Area.Region {
       desktopRegionClick(x: number, y: number, w: number, h: number): void;
 
-      desktopRegionMove(captureMat: Mat, x: number, y: number): void;
-
-      derive(x: number, y: number, w: number, h: number): void;
+      desktopRegionMove(x: number, y: number, w: number, h: number): void;
+
+      /**
+       * 派生一个点类型的区域
+       * @param x 水平位置（像素）
+       * @param y 垂直位置（像素）
+       */
+      derive(x: number, y: number): BetterGenshinImpact.GameTask.Model.Area.Region;
+
+      /**
+       * 派生一个点类型的区域
+       * @param x 水平位置（像素）
+       * @param y 垂直位置（像素）
+       * @param w 宽度
+       * @param h 高度
+       */
+      derive(
+        x: number,
+        y: number,
+        w: number,
+        h: number
+      ): BetterGenshinImpact.GameTask.Model.Area.Region;
+
+      /**
+       * 派生一个矩形类型的区域
+       * @param rect 矩形
+       */
+      derive(rect: Rect): BetterGenshinImpact.GameTask.Model.Area.Region;
+
+      derive(captureMat: Mat, x: number, y: number): void;
 
       constructor(w: number, h: number);
-
+      // overload
       constructor(w: number, h: number, iMouse: Fischless.WindowsInput.IMouseSimulator | null);
 
       constructor();

package/types/BetterGenshinImpact/GameTask/Model/Area/GameCaptureRegion.d.ts

@@ -1,4 +1,4 @@
-import { Mat, Size } from "mirada/dist/src/types/opencv";
+import type { Mat, Size } from "mirada/dist/src/types/opencv";
 import "../../../../Fischless/WindowsInput/IMouseSimulator";
 import "../../../../System/Drawing/Pen";
 import "../../../View/Drawable/DrawContent";

package/types/BetterGenshinImpact/GameTask/Model/Area/ImageRegion.d.ts

@@ -1,4 +1,4 @@
-import { Mat, Rect } from "mirada/dist/src/types/opencv";
+import type { Mat, Rect } from "mirada/dist/src/types/opencv";
 import "../../../../BetterGenshinImpact/Core/Recognition/RecognitionObject";
 import "../../../../BetterGenshinImpact/GameTask/Model/Area/Converter/INodeConverter";
 import "../../../../BetterGenshinImpact/GameTask/Model/Area/Region";

package/types/BetterGenshinImpact/GameTask/Model/Area/Region.d.ts

@@ -1,4 +1,4 @@
-import { Rect } from "mirada/dist/src/types/opencv";
+import type { Rect } from "mirada/dist/src/types/opencv";
 import "../../../../System/Drawing/Pen";
 import "../../../../System/IDisposable";
 import "../../../../System/Tuple";

package/types/BetterGenshinImpact/View/Drawable/RectDrawable.d.ts

@@ -1,4 +1,4 @@
-import { Rect } from "mirada/dist/src/types/opencv";
+import type { Rect } from "mirada/dist/src/types/opencv";
 import "../../../System/Drawing/Pen";
 
 declare global {