This commit is contained in:
libccy 2016-07-30 23:08:21 +08:00
parent 0b54d36350
commit 588920ae41
5 changed files with 16 additions and 5 deletions

View File

@ -2601,6 +2601,11 @@ card.swd={
return name; return name;
}, },
selectCard:function(){ selectCard:function(){
if(ui.selected.cards.length==2&&
get.type(ui.selected.cards[0])=='hslingjian'&&
get.type(ui.selected.cards[1])=='hslingjian'){
return [3,3];
}
if(_status.event.player.hasSkill('mujiaren_skill')) return [2,3]; if(_status.event.player.hasSkill('mujiaren_skill')) return [2,3];
return 2; return 2;
}, },

View File

@ -581,7 +581,7 @@ character.hearth={
trigger:{player:'equipEnd'}, trigger:{player:'equipEnd'},
frequent:true, frequent:true,
filter:function(event){ filter:function(event){
return get.subtype(event.card)=='equip1'&&typeof lib.cardType.hslingjian=='number'; return lib.inpile.contains(event.card.name)&&get.subtype(event.card)=='equip1'&&typeof lib.cardType.hslingjian=='number';
}, },
content:function(){ content:function(){
var num=1; var num=1;
@ -4584,7 +4584,7 @@ character.hearth={
zengli:'赠礼', zengli:'赠礼',
zengli_info:'出牌阶段限一次,你指定一名其他角色与你各装备一把武器', zengli_info:'出牌阶段限一次,你指定一名其他角色与你各装备一把武器',
xiubu:'修补', xiubu:'修补',
xiubu_info:'每当你装备一把武器,你可以获得数量等同于武器攻击范围的随机零件', xiubu_info:'每当你装备一把未强化的武器,你可以获得数量等同于武器攻击范围的随机零件',
mobao:'魔爆', mobao:'魔爆',
mobao_info:'出牌阶段限一次,你可以弃置至多三张黑色牌,然后对所有于上轮对你造成过伤害的角色造成等同于你弃牌数的雷电伤害', mobao_info:'出牌阶段限一次,你可以弃置至多三张黑色牌,然后对所有于上轮对你造成过伤害的角色造成等同于你弃牌数的雷电伤害',
xianji:'献祭', xianji:'献祭',

View File

@ -8,6 +8,8 @@ window.characterRank={
'swd_duguningke', 'swd_duguningke',
'swd_guyue', 'swd_guyue',
'swd_murongshi', 'swd_murongshi',
'swd_cheyun',
'swd_huanyuanzhi',
'swd_tuobayuer', 'swd_tuobayuer',
'swd_yuxiaoxue', 'swd_yuxiaoxue',
'gjqt_bailitusu', 'gjqt_bailitusu',
@ -16,13 +18,13 @@ window.characterRank={
'pal_liumengli', 'pal_liumengli',
], ],
ap:[ ap:[
'ow_dva',
'ow_mei',
'ow_yuanshi', 'ow_yuanshi',
'swd_xuanyuanjianxian', 'swd_xuanyuanjianxian',
'swd_yuwentuo', 'swd_yuwentuo',
'pal_xuanxiao', 'pal_xuanxiao',
'xk_fujianhan', 'xk_fujianhan',
'swd_cheyun',
'swd_huanyuanzhi',
'swd_jipeng', 'swd_jipeng',
'lusu', 'lusu',
'yuanshu', 'yuanshu',
@ -113,6 +115,10 @@ window.characterRank={
'ow_tianshi', 'ow_tianshi',
'ow_shibing', 'ow_shibing',
'ow_liekong', 'ow_liekong',
'ow_ana',
'ow_heibaihe',
'ow_maikelei',
'ow_kuangshu',
], ],
am:[ am:[
'guohuanghou', 'guohuanghou',

View File

@ -4155,7 +4155,6 @@ character.swd={
expose:0.2 expose:0.2
} }
}, },
chuanyang:{ chuanyang:{
trigger:{player:'shaBegin'}, trigger:{player:'shaBegin'},
check:function(event,player){ check:function(event,player){

View File

@ -13,6 +13,7 @@ window.noname_update={
'character/sp.js', 'character/sp.js',
'character/shenhua.js', 'character/shenhua.js',
'character/yxs.js', 'character/yxs.js',
'character/rank.js',
'card/swd.js', 'card/swd.js',
'card/hearth.js', 'card/hearth.js',
'layout/default/menu.css', 'layout/default/menu.css',