Browse Source

🐛背景音乐和自动导览和点位音乐冲突问题

shaogen1995 2 years ago
parent
commit
543651a4d7
4 changed files with 14 additions and 11 deletions
  1. 4 4
      SWKK/public/index.html
  2. 5 2
      SWKK/src/components/Hot.vue
  3. 2 2
      SWKK/src/components/Rbottom.vue
  4. 3 3
      SWKK/src/views/Home.vue

+ 4 - 4
SWKK/public/index.html

@@ -14,12 +14,12 @@
   <title>雨花台烈士纪念馆</title>
 
   <!-- 线上开发加上 -->
-  <!-- <script src="//4dkk.4dage.com/v4/sdk/4.2.0/kankan-sdk-deps.js"></script>
-  <script src="//4dkk.4dage.com/v4/sdk/4.2.0/kankan-sdk.js"></script> -->
+  <script src="//4dkk.4dage.com/v4/sdk/4.2.0/kankan-sdk-deps.js"></script>
+  <script src="//4dkk.4dage.com/v4/sdk/4.2.0/kankan-sdk.js"></script>
   
   <!-- 本地化加上 -->
-  <script src="./sdk/kankan-sdk-deps.js"></script>
-  <script src="./sdk/kankan-sdk.js"></script>
+  <!-- <script src="./sdk/kankan-sdk-deps.js"></script>
+  <script src="./sdk/kankan-sdk.js"></script> -->
 
   <script src="./jquery-2.1.1.min.js"></script>
 

+ 5 - 2
SWKK/src/components/Hot.vue

@@ -43,10 +43,11 @@
                   <!-- :src="`https://4dkk.4dage.com/scene_edit_data/${KKNum}/user/${item.media.video[0].src}`" -->
 
                   <!-- 本地化加上 -->
+                  <!-- :src="`scene_view_data/${KKNum}/user/${item.media.video[0].src}`" -->
                   <video
                     v-if="item.media && item.media.video[0]"
                     controls
-                    :src="`scene_view_data/${KKNum}/user/${item.media.video[0].src}`"
+                    :src="`https://4dkk.4dage.com/scene_edit_data/${KKNum}/user/${item.media.video[0].src}`"
                   ></video>
                 </div>
               </div>
@@ -67,10 +68,12 @@
               <!-- :audioSrc="`https://4dkk.4dage.com/scene_edit_data/${KKNum}/user/${item.media.audio[0].src}`" -->
 
               <!-- 本地化加上 -->
+              <!-- :audioSrc="`scene_view_data/${KKNum}/user/${item.media.audio[0].src}`" -->
+
               <Audio
                 :Aid="item.media.audio[0].src"
                 v-if="item.media && item.media.audio[0] && audioIndex === index"
-                :audioSrc="`scene_view_data/${KKNum}/user/${item.media.audio[0].src}`"
+                :audioSrc="`https://4dkk.4dage.com/scene_edit_data/${KKNum}/user/${item.media.audio[0].src}`"
               />
             </template>
           </div>

+ 2 - 2
SWKK/src/components/Rbottom.vue

@@ -281,7 +281,7 @@ export default {
         const dotAudioDomId = document.querySelector("#dotAudioDomId");
         if (dotAudioDomId) document.body.removeChild(dotAudioDomId);
 
-        dom.play();
+        if (!this.leftList[0].done) dom.play();
       } else dom.pause();
     },
   },
@@ -379,7 +379,7 @@ export default {
           window.bacMusic = !dom.paused;
           setTimeout(() => {
             this.music = false;
-          }, 800);
+          }, 500);
         } else {
           if (window.bacMusic) {
             setTimeout(() => {

+ 3 - 3
SWKK/src/views/Home.vue

@@ -248,9 +248,9 @@ export default {
       dom: ".box",
       num,
       // 本地化加上
-      deploy:'local',
-      resource:'',
-      server:''
+      // deploy:'local',
+      // resource:'',
+      // server:''
     });
     kankan.use("MinMap", {
       theme: {