Commit 79bd3a5f authored by wildfirecode13's avatar wildfirecode13

1

parent a7a6172d
No preview for this file type
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -614,19 +614,19 @@ const resCanvasList = {
'efaf990e-5392-49ad-94d8-25c04f651ede': {
name: '操场1',
ext: '.jpg',
url: '//yun.duiba.com.cn/spark/assets/操场1.b001a98dc403137934e6b7d7a17a7882ecd63478.jpg',
url: 'https://yun.duiba.com.cn/spark/assets/操场1.b001a98dc403137934e6b7d7a17a7882ecd63478.jpg',
uuid: 'efaf990e-5392-49ad-94d8-25c04f651ede'
},
'c6d699b0-b276-4985-b3ea-47bcef13f2ea': {
name: '教室1',
ext: '.jpg',
url: '//yun.duiba.com.cn/spark/assets/教室1.b439ee3a59ed36c920c92e11df87b317e4ff048d.jpg',
url: 'https://yun.duiba.com.cn/spark/assets/教室1.b439ee3a59ed36c920c92e11df87b317e4ff048d.jpg',
uuid: 'c6d699b0-b276-4985-b3ea-47bcef13f2ea'
},
'b3c8c187-e5c9-4968-9a00-a118d18ab2fc': {
name: '寝室1',
ext: '.jpg',
url: '//yun.duiba.com.cn/spark/assets/寝室1.e9238ec5e71c328817026128dd0f41fdc65203f4.jpg',
url: 'https://yun.duiba.com.cn/spark/assets/寝室1.e9238ec5e71c328817026128dd0f41fdc65203f4.jpg',
uuid: 'b3c8c187-e5c9-4968-9a00-a118d18ab2fc'
}
};
......
......@@ -28,6 +28,7 @@ export class Main {
private requestID;
private _pause: boolean;
constructor(canvas: HTMLCanvasElement) {
1 console.warn=function(){}
var sysInfo;
//@ts-ignore 存在my就初始化
if (my) {
......@@ -84,10 +85,14 @@ export class Main {
Ins.stageH = this.stage.viewRect.height;
console.log("舞台宽高:",Ins.stageW,Ins.stageH)
await RES.loadSparkAssets(resloadingList);
console.log('resloadingList 加载完毕')
changeScene(LoadingScene);
await RES.loadSparkAssets(resCanvasList);
await InitLottie.initLottieList(resLottieList);
console.log("通用资源加载完成")
await RES.loadSparkAssets(resCanvasList).catch(()=>{
console.log('loadSparkAssets resCanvasList 失败')
});
console.log('resCanvasList 加载完毕')
// await InitLottie.initLottieList(resLottieList);
// console.log("initLottieList完成")
FYGE.GDispatcher.dispatchEvent("loadEnd");
//打开开始场景
// changeScene(StartScene);
......
No preview for this file type
This source diff could not be displayed because it is too large. You can view the blob instead.
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