YunFeiyang
/
noname
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #329 from nofficalfs/PR-BugFix-AsyncLoad 

[BugFix] 兼容版异步等待无限加载问题
This commit is contained in:
Spmario233 2023-09-14 11:28:25 +08:00 committed by GitHub
parent c4f777ffd5 31a7b69799
commit 87d5747ec8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
game/game.js
View File

@ -7841,7 +7841,8 @@
value:function allSettled(ary){ value:function allSettled(ary){
const Promise = this; const Promise = this;
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
if (Object.prototype.toString.call(arr) != "[object Array]") // if (Object.prototype.toString.call(arr) != "[object Array]")
if (!Array.isArray(ary))
return reject(new TypeError(`${typeof arr} ${ary} is not iterable(cannot read property Symbol(Symbol.iterator))`)); return reject(new TypeError(`${typeof arr} ${ary} is not iterable(cannot read property Symbol(Symbol.iterator))`));
let args = Array.prototype.slice.call(ary); let args = Array.prototype.slice.call(ary);
if (args.length == 0) return resolve([]); if (args.length == 0) return resolve([]);
@ -33821,14 +33822,12 @@
})(); })();
} }
}, },
importExtension:function(data,finishLoad,exportext,pkg){ importExtension:gnc.async(function*(data,finishLoad,exportext,pkg){
//by 来瓶可乐加冰 //by 来瓶可乐加冰
if(!window.JSZip){ if(!window.JSZip)
lib.init.js(lib.assetURL+'game','jszip',function(){ yield new Promise((resolve,reject)=>lib.init.js(`${lib.assetURL}game`,"jszip",resolve,reject));
game.importExtension(data,finishLoad,exportext,pkg);
}); if(get.objtype(data)=='object'){
}
else if(get.objtype(data)=='object'){
//导出 //导出
var zip=new JSZip(); var zip=new JSZip();
var filelist=[]; var filelist=[];
@ -33936,6 +33935,8 @@
if(str===""||undefined) throw('你导入的不是扩展！请选择正确的文件'); if(str===""||undefined) throw('你导入的不是扩展！请选择正确的文件');
_status.importingExtension=true; _status.importingExtension=true;
eval(str); eval(str);
yield Promise.allSettled(_status.extensionLoading);
delete _status.extensionLoading;
_status.importingExtension=false; _status.importingExtension=false;
if(!game.importedPack) throw('err'); if(!game.importedPack) throw('err');
var extname=game.importedPack.name; var extname=game.importedPack.name;
@ -34070,7 +34071,7 @@
return false; return false;
} }
}; };
}, }),
export:function(textToWrite,name){ export:function(textToWrite,name){
var textFileAsBlob = new Blob([textToWrite], {type:'text/plain'}); var textFileAsBlob = new Blob([textToWrite], {type:'text/plain'});
var fileNameToSaveAs = name||'noname'; var fileNameToSaveAs = name||'noname';