@bettergi/types 0.1.16 → 0.1.17

package/bindings/Color.d.ts

@@ -0,0 +1,12 @@
+import type { ColorHostType } from "../types/System/Drawing/Color";
+
+declare global {
+  /**
+   * System.Drawing 颜色 HostType
+   * @since 0.63.0
+   */
+  const Color: ColorHostType;
+  type Color = System.Drawing.Color;
+}
+
+export {};

package/bindings/Pen.d.ts

@@ -0,0 +1,12 @@
+import type { PenHostType } from "../types/System/Drawing/Pen";
+
+declare global {
+  /**
+   * System.Drawing 画笔 HostType
+   * @since 0.63.0
+   */
+  const Pen: PenHostType;
+  type Pen = System.Drawing.Pen;
+}
+
+export {};

package/bindings/characterDevelopmentTask.d.ts

@@ -0,0 +1,11 @@
+import "../types/BetterGenshinImpact/GameTask/CharacterDevelopment/CharacterDevelopmentTask";
+
+declare global {
+  /**
+   * 角色养成信息识别任务
+   * @since 0.63.0
+   */
+  const characterDevelopmentTask: BetterGenshinImpact.GameTask.CharacterDevelopment.CharacterDevelopmentTask;
+}
+
+export {};

package/index.d.ts

@@ -4,6 +4,7 @@
 import "./bindings/keyMouseScript"; // 录制回放
 import "./bindings/pathingScript"; // 地图追踪
 import "./bindings/genshin"; // 游戏相关
+import "./bindings/characterDevelopmentTask"; // 角色养成信息识别
 import "./bindings/log"; // 日志
 import "./bindings/file"; // 受限文件读写
 import "./bindings/http"; // 受限 HTTP 请求
@@ -63,6 +64,8 @@ import "./bindings/DesktopRegion"; // 桌面区域
 import "./bindings/GameCaptureRegion"; // 游戏截图区域
 import "./bindings/ImageRegion"; // 图像区域
 import "./bindings/Region"; // 通用屏幕区域
+import "./bindings/Pen"; // System.Drawing 画笔
+import "./bindings/Color"; // System.Drawing 颜色
 
 // 战斗场景与角色宿主类型
 import "./bindings/CombatScenes";

package/package.json

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

package/types/BetterGenshinImpact/Core/BgiVision/BvFlow.d.ts

