From db566da909e842635ee2b7b4b03b36551955bbe5 Mon Sep 17 00:00:00 2001
From: oc <ckcz123@126.com>
Date: Sat, 12 Jan 2019 00:52:38 +0800
Subject: [PATCH] musicBtn & bgm in floor

---
 _server/comment.js | 5 ++++-
 libs/control.js    | 3 +++
 libs/events.js     | 3 +++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/_server/comment.js b/_server/comment.js
index b44cc428..e7e80b72 100644
--- a/_server/comment.js
+++ b/_server/comment.js
@@ -386,7 +386,10 @@ var comment_c456ea59_6018_45ef_8bcc_211a24c627dc =
                         },
                         "bgm": {
                             "_leaf": true,
-                            "_type": "textarea",
+                            "_type": "select",
+                            "_select": {
+                                "values": [null].concat(Object.keys(editor.core.material.bgms))
+                            },
                             "_data": "到达该层后默认播放的BGM。本项可忽略，或者为一个定义过的背景音乐如\"bgm.mp3\"。"
                         },
                         "item_ratio": {
diff --git a/libs/control.js b/libs/control.js
index 60c56c49..a56e4523 100644
--- a/libs/control.js
+++ b/libs/control.js
@@ -304,6 +304,8 @@ control.prototype.showStartAnimate = function (noAnimate, callback) {
     core.clearMap('all');
     core.deleteAllCanvas();
 
+    core.dom.musicBtn.style.display = 'block';
+
     // 重置音量
     core.events.setVolume(1, 0);
 
@@ -436,6 +438,7 @@ control.prototype.resetStatus = function(hero, hard, floorId, route, maps, value
     core.resize();
     this.updateGlobalAttribute(Object.keys(core.status.globalAttribute));
     this.triggerStatusBar(core.getFlag('hideStatusBar', false)?'hide':'show', core.getFlag("showToolbox"));
+    core.dom.musicBtn.style.display = 'none';
 }
 
 ////// 重新开始游戏；此函数将回到标题页面 //////
diff --git a/libs/events.js b/libs/events.js
index 2c00c849..2469336b 100644
--- a/libs/events.js
+++ b/libs/events.js
@@ -127,6 +127,7 @@ events.prototype.startGame = function (hard, seed, route, callback) {
         var post_start = function () {
 
             core.control.triggerStatusBar('show');
+            core.dom.musicBtn.style.display = 'none';
 
             core.changeFloor(core.firstData.floorId, null, nowLoc, null, function() {
                 if (core.isset(callback)) callback();
@@ -169,6 +170,8 @@ events.prototype.startGame = function (hard, seed, route, callback) {
 
         if (core.flags.startUsingCanvas) {
             core.control.triggerStatusBar('hide');
+            core.dom.musicBtn.style.display = 'block';
+            
             core.insertAction(core.clone(core.firstData.startCanvas), null, null, function() {
                 real_start();
             });