@ives_xxz/framework 2.1.5 → 2.1.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ives_xxz/framework",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "description": "cocoscreator 2.x mvc framework",
   "main": "index.js",
   "keywords": ["123456"],

package/types/FW.d.ts

@@ -467,24 +467,24 @@ declare namespace FW {
   /**
    * Socket配置
    */
-  type SocketConfig = {
+  type SocketConfig = Partial<{
     /** 心跳间隔 */
-    heartInternal?: number;
+    heartInternal: number;
     /** 心跳超时时间 */
-    heartTimeout?: number;
+    heartTimeout: number;
     /** 心跳弱网时间 */
-    heartWeakTime?: number;
+    heartWeakTime: number;
     /** 最大重连次数 */
-    maxReconnectTimes?: number;
+    maxReconnectTimes: number;
     /** 重连间隔 */
-    reconnectInternal?: number;
+    reconnectInternal: number;
     /** 协议符号 */
-    protocolSymbol?: Symbol;
+    protocolSymbol: Symbol;
     /** 协议轮询时间 */
-    protocolPollingTime?: number;
+    protocolPollingTime: number;
     /** 证书（可选） */
-    certificate?: cc.Asset;
-  };
+    certificate: cc.Asset;
+  }>;
 
   /**
    * 观察者
@@ -1233,15 +1233,15 @@ declare namespace FW {
     retryHandle: () => void;
   };
 
-  type HotUpdatingParam = {
-    downloadedFiles?: number;
-    totalFiles?: number;
-    downloadedBytes?: number;
-    totalBytes?: number;
-    percent?: number;
-    convertDownloadedBytes?: string;
-    convertTotalBytes?: string;
-  };
+  type HotUpdatingParam = Partial<{
+    downloadedFiles: number;
+    totalFiles: number;
+    downloadedBytes: number;
+    totalBytes: number;
+    percent: number;
+    convertDownloadedBytes: string;
+    convertTotalBytes: string;
+  }>;
 
   type AssetManager = {
     initialize();
@@ -1302,30 +1302,32 @@ declare namespace FW {
   };
 
   type CCEvent = {
-    eventName?: string;
     cb: (...args: any) => void;
     target: TargetType;
-    responseInterval?: number;
-    pause?: boolean;
-    enable?: boolean;
-    responseTime?: number;
-    lastResponseTimestamp?: number;
-    data?: any;
-  };
+  } & Partial<{
+    eventName: string;
+    responseInterval: number;
+    pause: boolean;
+    enable: boolean;
+    responseTime: number;
+    lastResponseTimestamp: number;
+    data: any;
+  }>;
 
   type FWEvent = {
-    eventName?: string;
     cb: (...args: any) => void;
-    responseTime?: number;
-    responseInterval?: number;
-    lastResponseTimestamp?: number;
-    options?: {
+  } & Partial<{
+    eventName: string;
+    responseTime: number;
+    responseInterval: number;
+    lastResponseTimestamp: number;
+    options: {
       priority?: number;
       intercept?: boolean;
       pause?: boolean;
       enable?: boolean;
     };
-  };
+  }>;
 
   type RegisterArgs = {
     target?: any;
@@ -1333,7 +1335,7 @@ declare namespace FW {
     FWEvent?: FWEvent[];
   };
 
-  type RegisterEventArgs = {
+  type RegisterEventArgs = Partial<{
     /** 事件名字 */
     eventName?: string;
     /**
@@ -1364,7 +1366,7 @@ declare namespace FW {
      * 是否启用
      */
     enable?: boolean;
-  };
+  }>;
 
   /**
    * 时间调度器
@@ -1683,21 +1685,21 @@ declare namespace FW {
   /**
    * spine动画参数
    */
-  type SkeletonArgs = {
-    loop?: boolean;
-    timeScale?: number;
-    progress?: number;
-    cb?: () => void;
-  };
+  type SkeletonArgs = Partial<{
+    loop: boolean;
+    timeScale: number;
+    progress: number;
+    cb: () => void;
+  }>;
   /**
    * tween动画参数
    */
-  type TweenArgs = {
-    id?: number;
-    tag?: string;
-    target?: Component | Node;
-    timeScale?: number;
-  };
+  type TweenArgs = Partial<{
+    id: number;
+    tag: string;
+    target: Component | Node;
+    timeScale: number;
+  }>;
 
   /**
    * 时间对象
@@ -1724,25 +1726,26 @@ declare namespace FW {
      * 目标对象
      */
     target: TargetType;
+
     /**
-     * 执行间隔
+     *  执行时间
      */
