Merge pull request #517 from nonameShijian/PR-Branch
修改.eslintrc.json的缩进,注释掉部分无用代码,隐藏火狐浏览器的滚动条
This commit is contained in:
commit
ff79e2bb2a
|
@ -268,7 +268,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
|
||||||
return target.countCards('h')>0&&game.hasPlayer(function(current){
|
return target.countCards('h')>0&&game.hasPlayer(function(current){
|
||||||
return target.canCompare(current);
|
return target.canCompare(current);
|
||||||
});
|
});
|
||||||
return ui.selected.targets[0].canCompare(target);
|
//return ui.selected.targets[0].canCompare(target);
|
||||||
},
|
},
|
||||||
filterAddedTarget:function(card,player,target,preTarget){
|
filterAddedTarget:function(card,player,target,preTarget){
|
||||||
return target!=player&&preTarget.canCompare(target);
|
return target!=player&&preTarget.canCompare(target);
|
||||||
|
|
|
@ -680,7 +680,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
||||||
if(evt.gaintag_map[i].includes('fuuko_chuanyuan')) return true;
|
if(evt.gaintag_map[i].includes('fuuko_chuanyuan')) return true;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
return false;
|
//return false;
|
||||||
},
|
},
|
||||||
content:function(){
|
content:function(){
|
||||||
trigger.addCount=false;
|
trigger.addCount=false;
|
||||||
|
|
|
@ -5044,7 +5044,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
||||||
if(evtx3.gaintag_map[i].contains('dcliuzhuan_tag')) return true;
|
if(evtx3.gaintag_map[i].contains('dcliuzhuan_tag')) return true;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
return false;
|
//return false;
|
||||||
}
|
}
|
||||||
else if(event.name=='lose'){
|
else if(event.name=='lose'){
|
||||||
if(event.player!=current||event.position!=ui.discardPile) return false;
|
if(event.player!=current||event.position!=ui.discardPile) return false;
|
||||||
|
@ -5268,7 +5268,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
||||||
if(target.group!=current.group) return false;
|
if(target.group!=current.group) return false;
|
||||||
if(!ui.selected.targets.length) return true;
|
if(!ui.selected.targets.length) return true;
|
||||||
return ui.selected.targets[0]==current;
|
return ui.selected.targets[0]==current;
|
||||||
return current==target;
|
//return current==target;
|
||||||
}).set('ai',function(target){
|
}).set('ai',function(target){
|
||||||
var player=_status.event.player;
|
var player=_status.event.player;
|
||||||
return get.effect(target,{name:'sha'},player,player);
|
return get.effect(target,{name:'sha'},player,player);
|
||||||
|
|
|
@ -9902,10 +9902,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
||||||
var att=get.attitude(player,target);
|
var att=get.attitude(player,target);
|
||||||
return -att;
|
return -att;
|
||||||
//if(cards.length==1) return -att;
|
//if(cards.length==1) return -att;
|
||||||
if(player==target) att/=2;
|
// if(player==target) att/=2;
|
||||||
if(target.hasSkill('pingkou')) att*=1.4;
|
// if(target.hasSkill('pingkou')) att*=1.4;
|
||||||
att*=(1+target.countCards('j')/2);
|
// att*=(1+target.countCards('j')/2);
|
||||||
return att;
|
// return att;
|
||||||
});
|
});
|
||||||
"step 3"
|
"step 3"
|
||||||
if(result.bool){
|
if(result.bool){
|
||||||
|
|
|
@ -4715,7 +4715,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
||||||
var player=_status.event.player,evt=_status.event.getParent();
|
var player=_status.event.player,evt=_status.event.getParent();
|
||||||
if(get.value(evt.card,evt.player)*get.attitude(player,evt.player)>0) return 0;
|
if(get.value(evt.card,evt.player)*get.attitude(player,evt.player)>0) return 0;
|
||||||
return Math.random()>(get.value(evt.card,evt.player)/6)?1:0;
|
return Math.random()>(get.value(evt.card,evt.player)/6)?1:0;
|
||||||
return 1;
|
//return 1;
|
||||||
});
|
});
|
||||||
'step 2'
|
'step 2'
|
||||||
if(result.index+event.addIndex==0){
|
if(result.index+event.addIndex==0){
|
||||||
|
|
|
@ -8218,7 +8218,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
||||||
return names.length>0&&player.hasCard(function(card){
|
return names.length>0&&player.hasCard(function(card){
|
||||||
return names.includes(get.name(card));
|
return names.includes(get.name(card));
|
||||||
},'hs');
|
},'hs');
|
||||||
return false;
|
//return false;
|
||||||
},
|
},
|
||||||
group:'twchaofeng_compare',
|
group:'twchaofeng_compare',
|
||||||
chooseButton:{
|
chooseButton:{
|
||||||
|
|
|
@ -11025,11 +11025,11 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
||||||
player.judge(function(card){
|
player.judge(function(card){
|
||||||
var type=get.subtype(card);
|
var type=get.subtype(card);
|
||||||
return ['equip1','equip4','equip3','equip6'].contains(type)?6:-6;
|
return ['equip1','equip4','equip3','equip6'].contains(type)?6:-6;
|
||||||
switch(type){
|
// switch(type){
|
||||||
case 'equip':return 4;
|
// case 'equip':return 4;
|
||||||
case 'trick':return -4;
|
// case 'trick':return -4;
|
||||||
default:return 0;
|
// default:return 0;
|
||||||
}
|
// }
|
||||||
}).judge2=function(result){
|
}).judge2=function(result){
|
||||||
return result.bool;
|
return result.bool;
|
||||||
};
|
};
|
||||||
|
|
20
game/game.js
20
game/game.js
|
@ -58520,16 +58520,16 @@
|
||||||
m=game.checkMod(from,to,m,'attackFrom',from);
|
m=game.checkMod(from,to,m,'attackFrom',from);
|
||||||
m=game.checkMod(from,to,m,'attackTo',to);
|
m=game.checkMod(from,to,m,'attackTo',to);
|
||||||
return m;
|
return m;
|
||||||
const attakRange=from.getEquipRange();
|
// const attakRange=from.getEquipRange();
|
||||||
m+=(1-attakRange);
|
// m+=(1-attakRange);
|
||||||
for(let i=0;i<equips2.length;i++){
|
// for(let i=0;i<equips2.length;i++){
|
||||||
let info=get.info(equips2[i]).distance;
|
// let info=get.info(equips2[i]).distance;
|
||||||
if(!info) continue;
|
// if(!info) continue;
|
||||||
if(info.attaclTo){
|
// if(info.attaclTo){
|
||||||
m+=info.attaclTo;
|
// m+=info.attaclTo;
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
return n;
|
// return n;
|
||||||
}
|
}
|
||||||
else if(method=='unchecked') return n;
|
else if(method=='unchecked') return n;
|
||||||
return Math.max(1,n);
|
return Math.max(1,n);
|
||||||
|
|
|
@ -5529,3 +5529,7 @@ div[data-decoration="bronze"]::after{
|
||||||
::-webkit-scrollbar {
|
::-webkit-scrollbar {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
/* 火狐隐藏滚动条 */
|
||||||
|
* {
|
||||||
|
scrollbar-width: none;
|
||||||
|
}
|
Loading…
Reference in New Issue