@@ -0,0 +1,243 @@
+import type {
+  ClrHostValue,
+  DoubleHost,
+  HostType,
+  Int32Host,
+  ReferenceTypeTrait,
+  StrongNumeric
+} from "../../../Microsoft/ClearScript/HostType";
+import "../../../OpenCvSharp/Rect";
+import "../../../System/Collections/Generic/IEnumerable";
+import type { KeyCode } from "../../Helpers/User32Helper";
+import type { BvFlowAction } from "./BvFlowAction";
+import type { BvLocator } from "./BvLocator";
+import type { BvPage } from "./BvPage";
+
+type Int32Value = number | StrongNumeric<Int32Host>;
+type DoubleValue = number | StrongNumeric<DoubleHost>;
+
+/**
+ * 流程中的脚本回调，可同步完成或返回 Promise
+ * @since 0.63.0
+ */
+export type BvFlowCallback = () => void | Promise<void>;
+
+/**
+ * BgiVision 链式流程，按添加顺序执行等待、输入与脚本动作
+ * @since 0.63.0
+ */
+declare const bvFlowBrand: unique symbol;
+export interface BvFlow extends ClrHostValue {
+  readonly [bvFlowBrand]: true;
+  /**
+   * 设置后续等待步骤的默认超时时间；添加步骤后不可修改
+   * @param milliseconds 超时时间（毫秒），必须大于 0
+   * @returns 当前流程
+   * @since 0.63.0
+   */
+  withDefaultTimeout(milliseconds: Int32Value): BvFlow;
+  /**
+   * 设置后续等待步骤的默认重试间隔；添加步骤后不可修改
+   * @param milliseconds 重试间隔（毫秒），必须大于 0
+   * @returns 当前流程
+   * @since 0.63.0
+   */
+  withDefaultRetryInterval(milliseconds: Int32Value): BvFlow;
+  /**
+   * 添加脚本回调动作
+   * @param action 同步或异步脚本回调
+   * @returns 可附加重试条件的动作
+   * @since 0.63.0
+   */
+  do(action: BvFlowCallback): BvFlowAction;
+  /**
+   * 添加键盘单击动作
+   * @param key 虚拟键名称
+   * @returns 可附加重试条件的动作
+   * @since 0.63.0
+   */
+  keyPress(key: KeyCode): BvFlowAction;
+  /**
+   * 添加鼠标左键单击动作；省略坐标时使用上一步匹配区域中心
+   * @returns 可附加重试条件的动作
+   * @since 0.63.0
+   */
+  click(): BvFlowAction;
+  click(x: DoubleValue, y: DoubleValue): BvFlowAction;
+  /**
+   * 添加鼠标右键单击动作；省略坐标时使用上一步匹配区域中心
+   * @returns 可附加重试条件的动作
+   * @since 0.63.0
+   */
+  rightClick(): BvFlowAction;
+  rightClick(x: DoubleValue, y: DoubleValue): BvFlowAction;
+  /**
+   * 添加鼠标中键单击动作；省略坐标时使用上一步匹配区域中心
+   * @returns 可附加重试条件的动作
+   * @since 0.63.0
+   */
+  middleClick(): BvFlowAction;
+  middleClick(x: DoubleValue, y: DoubleValue): BvFlowAction;
+  /**
+   * 添加鼠标移动动作；省略坐标时使用上一步匹配区域中心
+   * @returns 可附加重试条件的动作
+   * @since 0.63.0
+   */
+  moveTo(): BvFlowAction;
+  moveTo(x: DoubleValue, y: DoubleValue): BvFlowAction;
+  /**
+   * 添加指定起止坐标的拖动动作
+   * @param duration 拖动时长（毫秒），省略时为 300
+   * @returns 可附加重试条件的动作
+   * @since 0.63.0
+   */
+  drag(fromX: DoubleValue, fromY: DoubleValue, toX: DoubleValue, toY: DoubleValue): BvFlowAction;
+  drag(
+    fromX: DoubleValue,
+    fromY: DoubleValue,
+    toX: DoubleValue,
+    toY: DoubleValue,
+    duration: Int32Value
+  ): BvFlowAction;
+  /**
+   * 从上一步匹配区域中心拖动到指定坐标
+   * @param duration 拖动时长（毫秒），省略时为 300
+   * @returns 可附加重试条件的动作
+   * @since 0.63.0
+   */
+  dragTo(toX: DoubleValue, toY: DoubleValue): BvFlowAction;
+  dragTo(toX: DoubleValue, toY: DoubleValue, duration: Int32Value): BvFlowAction;
+  /**
+   * 从指定坐标拖动到上一步匹配区域中心
+   * @param duration 拖动时长（毫秒），省略时为 300
+   * @returns 可附加重试条件的动作
+   * @since 0.63.0
+   */
+  dragFrom(fromX: DoubleValue, fromY: DoubleValue): BvFlowAction;
+  dragFrom(fromX: DoubleValue, fromY: DoubleValue, duration: Int32Value): BvFlowAction;
+  /**
+   * 等待指定文本出现
+   * @param rect 感兴趣区域；省略时搜索整幅画面
+   * @param timeout 超时时间（毫秒）；null 使用流程默认值
+   * @param retryInterval 重试间隔（毫秒）；null 使用流程默认值
+   * @returns 当前流程
+   * @since 0.63.0
+   */
+  waitUntilText(text: string): BvFlow;
+  waitUntilText(text: string, rect: OpenCvSharp.Rect): BvFlow;
+  waitUntilText(text: string, rect: OpenCvSharp.Rect, timeout: Int32Value | null): BvFlow;
+  waitUntilText(
+    text: string,
+    rect: OpenCvSharp.Rect,
+    timeout: Int32Value | null,
+    retryInterval: Int32Value | null
+  ): BvFlow;
+  /**
+   * 等待任一指定文本出现
+   * @param texts 字符串集合或 ClearScript JS Array
+   * @returns 当前流程
+   * @since 0.63.0
+   */
+  waitUntilAnyText(
+    texts: readonly string[] | System.Collections.Generic.IEnumerableInput<string>
+  ): BvFlow;
+  waitUntilAnyText(
+    texts: readonly string[] | System.Collections.Generic.IEnumerableInput<string>,
+    rect: OpenCvSharp.Rect
+  ): BvFlow;
+  waitUntilAnyText(
+    texts: readonly string[] | System.Collections.Generic.IEnumerableInput<string>,
+    rect: OpenCvSharp.Rect,
+    timeout: Int32Value | null
+  ): BvFlow;
+  waitUntilAnyText(
+    texts: readonly string[] | System.Collections.Generic.IEnumerableInput<string>,
+    rect: OpenCvSharp.Rect,
+    timeout: Int32Value | null,
+    retryInterval: Int32Value | null
+  ): BvFlow;
+  /**
+   * 等待定位器目标出现
+   * @returns 当前流程
+   * @since 0.63.0
+   */
+  waitUntil(target: BvLocator): BvFlow;
+  waitUntil(target: BvLocator, timeout: Int32Value | null): BvFlow;
+  waitUntil(
+    target: BvLocator,
+    timeout: Int32Value | null,
+    retryInterval: Int32Value | null
+  ): BvFlow;
+  /**
+   * 等待任一定位器目标出现
+   * @param targets 定位器集合或 ClearScript JS Array
+   * @returns 当前流程
+   * @since 0.63.0
+   */
+  waitUntilAny(
+    targets: readonly BvLocator[] | System.Collections.Generic.IEnumerableInput<BvLocator>
+  ): BvFlow;
+  waitUntilAny(
+    targets: readonly BvLocator[] | System.Collections.Generic.IEnumerableInput<BvLocator>,
+    timeout: Int32Value | null
+  ): BvFlow;
+  waitUntilAny(
+    targets: readonly BvLocator[] | System.Collections.Generic.IEnumerableInput<BvLocator>,
+    timeout: Int32Value | null,
+    retryInterval: Int32Value | null
+  ): BvFlow;
+  /**
+   * 等待定位器目标消失
+   * @returns 当前流程
+   * @since 0.63.0
+   */
+  waitUntilDisappear(target: BvLocator): BvFlow;
+  waitUntilDisappear(target: BvLocator, timeout: Int32Value | null): BvFlow;
+  waitUntilDisappear(
+    target: BvLocator,
+    timeout: Int32Value | null,
+    retryInterval: Int32Value | null
+  ): BvFlow;
+  /**
+   * 等待全部定位器目标消失
+   * @param targets 定位器集合或 ClearScript JS Array
+   * @returns 当前流程
+   * @since 0.63.0
+   */
+  waitUntilAllDisappear(
+    targets: readonly BvLocator[] | System.Collections.Generic.IEnumerableInput<BvLocator>
+  ): BvFlow;
+  waitUntilAllDisappear(
+    targets: readonly BvLocator[] | System.Collections.Generic.IEnumerableInput<BvLocator>,
+    timeout: Int32Value | null
+  ): BvFlow;
+  waitUntilAllDisappear(
+    targets: readonly BvLocator[] | System.Collections.Generic.IEnumerableInput<BvLocator>,
+    timeout: Int32Value | null,
+    retryInterval: Int32Value | null
+  ): BvFlow;
+  /**
+   * 添加固定等待步骤
+   * @param milliseconds 等待时长（毫秒），不得小于 0
+   * @returns 当前流程
+   * @since 0.63.0
+   */
+  wait(milliseconds: Int32Value): BvFlow;
+  /**
+   * 执行流程；同一流程不可并发执行，开始后不可再添加步骤
+   * @returns 在任务完成后兑现所属页面的 Promise
+   * @since 0.63.0
+   */
+  run(): Promise<BvPage>;
+}
+
+declare global {
+  namespace BetterGenshinImpact.Core.BgiVision {
+    type BvFlow = import("./BvFlow").BvFlow;
+    type BvFlowCallback = import("./BvFlow").BvFlowCallback;
+  }
+}
+
+export interface BvFlowHostType extends HostType<BvFlow, ReferenceTypeTrait> {}
+
+export {};

