This commit is contained in:
parent
85046e9bc0
commit
ea2cdd1add
|
@ -570,6 +570,7 @@ card.yunchou={
|
|||
},
|
||||
selectTarget:2,
|
||||
multitarget:true,
|
||||
complexTarget:true,
|
||||
content:function(){
|
||||
if(target.get('e','5')){
|
||||
target.$give(target.get('e','5'),event.addedTarget);
|
||||
|
@ -1223,7 +1224,7 @@ card.yunchou={
|
|||
geanguanhuo:'隔岸观火',
|
||||
geanguanhuo_info:'出牌阶段对一名其他角色使用,令目标与一名你指定的另一名角色拼点,赢的角色获得对方的一张牌;若点数相同,目标可弃置你一张牌',
|
||||
toulianghuanzhu:'偷梁换柱',
|
||||
toulianghuanzhu_info:'出牌阶段对一名有手牌的角色使用,选择另一名角色获得目标两张手牌(不足则全拿),然后还给其等量手牌',
|
||||
toulianghuanzhu_info:'出牌阶段对一名有手牌的角色使用,选择另一名有手牌的角色获得目标两张手牌(不足则全拿),然后还给其等量手牌',
|
||||
toulianghuanzhu_bg:'柱',
|
||||
yihuajiemu:'移花接木',
|
||||
yihuajiemu_info:'对一名装备区内有宝物的角色使用,将其宝物牌转移至另一名角色',
|
||||
|
|
35
game/game.js
35
game/game.js
|
@ -20508,20 +20508,21 @@
|
|||
event._cardChoice=[];
|
||||
firstCheck=true;
|
||||
}
|
||||
// if(event.name=='chooseToUse'&&event.parent.name=='phaseUse'&&!event.skill&&
|
||||
// !event._targetChoice&&event._cardChoice&&event._cardChoice.length){
|
||||
// event._targetChoice=new Map();
|
||||
// var tmpselect=ui.selected;
|
||||
// for(var i=0;i<event._cardChoice.length;i++){
|
||||
// var targets=[];
|
||||
// if(!lib.card[event._cardChoice[i].name].complexTarget){
|
||||
// ui.selected={buttons:[],cards:[event._cardChoice[i]],targets:[]};
|
||||
// for(var j=0;j<game.players.length;j++){
|
||||
// if(event.filterTarget(event._cardChoice[i],,game.players[i]))
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
if(event.isMine()&&event.name=='chooseToUse'&&event.parent.name=='phaseUse'&&!event.skill&&
|
||||
!event._targetChoice&&!firstCheck&&window.Map){
|
||||
event._targetChoice=new Map();
|
||||
for(var i=0;i<event._cardChoice.length;i++){
|
||||
var targets=[];
|
||||
if(!lib.card[event._cardChoice[i].name].complexTarget){
|
||||
for(var j=0;j<game.players.length;j++){
|
||||
if(event.filterTarget(event._cardChoice[i],player,game.players[j])){
|
||||
targets.push(game.players[j]);
|
||||
}
|
||||
}
|
||||
}
|
||||
event._targetChoice.set(event._cardChoice[i],targets);
|
||||
}
|
||||
}
|
||||
var selectableCards=false;
|
||||
if(range[0]!=range[1]||range[0]>1) auto=false;
|
||||
for(i=0;i<cards.length;i++){
|
||||
|
@ -20544,7 +20545,7 @@
|
|||
if(nochess){
|
||||
if(ui.selected.cards.length<range[1]){
|
||||
cards[i].classList.add('selectable');
|
||||
if(event._cardChoice){
|
||||
if(event._cardChoice&&firstCheck){
|
||||
event._cardChoice.push(cards[i]);
|
||||
}
|
||||
}
|
||||
|
@ -20598,8 +20599,8 @@
|
|||
else if(game.players[i].isOut()){
|
||||
nochess=false;
|
||||
}
|
||||
else if(event._targetChoice){
|
||||
var targetChoice=event.targetChoice.get(card);
|
||||
else if(event._targetChoice&&event._targetChoice.has(card)){
|
||||
var targetChoice=event._targetChoice.get(card);
|
||||
if(!Array.isArray(targetChoice)||!targetChoice.contains(game.players[i])){
|
||||
nochess=false;
|
||||
}
|
||||
|
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue