diff --git a/miniprogram/game.json b/miniprogram/game.json index 704c4ff..d6cb17d 100644 --- a/miniprogram/game.json +++ b/miniprogram/game.json @@ -1,6 +1,6 @@ { "deviceOrientation": "portrait", - "iOSHighPerformance": true, + "iOSHighPerformance": false, "showStatusBar": false, "networkTimeout": { "request": 5000, @@ -31,12 +31,5 @@ ], "modifyFriendInteractiveStorageConfirmWording": "赠与${nickname}金币 x 1?", "serviceProviderTicket": "t8RALNXjJmVCzQVBT5GnaTorQZUub2XaypXejDPa1tAlV6WNON/+ZcbgUzPfAD0E3Wl6RfEOKn7jbehPOElElmD3ZC8RpQv3yHo=", - "navigateToMiniProgramAppIdList": ["wx4f4a4549a1069d03"], - "plugins":{ - "Layout": { - "version": "1.0.5", - "provider": "wx7a727ff7d940bb3f", - "contexts":[{"type":"openDataContext"}] - } - } + "navigateToMiniProgramAppIdList": ["wx4f4a4549a1069d03"] } diff --git a/miniprogram/js/api/AR/common/behavior.js b/miniprogram/js/api/AR/common/behavior.js index c2be567..c07b1ef 100644 --- a/miniprogram/js/api/AR/common/behavior.js +++ b/miniprogram/js/api/AR/common/behavior.js @@ -144,11 +144,11 @@ export default function getBehavior() { if (frame) { this.renderGL(frame) - canvas2dContext.drawImage(offScreenCanvas, 0, 0, this.data.width, this.data.height, 0, this.data.screenTop, this.data.width, this.data.height) if (this.mode == 'planeAR') { this.renderReticle() } this.render(frame) + canvas2dContext.drawImage(offScreenCanvas, 0, 0, this.data.width, this.data.height, 0, this.data.screenTop, this.data.width, this.data.height) } session.requestAnimationFrame(onFrame) diff --git a/miniprogram/js/api/AR/common/view.js b/miniprogram/js/api/AR/common/view.js index fc0a18f..04bf3a0 100644 --- a/miniprogram/js/api/AR/common/view.js +++ b/miniprogram/js/api/AR/common/view.js @@ -31,7 +31,7 @@ module.exports = function (PIXI, app, obj, titleName, buttonName, tip, config, m screen = p_texture(PIXI, { width: obj.width, height: obj.height * 0.8 - (title.height + title.y + 78 * PIXI.ratio), - y: title.height + title.y + 78 * PIXI.ratio, + y: title.height + title.y, x: 0 }); @@ -43,12 +43,22 @@ module.exports = function (PIXI, app, obj, titleName, buttonName, tip, config, m component.onReady(app, config, mode); + desc = p_text(PIXI, { + content: tip, + fontSize: 26 * PIXI.ratio, + fill: 0x576b95, + y: title.height + title.y + 100 + component.data.height, + relative_middle: { + containerWidth: obj.width + } + }); + if(buttonName != null){ let button = p_button(PIXI, { width: 370 * PIXI.ratio, height: 80 * PIXI.ratio, fill: 0x07c160, - y: title.height + title.y + 100 + component.data.height, + y: title.height + title.y + 200 + component.data.height, }); let buttonText = p_text(PIXI, { @@ -79,16 +89,6 @@ module.exports = function (PIXI, app, obj, titleName, buttonName, tip, config, m scroll.myAddChildFn(button); } - desc = p_text(PIXI, { - content: tip, - fontSize: 26 * PIXI.ratio, - fill: 0x576b95, - y: title.height + title.y + 150 + component.data.height + 80 * PIXI.ratio, - relative_middle: { - containerWidth: obj.width - } - }); - goBack.callBack = () => {