This commit is contained in:
libccy 2017-02-16 19:12:52 +08:00
parent 25825453d8
commit 6b8dd3b3d3
4 changed files with 18 additions and 23 deletions

View File

@ -1859,14 +1859,13 @@ character.ow={
} }
}, },
feiren:{ feiren:{
trigger:{player:'useCard'}, trigger:{source:'damageBegin'},
forced:true, forced:true,
priority:10, filter:function(event,player){
filter:function(event){ return event.card&&event.card.name=='sha'&&get.suit(event.card)=='spade'&&event.notLink();
return event.card.name=='sha';
}, },
content:function(){ content:function(){
player.addTempSkill('unequip','useCardAfter'); trigger.num++;
}, },
mod:{ mod:{
targetInRange:function(card){ targetInRange:function(card){
@ -1878,22 +1877,10 @@ character.ow={
} }
}, },
}, },
group:['feiren2'],
ai:{ ai:{
threaten:1.4 threaten:1.4
} }
}, },
feiren2:{
trigger:{source:'damageBegin'},
forced:true,
popup:false,
filter:function(event,player){
return event.card&&event.card.name=='sha'&&get.suit(event.card)=='spade';
},
content:function(){
trigger.num++;
}
},
feiren3:{ feiren3:{
trigger:{player:'useCardAfter'}, trigger:{player:'useCardAfter'},
filter:function(event,player){ filter:function(event,player){
@ -2993,7 +2980,7 @@ character.ow={
mujing_old_info:'每当你对攻击范围不含你的角色使用一张牌,你可以弃置目标一张牌;若你的手牌数不多于目标,你摸一张牌', mujing_old_info:'每当你对攻击范围不含你的角色使用一张牌,你可以弃置目标一张牌;若你的手牌数不多于目标,你摸一张牌',
feiren:'飞刃', feiren:'飞刃',
feiren2:'飞刃', feiren2:'飞刃',
feiren_info:'你的杀无视距离和防具;你的黑桃杀造成的伤害+1梅花杀可以额外指定一个目标', feiren_info:'你的杀无视距离;你的黑桃杀造成的伤害+1梅花杀可以额外指定一个目标',
zhanlong:'斩龙', zhanlong:'斩龙',
zhanlong_info:'限定技准备阶段若你体力值为1你可以弃置所有牌至少一张然后将三张杀置入你的手牌若如此做你本回合使用杀无次数限制', zhanlong_info:'限定技准备阶段若你体力值为1你可以弃置所有牌至少一张然后将三张杀置入你的手牌若如此做你本回合使用杀无次数限制',
xie:'谐', xie:'谐',

View File

@ -60,6 +60,8 @@ window.characterRank={
'hs_morgl', 'hs_morgl',
'ow_luxiao', 'ow_luxiao',
'gjqt_ouyangshaogong', 'gjqt_ouyangshaogong',
'ow_liekong',
'ow_ana',
], ],
a:[ a:[
'hs_khadgar', 'hs_khadgar',
@ -113,8 +115,6 @@ window.characterRank={
'bulianshi', 'bulianshi',
'sp_pangtong', 'sp_pangtong',
'liubiao', 'liubiao',
'jianyong',
'zhoutai',
'zhongyao', 'zhongyao',
'liuchen', 'liuchen',
'baiwuchang', 'baiwuchang',
@ -125,9 +125,6 @@ window.characterRank={
'hs_lafamu', 'hs_lafamu',
'ow_chanyata', 'ow_chanyata',
'ow_tianshi', 'ow_tianshi',
'ow_liekong',
'ow_ana',
'ow_heibaihe',
'ow_maikelei', 'ow_maikelei',
'ow_kuangshu', 'ow_kuangshu',
'ow_tuobiang', 'ow_tuobiang',
@ -145,6 +142,8 @@ window.characterRank={
], ],
am:[ am:[
'old_wangyi', 'old_wangyi',
'jianyong',
'zhoutai',
'zhugejin', 'zhugejin',
'hs_totemic', 'hs_totemic',
'swd_duanmeng', 'swd_duanmeng',
@ -242,6 +241,7 @@ window.characterRank={
'xiaoqiao', 'xiaoqiao',
'sp_zhangjiao', 'sp_zhangjiao',
'hs_tanghangu', 'hs_tanghangu',
'ow_heibaihe',
'ow_luba', 'ow_luba',
'pal_leiyuange', 'pal_leiyuange',
'dongbai', 'dongbai',

View File

@ -5846,6 +5846,10 @@ character.swd={
content:function(){ content:function(){
"step 0" "step 0"
var card=target.get('h').randomGet(); var card=target.get('h').randomGet();
if(!card){
event.finish();
return;
}
target.discard(card); target.discard(card);
var color=get.color(card); var color=get.color(card);
var suit=get.suit(card); var suit=get.suit(card);
@ -7552,6 +7556,7 @@ character.swd={
check:function(event,player){ check:function(event,player){
return ai.get.attitude(player,event.target)<=0; return ai.get.attitude(player,event.target)<=0;
}, },
logTarget:'target',
content:function(){ content:function(){
"step 0" "step 0"
player.judge(function(){ player.judge(function(){

View File

@ -20061,6 +20061,9 @@
ui.me.hide(); ui.me.hide();
ui.mebg.hide() ui.mebg.hide()
ui.autonode.hide(); ui.autonode.hide();
if(lib.config.radius_size!='off'){
ui.historybar.style.borderRadius='0 0 0 4px';
}
} }
if(game.online){ if(game.online){
var dialog=ui.create.dialog(); var dialog=ui.create.dialog();