Commit f4761447 authored by 范雪寒's avatar 范雪寒

Revert "feat: 分辨率适配"

This reverts commit 92d9ce0a.
parent 92d9ce0a
...@@ -3762,10 +3762,10 @@ ...@@ -3762,10 +3762,10 @@
"node": { "node": {
"__id__": 7 "__id__": 7
}, },
"_enabled": false, "_enabled": true,
"alignMode": 2, "alignMode": 2,
"_target": null, "_target": null,
"_alignFlags": 18, "_alignFlags": 45,
"_left": 0, "_left": 0,
"_right": 0, "_right": 0,
"_top": 0, "_top": 0,
...@@ -3778,8 +3778,8 @@ ...@@ -3778,8 +3778,8 @@
"_isAbsBottom": true, "_isAbsBottom": true,
"_isAbsHorizontalCenter": true, "_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true, "_isAbsVerticalCenter": true,
"_originalWidth": 1280, "_originalWidth": 0,
"_originalHeight": 720, "_originalHeight": 0,
"_id": "1bqJ4tHIpFjZymhKtOdYgN" "_id": "1bqJ4tHIpFjZymhKtOdYgN"
}, },
{ {
......
...@@ -80,7 +80,6 @@ cc.Class({ ...@@ -80,7 +80,6 @@ cc.Class({
start() { start() {
initAir(this); initAir(this);
this.reWriteAir(); this.reWriteAir();
this.updateScale();
window.courseware.getEngineInfo((dataStr) => { window.courseware.getEngineInfo((dataStr) => {
const engineInfo = JSON.parse(dataStr); const engineInfo = JSON.parse(dataStr);
...@@ -398,7 +397,6 @@ cc.Class({ ...@@ -398,7 +397,6 @@ cc.Class({
console.log("sceneName = " + conf.sceneName); console.log("sceneName = " + conf.sceneName);
const canvas = cc.find("Canvas"); const canvas = cc.find("Canvas");
const middleLayer = cc.find("middleLayer"); const middleLayer = cc.find("middleLayer");
middleLayer.getComponent("middleLayer").updateWidgets();
this.hideWaitingLetters(); this.hideWaitingLetters();
callback && callback(); callback && callback();
}); });
...@@ -407,23 +405,6 @@ cc.Class({ ...@@ -407,23 +405,6 @@ cc.Class({
); );
}, },
updateWidgets() {
this.updateScale();
this.node.getComponentsInChildren(cc.Widget).forEach((widget) => {
widget.updateAlignment();
});
},
updateScale() {
const canvas = cc.find("Canvas");
const size = cc.view.getCanvasSize();
this.node.width = size.width;
this.node.height = size.height;
this.node.scale = canvas.width / size.width;
this.node.getComponent(cc.Widget).updateAlignment();
},
loadBundleByConf(conf, callback) { loadBundleByConf(conf, callback) {
if (cc.sys.isNative && cc.sys.os == cc.sys.OS_IOS) { if (cc.sys.isNative && cc.sys.os == cc.sys.OS_IOS) {
this.loadBundle(conf.ios, callback); this.loadBundle(conf.ios, callback);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment