From 79f0854371d30b5c1b6e061e03b910ae00365090 Mon Sep 17 00:00:00 2001
From: oc <ckcz123@126.com>
Date: Thu, 8 Mar 2018 23:21:33 +0800
Subject: [PATCH] bgm

---
 libs/actions.js | 4 +++-
 libs/control.js | 8 +++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/libs/actions.js b/libs/actions.js
index 7cbebf1d..1a815548 100644
--- a/libs/actions.js
+++ b/libs/actions.js
@@ -1353,8 +1353,10 @@ actions.prototype.clickSwitchs = function (x,y) {
                 core.musicStatus.bgmStatus = !core.musicStatus.bgmStatus;
                 if (core.musicStatus.bgmStatus)
                     core.resumeBgm();
-                else
+                else {
                     core.pauseBgm();
+                    core.musicStatus.playingBgm = null;
+                }
                 core.setLocalStorage('bgmStatus', core.musicStatus.bgmStatus);
                 core.ui.drawSwitchs();
                 break;
diff --git a/libs/control.js b/libs/control.js
index 1ca01d62..8e7a992e 100644
--- a/libs/control.js
+++ b/libs/control.js
@@ -300,6 +300,8 @@ control.prototype.startGame = function (hard, callback) {
 ////// 重新开始游戏；此函数将回到标题页面 //////
 control.prototype.restart = function() {
     this.showStartAnimate();
+    if (core.bgms.length>0)
+        core.playBgm(core.bgms[0]);
 }
 
 
@@ -1994,7 +1996,11 @@ control.prototype.resumeBgm = function () {
         }
         else {
             if (core.bgms.length>0) {
-                core.playBgm(core.bgms[0]);
+                if (core.isset(core.floors[core.status.floorId].bgm)) {
+                    core.playBgm(core.floors[core.status.floorId].bgm);
+                }
+                else
+                    core.playBgm(core.bgms[0]);
                 core.musicStatus.isPlaying = true;
             }
         }