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

Merge pull request #632 from nonameShijian/PR-Branch 

修复网页版导出扩展弹窗的问题，修复状态栏设置失效的bug
This commit is contained in:
Spmario233 2023-11-16 22:31:26 +08:00 committed by GitHub
parent 20b6493300 bf48a05fb7
commit a35c02919d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 66 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

131
game/game.js
View File

@ -3878,7 +3878,7 @@
name:'显示状态栏',
init:false,
unfrequent:true,
content:function(bool){
onclick:function(bool){
game.saveConfig('show_statusbar',bool);
if(window.StatusBar&&lib.device=='android'){
if(bool){
@ -8250,7 +8250,7 @@
run:function(time){
lib.status.time=time;
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;
}
if(lib.updates[i](time-lib.updates[i]._time-lib.status.delayed)===false){
@ -8645,39 +8645,36 @@
else src=`image/${type}/${subfolder}/${name}${ext}`;
}
else src=`image/${name}${ext}`;
this.style.backgroundPositionX='center';
this.style.backgroundSize='cover';
if(type=='character'){
new Promise((resolve,reject)=>{
const image=new Image();
image.src=`${lib.assetURL}${src}`;
image.onload=resolve;
if(type=='character') image.onerror=reject;
}).then(()=>{
this.setBackgroundImage(src);
}).catch(()=>new Promise((resolve,reject)=>{
const nameinfo=get.character(name);
const sex=nameinfo[0];
src=`image/character/default_silhouette_${sex}${ext}`;
const image=new Image();
image.src=`${lib.assetURL}${src}`;
image.onload=()=>resolve(src);
image.onerror=reject;
}).catch(()=>new Promise((resolve,reject)=>{
const nameinfo=get.character(name);
const sex=nameinfo[0];
src=`image/character/default_silhouette_${sex=='female'?'female':'male'}${ext}`;
const image=new Image();
image.src=`${lib.assetURL}${src}`;
image.onload=()=>resolve(src);
image.onerror=reject;
})).then((src)=>{
this.setBackgroundImage(src);
}));
}
else{
new Promise((resolve,reject)=>{
const image=new Image();
image.src=`${lib.assetURL}${src}`;
image.onload=resolve;
if(type=='character') image.onerror=reject;
}).then(()=>{
this.setBackgroundImage(src);
}
this.style.backgroundPositionX='center';
this.style.backgroundSize='cover';
}).catch(()=>new Promise((resolve,reject)=>{
const nameinfo=get.character(name);
const sex=nameinfo[0];
src=`image/character/default_silhouette_${sex}${ext}`;
const image=new Image();
image.src=`${lib.assetURL}${src}`;
image.onload=()=>resolve(src);
image.onerror=reject;
}).catch(()=>new Promise((resolve,reject)=>{
const nameinfo=get.character(name);
const sex=nameinfo[0];
src=`image/character/default_silhouette_${sex=='female'?'female':'male'}${ext}`;
const image=new Image();
image.src=`${lib.assetURL}${src}`;
image.onload=()=>resolve(src);
image.onerror=reject;
})).then((src)=>{
this.setBackgroundImage(src);
this.style.backgroundPositionX='center';
this.style.backgroundSize='cover';
}));
return this;
}
});
@ -19901,14 +19898,14 @@
cards[i].recheck();
var info=lib.card[cards[i].name];
if('_destroy' in cards[i]){
if(Object.prototype.hasOwnProperty.call(cards[i], '_destroy')){
if(cards[i]._destroy){
cards[i].delete();
cards[i].destroyed=cards[i]._destroy;
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)){
cards[i].selfDestroy(event);
continue;
@ -25588,7 +25585,7 @@
}
}
if(next.animate=='gain2'||next.animate=='draw2'){
if(!('log' in next)){
if(!Object.prototype.hasOwnProperty.call(next, 'log')){
next.log=true;
}
}
@ -25675,7 +25672,7 @@
}
}
if(next.animate=='gain2'||next.animate=='draw2'||next.animate=='give'){
if(!('log' in next)){
if(!Object.prototype.hasOwnProperty.call(next, 'log')){
next.log=true;
}
}
@ -26479,7 +26476,7 @@
}
clearTimeout(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;
}
var noresume=false;
@ -26506,7 +26503,7 @@
else if(_status.paused&&!noresume) game.resume();
}
tempUnwait(result){
if(!(this.playerid in lib.node.torespond)){
if(!Object.prototype.hasOwnProperty.call(lib.node.torespond, this.playerid)){
return;
}
var proceed;
@ -31531,18 +31528,14 @@
const next=new lib.element.GameEvent(`${this.name}Inserted`,false);
this.next.push(next);
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;
}
insertAfter(content,map){
const next=new lib.element.GameEvent(`${this.name}Inserted`,false);
this.after.push(next);
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;
}
backup(skill){
@ -37851,7 +37844,7 @@
const config=game.importedPack.config;
Object.keys(config).forEach(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){
const files=zip.files,hiddenFileFlags=['.','_'],fileList=Object.keys(files).filter(key=>!files[key].dir&&!hiddenFileFlags.includes(key[0])).reverse();
@ -42291,7 +42284,7 @@
config.num=config.num||num||3;
config.ratio=config.ratio||ratio||1.2;
config.update=config.update||update;
if(!('first' in config)){
if(!Object.prototype.hasOwnProperty.call(config, 'first')){
if(typeof first=='boolean'){
config.first=first;
}
@ -42905,10 +42898,10 @@
}
if(info.marktext) lib.translate[`${i}_bg`]=info.marktext;
if(info.silent){
if(!('forced' in info)) info.forced=true;
if(!('popup' in info)) info.popup=false;
if(!Object.prototype.hasOwnProperty.call(info, 'forced')) info.forced=true;
if(!Object.prototype.hasOwnProperty.call(info, 'popup')) info.popup=false;
}
if(!('_priority' in info)){
if(!Object.prototype.hasOwnProperty.call(info, '_priority')){
let priority=0;
if(info.priority){
priority=info.priority*100;
@ -45205,7 +45198,7 @@
var cfg=copyObj(infoconfig[j]);
cfg._name=j;
cfg.mode=mode;
if(!(j in config)){
if(!Object.prototype.hasOwnProperty.call(config, j)){
game.saveConfig(j,cfg.init,mode);
}
else{
@ -45673,7 +45666,7 @@
}
var cfg=copyObj(info.config[j]);
cfg._name=j;
if(!(j in config)){
if(!Object.prototype.hasOwnProperty.call(config, j)){
if(cfg.type!='autoskill'&&cfg.type!='banskill'){
game.saveConfig(j,cfg.init);
}
@ -47547,7 +47540,7 @@
j=mode+'_'+i+'_playpackconfig';
}
cfg._name=j;
if(!(j in lib.config)){
if(!Object.prototype.hasOwnProperty.call(lib.config, j)){
game.saveConfig(j,cfg.init);
}
else{
@ -47829,9 +47822,7 @@
for(var i in dash2.content.image){
extension[i]=dash2.content.image[i];
}
game.readFile('LICENSE',function(data){
extension['LICENSE']=data;
game.writeFile(data,'extension/'+page.currentExtension,'LICENSE',function(){})
var callback=()=>{
if(exportext){
var proexport=function(){
game.importExtension(extension,null,page.currentExtension,{
@ -47857,9 +47848,19 @@
exportExtLine.style.display='';
});
}
},function(){
alert('许可证文件丢失，无法导出扩展');
});
};
//兼容网页版情况
if(typeof game.readFile=="function") {
game.readFile('LICENSE',function(data){
extension['LICENSE']=data;
game.writeFile(data,'extension/'+page.currentExtension,'LICENSE',function(){})
callback();
},function(){
alert('许可证文件丢失，无法导出扩展');
});
}else{
callback();
}
},500);
};
var buttonConfirm=document.createElement('button');
@ -49940,7 +49941,7 @@
game.saveConfig('extension_'+extname+'_enable',true);
game.saveConfig('extension_'+extname+'_version',that.info.version);
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);
}
}
@ -58621,7 +58622,7 @@
priority:skill=>{
const info=get.info(skill);
if(!info) return 0;
if('_priority' in info) return info._priority;
if(Object.prototype.hasOwnProperty.call(info, '_priority')) return info._priority;
let priority=0;
if(info.priority){
priority=info.priority*100;
@ -59301,7 +59302,7 @@
character:(name,num)=>{
let info=lib.character[name];
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(info){
@ -60359,7 +60360,7 @@
if(card.length==1) return get.suit(card[0],player);
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);
}
else{
@ -60411,7 +60412,7 @@
if(!card) return;
//狗卡你是真敢出啊
var number=null;
if('number' in card){
if(Object.prototype.hasOwnProperty.call(card, 'number')){
number=card.number;
if(typeof number!='number') number=null;
}