This commit is contained in:
libccy 2015-11-16 09:59:54 +08:00
parent 19833eb9a6
commit 23485a722c
5 changed files with 22 additions and 9 deletions

View File

@ -132,6 +132,9 @@ card.extra={
value:[3,1], value:[3,1],
useful:1, useful:1,
}, },
wuxie:function(target,card,player,current,state){
if(ai.get.attitude(current,player)>=0&&state>0) return false;
},
result:{ result:{
player:function(player){ player:function(player){
var nh=player.num('h'); var nh=player.num('h');

View File

@ -208,6 +208,9 @@ card.hearth={
value:[3,1], value:[3,1],
useful:1, useful:1,
}, },
wuxie:function(target,card,player,current,state){
if(ai.get.attitude(current,player)>=0&&state>0) return false;
},
result:{ result:{
player:function(player){ player:function(player){
var nh=player.num('h'); var nh=player.num('h');

View File

@ -315,6 +315,7 @@ character.fire={
return -2; return -2;
}, },
target:function(player,target){ target:function(player,target){
if(player.hp<=2) return 0;
return ai.get.damageEffect(target,player); return ai.get.damageEffect(target,player);
} }
} }

View File

@ -7157,16 +7157,15 @@
node.addEventListener(lib.config.touchscreen?'touchend':'mouseup',function(e){ node.addEventListener(lib.config.touchscreen?'touchend':'mouseup',function(e){
node.classList.remove('controlthundertext'); node.classList.remove('controlthundertext');
node.parentNode.classList.remove('controlpressdown'); node.parentNode.classList.remove('controlpressdown');
setTimeout(function(){
node.parentNode.classList.remove('controlpressdownx'); node.parentNode.classList.remove('controlpressdownx');
},200); // setTimeout(function(){
// if(node.parentNode)
// },200);
}); });
node.addEventListener(lib.config.touchscreen?'touchmove':'mousemove',function(e){ node.addEventListener(lib.config.touchscreen?'touchmove':'mousemove',function(e){
node.classList.remove('controlthundertext'); node.classList.remove('controlthundertext');
node.parentNode.classList.remove('controlpressdown'); node.parentNode.classList.remove('controlpressdown');
setTimeout(function(){
node.parentNode.classList.remove('controlpressdownx'); node.parentNode.classList.remove('controlpressdownx');
},200);
}); });
} }
}, },
@ -10949,10 +10948,14 @@
return caption; return caption;
}, },
control:function(){ control:function(){
var nc=true; var nc=(ui.control.childNodes.length==0);
for(var i=0;i<ui.control.childNodes.length;i++){ for(var i=0;i<ui.control.childNodes.length;i++){
if(!ui.control.childNodes[i].classList.contains('removing')){ if(ui.control.childNodes[i].classList.contains('removing')){
nc=false;break; var that=ui.control.childNodes[i];
var width=that.offsetWidth;
that.style.marginLeft=(-width/2)+'px';
that.style.marginRight=(-width/2)+'px';
that.style.transitionDuration=0.8*parseFloat(getComputedStyle(that).opacity)+'s';
} }
} }
var i,controls; var i,controls;

View File

@ -1052,6 +1052,9 @@ mode.chess={
} }
if(_status.characterList.length<6){ if(_status.characterList.length<6){
game.over(true); game.over(true);
event.done.close();
event.control.close();
return;
} }
setTimeout(function(){ setTimeout(function(){
dialog.open(); dialog.open();