From feb816e04087bc1e06213bb290f64519c06fcec3 Mon Sep 17 00:00:00 2001
From: dgflash <dgflash@qq.com>
Date: Sun, 10 Mar 2024 23:37:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/core/common/audio/AudioEffect.ts  |  2 -
 assets/core/common/audio/AudioManager.ts |  7 ++--
 assets/core/common/audio/AudioMusic.ts   | 52 +++++++++++++++---------
 3 files changed, 36 insertions(+), 25 deletions(-)

diff --git a/assets/core/common/audio/AudioEffect.ts b/assets/core/common/audio/AudioEffect.ts
index a448bc2..766562e 100644
--- a/assets/core/common/audio/AudioEffect.ts
+++ b/assets/core/common/audio/AudioEffect.ts
@@ -64,9 +64,7 @@ export class AudioEffect extends AudioSource {
      */
     release(url: string) {
         if (this.effects.has(url)) {
-            var ac = this.effects.get(url);
             this.effects.delete(url);
-            ac?.destroy();
             oops.res.release(url);
         }
     }
diff --git a/assets/core/common/audio/AudioManager.ts b/assets/core/common/audio/AudioManager.ts
index e390d91..3c4dd33 100644
--- a/assets/core/common/audio/AudioManager.ts
+++ b/assets/core/common/audio/AudioManager.ts
@@ -35,14 +35,15 @@ export class AudioManager extends Component {
      * @param callback   音乐播放完成事件
      */
     playMusic(url: string, callback?: Function) {
-        if (this._switch_music) {
-            if (!this.music.playing) this.music.load(url, callback);
+        if (this._switch_music && !this.music.playing) {
+            this.music.loop = false;
+            this.music.load(url, callback);
         }
     }
 
     /** 循环播放背景音乐 */
     playMusicLoop(url: string) {
-        if (this._switch_music) {
+        if (this._switch_music && !this.music.playing) {
             this.music.loop = true;
             this.music.load(url);
         }
diff --git a/assets/core/common/audio/AudioMusic.ts b/assets/core/common/audio/AudioMusic.ts
index 48568ee..8d9b6eb 100644
--- a/assets/core/common/audio/AudioMusic.ts
+++ b/assets/core/common/audio/AudioMusic.ts
@@ -39,30 +39,40 @@ export class AudioMusic extends AudioSource {
      * @param callback     加载完成回调
      */
     public load(url: string, callback?: Function) {
-        oops.res.load(url, AudioClip, (err: Error | null, data: AudioClip) => {
-            if (err) {
-                error(err);
-            }
+        if (this._url == null) {
+            oops.res.load(url, AudioClip, (err: Error | null, data: AudioClip) => {
+                if (err) {
+                    error(err);
+                }
 
-            if (this.playing) {
-                this._isPlay = false;
-                this.stop();
-            }
+                // 注：事件定义在这里，是为了在播放前设置初始播放位置数据
+                callback && callback();
 
-            if (this._url) {
-                oops.res.release(this._url);
-            }
+                this.playPrepare(url, data);
+            });
+        }
+        else {
+            this.playPrepare(url, this.clip!);
+        }
+    }
 
-            this.enabled = true;
-            this.clip = data;
+    private playPrepare(url: string, data: AudioClip) {
+        if (this.playing) {
+            this._isPlay = false;
+            this.stop();
+        }
 
-            // 注：事件定义在这里，是为了在播放前设置初始播放位置数据
-            callback && callback();
+        if (this._url) {
+            this.clip = null;
+            oops.res.release(this._url);
+        }
 
-            this.play();
+        this.enabled = true;
+        this.clip = data;
 
-            this._url = url;
-        });
+        this.play();
+
+        this._url = url;
     }
 
     /** cc.Component 生命周期方法，验证背景音乐播放完成逻辑，建议不要主动调用 */
@@ -73,7 +83,9 @@ export class AudioMusic extends AudioSource {
 
         if (this._isPlay && this.playing == false && this.progress == 0) {
             this._isPlay = false;
-            this.enabled = false
+            this.enabled = false;
+            this.clip = null;
+            this._url = null!;
             this.onComplete && this.onComplete();
         }
     }
@@ -81,7 +93,7 @@ export class AudioMusic extends AudioSource {
     /** 释放当前背景音乐资源 */
     release() {
         if (this._url) {
-            this.clip?.destroy();
+            this.clip = null;
             oops.res.release(this._url);
             this._url = null!;
         }