@ives_xxz/framework 1.6.5 → 2.0.0

package/item/FWVirtualListItem.ts

@@ -52,7 +52,7 @@ export default class FWVirtualListItem extends FWObject {
 
   _registerEvent() {
     if (!this._eventReg) {
-      if (this.btnCom && this.list.selectedMode > 0) {
+      if (this.btnCom && (this.list.selectedMode as number) > 0) {
         this.btnCom.clickEvents.unshift(this.createEvt(this, 'onClickThis'));
       }
       if (this.adaptiveSize) {

package/language/FWLanguage.ts

@@ -1,5 +1,4 @@
-import { FWEventDefine } from "../define/FWEventDefine";
-import { FWLodash } from "../utils/FWLodash";
+import { FWLodash } from '../utils/FWLodash';
 
 const { ccclass, property, executeInEditMode } = cc._decorator;
 
@@ -10,11 +9,8 @@ export default abstract class FWLanguage extends cc.Component {
   protected _language: number = 0;
 
   @property({
-    type: FWLodash.CCEnum([
-      "请选择语言",
-      ...FW.Entry.languageMgr.getSupportedLanguages(),
-    ]),
-    displayName: "language",
+    type: FWLodash.CCEnum(['请选择语言', ...FW.Entry.languageMgr.getSupportedLanguages()]),
+    displayName: 'language',
     visible: true,
     serializable: true,
   })
@@ -34,21 +30,21 @@ export default abstract class FWLanguage extends cc.Component {
 
   private refreshInspector() {
     //@ts-ignore
-    Editor.Utils.refreshSelectedInspector("node", this.node.uuid);
+    Editor.Utils.refreshSelectedInspector('node', this.node.uuid);
   }
 
   protected onLoad(): void {
-    this.registerEvent({
-  FWEvent: [
-    {
-      eventName: FWEventDefine.LanguageEvent.LANGUAGE_CHANGE,
-      cb: () => {
-        this._language = FW.Entry.languageMgr.getLanguageIndex();
-        this.onLanguageChange();
-      }
-    }
-  ]
-});
+    FW.Entry.uiMgr.register({
+      FWEvent: [
+        {
+          eventName: FW.EventDefine.LanguageEvent.LANGUAGE_CHANGE,
+          cb: () => {
+            this._language = FW.Entry.languageMgr.getLanguageIndex();
+            this.onLanguageChange();
+          },
+        },
+      ],
+    });
   }
 
   protected onEnable(): void {

package/layer/FWLayer.ts

@@ -1,7 +1,7 @@
 const { ccclass, property } = cc._decorator;
 
 @ccclass
-export default class FWLayer extends cc.Component implements FW.Layer {
+export class FWLayer extends cc.Component implements FW.Layer {
   public readonly entry: FW.Entry = FW.Entry;
   public ctr: FW.LayerController;
   public onLoad(): void {}

package/log/FWLog.ts

@@ -1,20 +1,17 @@
-import { FWSystemDefine } from '../define/FWSystemDefine';
-
-export const FWLogColorMap: Map<FWSystemDefine.FWLogType, string> = new Map<
-  FWSystemDefine.FWLogType,
-  string
->([
-  [FWSystemDefine.FWLogType.DEBUG, '#FFFFFF'],
-  [FWSystemDefine.FWLogType.SOCKET_SEND, '#50BBE4'],
-  [FWSystemDefine.FWLogType.SOCKET_RECEIVE, '#F423DF'],
-  [FWSystemDefine.FWLogType.REQUEST, '#23F4C6'],
-  [FWSystemDefine.FWLogType.RESPONSE, '#FF8A00'],
-  [FWSystemDefine.FWLogType.WARN, '#FFC107'],
-  [FWSystemDefine.FWLogType.ERROR, '#DC3545'],
-  [FWSystemDefine.FWLogType.SYSTEM, '#9b1eeeff'],
-]);
-
-class FWLog {
+export class FWLog {
+  FWLogColorMap: Map<FW.SystemDefine.FWLogType, string> = new Map<
+    FW.SystemDefine.FWLogType,
+    string
+  >([
+    [FW.SystemDefine.FWLogType.DEBUG, '#FFFFFF'],
+    [FW.SystemDefine.FWLogType.SOCKET_SEND, '#50BBE4'],
+    [FW.SystemDefine.FWLogType.SOCKET_RECEIVE, '#F423DF'],
+    [FW.SystemDefine.FWLogType.REQUEST, '#23F4C6'],
+    [FW.SystemDefine.FWLogType.RESPONSE, '#FF8A00'],
+    [FW.SystemDefine.FWLogType.WARN, '#FFC107'],
+    [FW.SystemDefine.FWLogType.ERROR, '#DC3545'],
+    [FW.SystemDefine.FWLogType.SYSTEM, '#9b1eeeff'],
+  ]);
   private static instance: FWLog;
   public static getInstance() {
     if (!this.instance) {
@@ -30,8 +27,8 @@ class FWLog {
       return window.console.log.bind(
         window.console,
         `%c[debug]:${FW.Entry.timeMgr.getTime()}`,
-        `color: black; background-color: ${FWLogColorMap.get(
-          FWSystemDefine.FWLogType.DEBUG,
+        `color: black; background-color: ${this.FWLogColorMap.get(
+          FW.SystemDefine.FWLogType.DEBUG,
         )}; font-weight: bold; font-size: 10;`,
       );
 
@@ -43,8 +40,8 @@ class FWLog {
       return window.console.log.bind(
         window.console,
         `%c[sendMsg]:${FW.Entry.timeMgr.getTime()}`,
-        `color: black; background-color: ${FWLogColorMap.get(
-          FWSystemDefine.FWLogType.SOCKET_SEND,
+        `color: black; background-color: ${this.FWLogColorMap.get(
+          FW.SystemDefine.FWLogType.SOCKET_SEND,
         )}; font-weight: bold; font-size: 10;`,
       );
     return console.log;
@@ -55,8 +52,8 @@ class FWLog {
       return window.console.log.bind(
         window.console,
         `%c[receiveMsg]:${FW.Entry.timeMgr.getTime()}`,
-        `color: black; background-color: ${FWLogColorMap.get(
-          FWSystemDefine.FWLogType.SOCKET_RECEIVE,
+        `color: black; background-color: ${this.FWLogColorMap.get(
+          FW.SystemDefine.FWLogType.SOCKET_RECEIVE,
         )}; font-weight: bold; font-size: 10;`,
       );
     return console.log;
@@ -67,8 +64,8 @@ class FWLog {
       return window.console.log.bind(
         window.console,
         `%c[request]:${FW.Entry.timeMgr.getTime()}`,
-        `color: black; background-color: ${FWLogColorMap.get(
-          FWSystemDefine.FWLogType.REQUEST,
+        `color: black; background-color: ${this.FWLogColorMap.get(
+          FW.SystemDefine.FWLogType.REQUEST,
         )}; font-weight: bold; font-size: 10;`,
       );
     return console.log;
@@ -79,8 +76,8 @@ class FWLog {
       return window.console.log.bind(
         window.console,
         `%c[response]:${FW.Entry.timeMgr.getTime()}`,
-        `color: black; background-color: ${FWLogColorMap.get(
-          FWSystemDefine.FWLogType.RESPONSE,
+        `color: black; background-color: ${this.FWLogColorMap.get(
+          FW.SystemDefine.FWLogType.RESPONSE,
         )}; font-weight: bold; font-size: 10;`,
       );
     return console.log;
@@ -91,8 +88,8 @@ class FWLog {
       return window.console.log.bind(
         window.console,
         `%c[system]:${FW.Entry.timeMgr.getTime()}`,
-        `color: black; background-color: ${FWLogColorMap.get(
-          FWSystemDefine.FWLogType.SYSTEM,
+        `color: black; background-color: ${this.FWLogColorMap.get(
+          FW.SystemDefine.FWLogType.SYSTEM,
         )}; font-weight: bold; font-size: 10;`,
       );
     return console.log;
@@ -103,8 +100,8 @@ class FWLog {
       return window.console.warn.bind(
         window.console,
         `%c[warn]:${FW.Entry.timeMgr.getTime()}`,
-        `color: black; background-color: ${FWLogColorMap.get(
-          FWSystemDefine.FWLogType.WARN,
+        `color: black; background-color: ${this.FWLogColorMap.get(
+          FW.SystemDefine.FWLogType.WARN,
         )}; font-weight: bold; font-size: 10;`,
       );
     return console.warn;
@@ -115,8 +112,8 @@ class FWLog {
       return window.console.error.bind(
         window.console,
         `%c[error]:${FW.Entry.timeMgr.getTime()}`,
-        `color: black; background-color: ${FWLogColorMap.get(
-          FWSystemDefine.FWLogType.ERROR,
+        `color: black; background-color: ${this.FWLogColorMap.get(
+          FW.SystemDefine.FWLogType.ERROR,
         )}; font-weight: bold; font-size: 10;`,
       );
     return console.error;
@@ -128,5 +125,3 @@ if (!CC_DEBUG && !CC_DEV && !CC_BUILD) {
   window.console.warn = () => {};
   window.console.error = () => {};
 }
-
-export default FWLog.getInstance();

package/logic/FWLogic.ts

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

package/machine/FWStateMachine.ts

@@ -1,4 +1,3 @@
-import FWLog from '../log/FWLog';
 import { FWState } from '../state/FWState';
 
 export default class FWStateMachine implements FW.StateMachine {
@@ -17,7 +16,7 @@ export default class FWStateMachine implements FW.StateMachine {
   /** 进入状态 */
   enter(stateType: number, ...args: any): void {
     if (this.stateMap.size == 0) {
-      FWLog.error('stateMachine is not register!');
+      FW.Log.error('stateMachine is not register!');
       return;
     }
 

package/manager/FWAnimationManager.ts

@@ -1,8 +1,6 @@
 import { FWSkeleton } from '../animation/FWSkeleton';
 import { FWTween } from '../animation/FWTween';
 import { FWManager } from './FWManager';
-import { FWSystemDefine } from '../define/FWSystemDefine';
-import FWLog from '../log/FWLog';
 import { FWAnimationMachine } from '../machine/FWAnimationMachine';
 
 export default class FWAnimationManager extends FWManager {
@@ -10,9 +8,9 @@ export default class FWAnimationManager extends FWManager {
   public initialize(): void {
     this.animationMachineMap = new Map<string, FWAnimationMachine>();
 
-    this.createAnimationMachine(FWSystemDefine.FWAnimationMachineType.TWEEN);
-    this.createAnimationMachine(FWSystemDefine.FWAnimationMachineType.SKELETON);
-    this.createAnimationMachine(FWSystemDefine.FWAnimationMachineType.ANIMATION);
+    this.createAnimationMachine(FW.SystemDefine.FWAnimationMachineType.TWEEN);
+    this.createAnimationMachine(FW.SystemDefine.FWAnimationMachineType.SKELETON);
+    this.createAnimationMachine(FW.SystemDefine.FWAnimationMachineType.ANIMATION);
   }
 
   /**
@@ -22,7 +20,7 @@ export default class FWAnimationManager extends FWManager {
    */
   createTween(args?: FW.TweenArgs) {
     const t = new FWTween();
-    const machine = this.animationMachineMap.get(FWSystemDefine.FWAnimationMachineType.TWEEN);
+    const machine = this.animationMachineMap.get(FW.SystemDefine.FWAnimationMachineType.TWEEN);
     t.animationName = args?.tag || '';
     t.animation = cc.tween(args?.target);
     t.timeScale(args?.timeScale || 1);
@@ -37,7 +35,7 @@ export default class FWAnimationManager extends FWManager {
    */
   createSkeleton(skeleton: sp.Skeleton) {
     const s = new FWSkeleton();
-    const machine = this.animationMachineMap.get(FWSystemDefine.FWAnimationMachineType.SKELETON);
+    const machine = this.animationMachineMap.get(FW.SystemDefine.FWAnimationMachineType.SKELETON);
     s.animationName = skeleton.name;
     s.animation = skeleton;
     machine.addAnimation(s);
@@ -63,7 +61,7 @@ export default class FWAnimationManager extends FWManager {
    */
   private createAnimationMachine(animationMachineName: string) {
     if (this.animationMachineMap.has(animationMachineName)) {
-      FWLog.warn(`已创建动画机:${animationMachineName},请勿重复注册!`);
+      FW.Log.warn(`已创建动画机:${animationMachineName},请勿重复注册!`);
       return;
     }
     const machine = new FWAnimationMachine();

package/manager/FWAssetManager.ts

@@ -1,5 +1,4 @@
 import { FWSystemConfig } from '../config/FWSystemConfig';
-import FWLog from '../log/FWLog';
 import { FWManager } from './FWManager';
 
 /**
@@ -68,7 +67,7 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
         }, FWSystemConfig.PromiseConfig.loadAsset).promise,
       );
     } catch (e) {
-      FWLog.error('从远程加载spine动画资源失败!');
+      FW.Log.error('从远程加载spine动画资源失败!');
     }
   }
 
@@ -93,7 +92,7 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
 
   async preLoad(assetProperty: FW.AssetProperty | FW.AssetProperty[]) {
     if (!assetProperty) {
-      FWLog.error(`加载资源失败,请检查参数列表:${assetProperty}!`);
+      FW.Log.error(`加载资源失败,请检查参数列表:${assetProperty}!`);
       return undefined;
     }
 
@@ -107,19 +106,19 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
         const progress = property.progress;
 
         if (!bundleName || bundleName === '') {
-          FWLog.error(`找不到bundle${bundleName},或者bundle未加载!`);
+          FW.Log.error(`找不到bundle${bundleName},或者bundle未加载!`);
           return undefined;
         }
 
         if (!path || path === '') {
-          FWLog.error(`找不到资源路径${path},请检查!`);
+          FW.Log.error(`找不到资源路径${path},请检查!`);
           return undefined;
         }
 
         let bundle: cc.AssetManager.Bundle = await this.resMgr.loadBundle(bundleName);
 
         if (!bundle) {
-          FWLog.error(`加载bundle失败,请检查!`);
+          FW.Log.error(`加载bundle失败,请检查!`);
           return undefined;
         }
 
@@ -152,7 +151,7 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
    */
   async load(assetProperty: FW.AssetProperty): Promise<FW.AssetData> {
     if (!assetProperty) {
-      FWLog.error(`加载资源失败,请检查参数列表:${assetProperty}!`);
+      FW.Log.error(`加载资源失败,请检查参数列表:${assetProperty}!`);
       return undefined;
     }
     const bundleName = assetProperty.bundle || FW.Entry.bundleName;
@@ -163,19 +162,19 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
     const autoRelease = assetProperty.autoRelease;
 
     if (!bundleName || bundleName === '') {
-      FWLog.error(`找不到bundle${bundleName},或者bundle未加载!`);
+      FW.Log.error(`找不到bundle${bundleName},或者bundle未加载!`);
       return undefined;
     }
 
     if (!path || path === '') {
-      FWLog.error(`找不到资源路径${path},请检查!`);
+      FW.Log.error(`找不到资源路径${path},请检查!`);
       return undefined;
     }
 
     let bundle: cc.AssetManager.Bundle = await this.resMgr.loadBundle(bundleName);
 
     if (!bundle) {
-      FWLog.error(`加载bundle失败,请检查!`);
+      FW.Log.error(`加载bundle失败,请检查!`);
       return undefined;
     }
     const key = this.createAssetMapKey(assetProperty);
@@ -230,7 +229,7 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
    */
   async loadDir(assetProperty: FW.AssetProperty): Promise<FW.AssetData[]> {
     if (!assetProperty) {
-      FWLog.error(`加载资源失败,请检查参数列表:${assetProperty}!`);
+      FW.Log.error(`加载资源失败,请检查参数列表:${assetProperty}!`);
       return undefined;
     }
     const bundleName = assetProperty.bundle || FW.Entry.bundleName;
@@ -240,19 +239,19 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
     const autoRelease = assetProperty.autoRelease;
 
     if (!bundleName || bundleName === '') {
-      FWLog.error(`找不到bundle${bundleName},或者bundle未加载!`);
+      FW.Log.error(`找不到bundle${bundleName},或者bundle未加载!`);
       return undefined;
     }
 
     if (!path || path === '') {
-      FWLog.error(`找不到资源路径${path},请检查!`);
+      FW.Log.error(`找不到资源路径${path},请检查!`);
       return undefined;
     }
 
     const bundle: cc.AssetManager.Bundle = await this.resMgr.loadBundle(bundleName);
 
     if (!bundle) {
-      FWLog.error(`加载bundle失败,请检查!`);
+      FW.Log.error(`加载bundle失败,请检查!`);
       return undefined;
     }
 
@@ -263,7 +262,7 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
       ) => {
         bundle.loadDir(path, type, (err: Error, assets: cc.Asset[]) => {
           if (err || assets.length === 0) {
-            FWLog.error(`加载资源失败:${assets},请检查!`);
+            FW.Log.error(`加载资源失败:${assets},请检查!`);
             reject(err);
           }
 
@@ -303,24 +302,24 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
    */
   get(assetProperty: FW.AssetProperty): FW.AssetData {
     if (!assetProperty) {
-      FWLog.error(`加载资源失败,请检查参数列表:${assetProperty}!`);
+      FW.Log.error(`加载资源失败,请检查参数列表:${assetProperty}!`);
       return undefined;
     }
     const bundleName = assetProperty.bundle || FW.Entry.bundleName;
     const path = assetProperty.path;
 
     if (!bundleName || bundleName === '') {
-      FWLog.error(`找不到bundle${bundleName},或者bundle未加载!`);
+      FW.Log.error(`找不到bundle${bundleName},或者bundle未加载!`);
       return undefined;
     }
 
     if (!path || path === '') {
-      FWLog.error(`找不到资源路径${path},请检查!`);
+      FW.Log.error(`找不到资源路径${path},请检查!`);
       return undefined;
     }
 
     if (!this.has(assetProperty)) {
-      FWLog.error('获取资源失败,请先加载!');
+      FW.Log.error('获取资源失败,请先加载!');
       return undefined;
     }
 
@@ -337,7 +336,7 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
    */
   release(assetProperty: FW.AssetProperty): void {
     if (!assetProperty) {
-      FWLog.error(`加载资源失败,请检查参数列表:${assetProperty}!`);
+      FW.Log.error(`加载资源失败,请检查参数列表:${assetProperty}!`);
       return undefined;
     }
     const bundleName = assetProperty.bundle || FW.Entry.bundleName;
@@ -345,12 +344,12 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
     const autoRelease = assetProperty.autoRelease;
 
     if (!bundleName || bundleName === '') {
-      FWLog.error(`找不到bundle${bundleName},或者bundle未加载!`);
+      FW.Log.error(`找不到bundle${bundleName},或者bundle未加载!`);
       return undefined;
     }
 
     if (!path || path === '') {
-      FWLog.error(`找不到资源路径${path},请检查!`);
+      FW.Log.error(`找不到资源路径${path},请检查!`);
       return undefined;
     }
 
@@ -384,7 +383,7 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
    */
   has(assetProperty: FW.AssetProperty) {
     if (!assetProperty) {
-      FWLog.error(`判断资源是否存在失败,请检查参数列表:${assetProperty}!`);
+      FW.Log.error(`判断资源是否存在失败,请检查参数列表:${assetProperty}!`);
       return;
     }