@bettergi/types 0.1.15 → 0.1.16

package/types/BetterGenshinImpact/GameTask/AutoFight/Script/Method.d.ts

@@ -6,6 +6,65 @@ import type {
 import "../../../../System/Collections/Generic/IEnumerable";
 import "../../../../System/Collections/Generic/List";
 
+/**
+ * 战斗策略脚本中的动作方法名或别名
+ * 与上游 `Method` 静态实例的 `Alias` 对齐；未知写法仍可经 `(string & {})` 传入
+ * @since 0.50.0
+ */
+export type CombatMethodCode =
+  // Skill
+  | "skill"
+  | "e"
+  // Burst
+  | "burst"
+  | "q"
+  // Attack
+  | "attack"
+  | "普攻"
+  | "普通攻击"
+  // Charge
+  | "charge"
+  | "重击"
+  // Wait
+  | "wait"
+  | "after"
+  | "等待"
+  // Ready
+  | "ready"
+  | "完成"
+  // Check
+  | "check"
+  | "检测"
+  // Walk / 方向
+  | "walk"
+  | "行走"
+  | "w"
+  | "a"
+  | "s"
+  | "d"
+  // Aim（已注册静态成员；GetEnumByCode 的 Values 当前未 yield）
+  | "aim"
+  | "r"
+  | "瞄准"
+  // Dash / Jump
+  | "dash"
+  | "冲刺"
+  | "jump"
+  | "j"
+  | "跳跃"
+  // 宏
+  | "mousedown"
+  | "mouseup"
+  | "click"
+  | "moveby"
+  | "keydown"
+  | "keyup"
+  | "keypress"
+  | "scroll"
+  | "verticalscroll"
+  | "round"
+  | (string & {});
+
 /**
  * 战斗策略脚本中的动作方法
  * @since 0.50.0
@@ -17,12 +76,13 @@ export interface Method extends ClrHostValue {
    * 方法别名列表，脚本中可使用其中任一写法
    * @since 0.50.0
    */
-  readonly alias: System.Collections.Generic.List<string>;
+  readonly alias: System.Collections.Generic.List<CombatMethodCode>;
 }
 
 declare global {
   namespace BetterGenshinImpact.GameTask.AutoFight.Script {
     type Method = import("./Method").Method;
+    type CombatMethodCode = import("./Method").CombatMethodCode;
   }
 }
 
@@ -32,7 +92,7 @@ export interface MethodHostType extends HostType<Method, ReferenceTypeTrait> {
    * @param alias 方法别名列表
    * @since 0.50.0
    */
-  new (alias: System.Collections.Generic.List<string>): Method;
+  new (alias: System.Collections.Generic.List<CombatMethodCode>): Method;
   /**
    * 元素战技，别名含 `skill`、`e`
    * @since 0.50.0
@@ -165,7 +225,7 @@ export interface MethodHostType extends HostType<Method, ReferenceTypeTrait> {
    * @throws 方法名未知时抛出参数异常
    * @since 0.50.0
    */
-  getEnumByCode(method: string): BetterGenshinImpact.GameTask.AutoFight.Script.Method;
+  getEnumByCode(method: CombatMethodCode): BetterGenshinImpact.GameTask.AutoFight.Script.Method;
 }
 
 export {};

package/types/BetterGenshinImpact/GameTask/AutoLeyLineOutcrop/AutoLeyLineOutcropFightConfig.d.ts

@@ -8,6 +8,7 @@ import type { VoidResult } from "../../../Microsoft/ClearScript/VoidResult";
 import "../../../System/ComponentModel/INotifyPropertyChanged";
 import "../../../System/ComponentModel/INotifyPropertyChanging";
 import "../AutoFight/AutoFightConfig";
+import type { CombatStrategyName, PartySlotIndex } from "../AutoFight/AutoFightConfig";
 
 /**
  * 地脉花独立战斗配置
@@ -84,7 +85,7 @@ export interface AutoLeyLineOutcropFightConfig
    * 盾奶位角色队伍序号，从 1 开始，空字符串表示不指定
    * @since 0.58.0
    */
