Commit d5442ef7 authored by sunboylu's avatar sunboylu

feat: test null02

parent 974e051e
...@@ -519,7 +519,7 @@ export default class middleLayer extends cc.Component { ...@@ -519,7 +519,7 @@ export default class middleLayer extends cc.Component {
} else if (cc.sys.isNative && cc.sys.os == cc.sys.OS_ANDROID) { } else if (cc.sys.isNative && cc.sys.os == cc.sys.OS_ANDROID) {
sceneName = conf.android.sceneName; sceneName = conf.android.sceneName;
version = conf.android.version; version = conf.android.version;
bondleUrl = `${templateBaseUrl}/android/${conf.ios.sceneName}`; bondleUrl = `${templateBaseUrl}/android/${conf.android.sceneName}`;
} else { } else {
sceneName = conf.android.sceneName; sceneName = conf.android.sceneName;
version = ""; version = "";
...@@ -544,6 +544,12 @@ export default class middleLayer extends cc.Component { ...@@ -544,6 +544,12 @@ export default class middleLayer extends cc.Component {
bondleUrl, bondleUrl,
{ version: version }, { version: version },
async (err, bundle) => { async (err, bundle) => {
if (err || !bundle) {
console.error('[Bundle加载失败]', { bondleUrl, version, err });
this.showLog(`Bundle加载失败: ${bondleUrl}`);
callback && callback(err);
return;
}
this.curBundle = bundle; this.curBundle = bundle;
...@@ -551,24 +557,41 @@ export default class middleLayer extends cc.Component { ...@@ -551,24 +557,41 @@ export default class middleLayer extends cc.Component {
sceneName, sceneName,
null, null,
(finish, total, item) => { (finish, total, item) => {
this.setLoadingProgressBar(Math.floor(finish / total * 100)); const safeTotal = total || 1;
const progress = Math.floor((finish / safeTotal) * 100);
if (item && (item as any).url) {
console.log('[场景加载进度]', { finish, total: safeTotal, url: (item as any).url });
}
this.setLoadingProgressBar(progress);
}, },
(err, scene) => { (err, scene) => {
cc.director.runScene(scene, null, () => { if (err || !scene) {
console.log("sceneName1 = " + sceneName); console.error('[场景加载失败]', { sceneName, bondleUrl, err });
// const canvas = cc.find("Canvas"); this.showLog(`场景加载失败: ${sceneName}`);
const middleLayer = cc.find("middleLayer"); callback && callback(err);
middleLayer.getComponent(cc.Widget).updateAlignment(); return;
// middleLayer.scale = canvas.width / middleLayer.width; }
this.showCloseGameBtn(); try {
cc.director.runScene(scene, null, () => {
const destroyer = cc.instantiate(cc.find('middleLayer/Destroyer')); console.log("sceneName1 = " + sceneName);
destroyer.parent = cc.find('Canvas'); // const canvas = cc.find("Canvas");
destroyer.active = true; const middleLayer = cc.find("middleLayer");
middleLayer.getComponent(cc.Widget).updateAlignment();
// middleLayer.scale = canvas.width / middleLayer.width;
callback && callback(); this.showCloseGameBtn();
});
const destroyer = cc.instantiate(cc.find('middleLayer/Destroyer'));
destroyer.parent = cc.find('Canvas');
destroyer.active = true;
callback && callback();
});
} catch (e) {
console.error('[运行场景异常]', e);
this.showLog('运行场景异常');
callback && callback(e);
}
} }
); );
} }
......
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