@ives_xxz/framework 1.6.5 → 2.0.0

package/Framework.ts

@@ -1,9 +1,5 @@
 import 'reflect-metadata';
 import { Container, interfaces } from 'inversify';
-import { FWSystemDefine } from './define/FWSystemDefine';
-import FWLog from './log/FWLog';
-import { FWEventDefine } from './define/FWEventDefine';
-import { FrameworkBase } from './FrameworkBase';
 
 export class Framework implements FW.Framework {
   private container: Container;
@@ -37,11 +33,11 @@ export class Framework implements FW.Framework {
       }
 
       const suffixMap = {
-        Logic: FWSystemDefine.FWBindTag.LOGIC,
-        Data: FWSystemDefine.FWBindTag.DATA,
-        Config: FWSystemDefine.FWBindTag.CONFIG,
-        Sender: FWSystemDefine.FWBindTag.SENDER,
-        Handle: FWSystemDefine.FWBindTag.HANDLE,
+        Logic: FW.SystemDefine.FWBindTag.LOGIC,
+        Data: FW.SystemDefine.FWBindTag.DATA,
+        Config: FW.SystemDefine.FWBindTag.CONFIG,
+        Sender: FW.SystemDefine.FWBindTag.SENDER,
+        Handle: FW.SystemDefine.FWBindTag.HANDLE,
       };
 
       const [suffix] = Object.entries(suffixMap).find(([key]) => className.endsWith(key)) || [];
@@ -151,10 +147,10 @@ export class Framework implements FW.Framework {
     classes.forEach((cls) => {
       if (cls && this.container.isBound(cls)) {
         try {
-          const instance = this.container.get(cls) as FrameworkBase;
+          const instance = this.container.get(cls) as FW.FrameworkBase;
           instance?.initializeDependencies?.();
         } catch (error) {
-          FWLog.warn(`Error initializing dependencies for ${cls.name}:`, error);
+          FW.Log.warn(`Error initializing dependencies for ${cls.name}:`, error);
         }
       }
     });
@@ -239,7 +235,7 @@ export class Framework implements FW.Framework {
             instance?.['onDestroy']?.();
           }
         } catch (e) {
-          FWLog.warn(`Error destroying component ${key}:`, e);
+          FW.Log.warn(`Error destroying component ${key}:`, e);
         }
       }
     }
@@ -261,7 +257,7 @@ export class Framework implements FW.Framework {
     return new Map(this.registeredComponents);
   }
 
