Merge branch 'master' of http://192.168.0.115:3000/shaogen1995/WuZhongBWG

web/public/static/css/main.css

@@ -3343,7 +3343,7 @@ a.hasHover:hover, a:active {
 }
 
 .darkGlass {
-    background-color: rgba(0, 0, 0, .45)
+    background-color: rgba(0, 0, 0, .45);
 }
 
 .ui-icon {
@@ -3816,7 +3816,7 @@ a.hasHover:hover, a:active {
 }
 
 #view-controllers .darkGlass {
-    background-color: rgba(0, 0, 0, .45)
+    background-color: rgba(0, 0, 0, .45);
 }
 
 #view-controllers .darkGlass.active {
@@ -3962,7 +3962,7 @@ a.hasHover:hover, a:active {
 }
 
 #drawer.open {
-    height: 130px
+    height: 140px
 }
 
 #drawer-container.drawerOpen #drawer.open {
@@ -4020,7 +4020,8 @@ a.hasHover:hover, a:active {
 .frame-container {
     float: left;
     width: calc(100% - 58px);
-    height: 100%
+    height: 100%;
+    background-color: #A1653B;
 }
 
 .fullWidth .frame-container {
@@ -4030,10 +4031,8 @@ a.hasHover:hover, a:active {
 .frame {
     padding-top: 8px;
     width: 100%;
-    height: 100%;
+    height: 132px;
     float: left;
-    display: flex;
-    justify-content: center;
     background-color: #A1653B;
     position: relative;
 }
@@ -4043,7 +4042,7 @@ a.hasHover:hover, a:active {
 }
 
 .frame .slidee {
-    margin: 0;
+    margin: 0 auto;
     padding: 0;
     height: 100%;
     list-style: none
@@ -4124,18 +4123,15 @@ a.hasHover:hover, a:active {
 }
 
 .scrollbar {
-    width: calc(100% - 10px);
-    margin: 0 5px;
+    width: 100%;
     height: 8px;
     float: left;
-    border-radius: 5px;
-    background: rgba(0, 0, 0, .75)
 }
 
 .scrollbar .handle {
     width: 100px;
     height: 100%;
-    background: #00F3FF;
+    background: #fff;
     border-radius: 5px
 }
 

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";

web/public/static/js/main_2020_show.js

@@ -6447,6 +6447,7 @@ window.Modernizr = function(n, e, t) {
                     t.changeMode(Be)
                 }),
                 $("#gui-modes-floorplan").on("click", function(e) {
+                    SoundManager.pause('tour')
                     l(e),
                     i.mode !== _e.FLOORPLAN && (J.track("showcase_gui", {
                         gui_action: "click_floorplan_mode_button"
@@ -6454,12 +6455,16 @@ window.Modernizr = function(n, e, t) {
                     t.changeMode(_e.FLOORPLAN));
                 }),
                 $("#gui-modes-dollhouse").on("click", function(e) {
+                    SoundManager.pause('tour')
                     l(e),
                     i.mode !== _e.DOLLHOUSE && (J.track("showcase_gui", {
                         gui_action: "click_dollhouse_mode_button"
                     }),
                     t.changeMode(_e.DOLLHOUSE));
                 })
+                $("#gui-modes-inside").on("click", function() {
+                    SoundManager.pause('tour')
+                })
             }
             function v(e, t) {
                 function i() {

web/public/static/js/manage.js

@@ -970,6 +970,9 @@ var SoundManager = {//暂不支持同时播放
      
     
     play:function(name, src, currentTime){
+        // 点击开始自动导览的时候，手动停止背景音乐播放
+        window.manage.switchBgmState(false);
+
         var object = this.list.find(e=>e.name == name)
         if(object){
             if(this.currentAudio){ 

web/src/views/gui/compomemt/antique.vue

@@ -419,7 +419,7 @@ export default {
     background-size: 100% 100%;
     display: flex;
     .ifrCon {
-      background-color: #d9d9d9;
+      background-color: #fff6d2;
       position: relative;
       width: 558px;
       height: 478px;

web/src/views/gui/compomemt/hotspot.vue

@@ -2,7 +2,7 @@
   <div class="hotspot" :class="{ full: smBtn }">
     <div class="top">热点列表</div>
     <div class="main">
-      <div class="txtNone" v-if="data.length===0">暂无热点</div>
+      <div class="txtNone" v-if="data.length === 0">暂无热点</div>
       <div class="txt" v-else>
         <span
           :class="{ active: hotInd === index }"
@@ -42,8 +42,12 @@ export default {
   //方法集合
   methods: {
     openHot(e, index) {
-      e && e.examine(window.player, true);
-      this.hotInd = index;
+      // 停止自动导览
+      window.player.director.stopTour();
+      setTimeout(() => {
+        e && e.examine(window.player, true);
+        this.hotInd = index;
+      }, 200);
     },
   },
   //生命周期 - 创建完成（可以访问当前this实例）
@@ -85,7 +89,7 @@ export default {
     width: 100%;
     height: calc(100% - 100px);
     background-color: rgba(255, 246, 210, 1);
-    .txtNone{
+    .txtNone {
       height: 90%;
       color: #7e522f;
       font-size: 24px;
@@ -125,9 +129,9 @@ export default {
       height: 10%;
       background: url("../../../assets/img/closeT.png") no-repeat center center;
       background-size: 44px 44px;
-      &:hover{
-      background: url("../../../assets/img/close.png") no-repeat center center;
-      background-size: 44px 44px;
+      &:hover {
+        background: url("../../../assets/img/close.png") no-repeat center center;
+        background-size: 44px 44px;
       }
     }
   }

web/src/views/gui/compomemt/mapNav.vue

@@ -10,10 +10,14 @@
         v-for="item in data"
         :key="item.id"
       >
-        <div class="rowtxt" v-html="item.name"></div>
-        <img :src="require(`@/assets/img/${item.url}.png`)" alt="" />
+        <div class="rowtxt">
+          <div class="one">{{ item.name }}</div>
+          <div class="tow" v-if="item.num">{{ item.num }}</div>
+          <div class="three" v-html="item.txt" v-if="item.txt"></div>
+        </div>
+        <img :src="require(`@/assets/img/${item.url}.jpg`)" alt="" />
         <p class="bs">·</p>
-        <p v-html="item.name"></p>
+        <p>{{item.name+(item.num?item.num:'')}}</p>
         <!-- 背景遮造 -->
         <div class="smak" @click="cutScene(item.url)">
           <div>点击<br />浏览</div>
@@ -39,14 +43,22 @@ export default {
     //这里存放数据
     return {
       data: [
-        { name: "前言", url: "1185" },
+        { name: "序厅", url: "1185" },
         {
-          name: "<span>第一单元</span><br/>三大文明的发现地和革命地",
+          name: "吴忠溯源",
+          num: "（一）",
+          txt: "远古印记<br/>魏晋南北朝时期",
           url: "1186",
         },
-        { name: "<span>第二单元</span><br/>战国秦长城西端起首地", url: "1187" },
         {
-          name: "<span>第三单元</span><br/>丝绸之路南线的枢纽和重镇",
+          name: "吴忠溯源",
+          num: "（二）",
+          txt: "隋唐时期<br/>元明清时期",
+          url: "1187",
+        },
+        {
+          name: "红色吴忠展厅",
+          txt:'革命战争时期',
           url: "1188",
         },
       ],
@@ -119,24 +131,38 @@ export default {
       width: 230px;
       height: 620px;
       .rowtxt {
-        font-weight: 700;
+        width: 100%;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
         color: #774926;
-        font-size: 22px;
-        letter-spacing: 4px;
-        writing-mode: vertical-lr;
         position: absolute;
         top: 55px;
         left: 50%;
         transform: translateX(-50%);
-        /deep/span {
-          padding-top: 2px;
+        .one {
+          font-size: 22px;
+          font-weight: 700;
+          letter-spacing: 4px;
+          writing-mode: vertical-lr;
+        }
+        .tow{
+          font-weight: 700;
           font-size: 18px;
         }
+        .three{
+          margin-top: 25px;
+          font-size: 16px;
+          letter-spacing: 4px;
+          writing-mode: vertical-lr;
+        }
       }
       &:nth-of-type(1) .rowtxt {
-        font-size: 24px;
         top: 150px;
-        letter-spacing: 40px;
+        .one {
+          font-size: 24px;
+          letter-spacing: 40px;
+        }
       }
 
       & > img {
@@ -144,7 +170,7 @@ export default {
         height: 100%;
         object-fit: cover;
       }
-      .bs{
+      .bs {
         font-size: 80px;
         margin: 10px 0;
       }
@@ -179,9 +205,9 @@ export default {
         }
       }
       &:hover {
-          & > p{
-            color: #3f1e05;
-          }
+        & > p {
+          color: #3f1e05;
+        }
         .smak {
           opacity: 1;
         }
@@ -189,7 +215,7 @@ export default {
     }
     .noneAc {
       pointer-events: none;
-      opacity: .5;
+      opacity: 0.5;
     }
   }
   .close {

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=""
@@ -352,22 +354,19 @@ export default {
     switchBGM(flag) {
       if (flag) {
         window.manage.switchBgmState(true);
-        document.querySelector('#openMusic').style.display='none'
-        document.querySelector('#closeMusic').style.display='block'
+        document.querySelector("#openMusic").style.display = "none";
+        document.querySelector("#closeMusic").style.display = "block";
       } else {
         window.manage.switchBgmState(false);
-        document.querySelector('#openMusic').style.display='block'
-        document.querySelector('#closeMusic').style.display='none'
-        }
+        document.querySelector("#openMusic").style.display = "block";
+        document.querySelector("#closeMusic").style.display = "none";
+      }
     },
   },
 };
 </script>
 
 <style lang="less" scoped>
-#closeMusic{
-  display: none;
-}
 #hotList {
   display: none !important;
 }

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";

webM/public/static/js/main_2020_show.js

@@ -6440,6 +6440,7 @@ window.Modernizr = function(n, e, t) {
                     t.changeMode(Be)
                 }),
                 $("#gui-modes-floorplan").on("click", function(e) {
+                    SoundManager.pause('tour')
                     l(e),
                     i.mode !== _e.FLOORPLAN && (J.track("showcase_gui", {
                         gui_action: "click_floorplan_mode_button"
@@ -6447,12 +6448,16 @@ window.Modernizr = function(n, e, t) {
                     t.changeMode(_e.FLOORPLAN));
                 }),
                 $("#gui-modes-dollhouse").on("click", function(e) {
+                    SoundManager.pause('tour')
                     l(e),
                     i.mode !== _e.DOLLHOUSE && (J.track("showcase_gui", {
                         gui_action: "click_dollhouse_mode_button"
                     }),
                     t.changeMode(_e.DOLLHOUSE));
                 })
+                $("#gui-modes-inside").on("click", function() {
+                    SoundManager.pause('tour')
+                })
             }
             function v(e, t) {
                 function i() {

webM/src/views/gui/component/antique.vue

@@ -63,7 +63,7 @@
         <iframe :src="mySrc" frameborder="0" v-else></iframe>
         <!-- 全屏按钮 -->
         <div class="fullM" :class="{ fullX: fullscreen }" @click="screen">
-          <img src="@/assets/img/close.png" alt="" v-if="fullscreen" />
+          <img src="@/assets/img/close2.png" alt="" v-if="fullscreen" />
           <img src="@/assets/img/tab3Full.png" alt="" v-else />
         </div>
       </div>
@@ -219,7 +219,7 @@ export default {
       z-index: -1;
     }
     .ifrCon {
-      background-color: #d9d9d9;
+      background-color: #fff6d2;
       position: relative;
       width: 100%;
       height: calc(100% - 60px);
@@ -244,6 +244,7 @@ export default {
         }
       }
       .fullX {
+        z-index: 99;
         position: fixed;
         left: 50%;
         transform: translateX(-50%);
@@ -373,6 +374,9 @@ export default {
           height: 100%;
         }
         /deep/.el-input__inner {
+          // ios端无法输入的问题
+          -webkit-user-select: auto;
+          -webkit-user-select: text !important;
           height: 100%;
           line-height: 36px;
           color: #cc946d;

webM/src/views/gui/component/hotspot.vue

@@ -37,8 +37,13 @@ export default {
   //方法集合
   methods: {
     openHot(e, index) {
-      e && e.examine(window.player, true);
-      this.hotInd = index;
+      // 停止自动导览
+      window.player.director.stopTour();
+
+      setTimeout(() => {
+        e && e.examine(window.player, true);
+        this.hotInd = index;
+      }, 200);
     },
   },
   //生命周期 - 创建完成（可以访问当前this实例）

webM/src/views/gui/component/mapNav.vue

@@ -10,7 +10,7 @@
         :key="item.id"
       >
         <div class="rowTxt" v-html="item.name"></div>
-        <img :src="require(`@/assets/img/${item.url}.png`)" alt="" />
+        <img :src="require(`@/assets/img/${item.url}.jpg`)" alt="" />
       </div>
     </div>
     <!-- 关闭按钮 -->
@@ -26,14 +26,14 @@ export default {
     //这里存放数据
     return {
       data: [
-        { name: "前言", url: "1185" },
+        { name: "序厅", url: "1185" },
         {
-          name: "<span>第一单元</span><br/>三大文明的发现地和革命地",
+          name: "<span>吴忠溯源（一）</span><br/>远古印记  魏晋南北朝时期",
           url: "1186",
         },
-        { name: "<span>第二单元</span><br/>战国秦长城西端起首地", url: "1187" },
+        { name: "<span>吴忠溯源（二）</span><br/>隋唐时期  元明清时期", url: "1187" },
         {
-          name: "<span>第三单元</span><br/>丝绸之路南线的枢纽和重镇",
+          name: "<span>红色吴忠展厅</span><br/>革命战争时期",
           url: "1188",
         },
       ],
@@ -101,7 +101,7 @@ export default {
       & > img {
         width: 100%;
         height: 120px;
-        object-fit: cover;
+        object-fit: contain;
       }
     }
     .rowTxt {
@@ -113,7 +113,7 @@ export default {
       font-size: 16px;
       transform: translateY(-50%);
       /deep/span {
-        font-size: 14px;
+        font-size: 18px;
         line-height: 30px;
       }
     }

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;
 }