From 3604c7550f126ff14460aceb44b958ebb80e72fe Mon Sep 17 00:00:00 2001
From: unanmed <1319491857@qq.com>
Date: Wed, 21 Jun 2023 17:28:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E6=9D=BF=E6=92=AD?=
 =?UTF-8?q?=E6=94=BEbgm=E7=9A=84=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/libs/control.js | 95 ++----------------------------------------
 public/libs/events.js  |  5 ---
 src/core/audio/bgm.ts  | 13 ++++--
 src/types/control.d.ts |  7 ----
 4 files changed, 13 insertions(+), 107 deletions(-)

diff --git a/public/libs/control.js b/public/libs/control.js
index 19d07df..97a9e66 100644
--- a/public/libs/control.js
+++ b/public/libs/control.js
@@ -3579,107 +3579,20 @@ control.prototype.screenFlash = function (
 ////// 播放背景音乐 //////
 control.prototype.playBgm = function (bgm, startTime) {
     bgm = core.getMappedName(bgm);
-    if (main.mode != 'play' || !core.material.bgms[bgm]) return;
-    // 如果不允许播放
-    if (!core.musicStatus.bgmStatus) {
-        try {
-            core.musicStatus.playingBgm = bgm;
-            core.musicStatus.lastBgm = bgm;
-            core.material.bgms[bgm].pause();
-        } catch (e) {
-            console.error(e);
-        }
-        return;
-    }
-
-    try {
-        this._playBgm_play(bgm, startTime);
-    } catch (e) {
-        console.log('无法播放BGM ' + bgm);
-        console.error(e);
-        core.musicStatus.playingBgm = null;
-    }
-};
-
-control.prototype._playBgm_play = function (bgm, startTime) {
-    // 如果当前正在播放，且和本BGM相同，直接忽略
-    if (
-        core.musicStatus.playingBgm == bgm &&
-        !core.material.bgms[core.musicStatus.playingBgm].paused &&
-        !startTime
-    ) {
-        return;
-    }
-    // 如果正在播放中，暂停
-    if (core.musicStatus.playingBgm) {
-        core.material.bgms[core.musicStatus.playingBgm].pause();
-    }
-    // 缓存BGM
-    core.loader.loadBgm(bgm);
-    // 播放当前BGM
-    core.material.bgms[bgm].volume =
-        core.musicStatus.userVolume * core.musicStatus.designVolume;
-    core.material.bgms[bgm].currentTime = startTime || 0;
-    core.material.bgms[bgm].play();
-    core.musicStatus.playingBgm = bgm;
-    core.musicStatus.lastBgm = bgm;
-    core.setBgmSpeed(100);
-};
-
-///// 设置当前背景音乐的播放速度 //////
-control.prototype.setBgmSpeed = function (speed, usePitch) {
-    var bgm = core.musicStatus.playingBgm;
-    if (main.mode != 'play' || !core.material.bgms[bgm]) return;
-    bgm = core.material.bgms[bgm];
-    if (speed < 30 || speed > 300) return;
-    bgm.playbackRate = speed / 100;
-    core.musicStatus.bgmSpeed = speed;
-
-    if (bgm.preservesPitch != null) {
-        if (bgm.__preservesPitch == null)
-            bgm.__preservesPitch = bgm.preservesPitch;
-        if (usePitch == null) bgm.preservesPitch = bgm.__preservesPitch;
-        else if (usePitch) bgm.preservesPitch = false;
-        else bgm.preservesPitch = true;
-        core.musicStatus.bgmUsePitch = usePitch;
-    }
+    if (main.mode !== 'play') return;
+    ancTe.bgm.play(bgm, startTime);
 };
 
 ////// 暂停背景音乐的播放 //////
 control.prototype.pauseBgm = function () {
     if (main.mode != 'play') return;
-    try {
-        if (core.musicStatus.playingBgm) {
-            core.musicStatus.pauseTime =
-                core.material.bgms[core.musicStatus.playingBgm].currentTime;
-            core.material.bgms[core.musicStatus.playingBgm].pause();
-            core.musicStatus.playingBgm = null;
-        }
-    } catch (e) {
-        console.log('无法暂停BGM');
-        console.error(e);
-    }
+    ancTe.bgm.pause();
 };
 
 ////// 恢复背景音乐的播放 //////
 control.prototype.resumeBgm = function (resumeTime) {
     if (main.mode != 'play') return;
-    try {
-        var speed = core.musicStatus.bgmSpeed;
-        var usePitch = core.musicStatus.bgmUsePitch;
-        core.playBgm(
-            core.musicStatus.playingBgm ||
-                core.musicStatus.lastBgm ||
-                main.startBgm,
-            resumeTime ? core.musicStatus.pauseTime : 0
-        );
-        if (resumeTime) {
-            core.setBgmSpeed(speed, usePitch);
-        }
-    } catch (e) {
-        console.log('无法恢复BGM');
-        console.error(e);
-    }
+    ancTe.bgm.resume();
 };
 
 ////// 更改背景音乐的播放 //////
diff --git a/public/libs/events.js b/public/libs/events.js
index d2c0d0c..c6fde61 100644
--- a/public/libs/events.js
+++ b/public/libs/events.js
@@ -2308,11 +2308,6 @@ events.prototype._action_setVolume = function (data, x, y, prefix) {
     );
 };
 
-events.prototype._action_setBgmSpeed = function (data, x, y, prefix) {
-    core.setBgmSpeed(data.value, data.pitch || false);
-    core.doAction();
-};
-
 events.prototype._action_setValue = function (data, x, y, prefix) {
     this.setValue(data.name, data.operator, data.value, prefix);
     if (!data.norefresh) {
diff --git a/src/core/audio/bgm.ts b/src/core/audio/bgm.ts
index 5e0dd8f..3ff50c3 100644
--- a/src/core/audio/bgm.ts
+++ b/src/core/audio/bgm.ts
@@ -25,10 +25,15 @@ export class BgmController extends ResourceController<HTMLAudioElement> {
     play(id: BgmIds, when: number = 0) {
         if (this.playing === id) return;
         this.pause();
-        const bgm = this.get(id);
-        bgm.currentTime = when;
-        bgm.play();
-        this.playing = id;
+        if (core.musicStatus.bgmStatus) {
+            const bgm = this.get(id);
+            bgm.currentTime = when;
+            bgm.volume = core.musicStatus.userVolume;
+            bgm.play();
+            this.playing = id;
+        } else {
+            delete this.playing;
+        }
         this.lastBgm = id;
     }
 
diff --git a/src/types/control.d.ts b/src/types/control.d.ts
index 69c71e6..a97dcae 100644
--- a/src/types/control.d.ts
+++ b/src/types/control.d.ts
@@ -979,13 +979,6 @@ interface Control {
      */
     playBgm(bgm: BgmIds | NameMapIn<BgmIds>, startTime?: number): void;
 
-    /**
-     * 设置背景音乐的播放速度和音调
-     * @param speed 要设置到的速度，100是原速
-     * @param usePitch 是否允许声调改变
-     */
-    setBgmSpeed(speed: number, usePitch?: boolean): void;
-
     /**
      * 暂停背景音乐的播放
      */