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

fix

This commit is contained in:
libccy 2017-11-05 16:19:43 +08:00
parent 50c10f67d3
commit 8df4345a65
6 changed files with 51 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
card/standard.js
View File

@ -1524,8 +1524,10 @@ game.import('card',function(lib,game,ui,get,ai,_status){
bagua_skill:{
trigger:{player:'chooseToRespondBegin'},
filter:function(event,player){
console.log(123);
if(event.responded) return false;
if(!event.filterCard({name:'shan'})) return false;
if(!lib.filter.cardRespondable({name:'sha'},player,event)) return false;
var evt=event.getParent();
if(evt.player&&evt.player.hasSkillTag('unequip',false,evt.card)) return false;
return true;

4
character/extra.js
View File

@ -864,10 +864,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){
player.storage.yeyan=true;
if(cards.length==4){
player.loseHp(3);
target.damage('fire',3);
target.damage('fire',3,'nocard');
}
else{
target.damage('fire');
target.damage('fire','nocard');
}
},
intro:{

2
character/sp.js
View File

@ -701,7 +701,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
norespond:true,
skillTagFilter:function(player,tag,arg){
if(tag=='norespond'&&Array.isArray(arg)){
if(get.distance(player,arg[1])<=1) return true;
if(get.distance(arg[1],player)<=1) return true;
}
return false;
}

21
game/game.js
View File

@ -11766,6 +11766,9 @@
else{
checkShow=false;
}
if(lib.skill[skill].textAnimation){
checkShow=false;
}
player.$skill(lib.skill[skill].animationStr||lib.translate[skill],lib.skill[skill].skillAnimation,lib.skill[skill].animationColor,checkShow);
}
else{
@ -15084,7 +15087,13 @@
return next;
},
viewHandcards:function(target){
return this.viewCards(get.translation(target)+'的手牌',target.getCards('h'));
var cards=target.getCards('h');
if(cards.length){
return this.viewCards(get.translation(target)+'的手牌',cards);
}
else{
return false;
}
},
canMoveCard:function(withatt){
var player=this;
@ -16175,6 +16184,9 @@
else{
checkShow=false;
}
if(lib.skill[name].textAnimation){
checkShow=false;
}
this.$skill(lib.skill[name].animationStr||lib.translate[name],lib.skill[name].skillAnimation,lib.skill[name].animationColor,checkShow);
}
else if(!nopop) this.popup(get.skillTranslation(name,this));
@ -20215,9 +20227,10 @@
if(typeof filter=='function') return filter(card,player,event);
}
},
cardRespondable:function(card,player){
if(_status.event.name!='chooseToRespond') return true;
var source=_status.event.getParent().player;
cardRespondable:function(card,player,event){
event=event||_status.event;
if(event.name!='chooseToRespond') return true;
var source=event.getParent().player;
if(source!=player){
if(source.hasSkillTag('norespond',false,[card,player],true)){
return false;

2
game/update.js
View File

@ -5,7 +5,7 @@ window.noname_update={
'原7武将、新张宝',
'诸侯伐董、神之试炼',
'武将称号',
'bug修复（父魂、截辎、穿心、先辅、魔箭）'
'bug修复（父魂、截辎、穿心、先辅、魔箭、鹰扬、闪袭、伏骑）'
],
files:[
// 'game/game.js',

33
mode/guozhan.js
View File

@ -1235,13 +1235,36 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
filter:function(event){
return !event.iwhile;
},
direct:true,
content:function(){
if(player==trigger.player){
trigger.num1+=3;
}
else{
trigger.num2+=3;
'step 0'
player.chooseControl('点数+3','点数-3','cancel2').set('prompt',get.prompt('yingyang')).set('ai',function(){
if(_status.event.small) return 1;
else return 0;
}).set('small',trigger.small);
'step 1'
if(result.index!=2){
player.logSkill('yingyang');
if(result.index==0){
game.log(player,'拼点牌点数+3');
if(player==trigger.player){
trigger.num1+=3;
}
else{
trigger.num2+=3;
}
}
else{
game.log(player,'拼点牌点数-3');
if(player==trigger.player){
trigger.num1-=3;
}
else{
trigger.num2-=3;
}
}
}
}
},
gzqianxi:{