-  guardianAvatar: string;
+  guardianAvatar: PartySlotIndex;
   /**
    * 是否跳过盾奶位自身的战斗策略脚本
    * @since 0.58.0
@@ -116,10 +117,10 @@ export interface AutoLeyLineOutcropFightConfig
    */
   seekEnemyRotaryFactor: number;
   /**
-   * 战斗策略名称
+   * 战斗策略名称，`根据队伍自动选择` 表示按当前队伍匹配策略
    * @since 0.58.0
    */
-  strategyName: string;
+  strategyName: CombatStrategyName;
   /**
    * 是否启用游泳脱困检测
    * @since 0.58.0

package/types/BetterGenshinImpact/GameTask/AutoLeyLineOutcrop/AutoLeyLineOutcropParam.d.ts

@@ -145,6 +145,7 @@ export interface AutoLeyLineOutcropParam extends Omit<
 declare global {
   namespace BetterGenshinImpact.GameTask.AutoLeyLineOutcrop {
     type AutoLeyLineOutcropParam = import("./AutoLeyLineOutcropParam").AutoLeyLineOutcropParam;
+    type LeyLineOutcropType = import("./AutoLeyLineOutcropParam").LeyLineOutcropType;
   }
 }
 

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

@@ -23,6 +23,41 @@ export type MoveMode =
   | "swim" // 游泳
   | (string & {});
 
+/**
+ * 路径追踪赶路模式（`PathingPartyConfig.TravelMode`）
+ * 上游 UI 列表为 `精准靠近` / `连续赶路`；空串运行时会回退为 `精准靠近`
+ * @since 0.43.1
+ */
+export type TravelMode =
+  | "精准靠近" // 适合采集，节点间减速
+  | "连续赶路" // 适合锄地
+  | (string & {});
+
+/**
+ * 路径追踪队伍角色槽位序号（字符串）
+ * 上游 `PathingPartyConfig.AvatarIndexList`：`""` / `1`–`4`
+ * 用于 `MainAvatarIndex`、`GuardianAvatarIndex` 等
+ * @since 0.43.1
+ */
+export type MainAvatarIndex = "" | "1" | "2" | "3" | "4" | (string & {});
+
+/**
+ * 路径追踪自动赶路角色
+ * 上游 `PathingPartyConfig.HurryOnAvatarList`
+ * @since 0.43.1
+ */
+export type HurryOnAvatar =
+  | "" // 未指定 / 关闭列表首项
+  | "自动" // 按名单与主C自动挑选
+  | "玛薇卡"
+  | "闲云"
+  | "桑多涅"
+  | "恰斯卡"
+  | "流浪者"
+  | "伊法"
+  | "希诺宁"
+  | (string & {});
+
 /**
  * 路径点到达动作
  * @since 0.43.1
@@ -79,4 +114,19 @@ export type MonsterTag =
   | "legendary" // 传奇
   | (string & {});
 
+declare global {
+  namespace BetterGenshinImpact.GameTask.AutoPathing {
+    type HurryOnAvatar = import("./PathingScriptNames").HurryOnAvatar;
+    type MainAvatarIndex = import("./PathingScriptNames").MainAvatarIndex;
+    type MisidentificationHandlingMode =
+      import("./PathingScriptNames").MisidentificationHandlingMode;
+    type MisidentificationTriggerType = import("./PathingScriptNames").MisidentificationTriggerType;
+    type MonsterTag = import("./PathingScriptNames").MonsterTag;
+    type MoveMode = import("./PathingScriptNames").MoveMode;
+    type TravelMode = import("./PathingScriptNames").TravelMode;
+    type WaypointAction = import("./PathingScriptNames").WaypointAction;
+    type WaypointPointType = import("./PathingScriptNames").WaypointPointType;
+  }
+}
+
 export {};

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

@@ -201,6 +201,8 @@ export interface AutoSkipConfig
 declare global {
   namespace BetterGenshinImpact.GameTask.AutoSkip {
     type AutoSkipConfig = import("./AutoSkipConfig").AutoSkipConfig;
+    type ClickChatOption = import("./AutoSkipConfig").ClickChatOption;
+    type PictureInPictureSourceType = import("./AutoSkipConfig").PictureInPictureSourceType;
   }
 }
 

package/types/BetterGenshinImpact/GameTask/AutoStygianOnslaught/AutoStygianOnslaughtConfig.d.ts

@@ -7,6 +7,8 @@ import type {
 import "../../../System/Collections/Generic/List";
 import "../../../System/ComponentModel/INotifyPropertyChanged";
 import "../../../System/ComponentModel/INotifyPropertyChanging";
+import type { ResinName } from "../AutoDomain/AutoDomainTask";
+import type { CombatStrategyName } from "../AutoFight/AutoFightConfig";
 
 /**
  * 自动幽境危战配置
@@ -65,17 +67,17 @@ export interface AutoStygianOnslaughtConfig
    * 使用树脂的优先级列表，默认浓缩树脂优先于原粹树脂
    * @since 0.58.0
    */
