From a9212a8bba07e3cdd3da5abc9e46d2c4412db916 Mon Sep 17 00:00:00 2001 From: gaozl Date: Mon, 3 Nov 2025 16:44:21 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=AB=96=E7=89=88=E5=9C=B0=E5=9B=BE?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E4=BB=A3=E7=A0=81=E5=9B=BA=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/static/qm/MainMap_QM.js | 48 +++++++++++++++------------------- 1 file changed, 21 insertions(+), 27 deletions(-) diff --git a/public/static/qm/MainMap_QM.js b/public/static/qm/MainMap_QM.js index 9509a09..2692368 100644 --- a/public/static/qm/MainMap_QM.js +++ b/public/static/qm/MainMap_QM.js @@ -204,7 +204,7 @@ var QMUtil = function () { seldtFacNo: { type: "", no: "" }, }; this.timeObj = { collTime: -1, pathTime: -1 }; - this.sceneGap = { cameraX: 0, cameraY: 220, cameraZ: 220, x: 0, y: 0, z: 0, scale: 0.08 }; //改变地图位置，大小 + this.sceneGap = { cameraX: 15, cameraY: 220, cameraZ: 220, x: 15, y: 0, z: 0, scale: 0.08 }; //改变地图位置，大小 this.isMorePath = false; //多节点寻路模式 this.selectBuild = 0; this.selectFloor = 0; @@ -1571,7 +1571,7 @@ MainMap_QM.prototype = { this.util.allMap[this.util.selectBuild].hasOwnProperty("shopStyle") && (this.util.options.shopStyle = this.util.allMap[this.util.selectBuild].shopStyle); this.util.allMap[this.util.selectBuild].hasOwnProperty("modelIcon") && (this.util.options.modelIcon = this.util.allMap[this.util.selectBuild].modelIcon); this.util.allMap[this.util.selectBuild].hasOwnProperty("facSize") && (this.util.options.facSize = this.util.allMap[this.util.selectBuild].facSize); - this.util.allMap[this.util.selectBuild].hasOwnProperty("m_scale") && (this.util.sceneGap.scale = this.util.allMap[this.util.selectBuild].m_scale); + //this.util.allMap[this.util.selectBuild].hasOwnProperty("m_scale") && (this.util.sceneGap.scale = this.util.allMap[this.util.selectBuild].m_scale); //根据地图大小同步修改字体大小 spriteScale = 0.2-(this.util.sceneGap.scale-0.08); @@ -1581,16 +1581,16 @@ MainMap_QM.prototype = { this.shawLight.color = new THREE.Color( this.util.allMap[this.util.selectBuild].d_col || "#ffffff"); this.shawLight.intensity = this.util.allMap[this.util.selectBuild].d_int || 0.3; - if (this.util.allMap[this.util.selectBuild].c_site && this.util.allMap[this.util.selectBuild].c_site.split(",")) { - this.util.sceneGap.cameraX = parseInt(this.util.allMap[this.util.selectBuild].c_site.split(",")[0]) || this.util.sceneGap.cameraX; - this.util.sceneGap.cameraY = parseInt(this.util.allMap[this.util.selectBuild].c_site.split(",")[1]) || this.util.sceneGap.cameraY; - this.util.sceneGap.cameraZ = parseInt(this.util.allMap[this.util.selectBuild].c_site.split(",")[2]) || this.util.sceneGap.cameraZ; - } - if (this.util.allMap[this.util.selectBuild].m_site && this.util.allMap[this.util.selectBuild].m_site.split(",")) { - this.util.sceneGap.x = parseInt(this.util.allMap[this.util.selectBuild].m_site.split(",")[0]) || this.util.sceneGap.x; - this.util.sceneGap.y = parseInt(this.util.allMap[this.util.selectBuild].m_site.split(",")[1]) || this.util.sceneGap.y; - this.util.sceneGap.z = parseInt(this.util.allMap[this.util.selectBuild].m_site.split(",")[2]) || this.util.sceneGap.z; - } + // if (this.util.allMap[this.util.selectBuild].c_site && this.util.allMap[this.util.selectBuild].c_site.split(",")) { + // this.util.sceneGap.cameraX = parseInt(this.util.allMap[this.util.selectBuild].c_site.split(",")[0]) || this.util.sceneGap.cameraX; + // this.util.sceneGap.cameraY = parseInt(this.util.allMap[this.util.selectBuild].c_site.split(",")[1]) || this.util.sceneGap.cameraY; + // this.util.sceneGap.cameraZ = parseInt(this.util.allMap[this.util.selectBuild].c_site.split(",")[2]) || this.util.sceneGap.cameraZ; + // } + // if (this.util.allMap[this.util.selectBuild].m_site && this.util.allMap[this.util.selectBuild].m_site.split(",")) { + // this.util.sceneGap.x = parseInt(this.util.allMap[this.util.selectBuild].m_site.split(",")[0]) || this.util.sceneGap.x; + // this.util.sceneGap.y = parseInt(this.util.allMap[this.util.selectBuild].m_site.split(",")[1]) || this.util.sceneGap.y; + // this.util.sceneGap.z = parseInt(this.util.allMap[this.util.selectBuild].m_site.split(",")[2]) || this.util.sceneGap.z; + // } if (this.util.allMap[this.util.selectBuild].m_zoom) { this.util.m_zoom = this.util.allMap[this.util.selectBuild].m_zoom; } @@ -2146,8 +2146,7 @@ MainMap_QM.prototype = { this.controls.saveState(); this.changeBuild(this.util.deviceObj.build, this.util.deviceObj.floor); //初始化方向为第一人称方向 - //this.util.options.deviceAng && this.rotationAngle(this.util.deviceObj.angle); - this.rotationAngle(180); + this.util.options.deviceAng && this.rotationAngle(this.util.deviceObj.angle); this.startRender(); setTimeout(() => { @@ -2320,8 +2319,7 @@ MainMap_QM.prototype = { */ changeMapState: function (state) { Map_QM.controls.reset(); - //Map_QM.util.options.deviceAng && Map_QM.rotationAngle(Map_QM.util.deviceObj.angle); - Map_QM.rotationAngle(180); + Map_QM.util.options.deviceAng && Map_QM.rotationAngle(Map_QM.util.deviceObj.angle); if (state === "3d") { Map_QM.camera = Map_QM.cameraPerspective; Map_QM.controls.object = Map_QM.camera; @@ -2394,8 +2392,7 @@ MainMap_QM.prototype = { Map_QM.changeMapModel("3D"); Map_QM.resetFloorState(); Map_QM.controls.reset(); - // Map_QM.util.options.deviceAng && Map_QM.rotationAngle(Map_QM.util.deviceObj.angle); - Map_QM.rotationAngle(180); + Map_QM.util.options.deviceAng && Map_QM.rotationAngle(Map_QM.util.deviceObj.angle); Map_QM.clearFloor(Map_QM.util.selectFloor); this.changeBuildInner(buildOrder, floorOrder); }, @@ -2457,8 +2454,7 @@ MainMap_QM.prototype = { Map_QM.controls.setDistance(Map_QM.util.changeDist.inner - 25); Map_QM.controls.update(); } - // Map_QM.util.options.deviceAng && Map_QM.rotationAngle(Map_QM.util.deviceObj.angle); - Map_QM.rotationAngle(180); + Map_QM.util.options.deviceAng && Map_QM.rotationAngle(Map_QM.util.deviceObj.angle); Map_QM.clearFloor(fIndex); Map_QM.elementDestroy("all"); Map_QM.elementDestroy("go", true); @@ -3008,7 +3004,7 @@ MainMap_QM.prototype = { allJU = false; } isJUZ = juZ; - Map_QM.rotationAngle(180); + Map_QM.util.options.deviceAng && Map_QM.rotationAngle(Map_QM.util.deviceObj.angle); Map_QM.updateRender(); Map_QM.collLabel(); }, @@ -3074,8 +3070,7 @@ MainMap_QM.prototype = { this.controls.maxAzimuthAngle = Infinity; this.shawLight.castShadow = this.util.options.shadow; this.controls.reset(); - //this.util.options.deviceAng && this.rotationAngle(this.util.deviceObj.angle); - this.rotationAngle(180); + this.util.options.deviceAng && this.rotationAngle(this.util.deviceObj.angle); }, /** * @api {方法} changePathDir(pathState) 切换导航方向 @@ -3905,8 +3900,7 @@ MainMap_QM.prototype = { Map_QM.changeMapModel("3D"); Map_QM.resetFloorState(); Map_QM.controls.reset(); - // Map_QM.util.options.deviceAng && Map_QM.rotationAngle(Map_QM.util.deviceObj.angle); - Map_QM.rotationAngle(180); + Map_QM.util.options.deviceAng && Map_QM.rotationAngle(Map_QM.util.deviceObj.angle); TweenMax.killAll(true); if (!aName) { isJUZ = false; @@ -4160,6 +4154,7 @@ MainMap_QM.prototype = { */ timeOutInit: function () { Map_QM.updateRender(); + Map_QM.autoChangeEleAngle(); Map_QM.collLabel(); renderCount = 0; if (Map_QM.callBackLoadOver) { @@ -4277,8 +4272,7 @@ MainMap_QM.prototype = { clearTimeout(shopTime); isJUZ = false; Map_QM.controls.reset(); - // Map_QM.util.options.deviceAng && Map_QM.rotationAngle(Map_QM.util.deviceObj.angle); - Map_QM.rotationAngle(180); + Map_QM.util.options.deviceAng && Map_QM.rotationAngle(Map_QM.util.deviceObj.angle); }, 10000); } }, -- 2.30.2