|
|
|
@ -328,7 +328,7 @@ ConfigFun = function () { |
|
|
|
Config.allMap = JSON.parse(LZString.decompressFromBase64(mapData.mapData)) |
|
|
|
} |
|
|
|
} catch (e) { |
|
|
|
console.log(e); |
|
|
|
console.log(e) |
|
|
|
backObj.code = 404 |
|
|
|
backObj.msg = '地图数据JSON格式错误' |
|
|
|
callBack(backObj) |
|
|
|
@ -1457,7 +1457,7 @@ ConfigFun = function () { |
|
|
|
Map_QM.loaderOver() |
|
|
|
} |
|
|
|
} catch (e) { |
|
|
|
console.log(e); |
|
|
|
console.log(e) |
|
|
|
callBack({ code: 404, msg: '地图数据解析失败' }) |
|
|
|
callBack = null |
|
|
|
} |
|
|
|
@ -1727,7 +1727,7 @@ MainMap_QM.prototype = { |
|
|
|
}, |
|
|
|
|
|
|
|
initBuild: function (e) { |
|
|
|
console.log("******"); |
|
|
|
console.log('******') |
|
|
|
elevator = null |
|
|
|
straight = null |
|
|
|
elevatorDown = null |
|
|
|
@ -2881,9 +2881,9 @@ MainMap_QM.prototype = { |
|
|
|
* |
|
|
|
*/ |
|
|
|
addElementLabel: function (divObj, x = 0, y = 0, type = 'shopInfo') { |
|
|
|
Map_QM.elementDestroy(type); |
|
|
|
Map_QM.elementDestroy(type) |
|
|
|
let shopInfo = new THREE.CSS2DObject(divObj) |
|
|
|
shopInfo.position.set(x, -1 * y, Config.shopHeight || 50) |
|
|
|
shopInfo.position.set(x, -1 * y, type === 'shopInfo' ? (Config.shopHeight || 50) + 100 : 150) |
|
|
|
shopInfo.applyMatrix(Map_QM.mapArr[Config.selectBuild][Config.selectFloor].allObj.matrix) |
|
|
|
shopInfo.userData.type = type |
|
|
|
shopInfo.name = 'shopInfo' |
|
|
|
@ -3428,7 +3428,13 @@ MainMap_QM.prototype = { |
|
|
|
} |
|
|
|
|
|
|
|
if (selIcon) { |
|
|
|
return { build: selIcon.build, floor: selIcon.floor, node: selIcon.navCode, site:{x: selIcon.position.x, y: selIcon.position.y}, typeCode: Config.getFacType(iconType.type) } |
|
|
|
return { |
|
|
|
build: selIcon.build, |
|
|
|
floor: selIcon.floor, |
|
|
|
node: selIcon.navCode, |
|
|
|
site: { x: selIcon.position.x, y: -selIcon.position.y }, |
|
|
|
typeCode: Config.getFacType(iconType.type) |
|
|
|
} |
|
|
|
} else { |
|
|
|
// 当前楼栋没有
|
|
|
|
let startNade = Config.deviceObj.build + '_' + Config.startObj.floor + '_' + Config.startObj.node |
|
|
|
@ -3458,7 +3464,13 @@ MainMap_QM.prototype = { |
|
|
|
} |
|
|
|
} |
|
|
|
if (selIcon) { |
|
|
|
return { build: selIcon.build, floor: selIcon.floor, node: selIcon.navCode, site:{x: selIcon.position.x, y: selIcon.position.y}, typeCode: Config.getFacType(iconType.type) } |
|
|
|
return { |
|
|
|
build: selIcon.build, |
|
|
|
floor: selIcon.floor, |
|
|
|
node: selIcon.navCode, |
|
|
|
site: { x: selIcon.position.x, y: -selIcon.position.y }, |
|
|
|
typeCode: Config.getFacType(iconType.type) |
|
|
|
} |
|
|
|
} |
|
|
|
}, |
|
|
|
/** |
|
|
|
|