-  resinPriorityList: System.Collections.Generic.List<string>;
+  resinPriorityList: System.Collections.Generic.List<ResinName>;
   /**
    * 是否启用指定树脂使用次数模式
    * @since 0.58.0
    */
   specifyResinUse: boolean;
   /**
-   * 战斗策略名称
+   * 战斗策略名称，`根据队伍自动选择` 表示按当前队伍匹配策略
    * @since 0.58.0
    */
-  strategyName: string;
+  strategyName: CombatStrategyName;
   /**
    * 使用须臾树脂刷取的次数
    * @since 0.58.0

package/types/BetterGenshinImpact/GameTask/AutoStygianOnslaught/AutoStygianOnslaughtParam.d.ts

@@ -6,6 +6,8 @@ import type {
 } from "../../../Microsoft/ClearScript/HostType";
 import type { VoidResult } from "../../../Microsoft/ClearScript/VoidResult";
 import "../../../System/Collections/Generic/List";
+import type { ResinName } from "../AutoDomain/AutoDomainTask";
+import type { CombatStrategyName } from "../AutoFight/AutoFightConfig";
 import "../Model/BaseTaskParam";
 import "./AutoStygianOnslaughtConfig";
 import "./AutoStygianOnslaughtTask";
@@ -52,7 +54,7 @@ export interface AutoStygianOnslaughtParam extends Omit<
    * 使用树脂的优先级列表，默认浓缩树脂优先于原粹树脂
    * @since 0.58.0
    */
-  resinPriorityList: System.Collections.Generic.List<string>;
+  resinPriorityList: System.Collections.Generic.List<ResinName>;
   /**
    * 使用原粹树脂刷取的次数
    * @since 0.58.0
@@ -104,8 +106,8 @@ export interface AutoStygianOnslaughtParam extends Omit<
    * @returns ClearScript 宿主空结果
    * @since 0.58.0
    */
-  setResinPriorityList(priorities: HostArray<string>): VoidResult;
-  setResinPriorityList(...priorities: string[]): VoidResult;
+  setResinPriorityList(priorities: HostArray<ResinName>): VoidResult;
+  setResinPriorityList(...priorities: ResinName[]): VoidResult;
   /**
    * 设置战斗策略路径
    * @param strategyName 策略名称，省略或为空时使用全局自动战斗配置中的策略名称
@@ -113,7 +115,7 @@ export interface AutoStygianOnslaughtParam extends Omit<
    * @since 0.58.0
    */
   setCombatStrategyPath(): VoidResult;
