This commit is contained in:
libccy 2016-04-04 13:29:08 +08:00
parent 5cf1ac7ac8
commit 6269723078
4 changed files with 28 additions and 14 deletions

View File

@ -151,6 +151,7 @@ card.refresh={
var dialog=ui.create.dialog('木牛流马',player.get('e','5').cards);
var trigger=event.parent.parent;
player.chooseButton(dialog,function(button){
var player=_status.event.player;
if(get.select(get.info(button.link).selectTarget)[1]==-1){
if(get.type(button.link)=='delay') return -1;
if(get.type(button.link)=='equip'){
@ -161,6 +162,12 @@ card.refresh={
if(get.tag(button.link,'multitarget')) return -1;
if(button.link.name=='huoshaolianying') return -1;
}
if(button.link.name=='jiu'){
if(ai.get.effect(player,{name:'jiu'},player)>0){
return 1;
}
return -1;
}
return 1;
}).filterButton=function(button){
return trigger.filterCard(button.link,player,trigger);

View File

@ -966,8 +966,7 @@ card.standard={
},
content:function(){
"step 0"
targets[0].chooseToUse(
'对'+get.translation(targets[1])+'使用一张杀,或令'+get.translation(player)+'获得你的武器牌',
targets[0].chooseToUse('对'+get.translation(targets[1])+'使用一张杀,或令'+get.translation(player)+'获得你的武器牌',
{name:'sha'},targets[1],-1).targetRequired=true;
"step 1"
if(result.bool==false){
@ -1236,9 +1235,7 @@ card.standard={
}
player.chooseToUse('是否发动青龙偃月刀?',{name:'sha'},trigger.target,-1).logSkill='qinglong';
"step 1"
if(result.bool){
player.logSkill('qinglong');
}
if(result.bool);
else if(event.jiu){
player.addSkill('jiu');
}

View File

@ -47,7 +47,7 @@
};
var lib={
configprefix:'noname_0.9_',
versionOL:1,
versionOL:2,
updateURL:localStorage.getItem('noname_download_source')||'http://isha.applinzi.com/',
assetURL:'',
changeLog:[],
@ -6298,16 +6298,17 @@
else{
cards[0].style.transform='';
player.node.judges.insertBefore(cards[0],player.node.judges.firstChild);
game.broadcast(function(player,card){
game.broadcast(function(player,card,viewAs){
card.fix();
card.style.transform='';
card.classList.remove('drawinghidden');
card.viewAs=viewAs;
player.node.judges.insertBefore(card,player.node.judges.firstChild);
if(card.clone&&card.clone.parentNode==player.parentNode){
card.clone.moveDelete(player);
game.addVideo('gain2',player,get.cardsInfo([card]));
}
},player,cards[0]);
},player,cards[0],viewAs);
if(cards[0].clone&&cards[0].clone.parentNode==player.parentNode){
cards[0].clone.moveDelete(player);
game.addVideo('gain2',player,get.cardsInfo(cards));
@ -20710,18 +20711,26 @@
var input;
var addEntry=function(info){
if(list._chatempty){
list.innerHTML='';
delete list._chatempty;
}
var name=get.translation(info[0].name)||info[0].nickname;
var node=ui.create.div('.text');
var node=ui.create.div('.text.chat');
node.innerHTML=name+': '+info[1];
node.style.wordBreak='break-all';
node.style.marginBottom='3px';
list.appendChild(node);
list.scrollTop=list.scrollHeight;
uiintro.style.height=uiintro.content.scrollHeight+'px';
if(input) input.value='';
}
for(var i=0;i<lib.chatHistory.length;i++){
addEntry(lib.chatHistory[i]);
if(lib.chatHistory.length){
for(var i=0;i<lib.chatHistory.length;i++){
addEntry(lib.chatHistory[i]);
}
}
else{
list._chatempty=true;
list.appendChild(ui.create.div('.text.center','无聊天记录'))
}
uiintro.add(list);
uiintro.style.height=uiintro.content.offsetHeight+'px';
@ -20731,7 +20740,7 @@
node.style.paddingTop=0;
node.style.marginBottom='16px';
input=node.firstChild;
input.style.width='80%';
input.style.width='calc(100% - 20px)';
input.onkeydown=function(e){
if(e.keyCode==13&&input.value){
var player=game.me;

View File

@ -517,6 +517,7 @@ margin-bottom: 5px;
.caption>div{position: relative;}
.caption>.text{font-size:16px;text-align:left}
.caption>.text.center{text-align:center}
.caption>.text.chat{word-break: break-all;margin-bottom: 3px;margin-left: 10px;width: calc(100% - 20px)}
.caption>div>div{font-size: 16px;position: relative;width: calc(100% - 70px);vertical-align: top;margin: 0;padding: 0;}
.skill{left: 0 !important;width: 70px !important;}
.caption>.ctext{text-align:center;font-size:16px;}