|
|
@@ -12,6 +12,7 @@ window.browser = null
|
|
|
window.momentTourBlackNewType = 0//true
|
|
|
|
|
|
|
|
|
+window.modelDownTranslate = 0.2;//因为漫游时的模型比投影的低一些，所以手动下降些
|
|
|
|
|
|
g_playAudio = null
|
|
|
|
|
|
@@ -18345,7 +18346,7 @@ window.Modernizr = function(n, e, t) {
|
|
|
|
|
|
}else if(info.sid == "1626863308658"){
|
|
|
menuSanda = overlay
|
|
|
- overlay.plane.material.depthTest = false
|
|
|
+ //overlay.plane.material.depthTest = false
|
|
|
initMenuSanda()
|
|
|
}else if(info.sid == "1626933767157"){//下一张
|
|
|
rightBtn = overlay
|
|
|
@@ -18389,7 +18390,7 @@ window.Modernizr = function(n, e, t) {
|
|
|
d = player.overlayGroup.children.find(e=>e.sid == '1626743691935')
|
|
|
d.plane.material = c.plane.material;//同步视频
|
|
|
var main = player.overlayGroup.children.find(e=>e.sid == "1626743467424")
|
|
|
- main.plane.material.depthTest = false
|
|
|
+ //main.plane.material.depthTest = false
|
|
|
c.plane.material.map.image.loop = false
|
|
|
main.plane.material.map.image.loop = false
|
|
|
main.plane.material.map.image.addEventListener('ended', ()=>{ //同步播
|
|
|
@@ -18469,12 +18470,15 @@ window.Modernizr = function(n, e, t) {
|
|
|
t.hots[sid].infoAttribute || (t.hots[sid].infoAttribute = {})
|
|
|
this.hots[sid].initStyleImg(t.hots[sid].infoAttribute);
|
|
|
window.hotData[sid] = t.hots[sid];
|
|
|
+
|
|
|
+
|
|
|
+ //t.hots[sid].mesh.position.y-= window.modelDownTranslate//add
|
|
|
})
|
|
|
}
|
|
|
this.createHotItem(window.hotData, this.hots);
|
|
|
|
|
|
|
|
|
-
|
|
|
+
|
|
|
|
|
|
|
|
|
|
|
|
@@ -22764,6 +22768,11 @@ window.Modernizr = function(n, e, t) {
|
|
|
n.prototype.start = function(e) {
|
|
|
//-------------------
|
|
|
window.initOverlay(r)
|
|
|
+ this.model.chunks.forEach(e=>e.position.y -= window.modelDownTranslate)
|
|
|
+ this.model.floors.list[0].collider.position.y-=window.modelDownTranslate
|
|
|
+ this.model.floors.list[0].collider.updateMatrixWorld()
|
|
|
+ player.model.colliders.forEach(e=>e.updateMatrixWorld())
|
|
|
+
|
|
|
this.model.loadOverlays()
|
|
|
// initMenu()
|
|
|
//-------------------
|
|
|
@@ -23399,32 +23408,10 @@ window.Modernizr = function(n, e, t) {
|
|
|
}
|
|
|
|
|
|
//this.overlayGroup && (t = t.concat(this.overlayGroup.children.filter(e=>e.overlayType == "video")));
|
|
|
- //this.overlayGroup && (t = t.concat(this.overlayGroup.children.filter(e=>e.overlayType != "video")));
|
|
|
+ this.overlayGroup && (t = t.concat(this.overlayGroup.children.filter(e=>e.overlayType != "video")));
|
|
|
|
|
|
-
|
|
|
-
|
|
|
var i = new r.Vector3(e.x,e.y,-1).unproject(this.camera);
|
|
|
this.raycaster.set(i, this.getMouseDirection(e));
|
|
|
-
|
|
|
-
|
|
|
- if(this.overlayGroup){
|
|
|
- let planes = this.overlayGroup.children.filter(e=>e.overlayType != "video")
|
|
|
- let n = this.raycaster.intersectObjects(planes, true)
|
|
|
-
|
|
|
-
|
|
|
- if(n && n.length){
|
|
|
- let a = this.hoverOverlay( n[0].object)
|
|
|
-
|
|
|
- if(a){
|
|
|
- $("#player").css("cursor","pointer");
|
|
|
- return;
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- }
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
var n = this.raycaster.intersectObjects(t, true);//add true
|
|
|
// n[0] && console.log(n[0].point);
|
|
|
if(g_HotStatus=="add"){
|
|
|
@@ -23449,11 +23436,9 @@ window.Modernizr = function(n, e, t) {
|
|
|
|
|
|
this.intersectHot = null;
|
|
|
|
|
|
+ var intersect = this.hoverOverlay(this.overlayGroup && o && o.object.parent.parent == this.overlayGroup && o.object)
|
|
|
|
|
|
-
|
|
|
- //var intersect = this.hoverOverlay(this.overlayGroup && o && o.object.parent.parent == this.overlayGroup && o.object)
|
|
|
-
|
|
|
- if( /* !intersect && */g_HotStatus!="add") $("#player").css("cursor","");
|
|
|
+ if( !intersect && g_HotStatus!="add") $("#player").css("cursor","");
|
|
|
if (o.face) {
|
|
|
o.normal = o.face.normal.applyQuaternion(o.object.quaternion);
|
|
|
var a = this.position.clone().sub(o.point);
|
xzw