@ives_xxz/framework 1.6.6 → 2.0.1

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

package/manager/FWAudioManager.ts

@@ -1,6 +1,4 @@
-import { FWManager } from "./FWManager";
-import FWLog from "../log/FWLog";
-import { FWSystemDefine } from "../define/FWSystemDefine";
+import { FWManager } from './FWManager';
 
 class FWAudioData {
   clip: cc.AudioClip;
@@ -11,17 +9,10 @@ class FWAudioData {
 }
 
 class FWAudioPoolItem {
-  constructor(
-    public audioId: number,
-    public startTime: number,
-    public tag?: string
-  ) {}
+  constructor(public audioId: number, public startTime: number, public tag?: string) {}
 }
 
-export default class FWAudioManager
-  extends FWManager
-  implements FW.AudioManager
-{
+export default class FWAudioManager extends FWManager implements FW.AudioManager {
   musicVolume: number = 1;
   effectsVolume: number = 1;
   soundVolume: number = 1;
@@ -38,21 +29,13 @@ export default class FWAudioManager
    * 播放背景音乐
    */
   async playMusic(path: string, volume?: number, loop?: boolean): Promise<void>;
-  async playMusic(
-    music: cc.AudioClip,
-    volume?: number,
-    loop?: boolean
-  ): Promise<void>;
-  async playMusic(
-    assetProperty: FW.AssetProperty,
-    volume?: number,
-    loop?: boolean
-  ): Promise<void>;
+  async playMusic(music: cc.AudioClip, volume?: number, loop?: boolean): Promise<void>;
+  async playMusic(assetProperty: FW.AssetProperty, volume?: number, loop?: boolean): Promise<void>;
   async playMusic(): Promise<void> {
     try {
       const audioData = await this.processAudioArguments(
         arguments,
-        FWSystemDefine.FWAudioType.MUSIC
+        FW.SystemDefine.FWAudioType.MUSIC,
       );
       if (!audioData.clip) return;
 
@@ -63,9 +46,9 @@ export default class FWAudioManager
       const id = cc.audioEngine.playMusic(audioData.clip, loop);
       cc.audioEngine.setVolume(id, volume);
 
-      FWLog.debug(`播放背景音乐: ${this.getAudioName(audioData.clip)}`);
+      FW.Log.debug(`播放背景音乐: ${this.getAudioName(audioData.clip)}`);
     } catch (e) {
-      FWLog.error("播放音乐失败:", e);
+      FW.Log.error('播放音乐失败:', e);
     }
   }
 
@@ -95,40 +78,39 @@ export default class FWAudioManager
     cb?: (id: number) => void,
     volume?: number,
     loop?: boolean,
-    tag?: string
+    tag?: string,
   ): Promise<number>;
   async play(
     audio: cc.AudioClip,
     cb?: (id: number) => void,
     volume?: number,
     loop?: boolean,
-    tag?: string
+    tag?: string,
   ): Promise<number>;
   async play(
     assetProperty: FW.AssetProperty,
     cb?: (id: number) => void,
     volume?: number,
     loop?: boolean,
-    tag?: string
+    tag?: string,
   ): Promise<number>;
   async play(): Promise<number> {
     try {
       if (this.audioPool.size >= this.maxConcurrentAudio) {
         this.clearFinishedAudio();
         if (this.audioPool.size >= this.maxConcurrentAudio) {
-          FWLog.warn("音频池已满，无法播放新音频");
+          FW.Log.warn('音频池已满，无法播放新音频');
           return -1;
         }
       }
 
       const audioData = await this.processAudioArguments(
         arguments,
-        FWSystemDefine.FWAudioType.SOUND
+        FW.SystemDefine.FWAudioType.SOUND,
       );
       if (!audioData.clip) return -1;
 
-      const volume =
-        (audioData.volume ?? this.soundVolume) * this.effectsVolume;
+      const volume = (audioData.volume ?? this.soundVolume) * this.effectsVolume;
       const loop = audioData.loop ?? false;
       const tag = audioData.tag;
 
@@ -143,7 +125,7 @@ export default class FWAudioManager
 
       return id;
     } catch (e) {
-      FWLog.error("播放音效失败:", e);
+      FW.Log.error('播放音效失败:', e);
       return -1;
     }
   }
@@ -155,30 +137,30 @@ export default class FWAudioManager
     if (this.audioPool.has(id)) {
       cc.audioEngine.stop(id);
       this.audioPool.delete(id);
-      FWLog.debug(`停止音效: ID ${id}`);
+      FW.Log.debug(`停止音效: ID ${id}`);
     }
   }
 
   pauseAll(): void {
     cc.audioEngine.pauseAll();
-    FWLog.debug("暂停所有音效");
+    FW.Log.debug('暂停所有音效');
   }
 
   resumeAll(): void {
     cc.audioEngine.resumeAll();
-    FWLog.debug("恢复所有音效");
+    FW.Log.debug('恢复所有音效');
   }
 
   stopAll(): void {
     cc.audioEngine.stopAll();
     this.audioPool.clear();
-    FWLog.debug("停止所有音效");
+    FW.Log.debug('停止所有音效');
   }
 
   /** 设置播放音效是否静音 */
   setSoundMute(mute: boolean): void {
     this.soundVolume = mute ? 0 : 1;
-    FWLog.debug(`音效${mute ? "静音" : "取消静音"}`);
+    FW.Log.debug(`音效${mute ? '静音' : '取消静音'}`);
   }
 
   /**
@@ -188,7 +170,7 @@ export default class FWAudioManager
     try {
       let clip: cc.AudioClip;
 
-      if (typeof assetProperty === "string") {
+      if (typeof assetProperty === 'string') {
         clip = await FW.Entry.resMgr.loadAsset<cc.AudioClip>({
           path: assetProperty,
           bundle: FW.Entry.bundleName,
@@ -249,7 +231,7 @@ export default class FWAudioManager
    */
   private async processAudioArguments(
     args: IArguments,
-    type: FWSystemDefine.FWAudioType
+    type: FW.SystemDefine.FWAudioType,
   ): Promise<FWAudioData> {
     const audioData = new FWAudioData();
     const argsArray = Array.from(args);
@@ -261,7 +243,7 @@ export default class FWAudioManager
       audioData.clip = await this.loadAudioClip(assetProperty);
     }
 
-    if (type === FWSystemDefine.FWAudioType.MUSIC) {
+    if (type === FW.SystemDefine.FWAudioType.MUSIC) {
       audioData.volume = argsArray[1];
       audioData.loop = argsArray[2];
     } else {
@@ -278,7 +260,7 @@ export default class FWAudioManager
    * 标准化资源属性
    */
   private normalizeAssetProperty(input: any): FW.AssetProperty {
-    if (typeof input === "string") {
+    if (typeof input === 'string') {
       return {
         path: input,
         bundle: FW.Entry.bundleName,
@@ -290,9 +272,7 @@ export default class FWAudioManager
   /**
    * 加载音频片段
    */
-  private async loadAudioClip(
-    assetProperty: FW.AssetProperty
-  ): Promise<cc.AudioClip> {
+  private async loadAudioClip(assetProperty: FW.AssetProperty): Promise<cc.AudioClip> {
     try {
       return await FW.Entry.resMgr.loadAsset<cc.AudioClip>(assetProperty);
     } catch (e) {
@@ -304,19 +284,17 @@ export default class FWAudioManager
    * 生成缓存键
    */
   private getCacheKey(assetProperty: FW.AssetProperty): string {
-    if (typeof assetProperty === "string") {
+    if (typeof assetProperty === 'string') {
       return `${FW.Entry.bundleName}_${assetProperty}`;
     }
-    return `${assetProperty.bundle || FW.Entry.bundleName}_${
-      assetProperty.path
-    }`;
+    return `${assetProperty.bundle || FW.Entry.bundleName}_${assetProperty.path}`;
   }
 
   /**
    * 获取音频名称
    */
   private getAudioName(clip: cc.AudioClip): string {
-    return clip.name || "未知音频";
+    return clip.name || '未知音频';
   }
 
   /**
@@ -330,7 +308,7 @@ export default class FWAudioManager
       if (!cc.audioEngine.getState(id)) {
         this.audioPool.delete(id);
       } else if (currentTime - item.startTime > maxAge) {
-        FWLog.warn(`强制停止超时音频: ID ${id}`);
+        FW.Log.warn(`强制停止超时音频: ID ${id}`);
         this.stop(id);
       }
     });
@@ -344,7 +322,7 @@ export default class FWAudioManager
       this.clearFinishedAudio,
       this.cleanupInterval,
       cc.macro.REPEAT_FOREVER,
-      this
+      this,
     );
   }
 

package/manager/FWBundleManager.ts

@@ -1,7 +1,5 @@
 import { FWManager } from './FWManager';
-import FWLog from '../log/FWLog';
 import { FWSystemConfig } from '../config/FWSystemConfig';
-import { FWLodash } from '../utils/FWLodash';
 
 export class FWBundleManager extends FWManager implements FW.BundleManager {
   bundleMap: Map<string, cc.AssetManager.Bundle>;
@@ -44,7 +42,7 @@ export class FWBundleManager extends FWManager implements FW.BundleManager {
           },
           async (err: Error, bundle: cc.AssetManager.Bundle) => {
             if (err || !bundle) {
-              FWLog.error(`"加载bundle失败:"${bundleName}!`);
+              FW.Log.error(`"加载bundle失败:"${bundleName}!`);
               reject(err);
             }
 
@@ -67,7 +65,7 @@ export class FWBundleManager extends FWManager implements FW.BundleManager {
    */
   get(bundleName: string): cc.AssetManager.Bundle {
     if (!this.has(bundleName)) {
-      FWLog.error('获取bundle失败,请先加载!');
+      FW.Log.error('获取bundle失败,请先加载!');
       return undefined;
     }
     return this.bundleMap.get(bundleName);

package/manager/FWComponentManager.ts

@@ -1,4 +1,3 @@
-import FWVirtualViewComponent from '../component/FWVirtualViewComponent';
 import { FWManager } from './FWManager';
 
 export default class FWComponentManager extends FWManager implements FW.ComponentManager {

package/manager/FWEngineManager.ts

@@ -1,6 +1,3 @@
-import { FWEventDefine } from '../define/FWEventDefine';
-import { FWSystemDefine } from '../define/FWSystemDefine';
-import FWLog from '../log/FWLog';
 import { FWManager } from './FWManager';
 
 export default class FWEngineManager extends FWManager implements FW.EngineManager {
@@ -16,7 +13,7 @@ export default class FWEngineManager extends FWManager implements FW.EngineManag
   }
 
   restart() {
-    FW.Entry.evtMgr.dispatch(FWEventDefine.SystemEvent.SYSTEM_RESTART);
+    FW.Entry.evtMgr.dispatch(FW.EventDefine.SystemEvent.SYSTEM_RESTART);
     FW.Entry.initialize();
     FW.Framework.restart();
     cc.game.restart();
@@ -25,20 +22,20 @@ export default class FWEngineManager extends FWManager implements FW.EngineManag
   getMemory() {
     if (!this.debug) return;
     if (window.performance && window.performance['memory']) {
-      FWLog.debug(
+      FW.Log.debug(
         '浏览器允许的最大内存:',
         this.formatBytes(window.performance['memory'].jsHeapSizeLimit),
       );
-      FWLog.debug(
+      FW.Log.debug(
         '浏览器已分配内存:',
         this.formatBytes(window.performance['memory'].totalJSHeapSize),
       );
-      FWLog.debug(
+      FW.Log.debug(
         '浏览器已使用内存:',
         this.formatBytes(window.performance['memory'].usedJSHeapSize),
       );
     } else {
-      FWLog.debug('当前浏览器不支持 performance.memory');
+      FW.Log.debug('当前浏览器不支持 performance.memory');
     }
   }
   /**
@@ -50,14 +47,14 @@ export default class FWEngineManager extends FWManager implements FW.EngineManag
   }
   /** 应用切换到前台 */
   private onAppShow() {
-    FWLog.debug('game on show!');
-    FW.Entry.evtMgr?.dispatch(FWSystemDefine.CCEventType.ON_SHOW);
+    FW.Log.debug('game on show!');
+    FW.Entry.evtMgr?.dispatch(FW.EventDefine.CCEvent.ON_SHOW);
   }
 
   /** 应用切换到后台 */
   private onAppHide() {
-    FWLog.debug('game on hide!');
-    FW.Entry.evtMgr?.dispatch(FWSystemDefine.CCEventType.ON_HIDE);
+    FW.Log.debug('game on hide!');
+    FW.Entry.evtMgr?.dispatch(FW.EventDefine.CCEvent.ON_HIDE);
   }
 
   private formatBytes(bytes: number) {

package/manager/FWEventManager.ts

@@ -1,6 +1,3 @@
-import { FWSystemDefine } from '../define/FWSystemDefine';
-import FWLog from '../log/FWLog';
-
 /**
  * 观察者
  */
@@ -166,13 +163,13 @@ export default class FWEventManager implements FW.EventManager {
     ) => void,
     target: FW.TargetType,
     options?: {
-      priority?: FWSystemDefine.FWPriorityOrder;
+      priority?: number;
       intercept?: boolean;
       once?: boolean;
     },
   ) {
     const observers = this.listeners[eventName];
-    const define = FWSystemDefine.FWPriorityOrder;
+    const define = FW.SystemDefine.FWPriorityOrder;
     const priority = options?.priority === undefined ? define.NORMAL : options.priority;
     const intercept = options?.intercept === undefined ? false : options.intercept;
     const once = options?.once === undefined ? false : options.once;
@@ -218,13 +215,13 @@ export default class FWEventManager implements FW.EventManager {
     ) => void,
     target: FW.TargetType,
     options?: {
-      priority?: FWSystemDefine.FWPriorityOrder;
+      priority?: number;
       intercept?: boolean;
     },
   ) {
     this.register(eventName, cb, target, {
       ...options,
-      once: true, // 强制设置为一次性事件
+      once: true,
     });
   }