From e68b8a74ecd60b612b2e1958b1fd687b40f6582f Mon Sep 17 00:00:00 2001
From: dgflash <dgflash@qq.com>
Date: Mon, 15 Jul 2024 16:46:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=83=8C=E6=99=AF=E9=9F=B3?=
 =?UTF-8?q?=E4=B9=90=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/core/common/audio/AudioMusic.ts | 19 +++++++------------
 assets/libs/network/HttpRequest.ts     |  5 +++++
 assets/libs/network/NetManager.ts      |  5 +++++
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/assets/core/common/audio/AudioMusic.ts b/assets/core/common/audio/AudioMusic.ts
index d9ba668..bddbd1a 100644
--- a/assets/core/common/audio/AudioMusic.ts
+++ b/assets/core/common/audio/AudioMusic.ts
@@ -4,7 +4,7 @@
  * @LastEditors: dgflash
  * @LastEditTime: 2023-05-16 09:11:30
  */
-import { AudioClip, AudioSource, _decorator, error } from 'cc';
+import { AudioClip, AudioSource, _decorator } from 'cc';
 import { oops } from '../../Oops';
 
 const { ccclass, menu } = _decorator;
@@ -21,8 +21,8 @@ export class AudioMusic extends AudioSource {
     private _progress: number = 0;
     private _isLoading: boolean = false;
     private _bundleName: string = null!;        // 当前音乐资源包
-    private _bundleName_next: string = null!;   // 下一个音乐资源包
     private _url: string = null!;               // 当前播放音乐
+    private _bundleName_next: string = null!;   // 下一个音乐资源包
     private _url_next: string = null!;          // 下一个播放音乐
 
     /** 获取音乐播放进度 */
@@ -45,12 +45,9 @@ export class AudioMusic extends AudioSource {
      * @param url          音乐资源地址
      * @param callback     加载完成回调
      */
-    load(url: string, callback?: Function, bundleName?: string) {
+    async load(url: string, callback?: Function, bundleName?: string) {
         if (bundleName == null) bundleName = oops.res.defaultBundleName;
 
-        // 同一个音乐不重复播放
-        if (this._url == url && this._bundleName == bundleName) return;
-
         // 下一个加载的背景音乐资源
         if (this._isLoading) {
             this._bundleName_next = bundleName;
@@ -59,11 +56,8 @@ export class AudioMusic extends AudioSource {
         }
 
         this._isLoading = true;
-        oops.res.load(bundleName, url, AudioClip, (err: Error | null, data: AudioClip) => {
-            if (err) {
-                error(err);
-                return;
-            }
+        var data: AudioClip = await oops.res.loadAsync(bundleName, url, AudioClip);
+        if (data) {
             this._isLoading = false;
 
             // 处理等待加载的背景音乐
@@ -79,7 +73,7 @@ export class AudioMusic extends AudioSource {
                 callback && callback();
                 this.playPrepare(bundleName, url, data);
             }
-        });
+        }
     }
 
     private playPrepare(bundleName: string, url: string, data: AudioClip) {
@@ -115,6 +109,7 @@ export class AudioMusic extends AudioSource {
     /** 释放当前背景音乐资源 */
     release() {
         if (this._url) {
+            this.stop();
             this.clip = null;
             oops.res.release(this._url, this._bundleName);
         }
diff --git a/assets/libs/network/HttpRequest.ts b/assets/libs/network/HttpRequest.ts
index fd300c8..48bff56 100644
--- a/assets/libs/network/HttpRequest.ts
+++ b/assets/libs/network/HttpRequest.ts
@@ -6,6 +6,11 @@
  */
 import { error, warn } from "cc";
 
+/**
+ * 使用流程文档可参考、简化与服务器对接、使用新版API体验，可进入下面地址获取新版本，替换network目录中的内容
+ * https://store.cocos.com/app/detail/5877
+ */
+
 /** 当前请求地址集合 */
 var urls: any = {};
 /** 请求参数 */
diff --git a/assets/libs/network/NetManager.ts b/assets/libs/network/NetManager.ts
index 0b6f099..753ce04 100644
--- a/assets/libs/network/NetManager.ts
+++ b/assets/libs/network/NetManager.ts
@@ -7,6 +7,11 @@
 import { CallbackObject, IRequestProtocol, NetData } from "./NetInterface";
 import { NetConnectOptions, NetNode } from "./NetNode";
 
+/**
+ * 使用流程文档可参考、简化与服务器对接、使用新版API体验，可进入下面地址获取新版本，替换network目录中的内容
+ * https://store.cocos.com/app/detail/5877
+ */
+
 /*
  * 网络节点管理类
  */