@ives_xxz/framework 1.6.6 → 2.0.1

package/define/FWEventDefine.ts

@@ -1,24 +1,27 @@
-export namespace FWEventDefine {
-  export enum LanguageEvent {
-    /** 语言变更 */
-    LANGUAGE_CHANGE = 'LANGUAGE_CHANGE',
-  }
+export class LanguageEvent {
+  /** 语言变更 */
+  LANGUAGE_CHANGE = 'LANGUAGE_CHANGE';
+}
+
+export class TaskEvent {
+  START = 'START';
+  PROGRESS = 'PROGRESS';
+  COMPLETE = 'COMPLETE';
+  YIELDED = 'YIELDED';
+  PAUSE = 'PAUSE';
+  RESUME = 'RESUME';
+  FRAME_START = 'FRAME_START';
+  FRAME_END = 'FRAME_END';
+  QUEUE = 'QUEUE';
+  ALL_COMPLETE = 'ALL_COMPLETE';
+  ERROR = 'ERROR';
+}
 
-  export enum TaskEvent {
-    START = 'START',
-    PROGRESS = 'PROGRESS',
-    COMPLETE = 'COMPLETE',
-    YIELDED = 'YIELDED',
-    PAUSE = 'PAUSE',
-    RESUME = 'RESUME',
-    FRAME_START = 'FRAME_START',
-    FRAME_END = 'FRAME_END',
-    QUEUE = 'QUEUE',
-    ALL_COMPLETE = 'ALL_COMPLETE',
-    ERROR = 'ERROR',
-  }
+export class CCEvent {
+  ON_SHOW = 'ON_SHOW';
+  ON_HIDE = 'ON_HIDE';
+}
 
-  export enum SystemEvent {
-    SYSTEM_RESTART,
-  }
+export class SystemEvent {
+  SYSTEM_RESTART = 0;
 }

package/define/FWSystemDefine.ts

@@ -1,152 +1,147 @@
-export namespace FWSystemDefine {
-  export enum FWBindTag {
-    LOGIC,
-    DATA,
-    CONFIG,
-    SENDER,
-    HANDLE,
-    SUB_LOGIC,
-  }
-  export enum FWObjectType {
-    ACTIVE,
-    OPACITY,
-  }
+export class FWBindTag {
+  LOGIC = 0;
+  DATA = 1;
+  CONFIG = 2;
+  SENDER = 3;
+  HANDLE = 4;
+  SUB_LOGIC = 5;
+}
+
+export class FWObjectType {
+  ACTIVE = 0;
+  OPACITY = 1;
+}
 
-  /** Layer渲染顺序 */
-  export const enum FWLayerRenderOrder {
-    SCENE = 0,
-    PERMANENT = 10,
-    UI = 100,
-    POPUP = 1000,
-    MAX = 10000,
-  }
+/** Layer渲染顺序 */
+export class FWLayerRenderOrder {
+  SCENE = 0;
+  PERMANENT = 10;
+  UI = 100;
+  POPUP = 1000;
+  MAX = 10000;
+}
+
+/**
+ * layer类型
+ */
+export class FWLayerType {
   /**
-   * layer类型
+   * 常驻
    */
-  export const enum FWLayerType {
-    /**
-     * 常驻
-     */
-    PERMANENT,
-    /**
-     * 可重复打开
-     */
-    REPEAT,
-    /**
-     * 弹出式(需要加入队列)
-     */
-    POPUP_QUEUE,
-    /**
-     * 弹出式(一次性,无需加入队列)
-     */
-    POPUP_DISPOSABLE,
-  }
-
-  export enum FWTaskStatus {
-    IDLE = 'IDLE',
-    RUNNING = 'RUNNING',
-    PAUSED = 'PAUSED',
-    COMPLETED = 'COMPLETED',
-  }
+  PERMANENT = 0;
+  /**
+   * 可重复打开
+   */
+  REPEAT = 1;
+  /**
+   * 弹出式(需要加入队列)
+   */
+  POPUP_QUEUE = 2;
+  /**
+   * 弹出式(一次性,无需加入队列)
+   */
+  POPUP_DISPOSABLE = 3;
+}
 
-  export enum FWPriorityOrder {
-    /**
-     * 优先级高
-     */
-    HIGHT,
-    /**
-     * 优先级普通
-     */
-    NORMAL,
-    /**
-     * 优先级低
-     */
-    LOW,
-  }
+export class FWTaskStatus {
+  IDLE = 'IDLE';
+  RUNNING = 'RUNNING';
+  PAUSED = 'PAUSED';
+  COMPLETED = 'COMPLETED';
+}
 
+export class FWPriorityOrder {
   /**
-   * 日志类型
+   * 优先级高
    */
-  export const enum FWLogType {
-    /** 调试信息 */
-    DEBUG,
-    /** socket请求 */
-    SOCKET_SEND,
-    /** socket接收 */
-    SOCKET_RECEIVE,
-    /**请求信息 */
-    REQUEST,
-    /** 响应信息 */
-    RESPONSE,
-    /** 警告信息 */
-    WARN,
-    /** 错误信息 */
-    ERROR,
-    /** 系统信息 */
-    SYSTEM,
-  }
-
+  HIGHT = 0;
   /**
-   * HTTP请求类型
+   * 优先级普通
    */
-  export const enum FWHttpRequestType {
-    GET = 'GET',
-    POST = 'POST',
-  }
-
+  NORMAL = 1;
   /**
-   * 动画机类型
+   * 优先级低
    */
-  export const enum FWAnimationMachineType {
-    TWEEN = 'TWEEN',
-    SKELETON = 'SKELETON',
-    ANIMATION = 'ANIMATION',
-  }
+  LOW = 2;
+}
+
+/**
+ * 日志类型
+ */
+export class FWLogType {
+  /** 调试信息 */
+  DEBUG = 0;
+  /** socket请求 */
+  SOCKET_SEND = 1;
+  /** socket接收 */
+  SOCKET_RECEIVE = 2;
+  /** 请求信息 */
+  REQUEST = 3;
+  /** 响应信息 */
+  RESPONSE = 4;
+  /** 警告信息 */
+  WARN = 5;
+  /** 错误信息 */
+  ERROR = 6;
+  /** 系统信息 */
+  SYSTEM = 7;
+}
+
+/**
+ * HTTP请求类型
+ */
+export class FWHttpRequestType {
+  GET = 'GET';
+  POST = 'POST';
+}
 
-  export const enum CCEventType {
-    ON_SHOW = 'ON_SHOW',
-    ON_HIDE = 'ON_HIDE',
-  }
+/**
+ * 动画机类型
+ */
+export class FWAnimationMachineType {
+  TWEEN = 'TWEEN';
+  SKELETON = 'SKELETON';
+  ANIMATION = 'ANIMATION';
+}
 
-  export enum FWScrollViewTemplateType {
-    NODE,
-    PREFAB,
-  }
+export class FWScrollViewTemplateType {
+  NODE = 0;
+  PREFAB = 1;
+}
 
-  export enum FWScrollViewSlideType {
-    NORMAL,
-    ADHERING,
-    PAGE,
-  }
+export class FWScrollViewSlideType {
+  NORMAL = 0;
+  ADHERING = 1;
+  PAGE = 2;
+}
 
-  export enum FWScrollViewSelectedType {
-    NONE,
-    SINGLE,
-    MULTIPLE,
-  }
+export class FWScrollViewSelectedType {
+  NONE = 0;
+  SINGLE = 1;
+  MULTIPLE = 2;
+}
 
-  export enum FWLanguageAssetType {
-    LABEL = 'label',
-    SPRITE = 'sprite',
-    SKELETON = 'skeleton',
-  }
+export class FWLanguageAssetType {
+  LABEL = 'label';
+  SPRITE = 'sprite';
+  SKELETON = 'skeleton';
+}
 
-  export enum FWPromiseStatus {
-    PENDING = 'pending',
-    FULFILLED = 'fulfilled',
-    REJECTED = 'rejected',
-    CANCELLED = 'cancelled',
-  }
+export class FWPromiseStatus {
+  PENDING = 'pending';
+  FULFILLED = 'fulfilled';
+  REJECTED = 'rejected';
+  CANCELLED = 'cancelled';
+}
 
-  export enum FWLayerState {
-    CLOSED = 'closed',
-    OPENING = 'opening',
-    OPENED = 'opened',
-    CLOSING = 'closing',
-  }
+export class FWLayerState {
+  CLOSED = 'closed';
+  OPENING = 'opening';
+  OPENED = 'opened';
+  CLOSING = 'closing';
+}
 
-  export enum FWAudioType {
-    MUSIC,
-    SOUND,
-  }
+export class FWAudioType {
+  MUSIC = 0;
+  SOUND = 1;
 }

package/define/FWSystemDefine.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "08a489c7-1eb2-493f-9fc2-604b47fe6bcf",
+  "uuid": "87adc2ef-9225-4ba8-9dba-5c0d192d2716",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

package/entry/FWEntry.ts

@@ -1,5 +1,4 @@
 import FWUiManager from '../manager/FWUiManager';
-import FWLog from '../log/FWLog';
 import FWAnimationManager from '../manager/FWAnimationManager';
 import FWAudioManager from '../manager/FWAudioManager';
 import FWComponentManager from '../manager/FWComponentManager';
@@ -22,7 +21,7 @@ import { FWPerformanceManager } from '../manager/FWPerformanceManager';
 /**
  * 入口脚本
  */
-export default class FWEntry implements FW.Entry {
+export class FWEntry implements FW.Entry {
   map: Map<string, FW.RegisterBundle>;
   /**
    * 事件管理器
@@ -144,7 +143,7 @@ export default class FWEntry implements FW.Entry {
         this.bundleName = '';
         return;
       } catch (e) {
-        FWLog.error('launchScene failed:', name);
+        FW.Log.error('launchScene failed:', name);
       }
     }