update

packages/qjkankan-editor/src/components/materialListInMaterialSelector.vue

@@ -37,6 +37,7 @@
         >
         </span>
       </div> -->
+
       <div
         v-show="listLocalLength !== 0 || hasMoreData"
         class="table-body"
@@ -548,7 +549,6 @@ export default {
           this.longPollingIntervalId = null;
           // 最后上传成功能状态
           if (!newVal && oldValue) {
-            // debugger;
             this.refreshMaterialList();
           }
         } else {
@@ -666,12 +666,15 @@ export default {
           });
 
         const res = new Map();
-
+        const lastItem = this.folderPath[this.folderPath.length - 1];
         const latestUploadlist = this.uploadStatusList
           .concat(uploadlist)
-          .filter((a) => !res.has(a.backendId) && res.set(a.backendId, 1));
+          .filter((a) => !res.has(a.backendId) && res.set(a.backendId, 1))
+          .filter((i) => i.parentFolderId === lastItem.id);
         console.log("latestUploadlist", latestUploadlist);
-        // console.log("origin-list", this.list);
+
+        console.log("lastItem", lastItem);
+
         const capitalizedMaterialType = capitalize(this.materialType);
         this.$store.commit(
           `setUploadStatusList${capitalizedMaterialType}`,

packages/qjkankan-kankan-view/.env.testprod

@@ -4,9 +4,9 @@ VUE_APP_RESOURCE_URL=https://4dkk.4dage.com/
 # 静态资源地址
 VUE_APP_CDN_URL=https://4dkk.4dage.com/v4/www/
 # sdk 正式服
-VUE_APP_SDK_DIR=https://4dkk.4dage.com/v4/www/sdk/
+# VUE_APP_SDK_DIR=https://4dkk.4dage.com/v4/www/sdk/
 # sdk 测试服
-# VUE_APP_SDK_DIR=https://4dkk.4dage.com/v4-test/www/sdk/ 
+VUE_APP_SDK_DIR=https://4dkk.4dage.com/v4-test/www/sdk/ 
 
 
 

packages/qjkankan-kankan-view/public/smg.html

@@ -28,8 +28,9 @@
 
         <script src="<%= BASE_URL %><%= VUE_APP_STATIC_DIR %>/static/lib/jweixin-1.6.0.js"></script>
 
-        <script src="<%= VUE_APP_SDK_DIR %>kankan-sdk-deps.js?v=4.10.0-alpha.28"></script>
-        <script src="<%= VUE_APP_SDK_DIR %>kankan-sdk.js?v=4.10.0-alpha.28"></script>
+        <script src="<%= VUE_APP_SDK_DIR %>kankan-sdk-deps.js?v=4.10.0-alpha.32"></script>
+        <script src="<%= VUE_APP_SDK_DIR %>kankan-sdk.js?v=4.10.0-alpha.32"></script>
+
 
         <!-- <script src="<%= VUE_APP_SDK_DIR %>kankan-sdk-deps.js"></script>
         <script src="<%= VUE_APP_SDK_DIR %>kankan-sdk.js"></script> -->

packages/qjkankan-kankan-view/public/spg.html

@@ -16,8 +16,8 @@
             <strong>We're sorry but doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
         </noscript>
         <div id="app"></div>
-        <script src="<%= VUE_APP_SDK_DIR %>kankan-sdk-deps.js?v=4.10.0-alpha.28"></script>
-        <script src="<%= VUE_APP_SDK_DIR %>kankan-sdk.js?v=4.10.0-alpha.28"></script>   
+        <script src="<%= VUE_APP_SDK_DIR %>kankan-sdk-deps.js?v=v=4.10.0-alpha.32"></script>
+        <script src="<%= VUE_APP_SDK_DIR %>kankan-sdk.js?v=v=4.10.0-alpha.32"></script>   
         <!-- <script src="<%= VUE_APP_SDK_DIR %>kankan-sdk-deps.js"></script>
         <script src="<%= VUE_APP_SDK_DIR %>kankan-sdk.js"></script> -->
 

packages/qjkankan-kankan-view/src/components/shared/Guide.vue

@@ -1,246 +1,272 @@
 <template>
-    <div v-if="show && isMobile" class="user-guide-overlay">
-        <div class="user-guide-mobile">
-                <div class="zh">
-                    <div class="btn" @click="onSet"></div>
-                </div>
-        </div>
+  <div v-if="show && isMobile" class="user-guide-overlay">
+    <div class="user-guide-mobile">
+      <div class="en" v-if="lang === 'en'">
+        <ul>
+          <li>
+            <div>
+              <span>Walk</span>
+              <div>Click to move</div>
+            </div>
+          </li>
+          <li>
+            <div>
+              <span>Roam</span>
+              <div>Swipe the screen to roam the screen to roam</div>
+            </div>
+          </li>
+          <li>
+            <div>
+              <span>Zoom</span>
+              <div>Zoom in or out</div>
+            </div>
+          </li>
+        </ul>
+        <div class="btn" @click="onSet">Got it</div>
+      </div>
+      <div class="zh" v-else>
+        <div class="btn" @click="onSet"></div>
+      </div>
     </div>
+  </div>
 </template>
 <script setup>
-import { onMounted, watch, computed, ref, nextTick } from 'vue'
-import { useApp } from '@/app'
+import { onMounted, watch, computed, ref, nextTick } from "vue";
+import { useApp } from "@/app";
 import browser from "@/utils/browser";
 
-const isMobile = browser.isMobile()
+const lang = computed(() => browser.getURLParam("lang"));
 
-const show = ref(false)
+const isMobile = browser.isMobile();
+
+const show = ref(false);
 const onSet = () => {
-    show.value = false
-    localStorage.setItem('user_guide', Date.now())
-}
-const getTips = tips => {
-    let text = tips.split('<br />')
-    return `<span>${text[0]}</span><div>${text[1]}</div>`
-}
-useApp().then(app => {
-    app.Scene.on('loaded', () => {
-        if (!localStorage.getItem('user_guide')) {
-            show.value = true
-        }
-    })
-})
+  show.value = false;
+  localStorage.setItem("user_guide", Date.now());
+};
+const getTips = (tips) => {
+  let text = tips.split("<br />");
+  return `<span>${text[0]}</span><div>${text[1]}</div>`;
+};
+useApp().then((app) => {
+  app.Scene.on("loaded", () => {
+    // show.value = true;
+    if (!localStorage.getItem("user_guide")) {
+      show.value = true;
+    }
+  });
+});
 </script>
 <style lang="scss" scoped>
 .user-guide-overlay {
-    position: fixed;
-    left: 0;
-    top: 0;
-    width: 100%;
-    height: 100%;
-    z-index: 100000;
-    background-color: rgba(0, 0, 0, 0.7);
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  z-index: 100000;
+  background-color: rgba(0, 0, 0, 0.7);
 }
 .user-guide {
-    white-space: normal;
-    position: absolute;
-    top: 50%;
-    left: 1.2rem;
-    right: 1.2rem;
-    border-radius: 0.15rem;
-    color: #fff;
-    transform: translateY(-50%);
-    background-color: rgba(0, 0, 0, 0.7);
-    z-index: 999999;
-    .main {
-        padding: 0.8rem;
-        padding-bottom: 0;
-        h4 {
-            margin: 0;
-            font-size: 0.5rem;
-            text-align: center;
-        }
-        ul,
-        li {
-            list-style: none;
-            padding: 0;
-            margin: 0;
-            width: 100%;
-        }
-        ul {
-            margin: 0.4rem 0;
-        }
-        li {
-            display: flex;
-            align-items: center;
-            padding: 0.6rem 0;
-            i {
-                font-size: 1.2rem;
-            }
-            > div {
-                line-height: 1.6;
-                font-size: 0.4rem;
-                margin-left: 0.35rem;
-            }
-        }
-
-        button {
-            width: 100%;
-            margin-bottom: 0.5rem;
-            background-color: #fff;
-            font-size: 0.4rem;
-            color: #444;
-            height: 1.1rem;
-            border: none;
-            border-radius: 0.15rem;
-            &[type='submit'] {
-                color: #fff;
-                background-color: transparent;
-            }
-        }
+  white-space: normal;
+  position: absolute;
+  top: 50%;
+  left: 1.2rem;
+  right: 1.2rem;
+  border-radius: 0.15rem;
+  color: #fff;
+  transform: translateY(-50%);
+  background-color: rgba(0, 0, 0, 0.7);
+  z-index: 999999;
+  .main {
+    padding: 0.8rem;
+    padding-bottom: 0;
+    h4 {
+      margin: 0;
+      font-size: 0.5rem;
+      text-align: center;
+    }
+    ul,
+    li {
+      list-style: none;
+      padding: 0;
+      margin: 0;
+      width: 100%;
+    }
+    ul {
+      margin: 0.4rem 0;
+    }
+    li {
+      display: flex;
+      align-items: center;
+      padding: 0.6rem 0;
+      i {
+        font-size: 1.2rem;
+      }
+      > div {
+        line-height: 1.6;
+        font-size: 0.4rem;
+        margin-left: 0.35rem;
+      }
     }
 
-    @media (orientation: landscape) {
-        width: 400px;
-        left: 50% !important;
-        right: auto !important;
-        margin-left: -200px;
-        .main {
-            padding: 0.5rem;
-            h4 {
-                font-size: 0.35rem;
-            }
-            ul {
-                margin: 0.3rem 0;
-            }
-            li {
-                padding: 0.1rem 0;
-                i {
-                    font-size: 0.6rem;
-                }
-                > div {
-                    font-size: 0.25rem;
-                }
-            }
+    button {
+      width: 100%;
+      margin-bottom: 0.5rem;
+      background-color: #fff;
+      font-size: 0.4rem;
+      color: #444;
+      height: 1.1rem;
+      border: none;
+      border-radius: 0.15rem;
+      &[type="submit"] {
+        color: #fff;
+        background-color: transparent;
+      }
+    }
+  }
 
-            button {
-                margin-bottom: 0rem;
-                font-size: 0.3rem;
-                height: 0.8rem;
-            }
+  @media (orientation: landscape) {
+    width: 400px;
+    left: 50% !important;
+    right: auto !important;
+    margin-left: -200px;
+    .main {
+      padding: 0.5rem;
+      h4 {
+        font-size: 0.35rem;
+      }
+      ul {
+        margin: 0.3rem 0;
+      }
+      li {
+        padding: 0.1rem 0;
+        i {
+          font-size: 0.6rem;
         }
+        > div {
+          font-size: 0.25rem;
+        }
+      }
+
+      button {
+        margin-bottom: 0rem;
+        font-size: 0.3rem;
+        height: 0.8rem;
+      }
     }
+  }
 }
 .user-guide-mobile {
-    position: absolute;
-    top: 1.55789rem;
-    left: 50%;
-    width: 7.89474rem;
-    transform: translateX(-50%);
-    .zh {
-        width: 100%;
-        height: 7rem;
-        background-image: url(~@/assets/images/guide/novice_guide_text@2x.png);
-        background-size: contain;
-        background-position: center top;
-        background-repeat: no-repeat;
+  position: absolute;
+  top: 1.55789rem;
+  left: 50%;
+  width: 7.89474rem;
+  transform: translateX(-50%);
+  .zh {
+    width: 100%;
+    height: 7rem;
+    background-image: url(~@/assets/images/guide/novice_guide_text@2x.png);
+    background-size: contain;
+    background-position: center top;
+    background-repeat: no-repeat;
+  }
+  .en {
+    width: 100%;
+    color: #fff;
+    ul,
+    li {
+      list-style: none;
+      padding: 0;
+      margin: 0;
+      width: 100%;
     }
-    .en {
-        width: 100%;
-        color: #fff;
-        ul,
-        li {
-            list-style: none;
-            padding: 0;
-            margin: 0;
-            width: 100%;
-        }
-        ul {
-            margin: 0;
-        }
-        li {
-            display: flex;
-            align-items: flex-start;
-            padding: 0.5rem 0;
-            &:first-child {
-                padding-top: 0;
-            }
-            i {
-                font-size: 1.32rem;
-            }
-            > div {
-                font-size: 0.4rem;
-                margin-left: 0.3rem;
-                :deep(span) {
-                    font-size: 0.6rem;
-                    color: #00c2c4;
-                }
-                :deep(div) {
-                    font-size: 0.5rem;
-                    margin-top: 0.1rem;
-                    white-space: pre-line;
-                    line-height: 1.3;
-                }
-            }
+    ul {
+      margin: 0;
+    }
+    li {
+      display: flex;
+      align-items: flex-start;
+      padding: 0.5rem 0;
+      &:first-child {
+        padding-top: 0;
+      }
+      i {
+        font-size: 1.32rem;
+      }
+      > div {
+        font-size: 0.4rem;
+        margin-left: 0.3rem;
+        :deep(span) {
+          font-size: 0.6rem;
+          color: #00c2c4;
         }
-
-        .btn {
-            background-image: none;
-            color: #00c2c4;
-            line-height: 1.2rem;
-            text-align: center;
-            font-size: 0.52632rem;
-            background-image: url(~@/assets/images/guide/novice_guide_button_empty@2x.png);
+        :deep(div) {
+          font-size: 0.5rem;
+          margin-top: 0.1rem;
+          white-space: pre-line;
+          line-height: 1.3;
         }
+      }
     }
+
     .btn {
-        position: absolute;
-        bottom: -3.15789rem;
-        left: 50%;
-        width: 3.5rem;
-        height: 1.31579rem;
-        background-image: url(~@/assets/images/guide/novice_guide_button@2x.png);
-        background-size: contain;
-        background-position: center top;
-        background-repeat: no-repeat;
-        transform: translateX(-50%);
+      background-image: none;
+      color: #00c2c4;
+      line-height: 1.2rem;
+      text-align: center;
+      font-size: 0.52632rem;
+      background-image: url(~@/assets/images/guide/novice_guide_button_empty@2x.png);
     }
+  }
+  .btn {
+    position: absolute;
+    bottom: -3.15789rem;
+    left: 50%;
+    width: 3.5rem;
+    height: 1.31579rem;
+    background-image: url(~@/assets/images/guide/novice_guide_button@2x.png);
+    background-size: contain;
+    background-position: center top;
+    background-repeat: no-repeat;
+    transform: translateX(-50%);
+  }
 
-    @media (orientation: landscape) {
-        top: 0.5rem;
-        .zh {
-            height: 4rem;
-            .btn {
-                width: 2.5rem;
-                height: 0.8rem;
-                bottom: -1.4rem;
-            }
-        }
+  @media (orientation: landscape) {
+    top: 0.5rem;
+    .zh {
+      height: 4rem;
+      .btn {
+        width: 2.5rem;
+        height: 0.8rem;
+        bottom: -1.4rem;
+      }
+    }
 
-        .en {
-            li {
-                padding: 0.15rem 0;
-                i {
-                    font-size: 1rem;
-                }
-                > div {
-                    margin-left: 0.3rem;
-                    :deep(span) {
-                        font-size: 0.3rem;
-                    }
-                    :deep(div) {
-                        font-size: 0.25rem;
-                        margin-top: 0.1rem;
-                    }
-                }
-            }
-            .btn {
-                height: 0.7rem;
-                line-height: 0.63rem;
-                font-size: 0.25rem;
-                bottom: -0.7rem;
-            }
+    .en {
+      li {
+        padding: 0.15rem 0;
+        i {
+          font-size: 1rem;
+        }
+        > div {
+          margin-left: 0.3rem;
+          :deep(span) {
+            font-size: 0.3rem;
+          }
+          :deep(div) {
+            font-size: 0.25rem;
+            margin-top: 0.1rem;
+          }
         }
+      }
+      .btn {
+        height: 0.7rem;
+        line-height: 0.63rem;
+        font-size: 0.25rem;
+        bottom: -0.7rem;
+      }
     }
+  }
 }
 </style>

packages/qjkankan-view/.env.testdev

@@ -10,4 +10,4 @@ VUE_APP_APIS_URL=https://test.4dkankan.com/
 VUE_APP_DEBBUG_FLAG=0516-03
 VUE_APP_DEBBUG_NOTIFY=0
 VUE_APP_DEBBUG_V4=1
-VUE_APP_DEBBUG_V4_URL="http://192.168.0.186:8081"
+VUE_APP_DEBBUG_V4_URL="http://192.168.0.20:8081"

packages/qjkankan-view/.env.testprod

@@ -7,7 +7,7 @@ VUE_APP_PROXY_URL='https://test.4dkankan.com/qjkankan/'
 VUE_APP_URL_FILL=/qjkankan
 # 接口请求地址
 VUE_APP_APIS_URL=https://test.4dkankan.com/
-VUE_APP_DEBBUG_FLAG=0728-02
+VUE_APP_DEBBUG_FLAG=0801-01
 VUE_APP_DEBBUG_NOTIFY=0
 VUE_APP_DEBBUG_V4=0
 VUE_APP_DEBBUG_V4_URL="http://192.168.0.186:8081"

packages/qjkankan-view/src/components/Fdkk/index.vue

@@ -7,9 +7,7 @@
         :key="currentScene.sceneCode"
         v-if="!isMobile"
         id="fdkkifr"
-        :src="`/spc.html?m=${
-          currentScene.sceneCode
-        }&lang=${lang}`"
+        :src="`/spc.html?m=${currentScene.sceneCode}&lang=${lang}`"
         frameborder="0"
       ></iframe>
       <!-- <iframe :key="currentScene.sceneCode" v-if="!isMobile" id="fdkkifr" :src="`https://test.4dkankan.com/spc.html?m=${currentScene.sceneCode}`" -->
@@ -78,11 +76,11 @@ const V4IframeUrl = computed(() => {
   if (process.env.VUE_APP_DEBBUG_V4 == 1) {
     return `${v4Mi}/${unref(isMobile) ? "smg" : "spg"}.html?m=${
       unref(currentScene).sceneCode
-    }&lang=${unref(lang)}&rnd=${Math.floor(Math.random()*100000)}`;
+    }&lang=${unref(lang)}&rnd=${Math.floor(Math.random() * 100000)}`;
   } else {
     return `${unref(isMobile) ? "smg" : "spg"}.html?m=${
       unref(currentScene).sceneCode
-    }&lang=${unref(lang)}&rnd=${Math.floor(Math.random()*100000)}`;
+    }&lang=${unref(lang)}&rnd=${Math.floor(Math.random() * 100000)}`;
   }
 });
 
@@ -141,9 +139,10 @@ const handleMessage = (res) => {
     //
     if (event == "toggleBgmStatus") {
       console.error("toggleBgmStatus", params);
-      // debugger;
-      if (params.status) {
+      if (!params.status) {
+        store.dispatch("audio/pauseBGM");
       } else {
+        store.dispatch("audio/playBGM", 2);
       }
     }
 

packages/qjkankan-view/src/components/Pano/index.vue

@@ -99,7 +99,9 @@ watch(
           let flag =
             data.data.bgMusic &&
             data.data.bgMusic != "0" &&
+            data.data.bgMusic != "Cheerful" &&
             data.data.bgMusic != "noMusic";
+   
           console.error("是否有V3--BGM", flag);
           store.commit("fdkk/setV3FdkkBGM", flag);
           store.dispatch("audio/initV3BGM", flag);

packages/qjkankan-view/src/components/UIGather/list.vue

@@ -225,6 +225,8 @@ const swiperOptions = {
   freeMode: {
     enabled: true,
     sticky: false,
+    momentumBounce: false,
+    // momentumVelocityRatio: 0.5,
   },
 };
 

packages/qjkankan-view/src/components/UIGather/menu.vue

@@ -127,7 +127,7 @@
 </template>
 
 <script setup>
-import { ref, watch, computed, onMounted, nextTick } from "vue";
+import { ref, watch, computed, onMounted, nextTick, watchEffect } from "vue";
 import { useStore } from "vuex";
 const store = useStore();
 const toursList = computed(() => store.getters["fdkk/toursList"]);
@@ -181,7 +181,15 @@ const onModeChange = (name) => {
     );
 };
 
-onMounted(() => {});
+onMounted(() => {
+  watchEffect(() => {
+    if (isPlayTours.value) {
+      store.commit("functions/setShowScenesList", false);
+    } else {
+      store.commit("functions/setShowScenesList", true);
+    }
+  });
+});
 </script>
 
 <style lang="scss" scoped>

packages/qjkankan-view/src/components/UIGather/mobile/control.fdkk.vue

@@ -233,7 +233,7 @@ const onLink = () => {
 };
 
 const onIsBGM = () => {
-  console.log("fdkk----onIsBGM");
+  console.log("fdkk----onIsBGM", fdkkCurrentVersion.value);
 
   if (unref(isHasV3BGM)) {
     const v3playToggle = !unref(isPlayV3BGM);