-  setCombatStrategyPath(strategyName: string | null): VoidResult;
+  setCombatStrategyPath(strategyName: CombatStrategyName | null): VoidResult;
 }
 
 declare global {

package/types/BetterGenshinImpact/GameTask/Common/Job/CraftMaterialTask.d.ts

@@ -9,6 +9,22 @@ import type {
 import "../../../../System/Collections/Generic/List";
 import "../Reward/RewardItem";
 
+/**
+ * 合成台材料筛选类型
+ * 来源：`Assets/Model/ItemV2/item.csv` 的 `material_type` 去重集合
+ * @since 0.62.0
+ */
+export type CraftMaterialType =
+  | "武器突破素材"
+  | "消耗品"
+  | "药剂"
+  | "角色与武器培养素材"
+  | "角色天赋素材"
+  | "角色突破素材"
+  | "食物"
+  | "鱼饵"
+  | (string & {});
+
 /**
  * 合成指定材料的执行结果
  * @since 0.62.0
@@ -40,7 +56,7 @@ export interface CraftMaterialResult extends ClrHostValue {
    * 本次使用的材料筛选类型
    * @since 0.62.0
    */
-  materialType: string;
+  materialType: CraftMaterialType;
   /**
    * 本次合成产物汇总
    * @since 0.62.0
@@ -51,6 +67,7 @@ export interface CraftMaterialResult extends ClrHostValue {
 declare global {
   namespace BetterGenshinImpact.GameTask.Common.Job {
     type CraftMaterialResult = import("./CraftMaterialTask").CraftMaterialResult;
+    type CraftMaterialType = import("./CraftMaterialTask").CraftMaterialType;
   }
 }
 
@@ -77,7 +94,7 @@ export interface CraftMaterialResultHostType extends HostType<
     materialName: string,
     targetQuantity: number | StrongNumeric<Int32Host>,
     actualQuantity: number | StrongNumeric<Int32Host>,
-    materialType: string,
+    materialType: CraftMaterialType,
     rewards: System.Collections.Generic.List<BetterGenshinImpact.GameTask.Common.Reward.RewardItem>
   ): BetterGenshinImpact.GameTask.Common.Job.CraftMaterialResult;
 }

package/types/BetterGenshinImpact/GameTask/Common/Map/MapScriptNames.d.ts

@@ -43,4 +43,13 @@ export type MapMatchMethod =
   | "SIFT" // SIFT 特征匹配
   | (string & {});
 
+declare global {
+  namespace BetterGenshinImpact.GameTask.Common.Map {
+    type Area = import("./MapScriptNames").Area;
+    type CountryName = import("./MapScriptNames").CountryName;
+    type MapMatchMethod = import("./MapScriptNames").MapMatchMethod;
+    type MapName = import("./MapScriptNames").MapName;
+  }
+}
+
 export {};

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

@@ -9,7 +9,6 @@ import type { VoidResult } from "../../../../Microsoft/ClearScript/VoidResult";
 import "../../../../OpenCvSharp/Mat";
 import "../../../../OpenCvSharp/Size";
 import "../../../../System/Drawing/Pen";
-import "../../../../System/Func";
 import "../../../../System/IDisposable";
 import "../../../../System/ValueTuple";
 import "../../../View/Drawable/DrawContent";
@@ -146,30 +145,30 @@ export interface GameCaptureRegionHostType extends HostType<GameCaptureRegion, R
   ): GameCaptureRegion;
   /**
    * 在游戏截图坐标系点击；回调参数为当前捕获尺寸与到 1080P 的缩放比，魔法数字须按 1080P 编写
-   * @param posFunc 根据捕获尺寸与 1080P 缩放比计算点击坐标的回调
+   * @param posFunc 根据捕获尺寸与 1080P 缩放比计算点击坐标的脚本回调，返回坐标 ValueTuple 宿主对象
    * @returns ClearScript 宿主空结果
    * @since 0.43.1
    */
   gameRegionClick(
-    posFunc: System.Func<OpenCvSharp.Size, number, System.ValueTuple<number, number>>
+    posFunc: (size: OpenCvSharp.Size, scale: number) => System.ValueTuple<number, number>
   ): VoidResult;
   /**
    * 在游戏截图坐标系移动鼠标；回调参数为当前捕获尺寸与到 1080P 的缩放比
-   * @param posFunc 根据捕获尺寸与 1080P 缩放比计算目标坐标的回调
+   * @param posFunc 根据捕获尺寸与 1080P 缩放比计算目标坐标的脚本回调，返回坐标 ValueTuple 宿主对象
    * @returns ClearScript 宿主空结果
    * @since 0.43.1
    */
   gameRegionMove(
-    posFunc: System.Func<OpenCvSharp.Size, number, System.ValueTuple<number, number>>
+    posFunc: (size: OpenCvSharp.Size, scale: number) => System.ValueTuple<number, number>
   ): VoidResult;
   /**
    * 在游戏截图坐标系按偏移移动鼠标；回调参数为当前捕获尺寸与到 1080P 的缩放比
-   * @param deltaFunc 根据捕获尺寸与 1080P 缩放比计算偏移量的回调
+   * @param deltaFunc 根据捕获尺寸与 1080P 缩放比计算偏移量的脚本回调，返回偏移 ValueTuple 宿主对象
    * @returns ClearScript 宿主空结果
    * @since 0.43.1
    */
   gameRegionMoveBy(
-    deltaFunc: System.Func<OpenCvSharp.Size, number, System.ValueTuple<number, number>>
+    deltaFunc: (size: OpenCvSharp.Size, scale: number) => System.ValueTuple<number, number>
   ): VoidResult;
   /**
    * 按 1080P 坐标点击，自动换算到当前捕获分辨率

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

@@ -10,7 +10,6 @@ import "../../../../OpenCvSharp/Mat";
 import "../../../../OpenCvSharp/Rect";
 import "../../../../SixLabors/ImageSharp/Image";
 import "../../../../SixLabors/ImageSharp/PixelFormats/Rgb24";
-import "../../../../System/Action";
 import "../../../../System/Collections/Generic/List";
 import "../../../../System/IDisposable";
 import "../../../Core/Recognition/RecognitionObject";
@@ -83,8 +82,8 @@ export interface ImageRegion
   /**
    * 在本区域内查找最优识别结果；支持模板匹配、OCR 匹配与 OCR 识别
    * @param ro 识别对象
-   * @param successAction 找到时的回调
-   * @param failAction 未找到时的回调
+   * @param successAction 找到时的脚本回调
+   * @param failAction 未找到时的脚本回调
    * @returns 最优识别区域；未找到时为空区域
    * @since 0.43.1
    */
@@ -93,18 +92,18 @@ export interface ImageRegion
   ): BetterGenshinImpact.GameTask.Model.Area.Region;
   find(
     ro: BetterGenshinImpact.Core.Recognition.RecognitionObject,
-    successAction: System.Action<BetterGenshinImpact.GameTask.Model.Area.Region> | null
+    successAction: ((region: BetterGenshinImpact.GameTask.Model.Area.Region) => void) | null
   ): BetterGenshinImpact.GameTask.Model.Area.Region;
   find(
     ro: BetterGenshinImpact.Core.Recognition.RecognitionObject,
-    successAction: System.Action<BetterGenshinImpact.GameTask.Model.Area.Region> | null,
-    failAction: System.Action | null
+    successAction: ((region: BetterGenshinImpact.GameTask.Model.Area.Region) => void) | null,
+    failAction: (() => void) | null
   ): BetterGenshinImpact.GameTask.Model.Area.Region;
   /**
    * 在本区域内查找全部识别结果；仅支持模板匹配与 OCR
    * @param ro 识别对象
-   * @param successAction 找到时的回调
-   * @param failAction 未找到时的回调
+   * @param successAction 找到时的脚本回调
+   * @param failAction 未找到时的脚本回调
    * @returns 识别区域列表，不含内嵌图像
    * @since 0.43.1
    */
@@ -113,16 +112,20 @@ export interface ImageRegion
   ): System.Collections.Generic.List<BetterGenshinImpact.GameTask.Model.Area.Region>;
   findMulti(
     ro: BetterGenshinImpact.Core.Recognition.RecognitionObject,
-    successAction: System.Action<
-      System.Collections.Generic.List<BetterGenshinImpact.GameTask.Model.Area.Region>
-    > | null
+    successAction:
+      | ((
+          regions: System.Collections.Generic.List<BetterGenshinImpact.GameTask.Model.Area.Region>
+        ) => void)
+      | null
   ): System.Collections.Generic.List<BetterGenshinImpact.GameTask.Model.Area.Region>;
   findMulti(
     ro: BetterGenshinImpact.Core.Recognition.RecognitionObject,
-    successAction: System.Action<
-      System.Collections.Generic.List<BetterGenshinImpact.GameTask.Model.Area.Region>
-    > | null,
-    failAction: System.Action | null
+    successAction:
+      | ((
+          regions: System.Collections.Generic.List<BetterGenshinImpact.GameTask.Model.Area.Region>
+        ) => void)
+      | null,
+    failAction: (() => void) | null
   ): System.Collections.Generic.List<BetterGenshinImpact.GameTask.Model.Area.Region>;
   /**
    * 释放资源

package/types/BetterGenshinImpact/Helpers/User32Helper.d.ts

@@ -223,4 +223,11 @@ export type Key =
 export type KeyCode =
   Uppercase<Key> | Lowercase<Key> | Uppercase<`VK_${Key}`> | Lowercase<`VK_${Key}`> | (string & {});
 
+declare global {
+  namespace BetterGenshinImpact.Helpers {
+    type Key = import("./User32Helper").Key;
+    type KeyCode = import("./User32Helper").KeyCode;
+  }
+}
+
 export {};