YunFeiyang
/
noname
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

This commit is contained in:
libccy 2016-06-07 18:24:00 +08:00
parent a01350118c
commit 4a9f63553d
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
character/yijiang.js
View File

@ -238,7 +238,7 @@ character.yijiang={
return get.type(card)==_status.event.cardType; return get.type(card)==_status.event.cardType;
}).set('cardType',type).set('ai',function(card){ }).set('cardType',type).set('ai',function(card){
if(_status.event.att){ if(_status.event.att){
return 10-ai.get.value(card); return 11-ai.get.value(card);
} }
return 0; return 0;
}).set('att',ai.get.attitude(target,player)>0); }).set('att',ai.get.attitude(target,player)>0);
@ -579,7 +579,7 @@ character.yijiang={
return false; return false;
}, },
filterTarget:function(card,player,target){ 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(){ content:function(){
'step 0' 'step 0'
@ -5647,8 +5647,7 @@ character.yijiang={
return lib.filter.filterCard({name:'jiu'},player,event); return lib.filter.filterCard({name:'jiu'},player,event);
} }
if(event.type!='dying') return false; if(event.type!='dying') return false;
if(player!=_status.dying) return false; if(player!=event.dying) return false;
if(player.storage.niepan) return false;
return true; return true;
}, },
content:function(){ content:function(){

6
game/game.js
View File

@ -24393,7 +24393,7 @@
_status.justdragged=false; _status.justdragged=false;
},500); },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){ if(get.utc()-_status._swipeorigin.time<500){
var dx=_status._swipeorigin.touches.clientX-_status._swipeorigin.clientX; var dx=_status._swipeorigin.touches.clientX-_status._swipeorigin.clientX;
var dy=_status._swipeorigin.touches.clientY-_status._swipeorigin.clientY; var dy=_status._swipeorigin.touches.clientY-_status._swipeorigin.clientY;
@ -25507,6 +25507,7 @@
return; return;
} }
var uiintro=get.nodeintro(this); var uiintro=get.nodeintro(this);
if(!uiintro) return;
uiintro.classList.add('popped'); uiintro.classList.add('popped');
uiintro.classList.add('static'); uiintro.classList.add('static');
ui.window.appendChild(uiintro); ui.window.appendChild(uiintro);
@ -27537,6 +27538,9 @@
uiintro.add(ui.create.div('.placeholder.slim')); uiintro.add(ui.create.div('.placeholder.slim'));
} }
else if(node.classList.contains('card')){ else if(node.classList.contains('card')){
if(ui.arena.classList.contains('observe')&&node.parentNode.classList.contains('handcards')){
return;
}
var name=node.name; var name=node.name;
if(get.position(node)=='j'&&node.viewAs&&node.viewAs!=name){ if(get.position(node)=='j'&&node.viewAs&&node.viewAs!=name){
uiintro.add(get.translation(node.viewAs)+'（'+get.translation(node)+'）'); uiintro.add(get.translation(node.viewAs)+'（'+get.translation(node)+'）');