@bettergi/types 0.1.15 → 0.1.17

package/types/BetterGenshinImpact/GameTask/AutoDomain/AutoDomainTask.d.ts

@@ -19,6 +19,63 @@ import "./AutoDomainParam";
 export type ResinName =
   "浓缩树脂" | "原粹树脂" | "原粹树脂20" | "原粹树脂40" | "须臾树脂" | "脆弱树脂" | (string & {});
 
+/**
+ * 分解圣遗物最大星级（字符串）；上游 `int.TryParse` 后按 1–4 使用
+ * @since 0.52.0
+ */
+export type ArtifactStar = "1" | "2" | "3" | "4" | (string & {});
+
+/**
+ * 可自动刷取的秘境名称
+ * 来源：`MapLazyAssets` 从 `tp.json` 提取的 BlessDomain / ForgeryDomain / MasteryDomain 点位名
+ * @since 0.52.0
+ */
+export type DomainName =
+  | "铭记之谷"
+  | "忘却之峡"
+  | "仲夏庭园"
+  | "塞西莉亚苗圃"
+  | "无妄引咎密宫"
+  | "太山府"
+  | "震雷连山密宫"
+  | "孤云凌霄之处"
+  | "华池岩岫"
+  | "芬德尼尔之顶"
+  | "山脊守望"
+  | "菫色之庭"
+  | "椛染之庭"
+  | "砂流之庭"
+  | "沉眠之庭"
+  | "昏识塔"
+  | "缘觉塔"
+  | "有顶塔"
+  | "岩中幽谷"
+  | "赤金的城墟"
+  | "熔铁的孤塞"
+  | "深潮的余响"
+  | "苍白的遗荣"
+  | "罪祸的终末"
+  | "临瀑之城"
+  | "褪色的剧场"
+  | "蕴火的幽墟"
+  | "深古瞭望所"
+  | "虹灵的净土"
+  | "荒废砌造坞"
+  | "无光的深都"
+  | "霜凝的机枢"
+  | "失落的月庭"
+  | "月童的库藏"
+  | "山风的荆冕"
+  | "" // 未指定
+  | (string & {});
+
+/**
+ * 周日 / 限时全开秘境奖励选项序号
+ * UI 列表为 `""` / `1` / `2` / `3`；任务内 `switch` 仅处理 1–3
+ * @since 0.52.0
+ */
+export type SundaySelectedValue = "" | "1" | "2" | "3" | (string & {});
+
 /**
  * 自动秘境独立任务
  * @since 0.52.0
@@ -51,6 +108,10 @@ export interface AutoDomainTask
 declare global {
   namespace BetterGenshinImpact.GameTask.AutoDomain {
     type AutoDomainTask = import("./AutoDomainTask").AutoDomainTask;
+    type ArtifactStar = import("./AutoDomainTask").ArtifactStar;
+    type DomainName = import("./AutoDomainTask").DomainName;
+    type ResinName = import("./AutoDomainTask").ResinName;
+    type SundaySelectedValue = import("./AutoDomainTask").SundaySelectedValue;
   }
 }
 

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";
 
 /**
  * 精英掉落拾取模式
@@ -17,6 +24,28 @@ export type OnlyPickEliteDropsMode =
   | "DisableAutoPickupForNonElite" // 非精英关闭自动拾取
   | (string & {});
 
+/**
+ * 战斗策略名称；`根据队伍自动选择` 表示按当前队伍匹配策略目录，其余为 `User/AutoFight` 下策略文件名（不含扩展名）
+ * @since 0.52.0
+ */
+export type CombatStrategyName = "根据队伍自动选择" | (string & {});
+
+/**
+ * 战斗策略文件种类标识
+ * 与上游 `AutoFightParam.ResolveStrategyPath` 返回的第二项对齐：优先命中 `.json`，否则回退 `.txt`；自动选队目录亦标为 `txt`
+ * @since 0.52.0
+ */
+export type StrategyFileKind =
+  | "json" // JSON 战斗策略
+  | "txt" // 文本 / 简易策略（含「根据队伍自动选择」目录）
+  | (string & {});
+
+/**
+ * 队伍内角色槽位序号（字符串），从 1 开始；空字符串表示不指定
+ * @since 0.52.0
+ */
+export type PartySlotIndex = "1" | "2" | "3" | "4" | "" | (string & {});
+
 /**
  * 自动战斗配置
  * @since 0.52.0
@@ -29,6 +58,9 @@ export interface AutoFightConfig
       | "actionSchedulerByCd"
       | "battleThresholdForLoot"
       | "burstEnabled"
+      | "damageNumberRecognitionMode"
+      | "drawRecognitionResults"
+      | "enableCombatTargeting"
       | "expBasedPickupEnabled"
       | "fightFinishDetectEnabled"
       | "finishDetectConfig"
@@ -37,6 +69,7 @@ export interface AutoFightConfig
       | "guardianCombatSkip"
       | "kazuhaPartyName"
       | "kazuhaPickupEnabled"
+      | "lockLostWaitTime"
       | "onlyPickEliteDropsMode"
       | "pickDropsAfterFightEnabled"
       | "pickDropsAfterFightSeconds"
@@ -45,6 +78,7 @@ export interface AutoFightConfig
       | "strategyName"
       | "swimmingEnabled"
       | "teamNames"
+      | "targetingDetectionInterval"
       | "timeout"
     >,
     System.ComponentModel.INotifyPropertyChangedInput,
@@ -89,7 +123,7 @@ export interface AutoFightConfig
    * 盾奶位角色队伍序号，从 1 开始，空字符串表示不指定
    * @since 0.52.0
    */
