@bettergi/types 0.1.5 → 0.1.7

package/enums/country.d.ts

@@ -1,4 +1,13 @@
-export type Country = "蒙德" | "璃月" | "稻妻" | "须弥" | "枫丹" | "纳塔" | "至冬" | (string & {});
+export type Country =
+  | "蒙德"
+  | "璃月"
+  | "稻妻"
+  | "须弥"
+  | "枫丹"
+  | "纳塔"
+  | "挪德卡莱"
+  | "至冬"
+  | (string & {});
 
 export type Area = "渊下宫" | "层岩巨渊·地下矿区" | "旧日之海" | "远古圣山" | "尘歌壶" | Country;
 

package/index.d.ts

@@ -53,8 +53,8 @@
 /// <reference path="./types/BetterGenshinImpact/Core/Script/Dependence/ServerTime.d.ts" />
 
 // 任务参数
-/// <reference path="./types/BetterGenshinImpact/GameTask/AutoDomain/AutoDomainParam" />
-/// <reference path="./types/BetterGenshinImpact/GameTask/AutoFight/AutoFightParam" />
+/// <reference path="./types/BetterGenshinImpact/GameTask/AutoDomain/AutoDomainParam.d.ts" />
+/// <reference path="./types/BetterGenshinImpact/GameTask/AutoFight/AutoFightParam.d.ts" />
 
 /// 设置
 /// <reference path="./objects/settings.d.ts" />

package/objects/file.d.ts

@@ -71,7 +71,7 @@ declare global {
     ): Mat;
 
     /**
-     * 输出文本文件
+     * 同步输出文本文件
      * @param path 文件路径（相对于脚本根目录，会自动创建目录）
      * @param content 文件内容（不能超过999MB）
      * @param append 是否追加内容（默认值：false）
@@ -89,7 +89,7 @@ declare global {
     function writeText(path: string, content: string, append?: boolean): Promise<boolean>;
 
     /**
-     *
+     * 输出文本文件
      * @param path 文件路径（相对于脚本根目录，会自动创建目录）
      * @param content 文件内容（不能超过999MB）
      * @param callbackFunc 回调函数
@@ -102,6 +102,14 @@ declare global {
       callbackFunc: (ex?: string, ret?: string) => void,
       append?: boolean
     ): Promise<boolean>;
+
+    /**
+     * 同步写入图片到文件
+     * @param path 文件路径（如果没有扩展名，自动追加.png）
+     * @param mat OpenCV Mat对象
+     * @since 0.48.2
+     */
+    function writeImageSync(path: string, mat: Mat): boolean;
   }
 }
 

package/package.json

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

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

@@ -1,5 +1,6 @@
 import "../../../System/Collections/Generic/List";
 import "../../../System/Threading/CancellationToken";
+import "../../../System/Tuple";
 import "../../GameTask/Model/Area/ImageRegion";
 import "../../GameTask/Model/Area/Region";
 import "../ISoloTask";
@@ -20,7 +21,7 @@ declare global {
       static pressUseResin(
         ra: BetterGenshinImpact.GameTask.Model.Area.ImageRegion,
         resinName: string
-      ): [boolean, number];
+      ): System.Tuple2<boolean, number>;
 
       /**
        * 点击使用树脂
@@ -30,7 +31,7 @@ declare global {
       static pressUseResin(
         regionList: System.Collections.Generic.List<BetterGenshinImpact.GameTask.Model.Area.Region>,
         resinName: string
-      ): [boolean, number];
+      ): System.Tuple2<boolean, number>;
 
       constructor(taskParam: BetterGenshinImpact.GameTask.AutoDomain.AutoDomainParam);
     }

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

@@ -1,5 +1,6 @@
 import "../../../System/Collections/Generic/List";
 import "../../../System/Threading/CancellationToken";
+import "../../../System/Tuple";
 import "../../GameTask/Model/Area/ImageRegion";
 import "../../GameTask/Model/Area/Region";
 import "../ISoloTask";
@@ -20,7 +21,7 @@ declare global {
       static pressUseResin(
         ra: BetterGenshinImpact.GameTask.Model.Area.ImageRegion,
         resinName: string
-      ): [boolean, number];
+      ): System.Tuple2<boolean, number>;
 
       /**
        * 点击使用树脂
@@ -30,7 +31,7 @@ declare global {
       static pressUseResin(
         regionList: System.Collections.Generic.List<BetterGenshinImpact.GameTask.Model.Area.Region>,
         resinName: string
-      ): [boolean, number];
+      ): System.Tuple2<boolean, number>;
 
       constructor(taskParam: BetterGenshinImpact.GameTask.AutoFight.AutoFightParam);
     }

package/types/BetterGenshinImpact/GameTask/Model/Area/Converter/INodeConverter.d.ts

@@ -1,7 +1,14 @@
+import "../../../../../System/Tuple";
+
 declare global {
   namespace BetterGenshinImpact.GameTask.Model.Area.Converter {
     interface INodeConverter {
-      toPrev(x: number, y: number, w: number, h: number): [number, number, number, number];
+      toPrev(
+        x: number,
+        y: number,
+        w: number,
+        h: number
+      ): System.Tuple4<number, number, number, number>;
     }
   }
 }

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

@@ -1,6 +1,7 @@
 import { Rect } from "mirada/dist/src/types/opencv";
 import "../../../../System/Drawing/Pen";
 import "../../../../System/IDisposable";
+import "../../../../System/Tuple";
 import "../../../GameTask/Model/Area/Converter/INodeConverter";
 import "../../../GameTask/Model/Area/ImageRegion";
 import "../../../View/Drawable/LineDrawable";
@@ -165,10 +166,10 @@ declare global {
       convertPositionToGameCaptureRegion(x: number, y: number, w: number, h: number): Rect;
 
       /** 将指定区域的截图转换成位置元组 */
