@ives_xxz/framework 2.1.19 → 2.1.20

package/manager/FWAudioManager.ts

@@ -1,4 +1,4 @@
-import { FWManager } from './FWManager';
+import { FWManager } from "./FWManager";
 
 class FWAudioData {
   clip: cc.AudioClip;
@@ -9,10 +9,17 @@ 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;
@@ -29,13 +36,21 @@ export default class FWAudioManager extends FWManager implements FW.AudioManager
    * 播放背景音乐
    */
   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;
 
@@ -48,7 +63,7 @@ export default class FWAudioManager extends FWManager implements FW.AudioManager
 
       FW.Log.debug(`播放背景音乐: ${this.getAudioName(audioData.clip)}`);
     } catch (e) {
-      FW.Log.error('播放音乐失败:', e);
+      FW.Log.error("播放音乐失败:", e);
     }
   }
 
@@ -78,40 +93,41 @@ export default class FWAudioManager extends FWManager implements FW.AudioManager
     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("音频池已满，无法播放新音频");
+        return -1;
+      }
+    }
+
+    const audioData = await this.processAudioArguments(
+      arguments,
+      FW.SystemDefine.FWAudioType.SOUND
+    );
+    if (!audioData.clip) return -1;
+
     try {
       return new Promise<number>(async (resolve, reject) => {
-        if (this.audioPool.size >= this.maxConcurrentAudio) {
-          this.clearFinishedAudio();
-          if (this.audioPool.size >= this.maxConcurrentAudio) {
-            FW.Log.warn('音频池已满，无法播放新音频');
-            return -1;
-          }
-        }
-
-        const audioData = await this.processAudioArguments(
-          arguments,
-          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;
 
@@ -128,7 +144,7 @@ export default class FWAudioManager extends FWManager implements FW.AudioManager
         return id;
       });
     } catch (e) {
-      FW.Log.error('播放音效失败:', e);
+      FW.Log.error("播放音效失败:", e);
       return -1;
     }
   }
@@ -146,24 +162,24 @@ export default class FWAudioManager extends FWManager implements FW.AudioManager
 
   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 ? "静音" : "取消静音"}`);
   }
 
   /**
@@ -173,7 +189,7 @@ export default class FWAudioManager extends FWManager implements FW.AudioManager
     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,
@@ -234,7 +250,7 @@ export default class FWAudioManager extends FWManager implements FW.AudioManager
    */
   private async processAudioArguments(
     args: IArguments,
-    type: FW.SystemDefine.FWAudioType,
+    type: FW.SystemDefine.FWAudioType
   ): Promise<FWAudioData> {
     const audioData = new FWAudioData();
     const argsArray = Array.from(args);
@@ -263,7 +279,7 @@ export default class FWAudioManager extends FWManager implements FW.AudioManager
    * 标准化资源属性
    */
   private normalizeAssetProperty(input: any): FW.AssetProperty {
-    if (typeof input === 'string') {
+    if (typeof input === "string") {
       return {
         path: input,
         bundle: FW.Entry.bundleName,
@@ -275,7 +291,9 @@ export default class FWAudioManager extends FWManager implements FW.AudioManager
   /**
    * 加载音频片段
    */
-  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) {
@@ -287,17 +305,19 @@ export default class FWAudioManager extends FWManager implements FW.AudioManager
    * 生成缓存键
    */
   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 || "未知音频";
   }
 
   /**
@@ -325,7 +345,7 @@ export default class FWAudioManager extends FWManager implements FW.AudioManager
       this.clearFinishedAudio,
       this.cleanupInterval,
       cc.macro.REPEAT_FOREVER,
-      this,
+      this
     );
   }
 

package/package.json

@@ -1,9 +1,11 @@
 {
   "name": "@ives_xxz/framework",
-  "version": "2.1.19",
+  "version": "2.1.20",
   "description": "cocoscreator 2.x mvc framework",
   "main": "index.js",
-  "keywords": ["123456"],
+  "keywords": [
+    "123456"
+  ],
   "author": "ives",
   "license": "ISC"
 }