-  guardianAvatar: string;
+  guardianAvatar: PartySlotIndex;
   /**
    * 是否跳过盾奶位自身的战斗策略脚本
    * @since 0.52.0
@@ -134,7 +168,7 @@ export interface AutoFightConfig
    * 战斗策略名称，`根据队伍自动选择` 表示按当前队伍匹配策略
    * @since 0.52.0
    */
-  strategyName: string;
+  strategyName: CombatStrategyName;
   /**
    * 是否启用游泳脱困检测
    * @since 0.52.0
@@ -150,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;
 }
 
 /**
@@ -171,6 +230,7 @@ export interface AutoFightConfig_FightFinishDetectConfig
       | "isFirstCheck"
       | "rotaryFactor"
       | "rotateFindEnemyEnabled"
+      | "skipFightEndCheckWhenEnemyVisible"
     >,
     System.ComponentModel.INotifyPropertyChangedInput,
     System.ComponentModel.INotifyPropertyChangingInput {
@@ -225,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<
@@ -248,6 +313,11 @@ declare global {
 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;
   }
 }
 
@@ -263,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

@@ -8,7 +8,13 @@ import type { VoidResult } from "../../../Microsoft/ClearScript/VoidResult";
 import "../../../System/ValueTuple";
 import "../Model/BaseTaskParam";
 import "./AutoFightConfig";
-import type { OnlyPickEliteDropsMode } from "./AutoFightConfig";
+import type {
+  CombatStrategyName,
+  DamageNumberRecognitionMode,
+  OnlyPickEliteDropsMode,
+  PartySlotIndex,
+  StrategyFileKind
+} from "./AutoFightConfig";
 import "./AutoFightTask";
 
 /**
@@ -23,6 +29,9 @@ export interface AutoFightParam extends Omit<
   | "burstEnabled"
   | "checkBeforeBurst"
   | "combatStrategyPath"
+  | "damageNumberRecognitionMode"
+  | "drawRecognitionResults"
+  | "enableCombatTargeting"
   | "expBasedPickupEnabled"
   | "fightFinishDetectEnabled"
   | "finishDetectConfig"
@@ -32,6 +41,7 @@ export interface AutoFightParam extends Omit<
   | "isFirstCheck"
   | "kazuhaPartyName"
   | "kazuhaPickupEnabled"
+  | "lockLostWaitTime"
   | "onlyPickEliteDropsMode"
   | "pickDropsAfterFightEnabled"
   | "pickDropsAfterFightSeconds"
@@ -39,6 +49,7 @@ export interface AutoFightParam extends Omit<
   | "rotaryFactor"
   | "setCombatStrategyPath"
   | "setDefault"
+  | "targetingDetectionInterval"
   | "timeout"
 > {
   readonly [autoFightParamBrand]: true;
@@ -101,7 +112,7 @@ export interface AutoFightParam extends Omit<
    * 盾奶位角色队伍序号，从 1 开始，空字符串表示不指定
    * @since 0.52.0
    */
