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

Merge pull request #620 from kuangshen04/PR-Branch 

将无继承关系的hasOwnProperty改为in
This commit is contained in:
Spmario233 2023-11-11 23:40:33 +08:00 committed by GitHub
parent 6bc30e698d 4aae8e4e4e
commit b2debe610f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.eslintrc.json
View File

@ -11,7 +11,6 @@
"no-unused-vars": 0,
"no-undef": 0,
"no-redeclare": 0,
"no-prototype-builtins": 0,
"require-yield": 0,
"no-irregular-whitespace": ["error", { "skipStrings": true, "skipTemplates": true }],
"no-constant-condition": ["error", { "checkLoops": false }]/* ,

40
game/game.js
View File

@ -8188,7 +8188,7 @@
run:function(time){
lib.status.time=time;
for(var i=0;i<lib.updates.length;i++){
if(!Object.prototype.hasOwnProperty.call(lib.updates[i], '_time')){
if(!('_time' in lib.updates[i])){
lib.updates[i]._time=time;
}
if(lib.updates[i](time-lib.updates[i]._time-lib.status.delayed)===false){
@ -19829,14 +19829,14 @@
cards[i].recheck();
var info=lib.card[cards[i].name];
if(Object.prototype.hasOwnProperty.call(cards[i], '_destroy')){
if('_destroy' in cards[i]){
if(cards[i]._destroy){
cards[i].delete();
cards[i].destroyed=cards[i]._destroy;
continue;
}
}
else if(Object.prototype.hasOwnProperty.call(cards[i], 'destroyed')){
else if('destroyed' in cards[i]){
if(event.getlx!==false&&event.position&&cards[i].willBeDestroyed(event.position.id,null,event)){
cards[i].selfDestroy(event);
continue;
@ -25479,7 +25479,7 @@
}
}
if(next.animate=='gain2'||next.animate=='draw2'){
if(!Object.prototype.hasOwnProperty.call(next, 'log')){
if(!('log' in next)){
next.log=true;
}
}
@ -25566,7 +25566,7 @@
}
}
if(next.animate=='gain2'||next.animate=='draw2'||next.animate=='give'){
if(!Object.prototype.hasOwnProperty.call(next, 'log')){
if(!('log' in next)){
next.log=true;
}
}
@ -26370,7 +26370,7 @@
}
clearTimeout(lib.node.torespondtimeout[this.playerid]);
delete lib.node.torespondtimeout[this.playerid];
if(!Object.prototype.hasOwnProperty.call(lib.node.torespond, this.playerid)){
if(!(this.playerid in lib.node.torespond)){
return;
}
var noresume=false;
@ -26397,7 +26397,7 @@
else if(_status.paused&&!noresume) game.resume();
}
tempUnwait(result){
if(!Object.prototype.hasOwnProperty.call(lib.node.torespond, this.playerid)){
if(!(this.playerid in lib.node.torespond)){
return;
}
var proceed;
@ -37763,7 +37763,7 @@
const config=game.importedPack.config;
Object.keys(config).forEach(value=>{
const configObject=config[value];
if(configObject&&Object.prototype.hasOwnProperty.call(configObject, 'init')) game.saveConfig(`extension_${extensionName}_${value}`,configObject.init);
if(configObject&&('init' in configObject)) 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();
@ -42203,7 +42203,7 @@
config.num=config.num||num||3;
config.ratio=config.ratio||ratio||1.2;
config.update=config.update||update;
if(!Object.prototype.hasOwnProperty.call(config, 'first')){
if(!('first' in config)){
if(typeof first=='boolean'){
config.first=first;
}
@ -42817,10 +42817,10 @@
}
if(info.marktext) lib.translate[`${i}_bg`]=info.marktext;
if(info.silent){
if(!Object.prototype.hasOwnProperty.call(info, 'forced')) info.forced=true;
if(!Object.prototype.hasOwnProperty.call(info, 'popup')) info.popup=false;
if(!('forced' in info)) info.forced=true;
if(!('popup' in info)) info.popup=false;
}
if(!Object.prototype.hasOwnProperty.call(info, '_priority')){
if(!('_priority' in info)){
let priority=0;
if(info.priority){
priority=info.priority*100;
@ -45117,7 +45117,7 @@
var cfg=copyObj(infoconfig[j]);
cfg._name=j;
cfg.mode=mode;
if(!Object.prototype.hasOwnProperty.call(config, j)){
if(!(j in config)){
game.saveConfig(j,cfg.init,mode);
}
else{
@ -45585,7 +45585,7 @@
}
var cfg=copyObj(info.config[j]);
cfg._name=j;
if(!Object.prototype.hasOwnProperty.call(config, j)){
if(!(j in config)){
if(cfg.type!='autoskill'&&cfg.type!='banskill'){
game.saveConfig(j,cfg.init);
}
@ -47459,7 +47459,7 @@
j=mode+'_'+i+'_playpackconfig';
}
cfg._name=j;
if(!Object.prototype.hasOwnProperty.call(lib.config, j)){
if(!(j in lib.config)){
game.saveConfig(j,cfg.init);
}
else{
@ -49852,7 +49852,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]&&Object.prototype.hasOwnProperty.call(game.importedPack.config[i], 'init')){
if(game.importedPack.config[i]&&('init' in game.importedPack.config[i])){
game.saveConfig('extension_'+extname+'_'+i,game.importedPack.config[i].init);
}
}
@ -58516,7 +58516,7 @@
priority:skill=>{
const info=get.info(skill);
if(!info) return 0;
if(Object.prototype.hasOwnProperty.call(info, '_priority')) return info._priority;
if('_priority' in info) return info._priority;
let priority=0;
if(info.priority){
priority=info.priority*100;
@ -59196,7 +59196,7 @@
character:(name,num)=>{
let info=lib.character[name];
if(!info){
const pack=Object.keys(lib.characterPack).find(pack=>Object.prototype.hasOwnProperty.call(lib.characterPack[pack], name));
const pack=Object.keys(lib.characterPack).find(pack=>name in lib.characterPack[pack]);
if(pack) info=lib.characterPack[pack][name];
}
if(info){
@ -60254,7 +60254,7 @@
if(card.length==1) return get.suit(card[0],player);
return 'none';
}
else if(!Object.prototype.hasOwnProperty.call(card, 'suit')&&Array.isArray(card.cards)){
else if(!('suit' in card)&&Array.isArray(card.cards)){
return get.suit(card.cards,player);
}
else{
@ -60306,7 +60306,7 @@
if(!card) return;
//狗卡你是真敢出啊
var number=null;
if(Object.prototype.hasOwnProperty.call(card, 'number')){
if('number' in card){
number=card.number;
if(typeof number!='number') number=null;
}