diff --git a/public/static/img/guide.png b/public/static/img/guide.png index 95e063a..53518bb 100644 Binary files a/public/static/img/guide.png and b/public/static/img/guide.png differ diff --git a/public/static/img/site.png b/public/static/img/site.png index 8fced84..53518bb 100644 Binary files a/public/static/img/site.png and b/public/static/img/site.png differ diff --git a/public/static/qm/MainMap_QM.js b/public/static/qm/MainMap_QM.js index ebe9562..32f7813 100644 --- a/public/static/qm/MainMap_QM.js +++ b/public/static/qm/MainMap_QM.js @@ -320,7 +320,7 @@ ConfigFun = function () { Config.selectBuild = Config.deviceObj.build let backObj = { code: 200, msg: '加载成功', data: [] } - if(mapData){ + if (mapData) { try { if (mapData.mallKey != 'Zeditor') { Config.allMap = JSON.parse(mapData.mapData) @@ -333,9 +333,8 @@ ConfigFun = function () { callBack(backObj) callBack = null } - Config.getShopData(callBack,shopData) + Config.getShopData(callBack, shopData) } - } /*** ----------------------------------------------- 参数 API END ----------------------------------------------- **** */ this.Point = function (x = 0, y = 0) { @@ -1441,7 +1440,7 @@ ConfigFun = function () { return len } - this.getShopData = function (callBack,shopData) { + this.getShopData = function (callBack, shopData) { let backObj = { code: 200, msg: '加载成功', data: [] } if (shopData) { Config.shopData = shopData.shopList @@ -1467,7 +1466,7 @@ ConfigFun = function () { if (backObj.code == 404) { callBack(backObj) } - }else{ + } else { backObj.code = 500 backObj.msg = '店铺数据错误' callBack(backObj) @@ -4575,19 +4574,19 @@ MainMap_QM.prototype = { * Map_QM.changeWindowResize(1280,1080); */ changeWindowResize: function (width = -1, height = -1) { - aspect = width/height; - cameraPerspective.aspect = aspect; - cameraPerspective.updateProjectionMatrix(); - cameraOrtho.left = 340 * aspect / -2; - cameraOrtho.right = 340 * aspect / 2; - cameraOrtho.top = 340/2; - cameraOrtho.bottom = 340/-2; - cameraOrtho.updateProjectionMatrix(); - - Map_QM.renderer.setSize(width, height); - Map_QM.labelRenderer.setSize(width, height); - Map_QM.w = width; - Map_QM.h = height; + aspect = width / height + cameraPerspective.aspect = aspect + cameraPerspective.updateProjectionMatrix() + cameraOrtho.left = (340 * aspect) / -2 + cameraOrtho.right = (340 * aspect) / 2 + cameraOrtho.top = 340 / 2 + cameraOrtho.bottom = 340 / -2 + cameraOrtho.updateProjectionMatrix() + + Map_QM.renderer.setSize(width, height) + Map_QM.labelRenderer.setSize(width, height) + Map_QM.w = width + Map_QM.h = height } } Object.assign(MainMap_QM.prototype, THREE.EventDispatcher.prototype) @@ -5195,7 +5194,7 @@ FloorMap_QM.prototype = { alphaTest: 0.5 }) Map_QM.dirIcon = new MySprite_QM(spriteMaterial2) - Map_QM.dirIcon.scale.set(80, 80, 1) + Map_QM.dirIcon.scale.set(160, 160, 1) Map_QM.dirIcon.center = new THREE.Vector2(0.5, 0.5) Map_QM.dirIcon.position.set(shopX, -1 * shopY, shopZ) Map_QM.dirIcon.renderOrder = 300 diff --git a/src/components/Map/Map.vue b/src/components/Map/Map.vue index f66bf8b..e26cb5b 100644 --- a/src/components/Map/Map.vue +++ b/src/components/Map/Map.vue @@ -1,7 +1,7 @@