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

[2023/09/18: ③]

This commit is contained in:
Rintim 2023-09-18 19:11:02 +08:00
parent 0a2ab57ab8
commit 6b55691d39
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
game/game.js
View File

@ -9727,7 +9727,7 @@
_status.extension=lib.extensions[i][0]; _status.extension=lib.extensions[i][0];
_status.evaluatingExtension=lib.extensions[i][3]; _status.evaluatingExtension=lib.extensions[i][3];
if (typeof lib.extensions[i][1]=="function") if (typeof lib.extensions[i][1]=="function")
yield (gnc.is.coroutine(lib.extensions[i][1])?gnc.of(lib.extensions[i][1]):lib.extensions[i][1])(lib.extensions[i][2],lib.extensions[i][4]); yield (gnc.is.coroutine(lib.extensions[i][1])?gnc.of(lib.extensions[i][1]):lib.extensions[i][1]).call(lib.extensions[i],lib.extensions[i][2],lib.extensions[i][4]);
if(lib.extensions[i][4]){ if(lib.extensions[i][4]){
if(lib.extensions[i][4].character){ if(lib.extensions[i][4].character){
for(var j in lib.extensions[i][4].character.character){ for(var j in lib.extensions[i][4].character.character){
@ -10019,8 +10019,7 @@
js:(path,file,onload,onerror)=>{ js:(path,file,onload,onerror)=>{
if(path[path.length-1]=='/') path=path.slice(0,path.length-1); if(path[path.length-1]=='/') path=path.slice(0,path.length-1);
if(path==`${lib.assetURL}mode`&&lib.config.all.stockmode.indexOf(file)==-1){ if(path==`${lib.assetURL}mode`&&lib.config.all.stockmode.indexOf(file)==-1){
lib.init[`setMode_${file}`](); lib.genAwait(lib.init[`setMode_${file}`]()).then(onload);
onload();
return; return;
} }
if(Array.isArray(file)){ if(Array.isArray(file)){
@ -33942,7 +33941,7 @@
} }
if(obj.precontent){ if(obj.precontent){
_status.extension=obj.name; _status.extension=obj.name;
yield (gnc.is.generatorFunc(obj.precontent)?gnc.of(obj.precontent):obj.precontent)(cfg); yield (gnc.is.generatorFunc(obj.precontent)?gnc.of(obj.precontent):obj.precontent).call(obj,cfg);
delete _status.extension; delete _status.extension;
} }
if(obj.content){ if(obj.content){
@ -36591,12 +36590,12 @@
splash:imgsrc, splash:imgsrc,
fromextension:true fromextension:true
} }
lib.init['setMode_'+name]=function(){ lib.init['setMode_'+name]=gnc.of(function*(){
game.import('mode',function(lib,game,ui,get,ai,_status){ yield game.import('mode',function(lib,game,ui,get,ai,_status){
info.name=name; info.name=name;
return info; return info;
}); });
} });
if(!lib.config.extensionInfo[extname]){ if(!lib.config.extensionInfo[extname]){
lib.config.extensionInfo[extname]={}; lib.config.extensionInfo[extname]={};
} }
@ -38299,7 +38298,8 @@
}, },
loadModeAsync:function(name,callback){ loadModeAsync:function(name,callback){
window.game=game; window.game=game;
var script=lib.init.js(lib.assetURL+'mode',name,function(){ var script=lib.init.js(lib.assetURL+'mode',name,gnc.of(function*(){
yield Promise.allSettled(_status.importing.mode);
if(!lib.config.dev) delete window.game; if(!lib.config.dev) delete window.game;
script.remove(); script.remove();
var content=lib.imported.mode[name]; var content=lib.imported.mode[name];
@ -38308,7 +38308,7 @@
delete lib.imported.mode; delete lib.imported.mode;
} }
callback(content); callback(content);
}); }));
}, },
switchMode:function(name,configx){ switchMode:function(name,configx){
if(!lib.layoutfixed.contains(name)){ if(!lib.layoutfixed.contains(name)){
@ -38322,7 +38322,8 @@
} }
} }
window.game=game; window.game=game;
var script=lib.init.js(lib.assetURL+'mode',name,function(){ var script=lib.init.js(lib.assetURL+'mode',name,gnc.of(function*(){
yield Promise.allSettled(_status.importing.mode);
if(!lib.config.dev) delete window.game; if(!lib.config.dev) delete window.game;
script.remove(); script.remove();
var mode=lib.imported.mode; var mode=lib.imported.mode;
@ -38497,7 +38498,7 @@
game.loop(); game.loop();
}); });
} }
}); }));
}, },
loadMode:function(mode){ loadMode:function(mode){
var next=game.createEvent('loadMode',false); var next=game.createEvent('loadMode',false);