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

cancel

This commit is contained in:
libccy 2017-11-05 14:56:08 +08:00
parent c04fa03c7d
commit 8d386ad6e6
7 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
card/gujian.js
View File

@ -32,8 +32,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
global:'g_jinlianzhu', global:'g_jinlianzhu',
content:function(){ content:function(){
var evt=event.getParent(3)._trigger; var evt=event.getParent(3)._trigger;
evt.untrigger(); evt.cancel()
evt.finish();
if(evt.source){ if(evt.source){
evt.source.draw(); evt.source.draw();
} }

3
card/sp.js
View File

@ -14,8 +14,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
if(evt.jinchan){ if(evt.jinchan){
var type=get.type(evt.card,'trick'); var type=get.type(evt.card,'trick');
if(type=='basic'||type=='trick'){ if(type=='basic'||type=='trick'){
evt.untrigger(); evt.cancel();
evt.finish();
} }
} }
player.draw(2); player.draw(2);

8
card/standard.js
View File

@ -1713,12 +1713,12 @@ game.import('card',function(lib,game,ui,get,ai,_status){
if(event.list.length==0){ if(event.list.length==0){
event.finish(); event.finish();
if(!event.state){ if(!event.state){
trigger.untrigger();
if(event.triggername=='phaseJudge'){ if(event.triggername=='phaseJudge'){
trigger.untrigger();
trigger.cancelled=true; trigger.cancelled=true;
} }
else{ else{
trigger.finish(); trigger.cancel();
} }
} }
} }
@ -1822,12 +1822,12 @@ game.import('card',function(lib,game,ui,get,ai,_status){
} }
else{ else{
if(!event.state){ if(!event.state){
trigger.untrigger();
if(event.triggername=='phaseJudge'){ if(event.triggername=='phaseJudge'){
trigger.untrigger();
trigger.cancelled=true; trigger.cancelled=true;
} }
else{ else{
trigger.finish(); trigger.cancel();
} }
} }
} }

3
card/yunchou.js
View File

@ -418,8 +418,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
event.finish(); event.finish();
return; return;
} }
info.evt.untrigger(); info.evt.cancel();
info.evt.finish();
event.source=info.source; event.source=info.source;
event.source.storage.youdishenru=player; event.source.storage.youdishenru=player;
event.source.addSkill('youdishenru'); event.source.addSkill('youdishenru');

3
character/gwent.js
View File

@ -2749,8 +2749,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
content:function(){ content:function(){
var evt=event.getParent(3)._trigger; var evt=event.getParent(3)._trigger;
if(evt.gw_dudayuanshuai1){ if(evt.gw_dudayuanshuai1){
evt.untrigger(); evt.cancel();
evt.finish();
} }
if(evt.cards){ if(evt.cards){
player.gain(evt.cards,'gain2'); player.gain(evt.cards,'gain2');

2
character/shenhua.js
View File

@ -1995,7 +1995,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
} }
}, },
jiezi:{ jiezi:{
trigger:{global:'phaseDrawSkipped'}, trigger:{global:['phaseDrawSkipped','phaseDrawCancelled']},
forced:true, forced:true,
filter:function(event,player){ filter:function(event,player){
return event.player!=player; return event.player!=player;

6
game/game.js
View File

@ -9599,7 +9599,7 @@
var name=event.card.viewAs||event.card.name; var name=event.card.viewAs||event.card.name;
if(event.cancelled&&!event.direct){ if(event.cancelled&&!event.direct){
if(lib.card[name].cancel){ if(lib.card[name].cancel){
var next=game.createEvent(name+'Cancelled'); var next=game.createEvent(name+'Cancel');
next.setContent(lib.card[name].cancel); next.setContent(lib.card[name].cancel);
next.card=event.card; next.card=event.card;
next.player=player; next.player=player;
@ -25694,8 +25694,8 @@
} }
else if(event.finished){ else if(event.finished){
if(event._triggered==1){ if(event._triggered==1){
if(event.type=='card') event.trigger('useCardToCancelled'); if(event.type=='card') event.trigger('useCardToOmitted');
event.trigger(event.name+'Cancelled'); event.trigger(event.name+'Omitted');
event._triggered=4; event._triggered=4;
} }
else if(event._triggered==2){ else if(event._triggered==2){