From 4748fb65d83428cae333605c997acd3d233176df Mon Sep 17 00:00:00 2001
From: InstantMeteor <chuan_@outlook.com>
Date: Fri, 29 Nov 2019 16:38:04 +0800
Subject: [PATCH] Update events.js

---
 libs/events.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libs/events.js b/libs/events.js
index c95f2390..1729d674 100644
--- a/libs/events.js
+++ b/libs/events.js
@@ -2329,16 +2329,16 @@ events.prototype.showGif = function (name, x, y) {
 ////// 淡入淡出音乐 //////
 events.prototype.setVolume = function (value, time, callback) {
     var set = function (value) {
-        core.musicStatus.volume = value;
+        core.musicStatus.designVolume = value;
         if (core.musicStatus.playingBgm)
-            core.material.bgms[core.musicStatus.playingBgm].volume = value;
+            core.material.bgms[core.musicStatus.playingBgm].volume = core.musicStatus.userVolume * core.musicStatus.designVolume;
     }
     if (!time || time < 100) {
         set(value);
         if (callback) callback();
         return;
     }
-    var currVolume = core.musicStatus.volume;
+    var currVolume = core.musicStatus.designVolume;
     time /= Math.max(core.status.replay.speed, 1);
     var per_time = 10, step = 0, steps = parseInt(time / per_time);
     if (steps <= 0) steps = 1;