-      convertPositionToGameCaptureRegion(x: number, y: number): [number, number];
+      convertPositionToGameCaptureRegion(x: number, y: number): System.Tuple2<number, number>;
 
       /** 将指定桌面区域的截图转换成位置元组 */
-      convertPositionToDesktopRegion(x: number, y: number): [number, number];
+      convertPositionToDesktopRegion(x: number, y: number): System.Tuple2<number, number>;
 
       /** 生成一个新的矩形类型的区域 */
       toRect(): Rect;

package/types/System/Collections/IEqualityComparer.d.ts

@@ -0,0 +1,11 @@
+declare global {
+  namespace System.Collections {
+    interface IEqualityComparer {
+      equals(x: any, y: any): boolean;
+
+      getHashCode(obj: any): number;
+    }
+  }
+}
+
+export {};

package/types/System/Collections/IStructuralComparable.d.ts

@@ -0,0 +1,11 @@
+import "./IEqualityComparer";
+
+declare global {
+  namespace System.Collections {
+    interface IStructuralComparable {
+      compareTo(other: any, comparer: System.Collections.IEqualityComparer): number;
+    }
+  }
+}
+
+export {};

package/types/System/Collections/IStructuralEquatable.d.ts

@@ -0,0 +1,13 @@
+import "./IEqualityComparer";
+
+declare global {
+  namespace System.Collections {
+    interface IStructuralEquatable {
+      equals(other: any, comparer: System.Collections.IEqualityComparer): boolean;
+
+      getHashCode(comparer: System.Collections.IEqualityComparer): number;
+    }
+  }
+}
+
+export {};

package/types/System/DateTime.d.ts

@@ -5,4 +5,5 @@ declare global {
     }
   }
 }
+
 export {};

package/types/System/DateTimeOffset.d.ts

@@ -5,4 +5,5 @@ declare global {
     }
   }
 }
+
 export {};

package/types/System/Exception.d.ts

@@ -5,4 +5,5 @@ declare global {
     }
   }
 }
+
 export {};

package/types/System/IAsyncDisposable.d.ts

@@ -7,4 +7,5 @@ declare global {
     }
   }
 }
+
 export {};

package/types/System/IComparable.d.ts

@@ -0,0 +1,9 @@
+declare global {
+  namespace System {
+    interface IComparable {
+      compareTo(other: any): number;
+    }
+  }
+}
+
+export {};

package/types/System/IEquatable.d.ts

@@ -5,4 +5,5 @@ declare global {
     }
   }
 }
+
 export {};

package/types/System/Runtime/CompilerServices/ITuple.d.ts

@@ -0,0 +1,11 @@
+declare global {
+  namespace System.Runtime.CompilerServices {
+    interface ITuple {
+      length: number;
+
+      [index: number]: any;
+    }
+  }
+}
+
+export {};

package/types/System/Threading/CancellationToken.d.ts

@@ -55,4 +55,5 @@ declare global {
   }
   export import CancellationToken = System.Threading.CancellationToken;
 }
+
 export {};

package/types/System/Threading/CancellationTokenRegistration.d.ts

@@ -24,4 +24,5 @@ declare global {
     }
   }
 }
+
 export {};

package/types/System/Threading/CancellationTokenSource.d.ts

@@ -48,4 +48,5 @@ declare global {
   }
   export import CancellationTokenSource = System.Threading.CancellationTokenSource;
 }
+
 export {};

package/types/System/Threading/ITimer.d.ts

@@ -9,4 +9,5 @@ declare global {
     }
   }
 }
+
 export {};

package/types/System/Threading/Tasks/ValueTask.d.ts

@@ -9,4 +9,5 @@ declare global {
     }
   }
 }
+
 export {};

package/types/System/Threading/WaitHandle.d.ts

@@ -5,4 +5,5 @@ declare global {
     }
   }
 }
+
 export {};

package/types/System/TimeProvider.d.ts

@@ -28,4 +28,5 @@ declare global {
     }
   }
 }
+
 export {};

package/types/System/TimeSpan.d.ts

@@ -5,4 +5,5 @@ declare global {
     }
   }
 }
+
 export {};