-    internal?: number;
+    executeTime: number;
+  } & Partial<{
     /**
-     * 标签
+     * 执行间隔
      */
-    tag?: string;
-
+    internal: number;
     /**
-     *  执行时间
+     * 标签
      */
-    executeTime: number;
+    tag: string;
     /**
      * 回调函数
      * @returns
      */
-    cb?: () => void;
-  };
+    cb: () => void;
+  }>;
 
   type RegisterInitialize = {
     initialize();
@@ -1756,11 +1759,14 @@ declare namespace FW {
     autoRelease?: boolean;
   };
 
-  type RegisterFramework = {
+  type RegisterFrameworkBundle = {
     /**
      * bundle名字
      */
     bundleName: string;
+  };
+
+  type RegisterFrameworkComponent = {
     /**
      * 逻辑
      */
@@ -1783,6 +1789,8 @@ declare namespace FW {
     handle?: Newable<SocketHandle>;
   };
 
+  type RegisterFramework = RegisterFrameworkBundle & RegisterFrameworkComponent;
+
   /**
    * 状态机
    */
@@ -2007,27 +2015,30 @@ declare namespace FW {
   type OpacityAnimationArgs = {
     target: cc.Node;
     duration: number;
-    initOpacity?: number;
+  } & Partial<{
+    initOpacity: number;
     targetOpacity: number;
-    cb?: () => void;
-  };
+    cb: () => void;
+  }>;
 
   type ScaleAnimationArgs = {
     target: cc.Node;
     duration: number;
-    initScale?: number;
+  } & Partial<{
+    initScale: number;
     targetScale: number;
-    easing?: cc.Easing;
-    cb?: () => void;
-  };
+    easing: cc.Easing;
+    cb: () => void;
+  }>;
 
   type PositionAnimationArgs = {
     target: cc.Node;
     duration: number;
-    initPosition?: Vec3;
+  } & Partial<{
+    initPosition: Vec3;
     targetPosition: Vec3;
-    cb?: () => void;
-  };
+    cb: () => void;
+  }>;
 
   type Vec3 = {
     x?: number;
@@ -2108,7 +2119,7 @@ declare namespace FW {
     getString: <T extends string>(key: string) => T;
   }
 
-  type TaskOptions = {
+  type TaskOptions = Partial<{
     taskId: number;
     /**
      * 每帧最大执行时间(ms)，默认16ms (60fps) 帧预算
@@ -2122,6 +2133,8 @@ declare namespace FW {
      * 是否打印日志
      */
     log: boolean;
+  }> & {
+    taskId: number;
   };
 
   type TaskEvent = {
@@ -2280,13 +2293,13 @@ declare namespace FW {
     reason?: any,
   ) => void;
 
-  type PromiseExecuteOptions = {
-    reason?: any;
-    timeout?: number;
-    retryCount?: number;
-    retryInterval?: number;
-    retryCondition?: (error: any, retryCount: number) => boolean;
-  };
+  type PromiseExecuteOptions = Partial<{
+    reason: any;
+    timeout: number;
+    retryCount: number;
+    retryInterval: number;
+    retryCondition: (error: any, retryCount: number) => boolean;
+  }>;
 
   type PromiseAllResult<T = any> = {
     success: Array<{ id: number; value: T }>;
@@ -2299,16 +2312,16 @@ declare namespace FW {
   /**
    * 性能管理器配置
    */
-  type PerformanceModuleOptions = {
+  type PerformanceModuleOptions = Partial<{
     /** 是否自动收集性能数据 */
-    autoCollect?: boolean;
+    autoCollect: boolean;
     /** 性能数据保留时间（毫秒） */
-    dataRetentionTime?: number;
+    dataRetentionTime: number;
     /** 采样率（0-1） */
-    samplingRate?: number;
+    samplingRate: number;
     /** 性能警告阈值（毫秒） */
-    warningThreshold?: number;
-  };
+    warningThreshold: number;
+  }>;
 
   /**
    * 性能统计报告
@@ -2332,12 +2345,12 @@ declare namespace FW {
     timestamp: number;
   };
 
-  type ManagerOptions = {
+  type ManagerOptions = Partial<{
     /** 是否启用调试日志 */
-    debug?: boolean;
+    debug: boolean;
     /** 管理器名称（默认使用类名） */
-    name?: string;
-  };
+    name: string;
+  }>;
 
   type PropertyDecorator = (
     $class: Record<string, any>,
@@ -2395,11 +2408,6 @@ declare namespace FW {
 declare namespace FW {
   export abstract class FrameworkBase {
     public readonly entry: FW.Entry = FW.Entry;
-    public logic?: FW.Logic;
-    public data?: FW.Data;
-    public config?: FW.AssetConfig;
-    public sender?: FW.Sender;
-    public handle?: FW.Handle;
 
     /**
      * 调用Promise函数 并捕获性能数据

package/types/Global.d.ts

@@ -11,12 +11,12 @@ declare namespace globalThis {
   export function FWPropertyNode($opt?: ParamType): FW.PropertyDecorator;
   export function FWPropertyNodes(...paths: string[]): FW.PropertyDecorator;
   export function FWPropertyComponent(
-    $componentClass: INewable<cc.Component>,
+    $componentClass: FW.Newable<cc.Component>,
     $childName?: string,
     $mute = false,
   ): FW.PropertyDecorator;
   export function FWPropertyComponents(
-    $componentClass: INewable<cc.Component>,
+    $componentClass: FW.Newable<cc.Component>,
     $childName?: string,
   ): FW.PropertyDecorator;
 }