diff --git a/CHANGELOG.md b/CHANGELOG.md index 864a6a4..b7a4296 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +### [1.0.1-B.2](https://git.1000my.com/project-chengduSKP/cd_SKP_H_base_daoshi_vue_ts/compare/v1.0.1-B.1...v1.0.1-B.2) (2023-08-03) + + +### Bug Fixes + +* 🧩 地图优化 ([fdd28fb](https://git.1000my.com/project-chengduSKP/cd_SKP_H_base_daoshi_vue_ts/commit/fdd28fb35691e198b260e879e3c57f199f78d186)) + ### [1.0.1-B.1](https://git.1000my.com/project-chengduSKP/cd_SKP_H_base_daoshi_vue_ts/compare/v1.0.1-B.0...v1.0.1-B.1) (2023-08-03) diff --git a/package-lock.json b/package-lock.json index ed0e63b..4d5b2e7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "vue_cli_ts", - "version": "1.0.1-B.1", + "version": "1.0.1-B.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "vue_cli_ts", - "version": "1.0.1-B.1", + "version": "1.0.1-B.2", "dependencies": { "@better-scroll/core": "^2.5.0", "@better-scroll/observe-image": "^2.5.0", diff --git a/package.json b/package.json index 5ca3e09..d096280 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vue_cli_ts", - "version": "1.0.1-B.1", + "version": "1.0.1-B.2", "private": true, "scripts": { "serve": "vue-cli-service serve", diff --git a/public/static/qm/MainMap_QM.js b/public/static/qm/MainMap_QM.js index 6635c62..59283e8 100644 --- a/public/static/qm/MainMap_QM.js +++ b/public/static/qm/MainMap_QM.js @@ -56,7 +56,7 @@ QMUtil = function () { inArea: false, //点击后是否聚焦到房间 camZoom: 3, //设置我的方向状态地图放大倍数 boxShop: [], //设置box上显示的文字(过滤指),可点击触发onlyShop - deviceAng: false, //地图初始化方向是否使用设备角度 + deviceAng: true, //地图初始化方向是否使用设备角度 } this.mapAngle = 0; //地图默认角度 this.lightOptions = { @@ -2384,12 +2384,12 @@ MainMap_QM.prototype = { } Map_QM.controls.setZoom(zoom) let vat = Map_QM.mapBackToWorld(centerPoint.x, centerPoint.y, 0); - TweenMax.to(Map_QM.controls.object.position, 0.1, { - x: vat.x, delay: 0.1, onComplete: function () { - Map_QM.controls.maxDistance = Map_QM.util.options.maxDis; - } - }); - TweenMax.to(Map_QM.controls.target, 0.1, { x: vat.x, y: vat.y, z: vat.z }); + Map_QM.controls.maxDistance = Map_QM.util.options.maxDis; + Map_QM.controls.target.set(vat.x, vat.y, vat.z); + Map_QM.controls.object.lookAt(vat.x, vat.y, vat.z); + let angle = Map_QM.util.options.deviceAng ? Map_QM.util.deviceObj.angle : Map_QM.util.mapAngle + Map_QM.rotationAngle(angle) + isJUZ = true; }, //底图二维坐标转 3D模型三维坐标