@ives_xxz/framework 2.3.9 → 2.3.11

package/manager/FWAudioManager.ts

@@ -1,4 +1,4 @@
-import { FWManager } from "./FWManager";
+import { FWManager } from './FWManager';
 
 class FWAudioData {
   clip: cc.AudioClip;
@@ -12,20 +12,17 @@ class FWAudioPoolItem {
   constructor(
     public audioId: number,
     public startTime: number,
-    public tag?: string
+    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;
 
   private audioPool: Map<number, FWAudioPoolItem> = new Map();
-  private maxConcurrentAudio: number = 10;
+  private maxConcurrentAudio: number = 1000;
   private cleanupInterval: number = 5;
 
   public initialize(): void {
@@ -36,21 +33,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,
-        FW.SystemDefine.FWAudioType.MUSIC
+        FW.SystemDefine.FWAudioType.MUSIC,
       );
       if (!audioData.clip) return;
 
@@ -63,7 +52,7 @@ export default class FWAudioManager
 
       FW.Log.debug(`播放背景音乐: ${this.getAudioName(audioData.clip)}`);
     } catch (e) {
-      FW.Log.error("播放音乐失败:", e);
+      FW.Log.error('播放音乐失败:', e);
     }
   }
 
@@ -93,41 +82,40 @@ 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> {
     if (this.audioPool.size >= this.maxConcurrentAudio) {
       this.clearFinishedAudio();
       if (this.audioPool.size >= this.maxConcurrentAudio) {
-        FW.Log.warn("音频池已满，无法播放新音频");
+        FW.Log.warn('音频池已满，无法播放新音频');
         return -1;
       }
     }
 
     const audioData = await this.processAudioArguments(
       arguments,
-      FW.SystemDefine.FWAudioType.SOUND
+      FW.SystemDefine.FWAudioType.SOUND,
     );
     if (!audioData.clip) return -1;
 
     try {
       return new Promise<number>(async (resolve, reject) => {
-        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;
 
@@ -144,7 +132,7 @@ export default class FWAudioManager
         return id;
       });
     } catch (e) {
-      FW.Log.error("播放音效失败:", e);
+      FW.Log.error('播放音效失败:', e);
       return -1;
     }
   }
@@ -162,24 +150,24 @@ export default class FWAudioManager
 
   pauseAll(): void {
     cc.audioEngine.pauseAll();
-    FW.Log.debug("暂停所有音效");
+    FW.Log.debug('暂停所有音效');
   }
 
   resumeAll(): void {
     cc.audioEngine.resumeAll();
-    FW.Log.debug("恢复所有音效");
+    FW.Log.debug('恢复所有音效');
   }
 
   stopAll(): void {
     cc.audioEngine.stopAll();
     this.audioPool.clear();
-    FW.Log.debug("停止所有音效");
+    FW.Log.debug('停止所有音效');
   }
 
   /** 设置播放音效是否静音 */
   setSoundMute(mute: boolean): void {
     this.soundVolume = mute ? 0 : 1;
-    FW.Log.debug(`音效${mute ? "静音" : "取消静音"}`);
+    FW.Log.debug(`音效${mute ? '静音' : '取消静音'}`);
   }
 
   /**
@@ -189,7 +177,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,
@@ -250,7 +238,7 @@ export default class FWAudioManager
    */
   private async processAudioArguments(
     args: IArguments,
-    type: FW.SystemDefine.FWAudioType
+    type: FW.SystemDefine.FWAudioType,
   ): Promise<FWAudioData> {
     const audioData = new FWAudioData();
     const argsArray = Array.from(args);
@@ -279,7 +267,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,
@@ -291,9 +279,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) {
@@ -305,19 +291,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 || '未知音频';
   }
 
   /**
@@ -345,7 +329,7 @@ export default class FWAudioManager
       this.clearFinishedAudio,
       this.cleanupInterval,
       cc.macro.REPEAT_FOREVER,
-      this
+      this,
     );
   }
 

package/package.json

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

package/service/socket/FWSocket.ts

@@ -294,10 +294,14 @@ export default class FWSocket extends FW.Service implements FW.Socket {
   private onSocketClose() {
     FW.Log.debug('on close!');
     this.socketHandle?.onClose?.();
-    this.socket.onclose = null;
-    this.socket.onerror = null;
-    this.socket.onmessage = null;
-    this.socket.onopen = null;
+
+    if (this.socket) {
+      this.socket.onclose = null;
+      this.socket.onerror = null;
+      this.socket.onmessage = null;
+      this.socket.onopen = null;
+    }
+
     FW.Entry.timeMgr.scheduleOnce(
       () => {
         if (