package/types/BetterGenshinImpact/Core/BgiVision/BvFlowAction.d.ts

@@ -0,0 +1,249 @@
+import type {
+  ClrHostValue,
+  DoubleHost,
+  HostType,
+  Int32Host,
+  ReferenceTypeTrait,
+  StrongNumeric
+} from "../../../Microsoft/ClearScript/HostType";
+import "../../../OpenCvSharp/Rect";
+import "../../../System/Collections/Generic/IEnumerable";
+import type { KeyCode } from "../../Helpers/User32Helper";
+import type { BvFlow, BvFlowCallback } from "./BvFlow";
+import type { BvLocator } from "./BvLocator";
+import type { BvPage } from "./BvPage";
+
+type Int32Value = number | StrongNumeric<Int32Host>;
+type DoubleValue = number | StrongNumeric<DoubleHost>;
+
+/**
+ * 尚未提交的 BgiVision 流程动作，可配置重试条件或衔接下一动作
+ * @since 0.63.0
+ */
+declare const bvFlowActionBrand: unique symbol;
+export interface BvFlowAction extends ClrHostValue {
+  readonly [bvFlowActionBrand]: true;
+  /**
+   * 设置条件动作的超时时间
+   * @param milliseconds 超时时间（毫秒），必须大于 0
+   * @returns 当前动作
+   * @since 0.63.0
+   */
+  withTimeout(milliseconds: Int32Value): BvFlowAction;
+  /**
+   * 设置条件动作的重试间隔
+   * @param milliseconds 重试间隔（毫秒），必须大于 0
+   * @returns 当前动作
+   * @since 0.63.0
+   */
+  withRetryInterval(milliseconds: Int32Value): BvFlowAction;
+  /**
+   * 将当前动作作为一次性步骤提交，并添加脚本回调动作
+   * @since 0.63.0
+   */
+  do(action: BvFlowCallback): BvFlowAction;
+  /**
+   * 将当前动作作为一次性步骤提交，并添加键盘单击动作
+   * @since 0.63.0
+   */
+  keyPress(key: KeyCode): BvFlowAction;
+  /**
+   * 将当前动作作为一次性步骤提交，并添加鼠标左键单击动作
+   * @since 0.63.0
+   */
+  click(): BvFlowAction;
+  click(x: DoubleValue, y: DoubleValue): BvFlowAction;
+  /**
+   * 将当前动作作为一次性步骤提交，并添加鼠标右键单击动作
+   * @since 0.63.0
+   */
+  rightClick(): BvFlowAction;
+  rightClick(x: DoubleValue, y: DoubleValue): BvFlowAction;
+  /**
+   * 将当前动作作为一次性步骤提交，并添加鼠标中键单击动作
+   * @since 0.63.0
+   */
+  middleClick(): BvFlowAction;
+  middleClick(x: DoubleValue, y: DoubleValue): BvFlowAction;
+  /**
+   * 将当前动作作为一次性步骤提交，并添加鼠标移动动作
+   * @since 0.63.0
+   */
+  moveTo(): BvFlowAction;
+  moveTo(x: DoubleValue, y: DoubleValue): BvFlowAction;
+  /**
+   * 将当前动作作为一次性步骤提交，并添加指定起止坐标的拖动动作
+   * @since 0.63.0
+   */
+  drag(fromX: DoubleValue, fromY: DoubleValue, toX: DoubleValue, toY: DoubleValue): BvFlowAction;
+  drag(
+    fromX: DoubleValue,
+    fromY: DoubleValue,
+    toX: DoubleValue,
+    toY: DoubleValue,
+    duration: Int32Value
+  ): BvFlowAction;
+  /**
+   * 将当前动作作为一次性步骤提交，并从上一步匹配区域中心拖动到指定坐标
+   * @since 0.63.0
+   */
+  dragTo(toX: DoubleValue, toY: DoubleValue): BvFlowAction;
+  dragTo(toX: DoubleValue, toY: DoubleValue, duration: Int32Value): BvFlowAction;
+  /**
+   * 将当前动作作为一次性步骤提交，并从指定坐标拖动到上一步匹配区域中心
+   * @since 0.63.0
+   */
+  dragFrom(fromX: DoubleValue, fromY: DoubleValue): BvFlowAction;
+  dragFrom(fromX: DoubleValue, fromY: DoubleValue, duration: Int32Value): BvFlowAction;
+  /**
+   * 将当前动作作为一次性步骤提交，再等待指定文本出现
+   * @since 0.63.0
+   */
+  waitUntilText(text: string): BvFlow;
+  waitUntilText(text: string, rect: OpenCvSharp.Rect): BvFlow;
+  waitUntilText(text: string, rect: OpenCvSharp.Rect, timeout: Int32Value | null): BvFlow;
+  waitUntilText(
+    text: string,
+    rect: OpenCvSharp.Rect,
+    timeout: Int32Value | null,
+    retryInterval: Int32Value | null
+  ): BvFlow;
+  /**
+   * 将当前动作作为一次性步骤提交，再等待任一指定文本出现
+   * @since 0.63.0
+   */
+  waitUntilAnyText(
+    texts: readonly string[] | System.Collections.Generic.IEnumerableInput<string>
+  ): BvFlow;
+  waitUntilAnyText(
+    texts: readonly string[] | System.Collections.Generic.IEnumerableInput<string>,
+    rect: OpenCvSharp.Rect
+  ): BvFlow;
+  waitUntilAnyText(
+    texts: readonly string[] | System.Collections.Generic.IEnumerableInput<string>,
+    rect: OpenCvSharp.Rect,
+    timeout: Int32Value | null
+  ): BvFlow;
+  waitUntilAnyText(
+    texts: readonly string[] | System.Collections.Generic.IEnumerableInput<string>,
+    rect: OpenCvSharp.Rect,
+    timeout: Int32Value | null,
+    retryInterval: Int32Value | null
+  ): BvFlow;
+  /**
+   * 将当前动作作为一次性步骤提交，再等待定位器目标出现
+   * @since 0.63.0
+   */
+  waitUntil(target: BvLocator): BvFlow;
+  waitUntil(target: BvLocator, timeout: Int32Value | null): BvFlow;
+  waitUntil(
+    target: BvLocator,
+    timeout: Int32Value | null,
+    retryInterval: Int32Value | null
+  ): BvFlow;
+  /**
+   * 将当前动作作为一次性步骤提交，再等待任一定位器目标出现
+   * @since 0.63.0
+   */
+  waitUntilAny(
+    targets: readonly BvLocator[] | System.Collections.Generic.IEnumerableInput<BvLocator>
+  ): BvFlow;
+  waitUntilAny(
+    targets: readonly BvLocator[] | System.Collections.Generic.IEnumerableInput<BvLocator>,
+    timeout: Int32Value | null
+  ): BvFlow;
+  waitUntilAny(
+    targets: readonly BvLocator[] | System.Collections.Generic.IEnumerableInput<BvLocator>,
+    timeout: Int32Value | null,
+    retryInterval: Int32Value | null
+  ): BvFlow;
+  /**
+   * 将当前动作作为一次性步骤提交，再等待定位器目标消失
+   * @since 0.63.0
+   */
+  waitUntilDisappear(target: BvLocator): BvFlow;
+  waitUntilDisappear(target: BvLocator, timeout: Int32Value | null): BvFlow;
+  waitUntilDisappear(
+    target: BvLocator,
+    timeout: Int32Value | null,
+    retryInterval: Int32Value | null
+  ): BvFlow;
+  /**
+   * 将当前动作作为一次性步骤提交，再等待全部定位器目标消失
+   * @since 0.63.0
+   */
+  waitUntilAllDisappear(
+    targets: readonly BvLocator[] | System.Collections.Generic.IEnumerableInput<BvLocator>
+  ): BvFlow;
+  waitUntilAllDisappear(
+    targets: readonly BvLocator[] | System.Collections.Generic.IEnumerableInput<BvLocator>,
+    timeout: Int32Value | null
+  ): BvFlow;
+  waitUntilAllDisappear(
+    targets: readonly BvLocator[] | System.Collections.Generic.IEnumerableInput<BvLocator>,
+    timeout: Int32Value | null,
+    retryInterval: Int32Value | null
+  ): BvFlow;
+  /**
+   * 将当前动作作为一次性步骤提交，再添加固定等待步骤
+   * @since 0.63.0
+   */
+  wait(milliseconds: Int32Value): BvFlow;
+  /**
+   * 重复当前动作直到指定文本出现
+   * @since 0.63.0
+   */
+  untilText(text: string): BvFlow;
+  untilText(text: string, rect: OpenCvSharp.Rect): BvFlow;
+  /**
+   * 重复当前动作直到任一指定文本出现
+   * @since 0.63.0
+   */
+  untilAnyText(
+    texts: readonly string[] | System.Collections.Generic.IEnumerableInput<string>
+  ): BvFlow;
+  untilAnyText(
+    texts: readonly string[] | System.Collections.Generic.IEnumerableInput<string>,
+    rect: OpenCvSharp.Rect
+  ): BvFlow;
+  /**
+   * 重复当前动作直到定位器目标出现
+   * @since 0.63.0
+   */
+  until(target: BvLocator): BvFlow;
+  /**
+   * 重复当前动作直到任一定位器目标出现
+   * @since 0.63.0
+   */
+  untilAny(
+    targets: readonly BvLocator[] | System.Collections.Generic.IEnumerableInput<BvLocator>
+  ): BvFlow;
+  /**
+   * 重复当前动作直到定位器目标消失
+   * @since 0.63.0
+   */
+  untilDisappear(target: BvLocator): BvFlow;
+  /**
+   * 重复当前动作直到全部定位器目标消失
+   * @since 0.63.0
+   */
+  untilAllDisappear(
+    targets: readonly BvLocator[] | System.Collections.Generic.IEnumerableInput<BvLocator>
+  ): BvFlow;
+  /**
+   * 将当前动作作为一次性步骤提交并执行流程
+   * @returns 在任务完成后兑现所属页面的 Promise
+   * @since 0.63.0
+   */
+  run(): Promise<BvPage>;
+}
+
+declare global {
+  namespace BetterGenshinImpact.Core.BgiVision {
+    type BvFlowAction = import("./BvFlowAction").BvFlowAction;
+  }
+}
+
+export interface BvFlowActionHostType extends HostType<BvFlowAction, ReferenceTypeTrait> {}
+
+export {};