-  guardianAvatar: string;
+  guardianAvatar: PartySlotIndex;
   /**
    * 是否跳过盾奶位自身的战斗策略脚本
    * @since 0.52.0
@@ -137,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
@@ -149,7 +185,7 @@ export interface AutoFightParam extends Omit<
    * @since 0.52.0
    */
   setCombatStrategyPath(): VoidResult;
-  setCombatStrategyPath(strategyName: string | null): VoidResult;
+  setCombatStrategyPath(strategyName: CombatStrategyName | null): VoidResult;
   /**
    * 从当前全局自动战斗配置填充默认参数
    * @returns ClearScript 宿主空结果
@@ -200,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<
@@ -243,7 +284,7 @@ export interface AutoFightParamHostType extends HostType<AutoFightParam, Referen
    * @since 0.52.0
    */
   new (): AutoFightParam;
-  new (strategyName: string | null): AutoFightParam;
+  new (strategyName: CombatStrategyName | null): AutoFightParam;
   /**
    * 是否启用游泳脱困检测
    * @since 0.52.0
@@ -252,10 +293,12 @@ export interface AutoFightParamHostType extends HostType<AutoFightParam, Referen
   /**
    * 解析策略文件路径，优先检测 `.json`，未命中则回退 `.txt`
    * @param strategyName 策略名称（不含扩展名）
-   * @returns 完整路径与类型标识组成的元组，类型为 `json` 或 `txt`
+   * @returns 完整路径与策略文件种类组成的元组
    * @since 0.52.0
    */
-  resolveStrategyPath(strategyName: string): System.ValueTuple<string, string>;
+  resolveStrategyPath(
+    strategyName: CombatStrategyName
+  ): System.ValueTuple<string, StrategyFileKind>;
   readonly FightFinishDetectConfig: AutoFightParam_FightFinishDetectConfigHostType;
 }
 

package/types/BetterGenshinImpact/GameTask/AutoFight/Config/CombatAvatar.d.ts

@@ -5,6 +5,152 @@ import type {
   ReferenceTypeTrait
 } from "../../../../Microsoft/ClearScript/HostType";
 import "../../../../System/Collections/Generic/List";
