diff --git a/public/static/qm/MainMap_QM.js b/public/static/qm/MainMap_QM.js index f70f04c..8190771 100644 --- a/public/static/qm/MainMap_QM.js +++ b/public/static/qm/MainMap_QM.js @@ -7,7 +7,7 @@ var Map_QM, debug = false //basePath 基础路径 graphPath最佳路径 ftPath 扶梯路径 dtPath 电梯路径 var css_LR = - 'color:#000000;height: 16px;font-size: 14px; animation: hideIndex 1s; z-index: 90; text-shadow: 1px -1px 0 #fff, 1px -1px 0 #fff, -1px 1px 0 #fff, 1px 1px 0 #fff; pointer-events:none;' + 'color:#000000;height: 16px;font-size: 14px; z-index: 90; text-shadow: 1px -1px 0 #fff, 1px -1px 0 #fff, -1px 1px 0 #fff, 1px 1px 0 #fff; pointer-events:none;' var typeObj = [ { ft: 0, type: 0, code: 'ft', name: '扶梯' }, @@ -1585,6 +1585,7 @@ MainMap_QM.prototype = { iconName = false, camZoom = 3, inArea = false, + shadow = true, pathColor = 0xb47834, pathStyle = '3D' } = options @@ -1596,6 +1597,7 @@ MainMap_QM.prototype = { this.util.options.otherPath = otherPath.length > 0 ? otherPath : [] this.util.options.navColor = navColor != 0xee6a50 ? navColor : this.util.options.navColor this.util.options.overlap = overlap ? overlap : this.util.options.overlap + this.util.options.shadow = !shadow ? shadow : this.util.options.shadow this.util.options.iconName = iconName ? iconName : this.util.options.iconName this.util.options.camZoom = camZoom != 3 ? camZoom : this.util.options.camZoom this.util.options.inArea = inArea ? inArea : this.util.options.inArea @@ -2355,19 +2357,25 @@ MainMap_QM.prototype = { } else { Map_QM.util.selectBuild = build Map_QM.util.selectFloor = fIndex - TweenMax.fromTo( - Map_QM.mapArr[Map_QM.util.selectBuild][Map_QM.util.selectFloor].allObj.position, - 0.3, - { y: addFloor * Map_QM.util.options.fSpace }, - { - y: 0, - ease: Cubic.easeIn, - onComplete: function () { - Map_QM.timeOutInit() - if (callBack) callBack() + if(!Map_QM.util.options.shadow){ + Map_QM.mapArr[Map_QM.util.selectBuild][Map_QM.util.selectFloor].allObj.position.y = 0; + Map_QM.timeOutInit() + if (callBack) callBack() + }else{ + TweenMax.fromTo( + Map_QM.mapArr[Map_QM.util.selectBuild][Map_QM.util.selectFloor].allObj.position, + 0.3, + { y: addFloor * Map_QM.util.options.fSpace }, + { + y: 0, + ease: Cubic.easeIn, + onComplete: function () { + Map_QM.timeOutInit() + if (callBack) callBack() + } } - } - ) + ) + } } } else { //三层 @@ -2386,19 +2394,26 @@ MainMap_QM.prototype = { } else { Map_QM.util.selectBuild = build Map_QM.util.selectFloor = fIndex - TweenMax.fromTo( - Map_QM.mapArr[Map_QM.util.selectBuild][Map_QM.util.selectFloor].allObj.position, - 0.3, - { y: addFloor * Map_QM.util.options.fSpace }, - { - y: 0, - ease: Cubic.easeIn, - onComplete: function () { - Map_QM.timeOutInit() - if (callBack) callBack() + + if(!Map_QM.util.options.shadow){ + Map_QM.mapArr[Map_QM.util.selectBuild][Map_QM.util.selectFloor].allObj.position.y = 0; + Map_QM.timeOutInit() + if (callBack) callBack() + }else{ + TweenMax.fromTo( + Map_QM.mapArr[Map_QM.util.selectBuild][Map_QM.util.selectFloor].allObj.position, + 0.3, + { y: addFloor * Map_QM.util.options.fSpace }, + { + y: 0, + ease: Cubic.easeIn, + onComplete: function () { + Map_QM.timeOutInit() + if (callBack) callBack() + } } - } - ) + ) + } } } } @@ -3371,6 +3386,9 @@ MainMap_QM.prototype = { * 初始化后调用 */ timeOutInit: function () { + Map_QM.controls.update(); + Map_QM.renderer.render(Map_QM.scene, Map_QM.camera); + Map_QM.labelRenderer.render(Map_QM.scene, Map_QM.camera); if (Map_QM.callBackLoadOver) { let floorData = [] for (let i = 0; i < Map_QM.util.allMap.length; i++) { @@ -4995,6 +5013,7 @@ MainMap_QM.prototype = { * @apiParam {int} options.fSpace 双叠层状态下楼层的间距 默认值 500 * @apiParam {uint} options.navColor 途径店铺颜色 默认值 0xEE6A50 * @apiParam {boolean} options.overlap 是否叠层 默认值 false + * @apiParam {boolean} options.shadow 是否显示阴影 默认值 true * @apiParam {boolean} options.iconName 图标名称是否显示 默认值false * @apiParam {uint} options.pathColor 导航路径颜色 默认值 0xb47834, * @apiParam {string} options.pathStyle 导航第一视角 默认值 "2D", diff --git a/src/composables/useInitMap.js b/src/composables/useInitMap.js index 498a1d5..7a74cd4 100644 --- a/src/composables/useInitMap.js +++ b/src/composables/useInitMap.js @@ -90,6 +90,7 @@ function onReady({ floorOrder, location, angle }, map, shop, callback) { pathStyle: '3D', containerId: 'mapContainer', mapData: map, + shadow: false, shopData: shop }) }