-  private getKey(bundleName: string, tag: FWSystemDefine.FWBindTag) {
+  private getKey(bundleName: string, tag: FW.SystemDefine.FWBindTag) {
     return `${bundleName}${tag}`;
   }
 

package/FrameworkAutoInitialize.ts

@@ -0,0 +1,58 @@
+export function autoInitialize() {
+  const WD = window as any;
+  const SD = require('./define/FWSystemDefine');
+  const ED = require('./define/FWEventDefine');
+  WD.FW = {};
+
+  globalThis.FWPropertyNode = require('./expand/FWDecorator').FWPropertyNode;
+  globalThis.searchChild = require('./expand/FWDecorator').searchChild;
+  globalThis.FWPropertyNode = require('./expand/FWDecorator').FWPropertyNode;
+  globalThis.FWPropertyNodes = require('./expand/FWDecorator').FWPropertyNodes;
+  globalThis.FWPropertyComponent = require('./expand/FWDecorator').FWPropertyComponent;
+  globalThis.FWPropertyComponents = require('./expand/FWDecorator').FWPropertyComponents;
+  globalThis.PerformanceMonitor = require('./expand/FWDecorator').PerformanceMonitor;
+  globalThis.FWDeprecated = require('./expand/FWDecorator').FWDeprecated;
+  globalThis.FWSocketAutoProcessPause = require('./expand/FWDecorator').FWSocketAutoProcessPause;
+  globalThis.FWSocketAutoProcessResume = require('./expand/FWDecorator').FWSocketAutoProcessResume;
+  globalThis.RegisterEvents = require('./expand/FWDecorator').RegisterEvents;
+  globalThis.AutoRegisterCCEvent = require('./expand/FWDecorator').AutoRegisterCCEvent;
+  globalThis.AutoRegisterFWEvent = require('./expand/FWDecorator').AutoRegisterFWEvent;
+
+  (FW.SystemDefine as any) = {};
+  (FW.EventDefine as any) = {};
+
+  FW.EventDefine.CCEvent = new ED.CCEvent();
+  FW.EventDefine.LanguageEvent = new ED.LanguageEvent();
+  FW.EventDefine.SystemEvent = new ED.SystemEvent();
+  FW.EventDefine.TaskEvent = new ED.TaskEvent();
+  FW.SystemDefine.FWBindTag = new SD.FWBindTag();
+  FW.SystemDefine.FWObjectType = new SD.FWObjectType();
+  FW.SystemDefine.FWLayerRenderOrder = new SD.FWLayerRenderOrder();
+  FW.SystemDefine.FWLayerType = new SD.FWLayerType();
+  FW.SystemDefine.FWTaskStatus = new SD.FWTaskStatus();
+  FW.SystemDefine.FWPriorityOrder = new SD.FWPriorityOrder();
+  FW.SystemDefine.FWLogType = new SD.FWLogType();
+  FW.SystemDefine.FWHttpRequestType = new SD.FWHttpRequestType();
+  FW.SystemDefine.FWAnimationMachineType = new SD.FWAnimationMachineType();
+  FW.SystemDefine.FWScrollViewTemplateType = new SD.FWScrollViewTemplateType();
+  FW.SystemDefine.FWScrollViewSlideType = new SD.FWScrollViewSlideType();
+  FW.SystemDefine.FWScrollViewSelectedType = new SD.FWScrollViewSelectedType();
+  FW.SystemDefine.FWLanguageAssetType = new SD.FWLanguageAssetType();
+  FW.SystemDefine.FWPromiseStatus = new SD.FWPromiseStatus();
+  FW.SystemDefine.FWLayerState = new SD.FWLayerState();
+  FW.SystemDefine.FWAudioType = new SD.FWAudioType();
+  FW.Registry = require('./registry/FWRegistry').FWRegistry;
+  FW.Framework = new (require('./Framework').Framework)();
+  FW.FrameworkBase = require('./FrameworkBase').FrameworkBase;
+  FW.Entry = new (require('./entry/FWEntry').FWEntry)();
+  FW.Logic = require('./logic/FWLogic').FWLogic;
+  FW.Data = require('./data/FWData').FWData;
+  FW.Sender = require('./service/socket/FWSocketSender').FWSocketSender;
+  FW.Handle = require('./service/socket/FWSocketHandle').FWSocketHandle;
+  FW.AssetConfig = require('./config/FWAssetConfig').FWAssetConfig;
+  FW.Log = new (require('./log/FWLog').FWLog)();
+  FW.Layer = require('./layer/FWLayer').FWLayer;
+  FW.LayerController = require('./controller/FWLayerController').FWLayerController;
+  FW.Framework.initialize();
+  FW.Entry.initialize();
+}

package/{CC.d.ts.meta → FrameworkAutoInitialize.ts.meta}

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "01f051de-ca3a-4de6-ac59-5781550a55ee",
+  "uuid": "b1d4b4b3-2ea2-47b3-a76d-95a406ae7cb6",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

package/FrameworkBase.ts

@@ -1,12 +1,9 @@
 import { injectable } from 'inversify';
-import { FWEventDefine } from './define/FWEventDefine';
-import FWLog from './log/FWLog';
-import { FWSystemDefine } from './define/FWSystemDefine';
 import FWLogic from './logic/FWLogic';
 import FWData from './data/FWData';
+
 @injectable()
 export abstract class FrameworkBase {
-  public readonly entry: FW.Entry = FW.Entry;
   public logic?: FW.Logic;
   public data?: FW.Data;
   public config?: FW.Config;
@@ -17,9 +14,13 @@ export abstract class FrameworkBase {
   protected abstract initialize?(): void;
   protected abstract onDestroy?(): void;
   protected onRestart?(): void;
+  get entry() {
+    return FW.Entry;
+  }
+
   constructor() {
     this.initialize?.();
-    this.entry.evtMgr.register(FWEventDefine.SystemEvent.SYSTEM_RESTART, this.onRestart, this);
+    // this.entry.evtMgr.register(FW.EventDefine.SystemEvent.SYSTEM_RESTART, this.onRestart, this);
   }
 
   protected get moduleName(): string {
@@ -57,33 +58,33 @@ export abstract class FrameworkBase {
 
     const tag = this.getClassTag();
 
-    if (tag !== FWSystemDefine.FWBindTag.LOGIC) {
+    if (tag !== FW.SystemDefine.FWBindTag.LOGIC) {
       this.logic = FW.Framework.getComponent<FW.Logic>(
-        `${bundleName}${FWSystemDefine.FWBindTag.LOGIC}`,
+        `${bundleName}${FW.SystemDefine.FWBindTag.LOGIC}`,
       );
     }
 
-    if (tag !== FWSystemDefine.FWBindTag.DATA) {
+    if (tag !== FW.SystemDefine.FWBindTag.DATA) {
       this.data = FW.Framework.getComponent<FW.Data>(
-        `${bundleName}${FWSystemDefine.FWBindTag.DATA}`,
+        `${bundleName}${FW.SystemDefine.FWBindTag.DATA}`,
       );
     }
 
-    if (tag !== FWSystemDefine.FWBindTag.CONFIG) {
+    if (tag !== FW.SystemDefine.FWBindTag.CONFIG) {
       this.config = FW.Framework.getComponent<FW.Config>(
-        `${bundleName}${FWSystemDefine.FWBindTag.CONFIG}`,
+        `${bundleName}${FW.SystemDefine.FWBindTag.CONFIG}`,
       );
     }
 
-    if (tag !== FWSystemDefine.FWBindTag.SENDER) {
+    if (tag !== FW.SystemDefine.FWBindTag.SENDER) {
       this.sender = FW.Framework.getComponent<FW.SocketSender>(
-        `${bundleName}${FWSystemDefine.FWBindTag.SENDER}`,
+        `${bundleName}${FW.SystemDefine.FWBindTag.SENDER}`,
       );
     }
 
-    if (tag !== FWSystemDefine.FWBindTag.HANDLE) {
+    if (tag !== FW.SystemDefine.FWBindTag.HANDLE) {
       this.handle = FW.Framework.getComponent<FW.SocketHandle>(
-        `${bundleName}${FWSystemDefine.FWBindTag.HANDLE}`,
+        `${bundleName}${FW.SystemDefine.FWBindTag.HANDLE}`,
       );
     }
   }
@@ -110,7 +111,7 @@ export abstract class FrameworkBase {
     const shouldWarn = duration > 1000;
 
     if (FW.Entry.engineMgr.debug || shouldWarn) {
-      const log = shouldWarn ? FWLog.warn : FWLog.debug;
+      const log = shouldWarn ? FW.Log.warn : FW.Log.debug;
       log(`[${this.moduleName?.toUpperCase()}] Operation ${operationName} took ${duration}ms`);
     }
   }
@@ -123,7 +124,7 @@ export abstract class FrameworkBase {
       stack: error?.stack,
     };
 
-    FWLog.error(`Error in ${this.moduleName}.${operation}:`, errorInfo);
+    FW.Log.error(`Error in ${this.moduleName}.${operation}:`, errorInfo);
   }
 
   protected getCurrentTime(): number {
@@ -150,16 +151,16 @@ export abstract class FrameworkBase {
     return classNameLower.includes(bundleNameLower);
   }
 
-  private getClassTag(): FWSystemDefine.FWBindTag {
+  private getClassTag(): FW.SystemDefine.FWBindTag {
     const className = this.moduleName;
-    if (className.endsWith('Logic')) return FWSystemDefine.FWBindTag.LOGIC;
-    if (className.endsWith('Data')) return FWSystemDefine.FWBindTag.DATA;
+    if (className.endsWith('Logic')) return FW.SystemDefine.FWBindTag.LOGIC;
+    if (className.endsWith('Data')) return FW.SystemDefine.FWBindTag.DATA;
     if (className.endsWith('Config') || className.endsWith('AssetConfig'))
-      return FWSystemDefine.FWBindTag.CONFIG;
+      return FW.SystemDefine.FWBindTag.CONFIG;
     if (className.endsWith('Sender') || className.endsWith('SocketSender'))
-      return FWSystemDefine.FWBindTag.SENDER;
+      return FW.SystemDefine.FWBindTag.SENDER;
     if (className.endsWith('Handle') || className.endsWith('SocketHandle'))
-      return FWSystemDefine.FWBindTag.HANDLE;
+      return FW.SystemDefine.FWBindTag.HANDLE;
     return;
   }
 }

package/animation/FWSkeleton.ts

@@ -1,4 +1,3 @@
-import FWLog from '../log/FWLog';
 import { FWAnimation } from './FWAnimation';
 
 export class FWSkeleton extends FWAnimation implements FW.Skeleton {
@@ -36,12 +35,12 @@ export class FWSkeleton extends FWAnimation implements FW.Skeleton {
       animationName = animationName || skeletonNames?.[0];
 
       if (!animationName) {
-        FWLog.warn(`not find animationName,please check:${animationName}`);
+        FW.Log.warn(`not find animationName,please check:${animationName}`);
         return;
       }
 
       if (!this.hasAnimation(animationName)) {
-        FWLog.warn(`not find animationName,please check:${animationName}`);
+        FW.Log.warn(`not find animationName,please check:${animationName}`);
         return;
       }
 
@@ -52,7 +51,7 @@ export class FWSkeleton extends FWAnimation implements FW.Skeleton {
       );
 
       if (!this.animation.isAnimationCached() && trackEntry === null) {
-        FWLog.warn('cache mode no have callback!');
+        FW.Log.warn('cache mode no have callback!');
         args.cb?.();
         resolve();
         return;
@@ -141,7 +140,7 @@ export class FWSkeleton extends FWAnimation implements FW.Skeleton {
     // 取第一个骨骼作为挂点
     let boneNode = boneNodes[0];
     if (!boneNode) {
-      FWLog.warn('bone node is null');
+      FW.Log.warn('bone node is null');
     }
     node.parent = boneNode;
   }
@@ -158,7 +157,7 @@ export class FWSkeleton extends FWAnimation implements FW.Skeleton {
     const boneNodes = this.getBones(boneName);
     let boneNode: cc.Node = boneNodes[0];
     if (!boneNode) {
-      FWLog.error('boneNode is null');
+      FW.Log.error('boneNode is null');
       return cc.v3(0, 0, 0);
     }
     return boneNode.convertToWorldSpaceAR(cc.v3(0, 0, 0));

package/component/FWVirtualViewComponent.ts

@@ -1,6 +1,4 @@
-import { FWSystemDefine } from '../define/FWSystemDefine';
 import FWListItem from '../item/FWVirtualListItem';
-import FWLog from '../log/FWLog';
 
 const { ccclass, property, disallowMultiple, menu, executionOrder, requireComponent } =
   cc._decorator;
@@ -37,17 +35,17 @@ export default class FWVirtualViewComponent
 
   //模板类型
   @property({
-    type: cc.Enum(FWSystemDefine.FWScrollViewTemplateType),
+    type: cc.Enum(FW.SystemDefine.FWScrollViewTemplateType),
     tooltip: CC_DEV && '模板类型',
   })
-  private templateType: FWSystemDefine.FWScrollViewTemplateType =
-    FWSystemDefine.FWScrollViewTemplateType.PREFAB;
+  private templateType: FW.SystemDefine.FWScrollViewTemplateType =
+    FW.SystemDefine.FWScrollViewTemplateType.PREFAB;
   //模板Item（Node）
   @property({
     type: cc.Node,
     tooltip: CC_DEV && '模板Item',
     visible() {
-      return this.templateType == FWSystemDefine.FWScrollViewTemplateType.NODE;
+      return this.templateType == FW.SystemDefine.FWScrollViewTemplateType.NODE;
     },
   })
   tmpNode: cc.Node = null;
@@ -56,19 +54,19 @@ export default class FWVirtualViewComponent
     type: cc.Prefab,
     tooltip: CC_DEV && '模板Item',
     visible() {
-      return this.templateType == FWSystemDefine.FWScrollViewTemplateType.PREFAB;
+      return this.templateType == FW.SystemDefine.FWScrollViewTemplateType.PREFAB;
     },
   })
   tmpPrefab: cc.Prefab = null;
   //滑动模式
   @property()
-  private _slideMode: FWSystemDefine.FWScrollViewSlideType =
-    FWSystemDefine.FWScrollViewSlideType.NORMAL;
+  private _slideMode: FW.SystemDefine.FWScrollViewSlideType =
+    FW.SystemDefine.FWScrollViewSlideType.NORMAL;
   @property({
-    type: cc.Enum(FWSystemDefine.FWScrollViewSlideType),
+    type: cc.Enum(FW.SystemDefine.FWScrollViewSlideType),
     tooltip: CC_DEV && '滑动模式',
   })
-  set slideMode(val: FWSystemDefine.FWScrollViewSlideType) {
+  set slideMode(val: FW.SystemDefine.FWScrollViewSlideType) {
     this._slideMode = val;
   }
   get slideMode() {
@@ -81,7 +79,7 @@ export default class FWVirtualViewComponent
     tooltip: CC_DEV && '翻页作用距离',
     slide: true,
     visible() {
-      return this._slideMode == FWSystemDefine.FWScrollViewSlideType.PAGE;
+      return this._slideMode == FW.SystemDefine.FWScrollViewSlideType.PAGE;
     },
   })
   public pageDistance: number = 0.3;
@@ -107,7 +105,7 @@ export default class FWVirtualViewComponent
     tooltip: CC_DEV && '是否为循环列表',
     visible() {
       let val: boolean =
-        /*this.virtual &&*/ this.slideMode == FWSystemDefine.FWScrollViewSlideType.NORMAL;
+        /*this.virtual &&*/ this.slideMode == FW.SystemDefine.FWScrollViewSlideType.NORMAL;
       if (!val) this.cyclic = false;
       return val;
     },
@@ -159,15 +157,14 @@ export default class FWVirtualViewComponent
 
   //选择模式
   @property({
-    type: cc.Enum(FWSystemDefine.FWScrollViewSelectedType),
+    type: cc.Enum(FW.SystemDefine.FWScrollViewSelectedType),
     tooltip: CC_DEV && '选择模式',
   })
-  public selectedMode: FWSystemDefine.FWScrollViewSelectedType =
-    FWSystemDefine.FWScrollViewSelectedType.NONE;
+  public selectedMode: FW.SystemDefine.FWScrollViewSelectedType = 0;
   @property({
     tooltip: CC_DEV && '是否重复响应单选事件',
     visible() {
-      return this.selectedMode == FWSystemDefine.FWScrollViewSelectedType.SINGLE;
+      return this.selectedMode == FW.SystemDefine.FWScrollViewSelectedType.SINGLE;
     },
   })
   public repeatEventSingle: boolean = false;
@@ -183,7 +180,7 @@ export default class FWVirtualViewComponent
     let t: FWVirtualViewComponent = this;
     let item: any;
     switch (t.selectedMode) {
-      case FWSystemDefine.FWScrollViewSelectedType.SINGLE: {
+      case FW.SystemDefine.FWScrollViewSelectedType.SINGLE: {
         if (!t.repeatEventSingle && val == t._selectedId) return;
         item = t.getItemByListId(val);
 
@@ -205,7 +202,7 @@ export default class FWVirtualViewComponent
         );
         break;
       }
-      case FWSystemDefine.FWScrollViewSelectedType.MULTIPLE: {
+      case FW.SystemDefine.FWScrollViewSelectedType.MULTIPLE: {
         item = t.getItemByListId(val);
         if (!item) return;
         let listItem = item.getComponent(FWListItem);
@@ -256,7 +253,7 @@ export default class FWVirtualViewComponent
     let t = this;
     if (!t.checkInited(false)) return;
     if (val == null || val < 0) {
-      FWLog.error('numItems set the wrong::', val);
+      FW.Log.error('numItems set the wrong::', val);
       return;
     }
     t._actualNumItems = t._numItems = val;
@@ -268,7 +265,7 @@ export default class FWVirtualViewComponent
         t._numItems = t._cyclicNum * t._numItems;
       }
       t._onScrolling();
-      if (!t.frameByFrameRenderNum && t.slideMode == FWSystemDefine.FWScrollViewSlideType.PAGE)
+      if (!t.frameByFrameRenderNum && t.slideMode == FW.SystemDefine.FWScrollViewSlideType.PAGE)
         t.curPageNum = t.nearestListId;
     } else {
       if (t.cyclic) {
@@ -446,7 +443,7 @@ export default class FWVirtualViewComponent
 
     t.content = t._scrollView.content;
     if (!t.content) {
-      FWLog.error(t.node.name + "'s cc.ScrollView unset content!");
+      FW.Log.error(t.node.name + "'s cc.ScrollView unset content!");
       return;
     }
 
@@ -471,14 +468,14 @@ export default class FWVirtualViewComponent
 
     t.setTemplateItem(
       cc.instantiate(
-        t.templateType == FWSystemDefine.FWScrollViewTemplateType.PREFAB ? t.tmpPrefab : t.tmpNode,
+        t.templateType == FW.SystemDefine.FWScrollViewTemplateType.PREFAB ? t.tmpPrefab : t.tmpNode,
       ),
     );
 
     // 特定的滑动模式处理
     if (
-      t._slideMode == FWSystemDefine.FWScrollViewSlideType.ADHERING ||
-      t._slideMode == FWSystemDefine.FWScrollViewSlideType.PAGE
+      t._slideMode == FW.SystemDefine.FWScrollViewSlideType.ADHERING ||
+      t._slideMode == FW.SystemDefine.FWScrollViewSlideType.PAGE
     ) {
       t._scrollView.inertia = false;
       t._scrollView._onMouseWheel = function () {
@@ -630,13 +627,13 @@ export default class FWVirtualViewComponent
     //     }
     // }
     if (remove) {
-      t.selectedMode = FWSystemDefine.FWScrollViewSelectedType.NONE;
+      t.selectedMode = FW.SystemDefine.FWScrollViewSelectedType.NONE;
     }
     com = item.getComponent(cc.Widget);
     if (com && com.enabled) {
       t._needUpdateWidget = true;
     }
-    if (t.selectedMode == FWSystemDefine.FWScrollViewSelectedType.MULTIPLE) t.multSelected = [];
+    if (t.selectedMode == FW.SystemDefine.FWScrollViewSelectedType.MULTIPLE) t.multSelected = [];
 
     t._resetColumn();
   }
@@ -678,7 +675,7 @@ export default class FWVirtualViewComponent
    */
   checkInited(printLog: boolean = true) {
     if (!this._inited) {
-      if (printLog) FWLog.error('List initialization not completed!');
+      if (printLog) FW.Log.error('List initialization not completed!');
       return false;
     }
     return true;
@@ -1335,10 +1332,10 @@ export default class FWVirtualViewComponent
     }
     t._onScrolling();
 
-    if (t._slideMode == FWSystemDefine.FWScrollViewSlideType.ADHERING && !t.adhering) {
+    if (t._slideMode == FW.SystemDefine.FWScrollViewSlideType.ADHERING && !t.adhering) {
       //cc.log(t.adhering, t._scrollView.isAutoScrolling(), t._scrollView.isScrolling());
       t.adhere();
-    } else if (t._slideMode == FWSystemDefine.FWScrollViewSlideType.PAGE) {
+    } else if (t._slideMode == FW.SystemDefine.FWScrollViewSlideType.PAGE) {
       if (t._beganPos != null && t.curScrollIsTouch) {
         this._pageAdhere();
       } else {
@@ -1361,10 +1358,10 @@ export default class FWVirtualViewComponent
   _onTouchUp() {
     let t: any = this;
     t._scrollPos = null;
-    if (t._slideMode == FWSystemDefine.FWScrollViewSlideType.ADHERING) {
+    if (t._slideMode == FW.SystemDefine.FWScrollViewSlideType.ADHERING) {
       if (this.adhering) this._adheringBarrier = true;
       t.adhere();
-    } else if (t._slideMode == FWSystemDefine.FWScrollViewSlideType.PAGE) {
+    } else if (t._slideMode == FW.SystemDefine.FWScrollViewSlideType.PAGE) {
       if (t._beganPos != null) {
         this._pageAdhere();
       } else {
@@ -1380,10 +1377,10 @@ export default class FWVirtualViewComponent
       return;
 
     t._scrollPos = null;
-    if (t._slideMode == FWSystemDefine.FWScrollViewSlideType.ADHERING) {
+    if (t._slideMode == FW.SystemDefine.FWScrollViewSlideType.ADHERING) {
       if (t.adhering) t._adheringBarrier = true;
       t.adhere();
-    } else if (t._slideMode == FWSystemDefine.FWScrollViewSlideType.PAGE) {
+    } else if (t._slideMode == FW.SystemDefine.FWScrollViewSlideType.PAGE) {
       if (t._beganPos != null) {
         t._pageAdhere();
       } else {
@@ -1504,7 +1501,7 @@ export default class FWVirtualViewComponent
           this._delRedundantItem();
           this._forceUpdate = false;
           this._calcNearestItem();
-          if (this.slideMode == FWSystemDefine.FWScrollViewSlideType.PAGE)
+          if (this.slideMode == FW.SystemDefine.FWScrollViewSlideType.PAGE)
             this.curPageNum = this.nearestListId;
         }
       } else {
@@ -1523,7 +1520,7 @@ export default class FWVirtualViewComponent
       } else {
         this._updateDone = true;
         this._calcNearestItem();
-        if (this.slideMode == FWSystemDefine.FWScrollViewSlideType.PAGE)
+        if (this.slideMode == FW.SystemDefine.FWScrollViewSlideType.PAGE)
           this.curPageNum = this.nearestListId;
       }
     }
@@ -1775,10 +1772,10 @@ export default class FWVirtualViewComponent
     let t: any = this;
 
     if (!t.checkInited() || t.cyclic || !t._virtual)
-      return FWLog.error('This function is not allowed to be called!');
+      return FW.Log.error('This function is not allowed to be called!');
 
     if (!callFunc)
-      return FWLog.error(
+      return FW.Log.error(
         'CallFunc are not allowed to be NULL, You need to delete the corresponding index in the data array in the CallFunc!',
       );
 
@@ -1812,9 +1809,9 @@ export default class FWVirtualViewComponent
           if (t._virtual) t._createOrUpdateItem(newData);
           else t._createOrUpdateItem2(newId);
         } else t._numItems--;
-        if (t.selectedMode == FWSystemDefine.FWScrollViewSelectedType.SINGLE) {
+        if (t.selectedMode == FW.SystemDefine.FWScrollViewSelectedType.SINGLE) {
         } else if (
-          t.selectedMode == FWSystemDefine.FWScrollViewSelectedType.MULTIPLE &&
+          t.selectedMode == FW.SystemDefine.FWScrollViewSelectedType.MULTIPLE &&
           t.multSelected.length
         ) {
           let sub: number = t.multSelected.indexOf(listId);
@@ -1893,7 +1890,7 @@ export default class FWVirtualViewComponent
 
     let pos = t.getItemPos(listId);
     if (!pos) {
-      return CC_DEV && FWLog.error('pos is null', listId);
+      return CC_DEV && FW.Log.error('pos is null', listId);
     }
     let targetX: number, targetY: number;
 
@@ -2048,8 +2045,8 @@ export default class FWVirtualViewComponent
   skipPage(pageNum: number, timeInSecond: number) {
     let t: any = this;
     if (!t.checkInited()) return;
-    if (t._slideMode != FWSystemDefine.FWScrollViewSlideType.PAGE)
-      return FWLog.error('This function is not allowed to be called, Must SlideMode = PAGE!');
+    if (t._slideMode != FW.SystemDefine.FWScrollViewSlideType.PAGE)
+      return FW.Log.error('This function is not allowed to be called, Must SlideMode = PAGE!');
     if (pageNum < 0 || pageNum >= t._numItems) return;
     if (t.curPageNum == pageNum) return;
     // cc.log(pageNum);
@@ -2061,8 +2058,8 @@ export default class FWVirtualViewComponent
   calcCustomSize(numItems: number) {
     let t: any = this;
     if (!t.checkInited()) return;
-    if (!t._itemTmp) return FWLog.error('Unset template item!');
-    if (!t.renderEvent) return FWLog.error('Unset Render-Event!');
+    if (!t._itemTmp) return FW.Log.error('Unset template item!');
+    if (!t.renderEvent) return FW.Log.error('Unset Render-Event!');
     t._customSize = {};
     let temp: any = cc.instantiate(t._itemTmp);
     t.content.addChild(temp);

package/config/FWAssetConfig.ts

@@ -1,7 +1,7 @@
-import { injectable } from "inversify";
+import { injectable } from 'inversify';
 
 @injectable()
-export default abstract class FWAssetConfig implements FW.Config {
+export abstract class FWAssetConfig {
   abstract preLoad: FW.LoadConfig;
   abstract demandLoad: FW.LoadConfig;
 }

package/controller/FWLayerController.ts

@@ -1,9 +1,5 @@
-import { FWSystemDefine } from '../define/FWSystemDefine';
-import FWLayer from '../layer/FWLayer';
 import { FWLayerData } from '../manager/FWLayerManager';
-import { FrameworkBase } from '../FrameworkBase';
-export abstract class FWLayerController extends FrameworkBase implements FW.LayerController {
-  readonly entry: FW.Entry = FW.Entry;
+export abstract class FWLayerController extends FW.FrameworkBase implements FW.LayerController {
   /** layer数据 */
   layerData: FWLayerData;
   /** uuid */
@@ -11,9 +7,9 @@ export abstract class FWLayerController extends FrameworkBase implements FW.Laye
   /** 渲染顺序 */
   abstract renderOrder: number;
   /** 当前layer */
-  abstract layer: FWLayer;
+  abstract layer: FW.Layer;
   /** layer类型 */
-  abstract layerType: FWSystemDefine.FWLayerType;
+  abstract layerType: FW.SystemDefine.FWLayerType;
   /** 资源地址 */
   abstract get layerAssetProperty(): FW.AssetProperty;
   /** 关闭后是否自动释放资源 */

package/data/FWData.ts

@@ -1,7 +1,6 @@
-import { injectable } from "inversify";
-import { FrameworkBase } from "../FrameworkBase";
+import { injectable } from 'inversify';
 @injectable()
-export default class FWData extends FrameworkBase implements FW.Data {
+export class FWData extends FW.FrameworkBase implements FW.Data {
   public initialize?(): void;
   public onDestroy?(): void;
 }

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;
 }