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

修复网页版导出扩展弹窗的问题，修复状态栏设置失效的bug

This commit is contained in:
shijian 2023-11-14 14:26:29 +08:00
parent b2debe610f
commit acf978b8e8
1 changed files with 66 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
game/game.js
View File

@ -3816,7 +3816,7 @@
name:'显示状态栏', name:'显示状态栏',
init:false, init:false,
unfrequent:true, unfrequent:true,
content:function(bool){ onclick:function(bool){
game.saveConfig('show_statusbar',bool); game.saveConfig('show_statusbar',bool);
if(window.StatusBar&&lib.device=='android'){ if(window.StatusBar&&lib.device=='android'){
if(bool){ if(bool){
@ -8188,7 +8188,7 @@
run:function(time){ run:function(time){
lib.status.time=time; lib.status.time=time;
for(var i=0;i<lib.updates.length;i++){ for(var i=0;i<lib.updates.length;i++){
if(!('_time' in lib.updates[i])){ if(!Object.prototype.hasOwnProperty.call(lib.updates[i], '_time')){
lib.updates[i]._time=time; lib.updates[i]._time=time;
} }
if(lib.updates[i](time-lib.updates[i]._time-lib.status.delayed)===false){ if(lib.updates[i](time-lib.updates[i]._time-lib.status.delayed)===false){
@ -8583,9 +8583,6 @@
else src=`image/${type}/${subfolder}/${name}${ext}`; else src=`image/${type}/${subfolder}/${name}${ext}`;
} }
else src=`image/${name}${ext}`; else src=`image/${name}${ext}`;
this.style.backgroundPositionX='center';
this.style.backgroundSize='cover';
if(type=='character'){
new Promise((resolve,reject)=>{ new Promise((resolve,reject)=>{
const image=new Image(); const image=new Image();
image.src=`${lib.assetURL}${src}`; image.src=`${lib.assetURL}${src}`;
@ -8593,6 +8590,8 @@
if(type=='character') image.onerror=reject; if(type=='character') image.onerror=reject;
}).then(()=>{ }).then(()=>{
this.setBackgroundImage(src); this.setBackgroundImage(src);
this.style.backgroundPositionX='center';
this.style.backgroundSize='cover';
}).catch(()=>new Promise((resolve,reject)=>{ }).catch(()=>new Promise((resolve,reject)=>{
const nameinfo=get.character(name); const nameinfo=get.character(name);
const sex=nameinfo[0]; const sex=nameinfo[0];
@ -8611,11 +8610,9 @@
image.onerror=reject; image.onerror=reject;
})).then((src)=>{ })).then((src)=>{
this.setBackgroundImage(src); this.setBackgroundImage(src);
this.style.backgroundPositionX='center';
this.style.backgroundSize='cover';
})); }));
}
else{
this.setBackgroundImage(src);
}
return this; return this;
} }
}); });
@ -19829,14 +19826,14 @@
cards[i].recheck(); cards[i].recheck();
var info=lib.card[cards[i].name]; var info=lib.card[cards[i].name];
if('_destroy' in cards[i]){ if(Object.prototype.hasOwnProperty.call(cards[i], '_destroy')){
if(cards[i]._destroy){ if(cards[i]._destroy){
cards[i].delete(); cards[i].delete();
cards[i].destroyed=cards[i]._destroy; cards[i].destroyed=cards[i]._destroy;
continue; continue;
} }
} }
else if('destroyed' in cards[i]){ else if(Object.prototype.hasOwnProperty.call(cards[i], 'destroyed')){
if(event.getlx!==false&&event.position&&cards[i].willBeDestroyed(event.position.id,null,event)){ if(event.getlx!==false&&event.position&&cards[i].willBeDestroyed(event.position.id,null,event)){
cards[i].selfDestroy(event); cards[i].selfDestroy(event);
continue; continue;
@ -25479,7 +25476,7 @@
} }
} }
if(next.animate=='gain2'||next.animate=='draw2'){ if(next.animate=='gain2'||next.animate=='draw2'){
if(!('log' in next)){ if(!Object.prototype.hasOwnProperty.call(next, 'log')){
next.log=true; next.log=true;
} }
} }
@ -25566,7 +25563,7 @@
} }
} }
if(next.animate=='gain2'||next.animate=='draw2'||next.animate=='give'){ if(next.animate=='gain2'||next.animate=='draw2'||next.animate=='give'){
if(!('log' in next)){ if(!Object.prototype.hasOwnProperty.call(next, 'log')){
next.log=true; next.log=true;
} }
} }
@ -26370,7 +26367,7 @@
} }
clearTimeout(lib.node.torespondtimeout[this.playerid]); clearTimeout(lib.node.torespondtimeout[this.playerid]);
delete lib.node.torespondtimeout[this.playerid]; delete lib.node.torespondtimeout[this.playerid];
if(!(this.playerid in lib.node.torespond)){ if(!Object.prototype.hasOwnProperty.call(lib.node.torespond, this.playerid)){
return; return;
} }
var noresume=false; var noresume=false;
@ -26397,7 +26394,7 @@
else if(_status.paused&&!noresume) game.resume(); else if(_status.paused&&!noresume) game.resume();
} }
tempUnwait(result){ tempUnwait(result){
if(!(this.playerid in lib.node.torespond)){ if(!Object.prototype.hasOwnProperty.call(lib.node.torespond, this.playerid)){
return; return;
} }
var proceed; var proceed;
@ -31445,18 +31442,14 @@
const next=new lib.element.GameEvent(`${this.name}Inserted`,false); const next=new lib.element.GameEvent(`${this.name}Inserted`,false);
this.next.push(next); this.next.push(next);
next.setContent(content); next.setContent(content);
if(map){
Object.entries(map).forEach(entry=>next.set(entry[0],entry[1])); Object.entries(map).forEach(entry=>next.set(entry[0],entry[1]));
}
return next; return next;
} }
insertAfter(content,map){ insertAfter(content,map){
const next=new lib.element.GameEvent(`${this.name}Inserted`,false); const next=new lib.element.GameEvent(`${this.name}Inserted`,false);
this.after.push(next); this.after.push(next);
next.setContent(content); next.setContent(content);
if(map){
Object.entries(map).forEach(entry=>next.set(entry[0],entry[1])); Object.entries(map).forEach(entry=>next.set(entry[0],entry[1]));
}
return next; return next;
} }
backup(skill){ backup(skill){
@ -37763,7 +37756,7 @@
const config=game.importedPack.config; const config=game.importedPack.config;
Object.keys(config).forEach(value=>{ Object.keys(config).forEach(value=>{
const configObject=config[value]; const configObject=config[value];
if(configObject&&('init' in configObject)) game.saveConfig(`extension_${extensionName}_${value}`,configObject.init); if(configObject&&Object.prototype.hasOwnProperty.call(configObject, 'init')) game.saveConfig(`extension_${extensionName}_${value}`,configObject.init);
}); });
if(game.download){ if(game.download){
const files=zip.files,hiddenFileFlags=['.','_'],fileList=Object.keys(files).filter(key=>!files[key].dir&&!hiddenFileFlags.includes(key[0])).reverse(); const files=zip.files,hiddenFileFlags=['.','_'],fileList=Object.keys(files).filter(key=>!files[key].dir&&!hiddenFileFlags.includes(key[0])).reverse();
@ -42203,7 +42196,7 @@
config.num=config.num||num||3; config.num=config.num||num||3;
config.ratio=config.ratio||ratio||1.2; config.ratio=config.ratio||ratio||1.2;
config.update=config.update||update; config.update=config.update||update;
if(!('first' in config)){ if(!Object.prototype.hasOwnProperty.call(config, 'first')){
if(typeof first=='boolean'){ if(typeof first=='boolean'){
config.first=first; config.first=first;
} }
@ -42817,10 +42810,10 @@
} }
if(info.marktext) lib.translate[`${i}_bg`]=info.marktext; if(info.marktext) lib.translate[`${i}_bg`]=info.marktext;
if(info.silent){ if(info.silent){
if(!('forced' in info)) info.forced=true; if(!Object.prototype.hasOwnProperty.call(info, 'forced')) info.forced=true;
if(!('popup' in info)) info.popup=false; if(!Object.prototype.hasOwnProperty.call(info, 'popup')) info.popup=false;
} }
if(!('_priority' in info)){ if(!Object.prototype.hasOwnProperty.call(info, '_priority')){
let priority=0; let priority=0;
if(info.priority){ if(info.priority){
priority=info.priority*100; priority=info.priority*100;
@ -45117,7 +45110,7 @@
var cfg=copyObj(infoconfig[j]); var cfg=copyObj(infoconfig[j]);
cfg._name=j; cfg._name=j;
cfg.mode=mode; cfg.mode=mode;
if(!(j in config)){ if(!Object.prototype.hasOwnProperty.call(config, j)){
game.saveConfig(j,cfg.init,mode); game.saveConfig(j,cfg.init,mode);
} }
else{ else{
@ -45585,7 +45578,7 @@
} }
var cfg=copyObj(info.config[j]); var cfg=copyObj(info.config[j]);
cfg._name=j; cfg._name=j;
if(!(j in config)){ if(!Object.prototype.hasOwnProperty.call(config, j)){
if(cfg.type!='autoskill'&&cfg.type!='banskill'){ if(cfg.type!='autoskill'&&cfg.type!='banskill'){
game.saveConfig(j,cfg.init); game.saveConfig(j,cfg.init);
} }
@ -47459,7 +47452,7 @@
j=mode+'_'+i+'_playpackconfig'; j=mode+'_'+i+'_playpackconfig';
} }
cfg._name=j; cfg._name=j;
if(!(j in lib.config)){ if(!Object.prototype.hasOwnProperty.call(lib.config, j)){
game.saveConfig(j,cfg.init); game.saveConfig(j,cfg.init);
} }
else{ else{
@ -47741,9 +47734,7 @@
for(var i in dash2.content.image){ for(var i in dash2.content.image){
extension[i]=dash2.content.image[i]; extension[i]=dash2.content.image[i];
} }
game.readFile('LICENSE',function(data){ var callback=()=>{
extension['LICENSE']=data;
game.writeFile(data,'extension/'+page.currentExtension,'LICENSE',function(){})
if(exportext){ if(exportext){
var proexport=function(){ var proexport=function(){
game.importExtension(extension,null,page.currentExtension,{ game.importExtension(extension,null,page.currentExtension,{
@ -47769,9 +47760,19 @@
exportExtLine.style.display=''; exportExtLine.style.display='';
}); });
} }
};
//兼容网页版情况
if(typeof game.readFile=="function") {
game.readFile('LICENSE',function(data){
extension['LICENSE']=data;
game.writeFile(data,'extension/'+page.currentExtension,'LICENSE',function(){})
callback();
},function(){ },function(){
alert('许可证文件丢失，无法导出扩展'); alert('许可证文件丢失，无法导出扩展');
}); });
}else{
callback();
}
},500); },500);
}; };
var buttonConfirm=document.createElement('button'); var buttonConfirm=document.createElement('button');
@ -49852,7 +49853,7 @@
game.saveConfig('extension_'+extname+'_enable',true); game.saveConfig('extension_'+extname+'_enable',true);
game.saveConfig('extension_'+extname+'_version',that.info.version); game.saveConfig('extension_'+extname+'_version',that.info.version);
for(var i in game.importedPack.config){ for(var i in game.importedPack.config){
if(game.importedPack.config[i]&&('init' in game.importedPack.config[i])){ if(game.importedPack.config[i]&&Object.prototype.hasOwnProperty.call(game.importedPack.config[i], 'init')){
game.saveConfig('extension_'+extname+'_'+i,game.importedPack.config[i].init); game.saveConfig('extension_'+extname+'_'+i,game.importedPack.config[i].init);
} }
} }
@ -58516,7 +58517,7 @@
priority:skill=>{ priority:skill=>{
const info=get.info(skill); const info=get.info(skill);
if(!info) return 0; if(!info) return 0;
if('_priority' in info) return info._priority; if(Object.prototype.hasOwnProperty.call(info, '_priority')) return info._priority;
let priority=0; let priority=0;
if(info.priority){ if(info.priority){
priority=info.priority*100; priority=info.priority*100;
@ -59196,7 +59197,7 @@
character:(name,num)=>{ character:(name,num)=>{
let info=lib.character[name]; let info=lib.character[name];
if(!info){ if(!info){
const pack=Object.keys(lib.characterPack).find(pack=>name in lib.characterPack[pack]); const pack=Object.keys(lib.characterPack).find(pack=>Object.prototype.hasOwnProperty.call(lib.characterPack[pack], name));
if(pack) info=lib.characterPack[pack][name]; if(pack) info=lib.characterPack[pack][name];
} }
if(info){ if(info){
@ -60254,7 +60255,7 @@
if(card.length==1) return get.suit(card[0],player); if(card.length==1) return get.suit(card[0],player);
return 'none'; return 'none';
} }
else if(!('suit' in card)&&Array.isArray(card.cards)){ else if(!Object.prototype.hasOwnProperty.call(card, 'suit')&&Array.isArray(card.cards)){
return get.suit(card.cards,player); return get.suit(card.cards,player);
} }
else{ else{
@ -60306,7 +60307,7 @@
if(!card) return; if(!card) return;
//狗卡你是真敢出啊 //狗卡你是真敢出啊
var number=null; var number=null;
if('number' in card){ if(Object.prototype.hasOwnProperty.call(card, 'number')){
number=card.number; number=card.number;
if(typeof number!='number') number=null; if(typeof number!='number') number=null;
} }