From 25ce9e9b757da17cdaf24d2bfaeced5deec94e87 Mon Sep 17 00:00:00 2001
From: InstantMeteor <chuan_@outlook.com>
Date: Fri, 29 Nov 2019 16:37:36 +0800
Subject: [PATCH] Update control.js

---
 libs/control.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libs/control.js b/libs/control.js
index 5f7b5e6b..06e80118 100644
--- a/libs/control.js
+++ b/libs/control.js
@@ -2247,7 +2247,7 @@ control.prototype._playBgm_play = function (bgm, startTime) {
     // 缓存BGM
     core.loader.loadBgm(bgm);
     // 播放当前BGM
-    core.material.bgms[bgm].volume = core.musicStatus.volume;
+    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;
@@ -2320,7 +2320,7 @@ control.prototype.playSound = function (sound) {
             core.musicStatus.playingSounds[id] = source;
         }
         else {
-            core.material.sounds[sound].volume = core.musicStatus.volume;
+            core.material.sounds[sound].volume = core.musicStatus.userVolume;
             core.material.sounds[sound].play();
         }
     }