gx

scene/public/static/js/main_2020_show.js

@@ -4806,7 +4806,7 @@ window.Modernizr = (function (n, e, t) {
                   //var walk = window.DATA.black ? 'black' : 'walk';
                   //若是点击item，直接瞬间过渡。
                   var s = e ? "black" : this.getMomentTour(this.destinationItem); //window.DATA.momentTour || "walk";
-                  if (this.destinationItem[0] == 0 && this.destinationItem[1] == 0) s = "black"; // 周恩光加 返回最初导览点是瞬间过渡
+                  // if (this.destinationItem[0] == 0 && this.destinationItem[1] == 0) s = "black"; // 周恩光加 返回最初导览点是瞬间过渡
                   (a1 = this.player.warpToPanoByHeroIndex.bind(this.player, this.destinationItem, v.Show, m.Slow, s, true, i, this.actionComplete.bind(this))), (o = this.arrivedAtDestination.bind(this, !0));
 
                   if (s == "black" && r.zoom && r.zoom != this.player.zoomLevel) {
@@ -17581,7 +17581,7 @@ window.Modernizr = (function (n, e, t) {
                               const dyclList = ["R477v9477232"];
                               const backList = ["UIvfI7864930", "1WbTN3378847"];
                               const leaveList = ["lVJNiL6475205"];
-                              const preList = ["8bQAttr352715", "OhCw32349692", "etuW2qg359107", "sm2gV356039", "oSArG368903", "z4QHOmG365208","wH3fuA971417"];
+                              const preList = ["8bQAttr352715", "OhCw32349692", "etuW2qg359107", "sm2gV356039", "oSArG368903", "z4QHOmG365208", "wH3fuA971417"];
                               const nextList = ["7cfwna384370", "1R3IoM354485", "1sSNrr351762", "5eitA7357403", "7cfwna384370", "D6Cl1357678", "kiTE9o348778", "DzLdq369405", "xM8PsF363782"];
                               if (xyclList.includes(sid)) {
                                 e.hots[sid].texType = "photo";
@@ -22734,8 +22734,8 @@ window.Modernizr = (function (n, e, t) {
                 c = e.constantMoveSpeed,
                 h = null,
                 p = null;
-              //-----add-------
-              let blackList = ["1", "2", "3"];
+              //-----add-------  不明白为什么把1，2，3限制了瞬间过渡
+              let blackList = [];
               if (blackList.includes(this.currentPano.id) || blackList.includes(i.id)) {
                 return this.blackToPano(e, t);
               }

scene/public/static/js/manage.js

@@ -1245,7 +1245,12 @@ function matcher(data) {
           ? {
               camera: {
                 zoom: "-1",
-                quaternion: [JSON.parse(data.model.images[0].metadata).camera_quaternion.z, JSON.parse(data.model.images[0].metadata).camera_quaternion.w, JSON.parse(data.model.images[0].metadata).camera_quaternion.x, JSON.parse(data.model.images[0].metadata).camera_quaternion.y],
+                quaternion: [
+                  JSON.parse(data.model.images[0].metadata).camera_quaternion.z,
+                  JSON.parse(data.model.images[0].metadata).camera_quaternion.w,
+                  JSON.parse(data.model.images[0].metadata).camera_quaternion.x,
+                  JSON.parse(data.model.images[0].metadata).camera_quaternion.y,
+                ],
               },
               pano: { uuid: JSON.parse(data.model.images[0].metadata).scan_id },
               mode: "0",
@@ -2595,12 +2600,7 @@ function initByTHREE(THREE) {
 
         player.on("view.changed", (e) => {
           // 位移和旋转时自动关联最近导览点
-          if (
-            !player.director.highlightItem &&
-            e.cameraWorldMatrixChanged &&
-            !player.flying &&
-            !player.isWarping()
-          ) {
+          if (!player.director.highlightItem && e.cameraWorldMatrixChanged && !player.flying && !player.isWarping()) {
             // 仅在导览/沉浸模式下才保护 currentItem，避免最后一个点被拉回第一个；
             // 非导览模式下允许更新，确保进入沉浸前 currentItem 与当前位置一致，避免清屏。
             if (player.director.currentItem && window.__tourGuideActive) {
@@ -2609,9 +2609,7 @@ function initByTHREE(THREE) {
             common.intervalTool.isWaiting(
               "tourUpdateCurItem",
               () => {
-                player.guider3.setCurrentItem(
-                  player.director.findNearestItem(true, true),
-                );
+                player.guider3.setCurrentItem(player.director.findNearestItem(true, true));
               },
               521,
             );