瀏覽代碼

热点和背景音乐问题

shaogen1995 3 年之前
父節點
當前提交
a12ffa1290

+ 16 - 0
web/public/static/js/Hot.js

@@ -1091,6 +1091,18 @@ window.initHot = function (model) {
 
 
         examine(options = {}) {
+            console.log('打开热点,关闭背景音乐');
+
+            // 判断当前背景音乐是开的还是关的
+            let tempp =document.querySelector('#openMusic')
+            if(tempp.style.display==='block') {
+                // 背景音乐当前为关闭状态
+                window.musicFlagNow = '音乐关'
+            } else {
+                window.musicFlagNow = '音乐开'
+                SoundManager.pause('bgm')
+            }
+
             var openHot = this.info.link && this.info.actionType.openHot && !options.dontOpen
             var needExamine = options.examine || (!settings.dontExamHot && this.info.actionType.examine)
             if (!openHot && !needExamine) return;
@@ -1601,6 +1613,10 @@ window.initHot = function (model) {
 
     Hot.closePopup = () => {// 关闭热点页面
         if (!g_currentHot) return;
+
+        console.log('关闭热点,打开背景音乐');
+        if(window.musicFlagNow === '音乐开') SoundManager.play('bgm')
+        
         g_currentHot = null;
         var hotPop = document.getElementById('popup');
         hotPop.style.display = "none";

+ 2 - 3
web/src/views/gui/menu.vue

@@ -257,6 +257,7 @@
           <div>
             <img
               id="openMusic"
+              style="display: block;"
               @click="switchBGM(true)"
               src="../../assets/img/musicAc.png"
               alt=""
@@ -264,6 +265,7 @@
             />
             <img
               id="closeMusic"
+              style="display: none;"
               @click="switchBGM(false)"
               src="../../assets/img/music.png"
               alt=""
@@ -365,9 +367,6 @@ export default {
 </script>
 
 <style lang="less" scoped>
-#closeMusic{
-  display: none;
-}
 #hotList {
   display: none !important;
 }

+ 17 - 0
webM/public/static/js/Hot.js

@@ -1089,6 +1089,18 @@ window.initHot = function (model) {
 
 
         examine(options = {}) {
+            console.log('打开热点,关闭背景音乐');
+
+            // 判断当前背景音乐是开的还是关的
+            let tempp =document.querySelector('#openMusic')
+            if(tempp.style.display==='block') {
+                // 背景音乐当前为关闭状态
+                window.musicFlagNow = '音乐关'
+            } else {
+                window.musicFlagNow = '音乐开'
+                SoundManager.pause('bgm')
+            }
+
             var openHot = this.info.link && this.info.actionType.openHot && !options.dontOpen
             var needExamine = options.examine || (!settings.dontExamHot && this.info.actionType.examine)
             if (!openHot && !needExamine) return;
@@ -1599,6 +1611,11 @@ window.initHot = function (model) {
 
     Hot.closePopup = () => {// 关闭热点页面
         if (!g_currentHot) return;
+        
+        console.log('关闭热点,打开背景音乐');
+        if(window.musicFlagNow === '音乐开') SoundManager.play('bgm')
+        
+
         g_currentHot = null;
         var hotPop = document.getElementById('popup');
         hotPop.style.display = "none";

+ 1 - 1
webM/src/views/gui/component/mapNav.vue

@@ -113,7 +113,7 @@ export default {
       font-size: 16px;
       transform: translateY(-50%);
       /deep/span {
-        font-size: 14px;
+        font-size: 18px;
         line-height: 30px;
       }
     }

+ 2 - 5
webM/src/views/gui/menu.vue

@@ -281,7 +281,7 @@
             </div>
             <!-- 音乐 -->
             <div id="volume" class="ui-icon bgandshare wide">
-              <div id="openMusic">
+              <div id="openMusic" style="display: block;">
                 <img
                   @click="switchBGM(true)"
                   src="../../assets/img/musicAc.png"
@@ -289,7 +289,7 @@
                 />
                 <span class="musicTxt">打开音乐</span>
               </div>
-              <div id="closeMusic">
+              <div id="closeMusic" style="display: none;">
                 <img
                   @click="switchBGM(false)"
                   src="../../assets/img/music.png"
@@ -368,9 +368,6 @@ export default {
 </script>
 
 <style lang="less" scoped>
-#closeMusic {
-  display: none;
-}
 #hotList {
   display: none !important;
 }