@bettergi/types 0.1.15 → 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/RealtimeTimer.d.ts

@@ -1,4 +1,4 @@
-import type { RealtimeTimerHostType } from "../types/BetterGenshinImpact/Core/Script/Dependence/Model/RealTimeTimer";
+import type { RealtimeTimerHostType } from "../types/BetterGenshinImpact/Core/Script/Dependence/Model/RealtimeTimer";
 
 declare global {
   /**

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/bindings/getAvatars.d.ts

@@ -1,8 +1,9 @@
+import type { AvatarName } from "../types/BetterGenshinImpact/GameTask/AutoFight/Model/Avatar";
 import type { HostArray, HostDelegate } from "../types/Microsoft/ClearScript/HostType";
 
 interface getAvatarsHostDelegate extends HostDelegate {
-  (): HostArray<string>;
-  invoke(): HostArray<string>;
+  (): HostArray<AvatarName>;
+  invoke(): HostArray<AvatarName>;
 }
 
 declare global {

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.15",
+  "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/BvLocator.d.ts

@@ -6,14 +6,20 @@ import type {
   StrongNumeric
 } from "../../../Microsoft/ClearScript/HostType";
 import "../../../OpenCvSharp/Rect";
-import "../../../System/Action";
 import "../../../System/Collections/Generic/List";
-import "../../../System/Func";
 import "../../../System/Nullable";
 import "../../../System/Threading/CancellationToken";
 import "../../GameTask/Model/Area/Region";
 import "../Recognition/RecognitionObject";
 
+/**
+ * 重试前回调：收到当前匹配区域列表；可为同步或返回 Promise 的异步脚本函数
+ * @since 0.61.0
+ */
+export type BvLocatorRetryAction = (
+  regions: System.Collections.Generic.List<BetterGenshinImpact.GameTask.Model.Area.Region>
+) => void | Promise<void>;
+
 /**
  * BgiVision 定位器，按识别配置查找并操作匹配区域
  * @since 0.57.0
@@ -27,13 +33,10 @@ export interface BvLocator extends ClrHostValue {
    */
   readonly recognitionObject: BetterGenshinImpact.Core.Recognition.RecognitionObject;
   /**
-   * 每次重试前执行的回调
+   * 每次重试前执行的回调；脚本侧可直接赋函数，`null` 清除
    * @since 0.57.0
    */
-  retryAction: System.Func<
-    System.Collections.Generic.List<BetterGenshinImpact.GameTask.Model.Area.Region>,
-    Promise<void>
-  >;
+  retryAction: BvLocatorRetryAction | null;
   /**
    * 按当前识别配置查找全部匹配区域；不建议脚本直接调用
    * @returns 匹配到的区域列表
@@ -118,12 +121,12 @@ export interface BvLocator extends ClrHostValue {
   tryWaitForDisappear(timeout: number | StrongNumeric<Int32Host> | null | null): Promise<void>;
   /**
    * 设置感兴趣区域（ROI），覆盖识别配置中的 RegionOfInterest
-   * @param deltaFunc 由当前最大 1080P 捕获矩形计算 ROI 的回调
+   * @param deltaFunc 由当前最大 1080P 捕获矩形计算 ROI 的脚本回调
    * @returns 当前定位器，便于链式调用
    * @since 0.57.0
    */
   withRoi(
-    deltaFunc: System.Func<OpenCvSharp.Rect, OpenCvSharp.Rect>
+    deltaFunc: (captureRect: OpenCvSharp.Rect) => OpenCvSharp.Rect
   ): BetterGenshinImpact.Core.BgiVision.BvLocator;
   /**
    * 设置感兴趣区域（ROI），覆盖识别配置中的 RegionOfInterest
@@ -151,28 +154,20 @@ export interface BvLocator extends ClrHostValue {
     retryInterval: number | StrongNumeric<Int32Host>
   ): BetterGenshinImpact.Core.BgiVision.BvLocator;
   /**
-   * 设置每次重试前执行的回调；支持同步与异步脚本函数
-   * @param action 收到当前匹配区域列表时调用的回调；传入 null 清除回调
+   * 设置每次重试前执行的回调；支持同步与异步脚本函数（对应上游 `Action` 与 `dynamic` 重载）
+   * @param action 收到当前匹配区域列表时调用的脚本回调；传入 null 清除回调
    * @returns 当前定位器，便于链式调用
    * @since 0.61.0
    */
   withRetryAction(
-    action: System.Action<
-      System.Collections.Generic.List<BetterGenshinImpact.GameTask.Model.Area.Region>
-    > | null
+    action: BvLocatorRetryAction | null
   ): BetterGenshinImpact.Core.BgiVision.BvLocator;
-  /**
-   * 设置每次重试前执行的回调；供脚本传入无法隐式转为 Action 的函数
-   * @param action 脚本回调；可为同步函数或返回 Promise 的异步函数
-   * @returns 当前定位器，便于链式调用
-   * @since 0.61.0
-   */
-  withRetryAction(action: unknown): BetterGenshinImpact.Core.BgiVision.BvLocator;
 }
 
 declare global {
   namespace BetterGenshinImpact.Core.BgiVision {
     type BvLocator = import("./BvLocator").BvLocator;
+    type BvLocatorRetryAction = import("./BvLocator").BvLocatorRetryAction;
   }
 }