package/types/System/Tuple.d.ts

@@ -0,0 +1,184 @@
+import "./Collections/IStructuralComparable";
+import "./Collections/IStructuralEquatable";
+import "./IComparable";
+import "./Runtime/CompilerServices/ITuple";
+
+declare global {
+  // TODO: 未实现ITupleInternal接口，待补充（如果有必要）
+  namespace System {
+    class Tuple1<T1>
+      implements
+        System.Collections.IStructuralEquatable,
+        System.Collections.IStructuralComparable,
+        System.IComparable
+    {
+      item1: T1;
+
+      constructor(item1: T1);
+
+      equals(other: any): boolean;
+
+      compareTo(other: any): number;
+
+      getHashCode(comparer: System.Collections.IEqualityComparer): number;
+    }
+
+    class Tuple2<T1, T2>
+      implements
+        System.Collections.IStructuralEquatable,
+        System.Collections.IStructuralComparable,
+        System.IComparable
+    {
+      item1: T1;
+      item2: T2;
+
+      constructor(item1: T1, item2: T2);
+
+      equals(other: any): boolean;
+
+      compareTo(other: any): number;
+
+      getHashCode(comparer: System.Collections.IEqualityComparer): number;
+    }
+
+    class Tuple3<T1, T2, T3>
+      implements
+        System.Collections.IStructuralEquatable,
+        System.Collections.IStructuralComparable,
+        System.IComparable
+    {
+      item1: T1;
+      item2: T2;
+      item3: T3;
+
+      constructor(item1: T1, item2: T2, item3: T3);
+
+      equals(other: any): boolean;
+
+      compareTo(other: any): number;
+
+      getHashCode(comparer: System.Collections.IEqualityComparer): number;
+    }
+
+    class Tuple4<T1, T2, T3, T4>
+      implements
+        System.Collections.IStructuralEquatable,
+        System.Collections.IStructuralComparable,
+        System.IComparable
+    {
+      item1: T1;
+      item2: T2;
+      item3: T3;
+      item4: T4;
+
+      constructor(item1: T1, item2: T2, item3: T3, item4: T4);
+
+      equals(other: any): boolean;
+
+      compareTo(other: any): number;
+
+      getHashCode(comparer: System.Collections.IEqualityComparer): number;
+    }
+
+    class Tuple5<T1, T2, T3, T4, T5>
+      implements
+        System.Collections.IStructuralEquatable,
+        System.Collections.IStructuralComparable,
+        System.IComparable
+    {
+      item1: T1;
+      item2: T2;
+      item3: T3;
+      item4: T4;
+      item5: T5;
+
+      constructor(item1: T1, item2: T2, item3: T3, item4: T4, item5: T5);
+
+      equals(other: any): boolean;
+
+      compareTo(other: any): number;
+
+      getHashCode(comparer: System.Collections.IEqualityComparer): number;
+    }
+
+    class Tuple6<T1, T2, T3, T4, T5, T6>
+      implements
+        System.Collections.IStructuralEquatable,
+        System.Collections.IStructuralComparable,
+        System.IComparable
+    {
+      item1: T1;
+      item2: T2;
+      item3: T3;
+      item4: T4;
+      item5: T5;
+      item6: T6;
+
+      constructor(item1: T1, item2: T2, item3: T3, item4: T4, item5: T5, item6: T6);
+
+      equals(other: any): boolean;
+
+      compareTo(other: any): number;
+
+      getHashCode(comparer: System.Collections.IEqualityComparer): number;
+    }
+
+    class Tuple7<T1, T2, T3, T4, T5, T6, T7>
+      implements
+        System.Collections.IStructuralEquatable,
+        System.Collections.IStructuralComparable,
+        System.IComparable
+    {
+      item1: T1;
+      item2: T2;
+      item3: T3;
+      item4: T4;
+      item5: T5;
+      item6: T6;
+      item7: T7;
+
+      constructor(item1: T1, item2: T2, item3: T3, item4: T4, item5: T5, item6: T6, item7: T7);
+
+      equals(other: any): boolean;
+
+      compareTo(other: any): number;
+
+      getHashCode(comparer: System.Collections.IEqualityComparer): number;
+    }
+
+    class Tuple8<T1, T2, T3, T4, T5, T6, T7, T8>
+      implements
+        System.Collections.IStructuralEquatable,
+        System.Collections.IStructuralComparable,
+        System.IComparable
+    {
+      item1: T1;
+      item2: T2;
+      item3: T3;
+      item4: T4;
+      item5: T5;
+      item6: T6;
+      item7: T7;
+      item8: T8;
+
+      constructor(
+        item1: T1,
+        item2: T2,
+        item3: T3,
+        item4: T4,
+        item5: T5,
+        item6: T6,
+        item7: T7,
+        item8: T8
+      );
+
+      equals(other: any): boolean;
+
+      compareTo(other: any): number;
+
+      getHashCode(comparer: System.Collections.IEqualityComparer): number;
+    }
+  }
+}
+
+export {};