From fb8145a9f4bd200edc31a7847cf92adc5cdedf12 Mon Sep 17 00:00:00 2001
From: oc <ckcz123@126.com>
Date: Mon, 21 Jan 2019 22:25:43 +0800
Subject: [PATCH] pauseBgm

---
 _server/editor_blockly.js | 2 +-
 docs/event.md             | 6 ++----
 libs/control.js           | 2 +-
 libs/events.js            | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/_server/editor_blockly.js b/_server/editor_blockly.js
index c8dd2161..202f142f 100644
--- a/_server/editor_blockly.js
+++ b/_server/editor_blockly.js
@@ -145,7 +145,7 @@ editor_blockly = function () {
       MotaActionBlocks['screenFlash_s'].xmlText(),
       MotaActionBlocks['setWeather_s'].xmlText(),
       MotaActionBlocks['playBgm_s'].xmlText(),
-      // MotaActionBlocks['pauseBgm_s'].xmlText(),
+      MotaActionBlocks['pauseBgm_s'].xmlText(),
       // MotaActionBlocks['resumeBgm_s'].xmlText(),
       MotaActionBlocks['loadBgm_s'].xmlText(),
       MotaActionBlocks['freeBgm_s'].xmlText(),
diff --git a/docs/event.md b/docs/event.md
index 76ea4b18..4259f2c5 100644
--- a/docs/event.md
+++ b/docs/event.md
@@ -1273,15 +1273,13 @@ async可选，如果为true则会异步执行（即不等待当前事件执行
 ### pauseBgm：暂停背景音乐
 
 使用`{"type": "pauseBgm"}`可以暂停背景音乐的播放。
-
-**从V2.5.4开始不再支持此事件，请通过设置音量来达到此效果。**
-
+<!--
 ### resumeBgm：恢复背景音乐
 
 使用`{"type": "resumeBgm"}`可以恢复背景音乐的播放。
 
 **从V2.5.4开始不再支持此事件，请通过设置音量来达到此效果。**
-
+-->
 ### loadBgm：预加载一个背景音乐
 
 使用loadBgm可以预加载一个背景音乐。
diff --git a/libs/control.js b/libs/control.js
index 21fb7479..b07903b4 100644
--- a/libs/control.js
+++ b/libs/control.js
@@ -2608,6 +2608,7 @@ control.prototype.pauseBgm = function () {
     try {
         if (core.isset(core.musicStatus.playingBgm)) {
             core.material.bgms[core.musicStatus.playingBgm].pause();
+            core.musicStatus.playingBgm = null;
         }
     }
     catch (e) {
@@ -2615,7 +2616,6 @@ control.prototype.pauseBgm = function () {
         main.log(e);
     }
     this.setMusicBtn();
-
 }
 
 ////// 恢复背景音乐的播放 //////
diff --git a/libs/events.js b/libs/events.js
index 81900b85..082a94e9 100644
--- a/libs/events.js
+++ b/libs/events.js
@@ -928,11 +928,11 @@ events.prototype.doAction = function() {
             core.playBgm(data.name);
             this.doAction();
             break;
-        /*
         case "pauseBgm":
             core.pauseBgm();
             this.doAction();
             break
+        /*
         case "resumeBgm":
             core.resumeBgm();
             this.doAction();