package/types/BetterGenshinImpact/Core/BgiVision/BvPage.d.ts

@@ -10,11 +10,13 @@ import type {
 } from "../../../Microsoft/ClearScript/HostType";
 import type { VoidResult } from "../../../Microsoft/ClearScript/VoidResult";
 import "../../../OpenCvSharp/Rect";
+import "../../../System/Collections/Generic/IEnumerable";
 import "../../../System/Collections/Generic/List";
 import "../../../System/Threading/CancellationToken";
 import "../../GameTask/Model/Area/ImageRegion";
 import "../../GameTask/Model/Area/Region";
 import "../Recognition/RecognitionObject";
+import "./BvFlow";
 import "./BvImage";
 import "./BvLocator";
 
@@ -45,6 +47,12 @@ export interface BvPage extends ClrHostValue {
    * @since 0.57.0
    */
   defaultRetryInterval: number;
+  /**
+   * 创建使用当前超时与重试间隔的链式流程
+   * @returns 新的空流程
+   * @since 0.63.0
+   */
+  flow(): BetterGenshinImpact.Core.BgiVision.BvFlow;
   /**
    * 截取当前游戏画面为图像区域
    * @returns 当前游戏画面的图像区域
@@ -97,6 +105,20 @@ export interface BvPage extends ClrHostValue {
   getByText(): BetterGenshinImpact.Core.BgiVision.BvLocator;
   getByText(text: string): BetterGenshinImpact.Core.BgiVision.BvLocator;
   getByText(text: string, rect: OpenCvSharp.Rect): BetterGenshinImpact.Core.BgiVision.BvLocator;
+  /**
+   * 按任一指定文本创建定位器
+   * @param texts 字符串集合或 ClearScript JS Array
+   * @param rect 感兴趣区域；省略时搜索整幅画面
+   * @returns 对应目标的定位器
+   * @since 0.63.0
+   */
+  getByAnyText(
+    texts: readonly string[] | System.Collections.Generic.IEnumerableInput<string>
+  ): BetterGenshinImpact.Core.BgiVision.BvLocator;
+  getByAnyText(
+    texts: readonly string[] | System.Collections.Generic.IEnumerableInput<string>,
+    rect: OpenCvSharp.Rect
+  ): BetterGenshinImpact.Core.BgiVision.BvLocator;
   /**
    * 按图像创建定位器
    * @param image BgiVision 模板图像

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

@@ -46,17 +46,17 @@ export interface RecognitionObject extends ClrHostValue {
   name: string;
   /**
    * 模板图或识别区域所在捕获画布的尺寸，例如 1920×1080、3840×2160，对应模板截取来源图像大小
-   * @since unreleased
+   * @since 0.63.0
    */
   referenceImageSize: OpenCvSharp.Size | null;
   /**
    * 模板图或识别区域在截取来源图像中的位置与大小；模板匹配时宽高通常等于模板图尺寸，语义接近 bbox
-   * @since unreleased
+   * @since 0.63.0
    */
   referenceBoundingBox: OpenCvSharp.Rect | null;
   /**
    * 查找位置时的搜索选项；未指定时使用默认机制
-   * @since unreleased
+   * @since 0.63.0
    */
   searchOptions: BetterGenshinImpact.Core.Recognition.SearchOptions;
   /**

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

@@ -67,7 +67,7 @@ export interface AutoPathingScript extends ClrHostValue {
    * 读取 AutoPathing 目录下指定文件的文本内容
    * @param subPath 相对于 User\AutoPathing 的文件路径
    * @returns 文件文本内容，读取失败时返回空字符串
-   * @since unreleased
+   * @since 0.63.0
    */
   readTextSync(subPath: string): string;
 }

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

