This commit is contained in:
libccy 2017-05-17 16:13:00 +08:00
parent 39272c91c5
commit fd0b0f249a
4 changed files with 22 additions and 19 deletions

View File

@ -852,10 +852,14 @@ game.import('card',function(lib,game,ui,get,ai,_status){
list.push(get.cardPile('nanman','cardPile'));
list.push(get.cardPile('huoshaolianying','cardPile'));
list=[list.randomGet()];
var sha=get.cardPile('sha','cardPile');
if(sha){
sha.remove();
list.push(sha);
// var sha=get.cardPile('sha','cardPile');
// if(sha){
// sha.remove();
// list.push(sha);
// list.push(get.cardPile('sha','cardPile'));
// }
list.push(get.cardPile('sha','cardPile'));
if(list.length==1){
list.push(get.cardPile('sha','cardPile'));
}
if(list.length){
@ -1427,7 +1431,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
gw_ansha:'暗杀',
gw_ansha_info:'令一名体力为1的随机敌方角立即死亡然后结束出牌阶段',
gw_shizizhaohuan:'十字召唤',
gw_shizizhaohuan_info:'从牌堆中获得张杀以及决斗、火攻、火烧连营、南蛮入侵中的随机一张',
gw_shizizhaohuan_info:'从牌堆中获得张杀以及决斗、火攻、火烧连营、南蛮入侵四张牌中的随机一张',
gw_zuihouyuanwang:'最后愿望',
gw_zuihouyuanwang_info:'摸X张牌并弃置X张牌X为存活角色数',
gw_zirankuizeng:'自然馈赠',

View File

@ -56,6 +56,8 @@ window.noname_character_rank={
'swd_shuwaner',
],
a:[
'gw_luobo',
'gw_aigeleisi',
'gw_zhuoertan',
'gw_gaier',
'pal_mingxiu',

View File

@ -12341,7 +12341,7 @@
card.style.transform='';
card.classList.add('drawinghidden');
card.viewAs=viewAs;
if(viewAs&&viewAs!=card.name&&card.classList.contains('fullskin')){
if(viewAs&&viewAs!=card.name&&(card.classList.contains('fullskin')||card.classList.contains('fullborder'))){
card.classList.add('fakejudge');
card.node.background.innerHTML=lib.translate[viewAs+'_bg']||get.translation(viewAs)[0]
}
@ -12368,7 +12368,7 @@
delete cards[0].viewAs;
}
if(cards[0].viewAs&&cards[0].viewAs!=cards[0].name){
if(cards[0].classList.contains('fullskin')){
if(cards[0].classList.contains('fullskin')||cards[0].classList.contains('fullborder')){
cards[0].classList.add('fakejudge');
cards[0].node.background.innerHTML=lib.translate[cards[0].viewAs+'_bg']||get.translation(cards[0].viewAs)[0];
}
@ -18097,23 +18097,13 @@
if(info.color){
this.style.color=info.color;
}
else if(info.fullimage||info.fullborder){
this.style.color='white';
}
if(info.textShadow){
this.style.textShadow=info.textShadow;
}
else if(info.fullimage||info.fullborder){
this.style.textShadow='black 0 0 2px';
}
if(info.opacity){
this.node.info.style.opacity=info.opacity;
this.node.name.style.opacity=info.opacity;
}
else if(info.fullimage||info.fullborder){
this.node.info.style.opacity=1;
this.node.name.style.opacity=1;
}
if(info.modinfo){
this.node.info.innerHTML=info.modinfo;
}
@ -22561,7 +22551,7 @@
if(player&&content){
var card=get.infoCard(content[0]);
card.viewAs=content[1];
if(card.viewAs&&card.viewAs!=card.name&&card.classList.contains('fullskin')){
if(card.viewAs&&card.viewAs!=card.name&&(card.classList.contains('fullskin')||card.classList.contains('fullborder'))){
card.classList.add('fakejudge');
card.node.background.innerHTML=lib.translate[card.viewAs+'_bg']||get.translation(card.viewAs)[0]
}

View File

@ -1312,6 +1312,12 @@ div:not(.handcards)>.card>.info>span,
text-align: center;
}
.card.fullimage>div:not(.background),
.card.fullborder>div:not(.background){
color: white;
text-shadow: black 0px 0px 2px;
}
.equips>.card>.background {
font-size: 36px;
height: 36px;
@ -1330,7 +1336,8 @@ div:not(.handcards)>.card>.info>span,
.judges>.card.fakejudge.fullskin>.image {
display: none !important
}
.judges>.card.fakejudge.fullskin>.background {
.judges>.card.fakejudge.fullskin>.background,
.judges>.card.fakejudge.fullborder>.background {
display: block !important;
font-family: 'huangcao' !important;
padding-top: 4px !important;