fix error when set volume as a string value (cocos#3455)

loong6 · Nov 5, 2018 · b568f39 · b568f39
1 parent cf2d4d1
commit b568f39
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/cocos2d/audio/CCAudioEngine.js b/cocos2d/audio/CCAudioEngine.js
@@ -90,6 +90,17 @@ let getAudioFromId = function (id) {
     return _id2audio[id];
 };
 
+let handleVolume  = function (volume) {
+    if (!volume) {
+        // set default volume as 1
+        volume = 1;
+    }
+    else if (typeof volume === 'string') {
+        volume = Number.parseFloat(volume);
+    }
+    return volume;
+};
+
 /**
  * !#en cc.audioEngine is the singleton object, it provide simple audio APIs.
  * !#zh
@@ -150,9 +161,7 @@ var audioEngine = {
         }
 
         audio.setLoop(loop || false);
-        if (typeof volume !== 'number') {
-            volume = 1;
-        }
+        volume = handleVolume(volume);
         audio.setVolume(volume);
         audio.play();
 
@@ -647,6 +656,7 @@ var audioEngine = {
      * cc.audioEngine.setMusicVolume(0.5);
      */
     setMusicVolume: function (volume) {
+        volume = handleVolume(volume);
         var music = this._music;
         music.volume = volume;
         this.setVolume(music.id, music.volume);
@@ -690,6 +700,7 @@ var audioEngine = {
      * cc.audioEngine.setEffectsVolume(0.5);
      */
     setEffectsVolume: function (volume) {
+        volume = handleVolume(volume);
         var musicId = this._music.id;
         this._effect.volume = volume;
         for (var id in _id2audio) {