+import type { AvatarName } from "../Model/Avatar";
+
+/**
+ * 战斗角色武器类型编码（`combat_avatar.json` 的 `weapon` 字段）
+ * @since 0.50.0
+ */
+export type CombatAvatarWeaponCode =
+  | "0" // 未知 / 占位
+  | "1" // 单手剑
+  | "10" // 法器
+  | "11" // 双手剑
+  | "12" // 弓
+  | "13" // 长柄武器
+  | (string & {});
+
+/**
+ * 战斗角色英文名（`combat_avatar.json` 的 `nameEn`）
+ * 与 `AvatarName` 一一对应、顺序对齐；配置标准英文名，不是 YOLO 侧面头像 class（分类结果可能含 `Costume` 后缀）
+ * @since 0.50.0
+ */
+export type CombatAvatarNameEn =
+  | "Unknown"
+  | "Ayaka"
+  | "Qin"
+  | "Traveler"
+  | "PlayerGirl"
+  | "PlayerBoy"
+  | "Lisa"
+  | "Barbara"
+  | "Kaeya"
+  | "Diluc"
+  | "Razor"
+  | "Ambor"
+  | "Venti"
+  | "Xiangling"
+  | "Beidou"
+  | "Xingqiu"
+  | "Xiao"
+  | "Ningguang"
+  | "Klee"
+  | "Zhongli"
+  | "Fischl"
+  | "Bennett"
+  | "Tartaglia"
+  | "Noel"
+  | "Qiqi"
+  | "Chongyun"
+  | "Ganyu"
+  | "Albedo"
+  | "Diona"
+  | "Mona"
+  | "Keqing"
+  | "Sucrose"
+  | "Xinyan"
+  | "Rosaria"
+  | "Hutao"
+  | "Kazuha"
+  | "Feiyan"
+  | "Yoimiya"
+  | "Tohma"
+  | "Eula"
+  | "Shougun"
+  | "Sayu"
+  | "Kokomi"
+  | "Gorou"
+  | "Sara"
+  | "Itto"
+  | "Yae"
+  | "Heizo"
+  | "Yelan"
+  | "Momoka"
+  | "Aloy"
+  | "Shenhe"
+  | "Yunjin"
+  | "Shinobu"
+  | "Ayato"
+  | "Collei"
+  | "Dori"
+  | "Tighnari"
+  | "Nilou"
+  | "Cyno"
+  | "Candace"
+  | "Nahida"
+  | "Layla"
+  | "Wanderer"
+  | "Faruzan"
+  | "Yaoyao"
+  | "Alhatham"
+  | "Dehya"
+  | "Mika"
+  | "Kaveh"
+  | "Baizhuer"
+  | "Linette"
+  | "Liney"
+  | "Freminet"
+  | "Wriothesley"
+  | "Neuvillette"
+  | "Charlotte"
+  | "Furina"
+  | "Chevreuse"
+  | "Navia"
+  | "Gaming"
+  | "Liuyun"
+  | "Chiori"
+  | "Sigewinne"
+  | "Arlecchino"
+  | "Sethos"
+  | "Clorinde"
+  | "Emilie"
+  | "Kachina"
+  | "Kinich"
+  | "Mualani"
+  | "Xilonen"
+  | "Chasca"
+  | "Olorun"
+  | "Mavuika"
+  | "Citlali"
+  | "Lanyan"
+  | "Mizuki"
+  | "Iansan"
+  | "Varesa"
+  | "Escoffier"
+  | "Ifa"
+  | "SkirkNew"
+  | "Dahlia"
+  | "Ineffa"
+  | "MannequinBoy"
+  | "MannequinGirl"
+  | "Lauma"
+  | "Flins"
+  | "Aino"
+  | "Nefer"
+  | "Durin"
+  | "Jahoda"
+  | "Columbina"
+  | "Zibai"
+  | "Illuga"
+  | "Varka"
+  | "Linnea"
+  | "Lohen"
+  | "Nicole"
+  | "Prune"
+  | "Marionette"
+  | "Alyosha"
+  | "Odette"
+  | (string & {});
 
 /**
  * 战斗角色静态配置
@@ -22,17 +168,17 @@ export interface CombatAvatar extends ClrHostValue {
    * 角色名称（中文）
    * @since 0.50.0
    */
-  name: string;
+  name: AvatarName;
   /**
-   * 角色英文名
+   * 角色英文名（配置标准名，非 YOLO class）
    * @since 0.50.0
    */
-  nameEn: string;
+  nameEn: CombatAvatarNameEn;
   /**
-   * 武器类型
+   * 武器类型编码（非中文武器名）
    * @since 0.50.0
    */
-  weapon: string;
+  weapon: CombatAvatarWeaponCode;
   /**
    * 元素战技冷却时长，单位秒
    * @since 0.50.0
@@ -58,6 +204,8 @@ export interface CombatAvatar extends ClrHostValue {
 declare global {
   namespace BetterGenshinImpact.GameTask.AutoFight.Config {
     type CombatAvatar = import("./CombatAvatar").CombatAvatar;
+    type CombatAvatarNameEn = import("./CombatAvatar").CombatAvatarNameEn;
+    type CombatAvatarWeaponCode = import("./CombatAvatar").CombatAvatarWeaponCode;
   }
 }