@bettergi/types 0.1.16 → 0.1.18

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

@@ -5,7 +5,13 @@ import type {
   ReferenceTypeTrait,
   StrongNumeric
 } from "../../../Microsoft/ClearScript/HostType";
+import type { HostVariableOut } from "../../../Microsoft/ClearScript/HostVariable";
+import type { VoidResult } from "../../../Microsoft/ClearScript/VoidResult";
+import "../../../System/Collections/Generic/Dictionary";
+import "../../../System/Collections/Generic/List";
+import "../../../System/DateTime";
 import "../../../System/Threading/CancellationToken";
+import "../../../System/ValueTuple";
 import "../AutoPathing/Model/WaypointForTrack";
 import "../ISoloTask";
 import "./AutoFightParam";
@@ -51,6 +57,132 @@ export interface AutoFightTask extends ClrHostValue, BetterGenshinImpact.GameTas
   ): Promise<boolean>;
 }
 
+/**
+ * 战斗结束检测的运行时配置，由自动战斗参数解析而来，供 TXT 与 JSON 策略共用
+ * @since 0.64.0
+ */
+declare const autoFightTask_TaskFightFinishDetectConfigBrand: unique symbol;
+export interface AutoFightTask_TaskFightFinishDetectConfig extends ClrHostValue {
+  readonly [autoFightTask_TaskFightFinishDetectConfigBrand]: true;
+  /**
+   * 检查战斗结束前的默认延时，单位毫秒，默认 1500
+   * @since 0.64.0
+   */
+  delayTime: number;
+  /**
+   * 按下切换队伍后检测色块的延时，单位毫秒，默认 450
+   * @since 0.64.0
+   */
+  detectDelayTime: number;
+  /**
+   * 按角色名覆盖的检查延时，单位毫秒
+   * @since 0.64.0
+   */
+  delayTimes: System.Collections.Generic.Dictionary<string, number>;
+  /**
+   * 快速检查间隔，单位秒，默认 5
+   * @since 0.64.0
+   */
+  checkTime: number;
+  /**
+   * 触发快速检查的角色名列表
+   * @since 0.64.0
+   */
+  checkNames: System.Collections.Generic.List<string>;
+  /**
+   * 是否启用快速检查战斗结束
+   * @since 0.64.0
+   */
+  fastCheckEnabled: boolean;
+  /**
+   * 是否在切人后再执行战斗结束检查；无需等待上一动作后摇，目前仅 JSON 策略下生效
+   * @since 0.64.0
+   */
+  checkAfterSwitchAvatar: boolean;
+  /**
+   * 是否启用旋转寻找敌人
+   * @since 0.64.0
+   */
+  rotateFindEnemyEnabled: boolean;
+  /**
+   * 是否在敌人可见时跳过战斗结束检查；检测到敌人血条时跳过，与旋转寻找敌人互斥
+   * @since 0.64.0
+   */
+  skipFightEndCheckWhenEnemyVisible: boolean;
+  /**
+   * 开战后阻断战斗结束检查的时长，单位秒；默认 0 不阻断，大于 0 时该时间内的检查视为战斗未结束
+   * @since 0.64.0
+   */
+  blockCheckBeforeBattleSeconds: number;
+  /**
+   * 是否启用派蒙辅助检测；按 L 后当派蒙头像可见时提前跳出战斗结束检测
+   * @since 0.64.0
+   */
+  paimonEndCheckEnabled: boolean;
+  /**
+   * 派蒙辅助检测延时，单位毫秒
+   * @since 0.64.0
+   */
+  paimonEndCheckDelayMs: number;
+  /**
+   * 判断战斗结束的进度条颜色，RGB 三元组
+   * @since 0.64.0
+   */
+  readonly battleEndProgressBarColor: System.ValueTuple<number, number, number>;
+  /**
+   * 战斗结束进度条颜色容差，RGB 三元组
+   * @since 0.64.0
+   */
+  readonly battleEndProgressBarColorTolerance: System.ValueTuple<number, number, number>;
+}
+
+export interface AutoFightTask_TaskFightFinishDetectConfigHostType extends HostType<
+  AutoFightTask_TaskFightFinishDetectConfig,
+  ReferenceTypeTrait
+> {
+  /**
+   * 由自动战斗参数中的战斗结束检测配置构造运行时配置
+   * @param finishDetectConfig 自动战斗参数中的战斗结束检测配置
+   * @since 0.64.0
+   */
+  new (
+    finishDetectConfig: BetterGenshinImpact.GameTask.AutoFight.AutoFightParam.FightFinishDetectConfig
+  ): AutoFightTask_TaskFightFinishDetectConfig;
+  /**
+   * 解析快速检查参数字符串
+   * @param input 快速检查参数；数字为间隔秒数，人名为对应角色动作后触发，分号分隔
+   * @param checkTime 解析得到的检查间隔秒数
+   * @param names 解析得到的角色名列表，方法会追加去重后的人名
+   * @returns ClearScript 宿主空结果
+   * @since 0.64.0
+   */
+  parseCheckTimeString(
+    input: string,
+    checkTime: HostVariableOut<number>,
+    names: System.Collections.Generic.List<string>
+  ): VoidResult;
+  /**
+   * 解析检查结束延时字符串
+   * @param input 延时配置；纯数字为默认秒数，`名字,秒数` 为角色覆盖，分号分隔
+   * @param delayTime 解析得到的默认延时，单位毫秒
+   * @param nameDelayMap 角色名到延时毫秒的映射，方法会写入覆盖值
+   * @returns ClearScript 宿主空结果
+   * @since 0.64.0
+   */
+  parseFastCheckEndDelayString(
+    input: string,
+    delayTime: HostVariableOut<number>,
+    nameDelayMap: System.Collections.Generic.Dictionary<string, number>
+  ): VoidResult;
+}
+
+declare global {
+  namespace BetterGenshinImpact.GameTask.AutoFight.AutoFightTask {
+    type TaskFightFinishDetectConfig =
+      import("./AutoFightTask").AutoFightTask_TaskFightFinishDetectConfig;
+  }
+}
+
 declare global {
   namespace BetterGenshinImpact.GameTask.AutoFight {
     type AutoFightTask = import("./AutoFightTask").AutoFightTask;
@@ -64,6 +196,12 @@ export interface AutoFightTaskHostType extends HostType<AutoFightTask, Reference
    * @since 0.52.0
    */
   new (taskParam: BetterGenshinImpact.GameTask.AutoFight.AutoFightParam): AutoFightTask;
+  /**
+   * 重置「敌人可见时跳过战斗结束检查」的连续跳过计数；每场战斗开始时调用，TXT 与 JSON 策略共用
+   * @returns ClearScript 宿主空结果
+   * @since 0.64.0
+   */
+  resetSkipCheckCounter(): VoidResult;
   /**
    * 全局战斗进行中标志
    * @since 0.52.0
@@ -74,6 +212,41 @@ export interface AutoFightTaskHostType extends HostType<AutoFightTask, Reference
    * @since 0.52.0
    */
   fightWaypoint: BetterGenshinImpact.GameTask.AutoPathing.Model.WaypointForTrack;
+  /**
+   * 最近一次战斗结束检查的时间；TXT 与 JSON 策略共用，供更快触发检查判断间隔
+   * @since 0.64.0
+   */
+  lastFightFinishCheckTime: System.DateTime;
+  /**
+   * 本次战斗的开战时间；TXT 与 JSON 策略共用，供开战后一段时间阻断战斗结束检查
+   * @since 0.64.0
+   */
+  fightStartTime: System.DateTime;
+  /**
+   * 检查战斗是否已结束；TXT 与 JSON 策略共用的统一实现
+   * @param finishDetectConfig 战斗结束检测运行时配置
+   * @param ct 取消令牌
+   * @param delayTime 检查前延时，单位毫秒，默认 1500
+   * @param detectDelayTime 切换队伍后检测色块的延时，单位毫秒，默认 450
+   * @returns 在检测完成后兑现是否结束的 Promise
+   * @since 0.64.0
+   */
+  checkFightFinish(
+    finishDetectConfig: BetterGenshinImpact.GameTask.AutoFight.AutoFightTask.TaskFightFinishDetectConfig,
+    ct: System.Threading.CancellationToken
+  ): Promise<boolean>;
+  checkFightFinish(
+    finishDetectConfig: BetterGenshinImpact.GameTask.AutoFight.AutoFightTask.TaskFightFinishDetectConfig,
+    ct: System.Threading.CancellationToken,
+    delayTime: number | StrongNumeric<Int32Host>
+  ): Promise<boolean>;
+  checkFightFinish(
+    finishDetectConfig: BetterGenshinImpact.GameTask.AutoFight.AutoFightTask.TaskFightFinishDetectConfig,
+    ct: System.Threading.CancellationToken,
+    delayTime: number | StrongNumeric<Int32Host>,
+    detectDelayTime: number | StrongNumeric<Int32Host>
+  ): Promise<boolean>;
+  readonly TaskFightFinishDetectConfig: AutoFightTask_TaskFightFinishDetectConfigHostType;
 }
 
 export {};

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";
@@ -125,8 +123,8 @@ export type AvatarName =
   | "丝柯克"
   | "塔利雅"
   | "伊涅芙"
-  | "奇偶(男)"
-  | "奇偶(女)"
+  | "奇偶·男性"
+  | "奇偶·女性"
   | "菈乌玛"
   | "菲林斯"
   | "爱诺"
@@ -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/AutoLeyLineOutcrop/AutoLeyLineOutcropFightConfig.d.ts

@@ -150,13 +150,18 @@ export interface AutoLeyLineOutcropFightConfig_FightFinishDetectConfig
       | "battleEndProgressBarColor"
       | "battleEndProgressBarColorTolerance"
       | "beforeDetectDelay"
+      | "blockCheckBeforeBattleSeconds"
+      | "checkAfterSwitchAvatar"
       | "checkBeforeBurst"
       | "checkEndDelay"
       | "fastCheckEnabled"
       | "fastCheckParams"
       | "isFirstCheck"
+      | "paimonEndCheckDelay"
+      | "paimonEndCheckEnabled"
       | "rotaryFactor"
       | "rotateFindEnemyEnabled"
+      | "skipFightEndCheckWhenEnemyVisible"
     >,
     System.ComponentModel.INotifyPropertyChangedInput,
     System.ComponentModel.INotifyPropertyChangingInput {
@@ -196,6 +201,11 @@ export interface AutoLeyLineOutcropFightConfig_FightFinishDetectConfig
    * @since 0.58.0
    */
   fastCheckParams: string;
+  /**
+   * 是否在切人后再执行战斗结束检查；无需等待上一动作后摇，目前仅 JSON 策略下生效
+   * @since 0.64.0
+   */
+  checkAfterSwitchAvatar: boolean;
   /**
    * 是否在首次检查时进行面敌
    * @since 0.58.0
@@ -211,6 +221,26 @@ export interface AutoLeyLineOutcropFightConfig_FightFinishDetectConfig
    * @since 0.58.0
    */
   rotateFindEnemyEnabled: boolean;
+  /**
+   * 是否在敌人可见时跳过战斗结束检查；检测到敌人血条时跳过，与旋转寻找敌人互斥
+   * @since 0.64.0
+   */
+  skipFightEndCheckWhenEnemyVisible: boolean;
+  /**
+   * 开战后阻断战斗结束检查的时长，单位秒；默认 0 不阻断，大于 0 时该时间内的检查视为战斗未结束
+   * @since 0.64.0
+   */
+  blockCheckBeforeBattleSeconds: number;
+  /**
+   * 是否启用派蒙辅助检测；按 L 后当派蒙头像可见时提前跳出战斗结束检测
+   * @since 0.64.0
+   */
+  paimonEndCheckEnabled: boolean;
+  /**
+   * 派蒙辅助检测延时，单位秒
+   * @since 0.64.0
+   */
+  paimonEndCheckDelay: number;
 }
 
 export interface AutoLeyLineOutcropFightConfig_FightFinishDetectConfigHostType extends HostType<

package/types/BetterGenshinImpact/GameTask/AutoPathing/PathingScriptNames.d.ts

@@ -56,6 +56,8 @@ export type HurryOnAvatar =
   | "流浪者"
   | "伊法"
   | "希诺宁"
+  | "法尔伽"
+  | "夜兰"
   | (string & {});
 
 /**

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;
 }