瀏覽代碼

Merge branch 'dev' into dev2

# Conflicts:
#	settings/builder.json
smallqiang 5 年之前
父節點
當前提交
a8b5d145bb
共有 2 個文件被更改,包括 6 次插入0 次删除
  1. 5 0
      assets/scripts/common/Platform.js
  2. 1 0
      assets/scripts/utils/AudioMng.js

+ 5 - 0
assets/scripts/common/Platform.js

@@ -373,6 +373,11 @@ class Platform {
 
     static handelOnShow() {
         if (GameGlobal.isOnHide) {
+
+            if (GameModule.audioMng) {
+                GameModule.audioMng.playBgm();
+            }
+
             GameGlobal.isOnHide = false;
 
             //客户端优先刷新技能使用情况

+ 1 - 0
assets/scripts/utils/AudioMng.js

@@ -107,6 +107,7 @@ cc.Class({
      */
     stopAll () {
         cc.audioEngine.stopAll();
+        delete this.currentAudio['bgm'];
     },
 
     /**