This commit is contained in:
libccy 2017-09-15 15:54:36 +08:00
parent a9b80dd151
commit ae0031c4d1
3 changed files with 9 additions and 18 deletions

View File

@ -736,8 +736,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
mark:true, mark:true,
forced:true, forced:true,
content:function(){ content:function(){
trigger.untrigger(); trigger.cancel();
trigger.finish();
}, },
ai:{ ai:{
nofire:true, nofire:true,
@ -1029,8 +1028,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
trigger:{player:'phaseDrawBefore'}, trigger:{player:'phaseDrawBefore'},
content:function(){ content:function(){
"step 0" "step 0"
trigger.untrigger(); trigger.cancel();
trigger.finish();
"step 1" "step 1"
event.cards=get.cards(5); event.cards=get.cards(5);
if(event.isMine()==false){ if(event.isMine()==false){

View File

@ -885,8 +885,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
} }
"step 1" "step 1"
if(result.bool){ if(result.bool){
trigger.untrigger(); trigger.cancel();
trigger.finish();
if(trigger.source){ if(trigger.source){
trigger.source.recover(); trigger.source.recover();
} }
@ -1464,8 +1463,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
return false; return false;
}, },
content:function(){ content:function(){
trigger.untrigger(); trigger.cancel();
trigger.finish();
} }
}, },
yuling2:{ yuling2:{

View File

@ -419,8 +419,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
trigger:{player:'damageBefore'}, trigger:{player:'damageBefore'},
forced:true, forced:true,
content:function(){ content:function(){
trigger.untrigger(); trigger.cancel();
trigger.finish();
}, },
ai:{ ai:{
nofire:true, nofire:true,
@ -490,8 +489,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
trigger:{player:'phaseDrawBefore'}, trigger:{player:'phaseDrawBefore'},
forced:true, forced:true,
content:function(){ content:function(){
trigger.untrigger(); trigger.cancel();
trigger.finish();
var list=['bronze','silver','gold']; var list=['bronze','silver','gold'];
list.randomRemove(); list.randomRemove();
var cards=[]; var cards=[];
@ -715,8 +713,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
return event.source; return event.source;
}, },
content:function(){ content:function(){
trigger.untrigger(); trigger.cancel();
trigger.finish();
player.storage.gwchenshui++; player.storage.gwchenshui++;
player.updateMarks(); player.updateMarks();
if(trigger.source!=trigger.player&&trigger.source.isIn()&&trigger.player.isIn()){ if(trigger.source!=trigger.player&&trigger.source.isIn()&&trigger.player.isIn()){
@ -958,8 +955,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
player.showCards(player.storage.huanshu2,get.translation(player)+'发动了【幻术】'); player.showCards(player.storage.huanshu2,get.translation(player)+'发动了【幻术】');
'step 2' 'step 2'
player.removeSkill('huanshu2'); player.removeSkill('huanshu2');
trigger.untrigger(); trigger.cancel();
trigger.finish();
player.draw(2); player.draw(2);
}, },
group:'huanshu3' group:'huanshu3'
@ -1391,8 +1387,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
return game.roundNumber%3!=0; return game.roundNumber%3!=0;
}, },
content:function(){ content:function(){
trigger.untrigger(); trigger.cancel();
trigger.finish();
}, },
group:['gwjinyan_gain'], group:['gwjinyan_gain'],
subSkill:{ subSkill:{