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

Merge pull request #314 from nofficalfs/PR-Experimentalize-AsyncGameImport 

[Experimentalize] Asyncify `game.import`.
This commit is contained in:
Spmario233 2023-09-10 21:35:14 +08:00 committed by GitHub
parent b653bb4b19 7d130339f2
commit cc3c849fac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 40 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
game/game.js
View File

@ -8441,36 +8441,43 @@
throw e;
});
var styleToLoad=6;
var styleLoaded=function(){
styleToLoad--;
var styleLoaded=gnc.async(function*(){
--styleToLoad;
if(styleToLoad==0){
if(extensionlist.length&&(lib.config.mode!='connect'||show_splash)){
var extToLoad=extensionlist.length;
var extLoaded=function(){
extToLoad--;
_status.extensionLoading=[];
let extToLoad=extensionlist.length;
const extLoaded=gnc.async(function*(){
--extToLoad;
if(extToLoad==0){
yield Promise.allSettled(_status.extensionLoading);
delete _status.extensionLoading;
loadPack();
}
}
});
//读取扩展
var alerted=false;
for(var i=0;i<extensionlist.length;i++){
if(window.bannedExtensions.contains(extensionlist[i])){
alerted=true;
extToLoad--;
--extToLoad;
if(extToLoad==0){
yield Promise.allSettled(_status.extensionLoading);
delete _status.extensionLoading;
loadPack();
}
continue;
}
lib.init.js(lib.assetURL+'extension/'+extensionlist[i],'extension',extLoaded,(function(i){
return function(){
return gnc.async(function*(){
game.removeExtension(i);
extToLoad--;
--extToLoad;
if(extToLoad==0){
yield Promise.allSettled(_status.extensionLoading);
delete _status.extensionLoading;
loadPack();
}
}
});
}(extensionlist[i])));
}
}
@ -8478,7 +8485,7 @@
loadPack();
}
}
};
});
if(lib.config.layout=='default'){
lib.config.layout='mobile';
}
@ -9725,7 +9732,7 @@
try{
_status.extension=lib.extensions[i][0];
_status.evaluatingExtension=lib.extensions[i][3];
if (typeof lib.extensions[i][1]=="function") lib.extensions[i][1](lib.extensions[i][2],lib.extensions[i][4]);
if (typeof lib.extensions[i][1]=="function") yield lib.extensions[i][1](lib.extensions[i][2],lib.extensions[i][4]);
if(lib.extensions[i][4]){
if(lib.extensions[i][4].character){
for(var j in lib.extensions[i][4].character.character){
@ -33478,27 +33485,30 @@
}
},
import:function(type,content){
if(type=='extension'){
//Anti-Cheat system updated, no need to work here
//var backup_onload=lib.init.onload;
game.loadExtension(content);
//lib.init.onload=backup_onload;
}
else{
if(!lib.imported[type]){
lib.imported[type]={};
const asyncFn=gnc.async(function*(){
if(type=='extension'){
yield game.loadExtension(content);
}
var content2=content(lib,game,ui,get,ai,_status);
if(content2.name){
lib.imported[type][content2.name]=content2;
delete content2.name;
else{
if(!lib.imported[type]){
lib.imported[type]={};
}
var content2=yield content(lib,game,ui,get,ai,_status);
if(content2.name){
lib.imported[type][content2.name]=content2;
delete content2.name;
}
}
}
});
if(typeof _status.extensionLoading=="undefined")_status.extensionLoading=[];
const promise=asyncFn();
_status.extensionLoading.add(promise);
return promise;
},
loadExtension:function(obj){
loadExtension:gnc.async(function*(obj){
var noeval=false;
if(typeof obj=='function'){
obj=obj(lib,game,ui,get,ai,_status);
obj=yield obj(lib,game,ui,get,ai,_status);
noeval=true;
}
lib.extensionMenu['extension_'+obj.name]={
@ -33616,7 +33626,7 @@
}
if(obj.precontent){
_status.extension=obj.name;
obj.precontent(cfg);
yield obj.precontent(cfg);
delete _status.extension;
}
if(obj.content){
@ -33631,7 +33641,7 @@
else{
game.importedPack=obj;
}
},
}),
createDir:function(dir,success,error){
var nullFC=function(){};
success=success||nullFC;