@@ -133,7 +133,7 @@ export interface Dispatcher extends ClrHostValue {
    * @param avatarName 指定操作的角色名，省略时操作当前角色
    * @param customCt 自定义取消令牌
    * @returns 在任务完成后兑现的 Promise
-   * @since unreleased
+   * @since 0.63.0
    */
   runCombatScript(script: string): Promise<void>;
   runCombatScript(script: string, avatarName: AvatarName | null): Promise<void>;

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

@@ -140,7 +140,7 @@ export interface Genshin extends ClrHostValue {
    * @param y 目标 Y 坐标
    * @param forceCountry 强制先切换的大地图区域（`SwitchArea` OCR 文案），默认为 null
    * @returns 在任务完成后兑现的 Promise
-   * @since unreleased
+   * @since 0.63.0
    */
   clickMapPoint(
     x: number | StrongNumeric<DoubleHost>,
@@ -288,7 +288,7 @@ export interface Genshin extends ClrHostValue {
    * @param slot3 3 号位角色名，空字符串表示跳过
    * @param slot4 4 号位角色名，空字符串表示跳过
    * @returns 在任务完成后兑现是否成功的 Promise；完成保存并返回主界面为 true，参数无效、目标角色未找到或流程失败为 false
-   * @since unreleased
+   * @since 0.63.0
    */
   switchCharacter(): Promise<boolean>;
   switchCharacter(slot1: "" | AvatarName): Promise<boolean>;
@@ -357,6 +357,13 @@ export interface Genshin extends ClrHostValue {
    * @since 0.43.1
    */
   goToCraftingBench(country: CountryName): Promise<void>;
+  /**
+   * 前往合成台并合成浓缩树脂
+   * @param country 国家名称
+   * @returns 在任务完成后兑现的 Promise
+   * @since 0.63.0
+   */
+  goCraftResin(country: CountryName): Promise<void>;
   /**
    * 在当前已打开的合成界面中合成指定材料
    * @param materialName 目标成品材料名

package/types/BetterGenshinImpact/GameTask/AutoBoss/AutoBossConfig.d.ts

@@ -82,6 +82,7 @@ export interface AutoBossConfig
       | "specifyRunCount"
       | "strategyName"
       | "teamName"
+      | "timeout"
       | "useFragileResin"
       | "useTransientResin"
     >,
@@ -108,6 +109,11 @@ export interface AutoBossConfig
    * @since 0.62.0
    */
   rewardRecognitionEnabled: boolean;
+  /**
+   * 战斗超时时长，单位秒，默认 240
+   * @since 0.63.0
+   */
+  timeout: number;
   /**
    * 指定模式下成功领取奖励的目标次数
    * @since 0.62.0

package/types/BetterGenshinImpact/GameTask/AutoBoss/AutoBossParam.d.ts

@@ -29,6 +29,7 @@ export interface AutoBossParam extends Omit<
   | "specifyRunCount"
   | "strategyName"
   | "teamName"
+  | "timeout"
   | "useFragileResin"
   | "useTransientResin"
 > {
@@ -88,6 +89,11 @@ export interface AutoBossParam extends Omit<
    * @since 0.62.0
    */
   rewardRecognitionEnabled: boolean;
+  /**
+   * 战斗超时时长，单位秒，默认 240
+   * @since 0.63.0
+   */
+  timeout: number;
   /**
    * 从当前全局自动首领讨伐配置填充默认参数
    * @returns ClearScript 宿主空结果

package/types/BetterGenshinImpact/GameTask/AutoFight/AutoFightConfig.d.ts

@@ -1,11 +1,18 @@
 import "../../../CommunityToolkit/Mvvm/ComponentModel/ObservableObject";
 import type {
+  ClrHostValue,
+  EnumTypeTrait,
   HostType,
   PublicDefaultConstructorTrait,
   ReferenceTypeTrait
 } from "../../../Microsoft/ClearScript/HostType";
 import "../../../System/ComponentModel/INotifyPropertyChanged";
 import "../../../System/ComponentModel/INotifyPropertyChanging";
+import "../../../System/Enum";
+import "../../../System/IComparable";
+import "../../../System/IConvertible";
+import "../../../System/IFormattable";
+import "../../../System/ISpanFormattable";
 
 /**
  * 精英掉落拾取模式
@@ -51,6 +58,9 @@ export interface AutoFightConfig
       | "actionSchedulerByCd"
       | "battleThresholdForLoot"
       | "burstEnabled"
+      | "damageNumberRecognitionMode"
+      | "drawRecognitionResults"
+      | "enableCombatTargeting"
       | "expBasedPickupEnabled"
       | "fightFinishDetectEnabled"
       | "finishDetectConfig"
@@ -59,6 +69,7 @@ export interface AutoFightConfig
       | "guardianCombatSkip"
       | "kazuhaPartyName"
       | "kazuhaPickupEnabled"
+      | "lockLostWaitTime"
       | "onlyPickEliteDropsMode"
       | "pickDropsAfterFightEnabled"
       | "pickDropsAfterFightSeconds"
@@ -67,6 +78,7 @@ export interface AutoFightConfig
       | "strategyName"
       | "swimmingEnabled"
       | "teamNames"
+      | "targetingDetectionInterval"
       | "timeout"
     >,
     System.ComponentModel.INotifyPropertyChangedInput,
@@ -172,6 +184,31 @@ export interface AutoFightConfig
    * @since 0.52.0
    */
   timeout: number;
+  /**
+   * 是否在战斗中持续尝试面朝敌人
+   * @since 0.63.0
+   */
+  enableCombatTargeting: boolean;
+  /**
+   * 敌人不可见后开始旋转索敌前的等待时长，单位秒，默认 0.5
+   * @since 0.63.0
+   */
+  lockLostWaitTime: number;
+  /**
+   * 索敌识别间隔，单位毫秒，默认 50
+   * @since 0.63.0
+   */
+  targetingDetectionInterval: number;
+  /**
+   * 伤害数字识别模式
+   * @since 0.63.0
+   */
+  damageNumberRecognitionMode: DamageNumberRecognitionMode;
+  /**
+   * 是否在遮罩窗口绘制血条、伤害数字等识别结果
+   * @since 0.63.0
+   */
+  drawRecognitionResults: boolean;
 }
 
 /**
@@ -193,6 +230,7 @@ export interface AutoFightConfig_FightFinishDetectConfig
       | "isFirstCheck"
       | "rotaryFactor"
       | "rotateFindEnemyEnabled"
+      | "skipFightEndCheckWhenEnemyVisible"
     >,
     System.ComponentModel.INotifyPropertyChangedInput,
     System.ComponentModel.INotifyPropertyChangingInput {
@@ -247,6 +285,11 @@ export interface AutoFightConfig_FightFinishDetectConfig
    * @since 0.52.0
    */
   rotateFindEnemyEnabled: boolean;
+  /**
+   * 是否在敌人可见时跳过战斗结束检查；与旋转寻找敌人互斥
+   * @since 0.63.0
+   */
+  skipFightEndCheckWhenEnemyVisible: boolean;
 }
 
 export interface AutoFightConfig_FightFinishDetectConfigHostType extends HostType<
@@ -271,6 +314,7 @@ declare global {
   namespace BetterGenshinImpact.GameTask.AutoFight {
     type AutoFightConfig = import("./AutoFightConfig").AutoFightConfig;
     type CombatStrategyName = import("./AutoFightConfig").CombatStrategyName;
+    type DamageNumberRecognitionMode = import("./AutoFightConfig").DamageNumberRecognitionMode;
     type OnlyPickEliteDropsMode = import("./AutoFightConfig").OnlyPickEliteDropsMode;
     type PartySlotIndex = import("./AutoFightConfig").PartySlotIndex;
     type StrategyFileKind = import("./AutoFightConfig").StrategyFileKind;
@@ -289,4 +333,34 @@ export interface AutoFightConfigHostType extends HostType<
   readonly FightFinishDetectConfig: AutoFightConfig_FightFinishDetectConfigHostType;
 }
 
+/**
+ * 战斗索敌使用的伤害数字识别模式
+ * @since 0.63.0
+ */
+declare const damageNumberRecognitionModeBrand: unique symbol;
+export interface DamageNumberRecognitionMode extends ClrHostValue {
+  readonly [damageNumberRecognitionModeBrand]: true;
+}
+
+export interface DamageNumberRecognitionModeHostType extends HostType<
+  DamageNumberRecognitionMode,
+  EnumTypeTrait
+> {
+  /**
+   * 禁用伤害数字识别
+   * @since 0.63.0
+   */
+  readonly disabled: DamageNumberRecognitionMode;
+  /**
+   * 使用 OCR 识别伤害数字
+   * @since 0.63.0
+   */
+  readonly ocr: DamageNumberRecognitionMode;
+  /**
+   * 使用颜色识别伤害数字
+   * @since 0.63.0
+   */
+  readonly color: DamageNumberRecognitionMode;
+}
+
 export {};

package/types/BetterGenshinImpact/GameTask/AutoFight/AutoFightParam.d.ts

@@ -10,6 +10,7 @@ import "../Model/BaseTaskParam";
 import "./AutoFightConfig";
 import type {
   CombatStrategyName,
+  DamageNumberRecognitionMode,
   OnlyPickEliteDropsMode,
   PartySlotIndex,
   StrategyFileKind
@@ -28,6 +29,9 @@ export interface AutoFightParam extends Omit<
   | "burstEnabled"
   | "checkBeforeBurst"
   | "combatStrategyPath"
+  | "damageNumberRecognitionMode"
+  | "drawRecognitionResults"
+  | "enableCombatTargeting"
   | "expBasedPickupEnabled"
   | "fightFinishDetectEnabled"
   | "finishDetectConfig"
@@ -37,6 +41,7 @@ export interface AutoFightParam extends Omit<
   | "isFirstCheck"
   | "kazuhaPartyName"
   | "kazuhaPickupEnabled"
+  | "lockLostWaitTime"
   | "onlyPickEliteDropsMode"
   | "pickDropsAfterFightEnabled"
   | "pickDropsAfterFightSeconds"
@@ -44,6 +49,7 @@ export interface AutoFightParam extends Omit<
   | "rotaryFactor"
   | "setCombatStrategyPath"
   | "setDefault"
+  | "targetingDetectionInterval"
   | "timeout"
 > {
   readonly [autoFightParamBrand]: true;
@@ -142,6 +148,31 @@ export interface AutoFightParam extends Omit<
    * @since 0.52.0
    */
   qinDoublePickUp: boolean;
+  /**
+   * 是否在战斗中持续尝试面朝敌人
+   * @since 0.63.0
+   */
+  enableCombatTargeting: boolean;
+  /**
+   * 索敌识别间隔，单位毫秒，默认 50
+   * @since 0.63.0
+   */
+  targetingDetectionInterval: number;
+  /**
+   * 是否在遮罩窗口绘制血条、伤害数字等识别结果
+   * @since 0.63.0
+   */
+  drawRecognitionResults: boolean;
+  /**
+   * 敌人不可见后开始旋转索敌前的等待时长，单位秒，默认 0.5
+   * @since 0.63.0
+   */
+  lockLostWaitTime: number;
+  /**
+   * 伤害数字识别模式
+   * @since 0.63.0
+   */
+  damageNumberRecognitionMode: DamageNumberRecognitionMode;
   /**
    * 是否仅在检测到精英怪经验值图标时执行战后拾取
    * @since 0.61.0
@@ -205,6 +236,11 @@ export interface AutoFightParam_FightFinishDetectConfig extends ClrHostValue {
    * @since 0.52.0
    */
   rotateFindEnemyEnabled: boolean;
+  /**
+   * 是否在敌人可见时跳过战斗结束检查
+   * @since 0.63.0
+   */
+  skipFightEndCheckWhenEnemyVisible: boolean;
 }
 
 export interface AutoFightParam_FightFinishDetectConfigHostType extends HostType<

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

@@ -8,11 +8,9 @@ import type {
 } from "../../../../Microsoft/ClearScript/HostType";
 import type { VoidResult } from "../../../../Microsoft/ClearScript/VoidResult";
 import "../../../../OpenCvSharp/Rect";
-import "../../../../System/Collections/Generic/List";
 import "../../../../System/DateTime";
 import "../../../../System/Nullable";
 import "../../../../System/Threading/CancellationToken";
-import "../../../../System/ValueTuple";
 import "../../../../System/WebSocket";
 import type { KeyCode } from "../../../Helpers/User32Helper";
 import "../../Model/Area/ImageRegion";
@@ -486,28 +484,6 @@ export interface AvatarHostType extends HostType<Avatar, ReferenceTypeTrait> {
    * @since 0.50.0
    */
   parseActionSchedulerByCd(avatarName: AvatarName, input: string): number | null;
-  /**
-   * 识别屏幕上的血条位置列表
-   * @param existingCapture 可选的已有截图区域，省略时重新截图
-   * @returns 血条边界框元组列表
-   * @since 0.50.0
-   */
-  findBloodBars(): System.Collections.Generic.List<
-    System.ValueTuple<number, number, number, number>
-  >;
-  findBloodBars(
-    existingCapture: BetterGenshinImpact.GameTask.Model.Area.ImageRegion | null
-  ): System.Collections.Generic.List<System.ValueTuple<number, number, number, number>>;
-  /**
-   * 通过 OCR 寻找伤害数字或反应文字作为追踪目标（备用寻敌）；在 450,240–1600,900 区域 OCR，过滤纯数字 ≥4 位或含反应关键词的文本，按 `h²×文本字数` 加权得到中心坐标
-   * @param existingCapture 可选的已有截图区域，省略时重新截图
-   * @returns 离加权中心最近的有效项坐标与文本，未找到时为 null
-   * @since 0.50.0
-   */
-  findDamageNumber(): System.ValueTuple<number, number, string> | null;
-  findDamageNumber(
-    existingCapture: BetterGenshinImpact.GameTask.Model.Area.ImageRegion | null
-  ): System.ValueTuple<number, number, string> | null;
 }
 
 export {};

package/types/BetterGenshinImpact/GameTask/CharacterDevelopment/CharacterDevelopmentTask.d.ts

@@ -0,0 +1,158 @@
+import type {
+  ClrHostValue,
+  HostType,
+  PublicDefaultConstructorTrait,
+  ReferenceTypeTrait
+} from "../../../Microsoft/ClearScript/HostType";
+import "../../../System/Collections/Generic/IEnumerable";
+import "../../../System/Collections/Generic/List";
+import type { AvatarName } from "../AutoFight/Model/Avatar";
+
+/**
+ * 角色元素类型
+ * 来源：上游 `Assets/Model/AvatarGridIcon/avatar.csv` 的 `element_type`
+ * @since 0.63.0
+ */
+export type CharacterElementType = "火" | "水" | "雷" | "冰" | "风" | "岩" | "草" | (string & {});
+
+/**
+ * 单个角色的养成信息识别结果；未请求或未识别的字段为 null
+ * @since 0.63.0
+ */
+declare const characterDevelopmentResultBrand: unique symbol;
+export interface CharacterDevelopmentResult extends ClrHostValue {
+  readonly [characterDevelopmentResultBrand]: true;
+  /**
+   * 调用方传入并规范化后的角色名称
+   * @since 0.63.0
+   */
+  characterName: AvatarName;
+  /**
+   * 角色元素类型；旅行者和奇偶由模型识别，其余角色来自头像原型表
+   * @since 0.63.0
+   */
+  elementType: CharacterElementType | null;
+  /**
+   * 角色当前等级
+   * @since 0.63.0
+   */
+  level: number | null;
+  /**
+   * 角色当前等级上限
+   * @since 0.63.0
+   */
+  levelLimit: number | null;
+  /**
+   * 经物品原型表编辑距离纠错后的标准武器名称
+   * @since 0.63.0
+   */
+  weaponName: string | null;
+  /**
+   * 武器当前等级
+   * @since 0.63.0
+   */
+  weaponLevel: number | null;
+  /**
+   * 武器当前等级上限
+   * @since 0.63.0
+   */
+  weaponLevelLimit: number | null;
+  /**
+   * 普通攻击的界面显示等级
+   * @since 0.63.0
+   */
+  attackLevel: number | null;
+  /**
+   * 普通攻击是否显示命座带来的固定等级加成
+   * @since 0.63.0
+   */
+  attackHasBonus: boolean | null;
+  /**
+   * 元素战技的界面显示等级
+   * @since 0.63.0
+   */
+  skillLevel: number | null;
+  /**
+   * 元素战技是否显示命座带来的固定等级加成
+   * @since 0.63.0
+   */
+  skillHasBonus: boolean | null;
+  /**
+   * 元素爆发的界面显示等级
+   * @since 0.63.0
+   */
+  burstLevel: number | null;
+  /**
+   * 元素爆发是否显示命座带来的固定等级加成
+   * @since 0.63.0
+   */
+  burstHasBonus: boolean | null;
+}
+
+/**
+ * 角色养成信息识别任务入口
+ * @since 0.63.0
+ */
+declare const characterDevelopmentTaskBrand: unique symbol;
+export interface CharacterDevelopmentTask extends ClrHostValue {
+  readonly [characterDevelopmentTaskBrand]: true;
+  /**
+   * 识别单个角色的养成信息
+   * @param characterName 目标角色名称或已有别名
+   * @param categories 以分号分隔的 `属性`、`武器`、`天赋` 分类，null 表示全部
+   * @returns 在任务完成后兑现识别结果的 Promise
+   * @since 0.63.0
+   */
+  getCharacter(characterName: AvatarName): Promise<CharacterDevelopmentResult>;
+  getCharacter(
+    characterName: AvatarName,
+    categories: string | null
+  ): Promise<CharacterDevelopmentResult>;
+  /**
+   * 识别多个角色的养成信息
+   * @param characterNames 字符串集合或 ClearScript JS Array；不得为空或传入单个字符串
+   * @param categories 以分号分隔的 `属性`、`武器`、`天赋` 分类，null 表示全部
+   * @returns 在任务完成后兑现识别结果列表的 Promise
+   * @since 0.63.0
+   */
+  getMultiCharacters(
+    characterNames: readonly AvatarName[] | System.Collections.Generic.IEnumerableInput<AvatarName>
+  ): Promise<System.Collections.Generic.List<CharacterDevelopmentResult>>;
+  getMultiCharacters(
+    characterNames: readonly AvatarName[] | System.Collections.Generic.IEnumerableInput<AvatarName>,
+    categories: string | null
+  ): Promise<System.Collections.Generic.List<CharacterDevelopmentResult>>;
+}
+
+declare global {
+  namespace BetterGenshinImpact.GameTask.CharacterDevelopment {
+    type CharacterElementType = import("./CharacterDevelopmentTask").CharacterElementType;
+    type CharacterDevelopmentResult =
+      import("./CharacterDevelopmentTask").CharacterDevelopmentResult;
+    type CharacterDevelopmentTask = import("./CharacterDevelopmentTask").CharacterDevelopmentTask;
+  }
+}
+
+export interface CharacterDevelopmentResultHostType extends HostType<
+  CharacterDevelopmentResult,
+  ReferenceTypeTrait & PublicDefaultConstructorTrait
+> {
+  /**
+   * 构造空识别结果
+   * @since 0.63.0
+   */
+  new (): CharacterDevelopmentResult;
+}
+
+export interface CharacterDevelopmentTaskHostType extends HostType<
+  CharacterDevelopmentTask,
+  ReferenceTypeTrait & PublicDefaultConstructorTrait
+> {
+  /**
+   * 构造角色养成信息识别任务
+   * @since 0.63.0
+   */
+  new (): CharacterDevelopmentTask;
+}
+
+export {};

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

@@ -70,6 +70,11 @@ export interface Region extends ClrHostValue, System.IDisposableInput {
    * @since 0.43.1
    */
   text: string;
+  /**
+   * 模板匹配得分，值越大表示匹配程度越高；非模板匹配结果为 null
+   * @since 0.63.0
+   */
+  matchScore: number | null;
   /**
    * 上一层区域节点
    * @since 0.43.1

package/types/BetterGenshinImpact/GameTask/Model/GameUI/GridScreenName.d.ts

@@ -87,7 +87,7 @@ export interface GridScreenNameHostType extends HostType<GridScreenName, EnumTyp
   readonly crafting: GridScreenName;
   /**
    * 队伍配置快速编队界面的左侧角色头像网格
-   * @since unreleased
+   * @since 0.63.0
    */
   readonly partySetupCharacters: GridScreenName;
 }