diff --git a/audio/die/zhugeguo.ogg b/audio/die/zhugeguo.ogg new file mode 100644 index 000000000..a07cc4426 Binary files /dev/null and b/audio/die/zhugeguo.ogg differ diff --git a/audio/skill/qirang1.mp3 b/audio/skill/qirang1.mp3 new file mode 100755 index 000000000..575685e7b Binary files /dev/null and b/audio/skill/qirang1.mp3 differ diff --git a/audio/skill/qirang2.mp3 b/audio/skill/qirang2.mp3 new file mode 100755 index 000000000..5022486d7 Binary files /dev/null and b/audio/skill/qirang2.mp3 differ diff --git a/audio/skill/yuhua1.mp3 b/audio/skill/yuhua1.mp3 new file mode 100755 index 000000000..2ce2b2204 Binary files /dev/null and b/audio/skill/yuhua1.mp3 differ diff --git a/audio/skill/yuhua2.mp3 b/audio/skill/yuhua2.mp3 new file mode 100755 index 000000000..6cb410dc5 Binary files /dev/null and b/audio/skill/yuhua2.mp3 differ diff --git a/card/standard.js b/card/standard.js index 43d515588..d909e8db8 100755 --- a/card/standard.js +++ b/card/standard.js @@ -217,6 +217,7 @@ card.standard={ }, result:{ target:function(player,target){ + // if(player==target&&player.hp<=0) return 2; var nh=target.num('h'); var keep=false; if(nh<=target.hp){ @@ -249,6 +250,7 @@ card.standard={ if(num>2) return 2; } } + if(num>1&&player==target) return 2; return 0; } } diff --git a/character/mountain.js b/character/mountain.js index d45da3ad1..25f55e34a 100755 --- a/character/mountain.js +++ b/character/mountain.js @@ -103,9 +103,10 @@ character.mountain={ effect:{ target:function(card,player,target,current){ if(card.name=='sha'){ - if(player.num('h',{type:'basic'})<2) return 0; - var bs=player.num('h',{type:'basic'}); + if(_status.event.name=='xiangle') return; + var bs=player.get('h',{type:'basic'}); if(bs.length<2) return 0; + if(player.skills.contains('jiu')||player.skills.contains('tianxianjiu')) return; if(bs.length<=3&&player.num('h','sha')<=1){ for(var i=0;i