diff --git a/character/yijiang.js b/character/yijiang.js index 96bcd7325..0e6a8a143 100755 --- a/character/yijiang.js +++ b/character/yijiang.js @@ -238,7 +238,7 @@ character.yijiang={ return get.type(card)==_status.event.cardType; }).set('cardType',type).set('ai',function(card){ if(_status.event.att){ - return 10-ai.get.value(card); + return 11-ai.get.value(card); } return 0; }).set('att',ai.get.attitude(target,player)>0); @@ -579,7 +579,7 @@ character.yijiang={ return false; }, filterTarget:function(card,player,target){ - return target!=player&&target.num('h')&&!player.storage.jiyu.contains(target); + return target.num('h')&&!player.storage.jiyu.contains(target); }, content:function(){ 'step 0' @@ -5647,8 +5647,7 @@ character.yijiang={ return lib.filter.filterCard({name:'jiu'},player,event); } if(event.type!='dying') return false; - if(player!=_status.dying) return false; - if(player.storage.niepan) return false; + if(player!=event.dying) return false; return true; }, content:function(){ diff --git a/game/game.js b/game/game.js index 29b15ac70..54cdfd660 100755 --- a/game/game.js +++ b/game/game.js @@ -24393,7 +24393,7 @@ _status.justdragged=false; },500); } - else if(_status._swipeorigin&&!_status.paused2&&!_status.mousedragging){ + else if(_status._swipeorigin&&!_status.paused2&&!_status.mousedragging&&_status._swipeorigin.touches){ if(get.utc()-_status._swipeorigin.time<500){ var dx=_status._swipeorigin.touches.clientX-_status._swipeorigin.clientX; var dy=_status._swipeorigin.touches.clientY-_status._swipeorigin.clientY; @@ -25507,6 +25507,7 @@ return; } var uiintro=get.nodeintro(this); + if(!uiintro) return; uiintro.classList.add('popped'); uiintro.classList.add('static'); ui.window.appendChild(uiintro); @@ -27537,6 +27538,9 @@ uiintro.add(ui.create.div('.placeholder.slim')); } else if(node.classList.contains('card')){ + if(ui.arena.classList.contains('observe')&&node.parentNode.classList.contains('handcards')){ + return; + } var name=node.name; if(get.position(node)=='j'&&node.viewAs&&node.viewAs!=name){ uiintro.add(get.translation(node.viewAs)+'('+get.translation(node)+')');