commint in 2.28

js/SpecialScene.js

@@ -30,15 +30,19 @@ SpecialScene.prototype.special = function() {
                 that.data412();
                 break;
                 case "413":
-                // that.data413();
+                that.data413();
                 break;
                 case "415":
                 that.data413();
                 break;
+                case "454":
+                that.data454();
+                break;
             }
         },
         //移动到特点点位执行回调函数
         specifySpot : function(spot){
+            if(!spot) return;
             console.log(spot.id)
         }
     }
@@ -63,6 +67,10 @@ SpecialScene.prototype.data391 = function(){
     var safari = '<link rel="apple-touch-icon" sizes="180x180" href="images/icons/hnrd.jpg" />';
     $("head").append(safari);
 }
+SpecialScene.prototype.data454 = function(){
+    var btn = '<div class="warpper-LY"><a  target="_blank"  onclick="flyToFirst()" >一楼导税咨询台</a></div>';
+    $("body").append(btn);
+}
 
 var specialScene = new SpecialScene()
 

js/main_2018.js

@@ -14187,6 +14187,15 @@ window.Modernizr = function(n, e, t) {
 								})
 							})
 						}
+						
+						window.flyToFirst = function(){//xzw add
+							var pano = w.model.panos.get("8d778e19657f433fb9cf8947d823bb70");
+							var q = new _x.Quaternion(0.7099827027821568,-0.07708150183830938,0.6958985789714591,0.07555241737970636);
+							var lookAtPoint = new _x.Vector3(0,0,-1).applyQuaternion(q).add(pano.position);
+							w.flyToPano({pano:pano, lookAtPoint:lookAtPoint})
+						};
+						
+						
 						return $.when(e, U.startLoading(P, w, T, V.autoplay, u, N))
 					}).then(function() {
 						return f(P, U.onProgress, i, !u, a)
@@ -14492,8 +14501,9 @@ window.Modernizr = function(n, e, t) {
 				e("./lib/postprocessing/RenderPass.js"),
 				e("./lib/postprocessing/MaskPass.js"),
 				e("./lib/postprocessing/ShaderPass.js"),
-				window.Promise || (window.Promise = e("promise-polyfill"));
-				var x = e("three")
+                window.Promise || (window.Promise = e("promise-polyfill"));
+                var x = e("three")
+                  , _x = e("three")
 				  , S = (e("./util/sentry"),
 				e("./player"))
 				  , M = e("./director")
@@ -17463,10 +17473,12 @@ window.Modernizr = function(n, e, t) {
             n.prototype.loadLabels = function() {//xzw
                 this.labels = new x(this);
                 var e = $.Deferred();
+                //加载俯视图的标签  注释这个备注就会加载
+                window.MP_PREFETCHED_MODELDATA.model.player_options.labels ? this.showingLabels = true : '';
                 if (!this.showingLabels)
                     return e.resolve();
                // var t = this.options.urlBase + "/api/v1/jsonstore/model/labels/" + this.sid;
-			    var t = "data/" + this.sid + "/labels.json";
+			    var t = g_Prefix + "data/" + this.sid + "/labels.json";
                 return this.labels.load(t, !this.isPublic).done(e.resolve.bind(e)).fail(function() {
                     O.warn("Getting labels failed, not displaying labels."),
                     e.resolve()
@@ -20561,7 +20573,8 @@ window.Modernizr = function(n, e, t) {
                 this.bindEvents(e.container),
                 this.updateModel()
             }
-
+			 
+			
             //xzw add:  截图
 			function dataURLtoBlob(dataurl) {
 				var arr = dataurl.split(','), mime = arr[0].match(/:(.*?);/)[1],
@@ -22712,6 +22725,7 @@ window.Modernizr = function(n, e, t) {
                 this.quickstartCamera.fov = h.clampVFOV(a.insideFOV, a.insideFOVMax, $("#player").width(), $("#player").height()),
                 this.skybox = null
             }
+            
             var r = e("three")
               , o = e("../util/logger")
               , a = e("../constants")