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

lk

This commit is contained in:
libccy 2017-01-28 21:55:23 +08:00
parent d9b813f98e
commit 10fefde461
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
character/hearth.js
View File

@ -17,7 +17,7 @@ character.hearth={
hs_liadrin:['female','shu',4,['xueren']], hs_liadrin:['female','shu',4,['xueren']],
hs_morgl:['male','wu',3,['s_tuteng']], hs_morgl:['male','wu',3,['s_tuteng']],
// hs_khadgar:['male','shu',3,['s_tuteng']], // hs_khadgar:['male','shu',3,['s_tuteng']],
// hs_tyrande:['female','wei',3,['s_tuteng']], // hs_tyrande:['female','wei',3,['yuelu','xingluo']],
hs_neptulon:['male','wu',4,['liechao','qingliu']], hs_neptulon:['male','wu',4,['liechao','qingliu']],
hs_wvelen:['male','qun',3,['shengyan','xianzhi']], hs_wvelen:['male','qun',3,['shengyan','xianzhi']],
@ -5386,6 +5386,10 @@ character.hearth={
hs_tyrande:'泰兰德', hs_tyrande:'泰兰德',
hs_fenjie:'芬杰', hs_fenjie:'芬杰',
yuelu:'月印',
yuelu_info:'出牌阶段限一次，你可以弃置一张红桃牌令一名角色回复一点体力并获得一点护甲',
xingluo:'星落',
xingluo_info:'星落',
yushou:'御兽', yushou:'御兽',
yushou_info:'出牌阶段，你可以弃置一张牌并召唤一个随机的野兽宠物，效果持续到你的下一回合开始', yushou_info:'出牌阶段，你可以弃置一张牌并召唤一个随机的野兽宠物，效果持续到你的下一回合开始',
yushou_misha:'米莎', yushou_misha:'米莎',

19
game/game.js
View File

@ -1281,19 +1281,25 @@
oblong:'长方', oblong:'长方',
}, },
onclick:function(item){ onclick:function(item){
var linked=false;
if(game.me&&game.me.isLinked()){
linked=true;
}
game.saveConfig('cardshape',item); game.saveConfig('cardshape',item);
if(item=='oblong'&&(lib.config.layout=='long'||lib.config.layout=='mobile')){ if(item=='oblong'&&(lib.config.layout=='long'||lib.config.layout=='mobile')){
ui.arena.classList.add('oblongcard'); ui.arena.classList.add('oblongcard');
if(game.me&&game.me.classList.contains('linked')){
game.me.classList.remove('linked');
game.me.classList.add('linked2');
}
} }
else{ else{
ui.arena.classList.remove('oblongcard'); ui.arena.classList.remove('oblongcard');
if(game.me&&game.me.classList.contains('linked2')){ }
game.me.classList.remove('linked2'); if(linked){
if(get.is.linked2(game.me)){
game.me.classList.remove('linked');
game.me.classList.add('linked2');
}
else{
game.me.classList.add('linked'); game.me.classList.add('linked');
game.me.classList.remove('linked2');
} }
} }
} }
@ -31731,6 +31737,7 @@
is:{ is:{
linked2:function(player){ linked2:function(player){
if(lib.config.link_style=='mark') return true; if(lib.config.link_style=='mark') return true;
if(game.chess) return false;
if(lib.config.layout=='long'||lib.config.layout=='long2') return true; if(lib.config.layout=='long'||lib.config.layout=='long2') return true;
if(player.dataset.position=='0'){ if(player.dataset.position=='0'){
return ui.arena.classList.contains('oblongcard'); return ui.arena.classList.contains('oblongcard');