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

cancel

This commit is contained in:
libccy 2017-09-15 16:16:22 +08:00
parent 9a36475539
commit dded772ae2
6 changed files with 32 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
character/yxs.js
View File

@ -1155,8 +1155,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();
player.loseHp(); player.loseHp();
}, },
ai:{ ai:{
@ -1254,8 +1253,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}, },
content:function(){ content:function(){
game.log(player,'发动了察觉，',trigger.card,'对',trigger.target,'失效') game.log(player,'发动了察觉，',trigger.card,'对',trigger.target,'失效')
trigger.untrigger(); trigger.cancel();
trigger.finish();
}, },
ai:{ ai:{
effect:{ effect:{
@ -1792,8 +1790,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
return suits.length>=2; return suits.length>=2;
}, },
content:function(){ content:function(){
trigger.untrigger(); trigger.cancel();
trigger.finish();
player.addSkill('nichang2'); player.addSkill('nichang2');
} }
}, },
@ -2314,8 +2311,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
next.logSkill=['feigong',trigger.player]; next.logSkill=['feigong',trigger.player];
"step 1" "step 1"
if(result.bool){ if(result.bool){
trigger.untrigger(); trigger.cancel();
trigger.finish();
} }
}, },
ai:{ ai:{

9
game/game.js
View File

@ -20471,8 +20471,7 @@
game.log(player,'获得了','【免疫】'); game.log(player,'获得了','【免疫】');
}, },
content:function(){ content:function(){
trigger.untrigger(); trigger.cancel();
trigger.finish();
}, },
ai:{ ai:{
nofire:true, nofire:true,
@ -20523,8 +20522,7 @@
return player.hp>=player.maxHp; return player.hp>=player.maxHp;
}, },
content:function(){ content:function(){
trigger.untrigger(); trigger.cancel();
trigger.finish();
}, },
}, },
_turnover:{ _turnover:{
@ -20537,8 +20535,7 @@
// game.players[i].in(); // game.players[i].in();
// } // }
if(player.isTurnedOver()){ if(player.isTurnedOver()){
trigger.untrigger(); trigger.cancel();
trigger.finish();
player.turnOver(); player.turnOver();
player.phaseSkipped=true; player.phaseSkipped=true;
} }

36
mode/boss.js
View File

@ -1773,8 +1773,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
return _status.currentPhase==player; return _status.currentPhase==player;
}, },
content:function(){ content:function(){
trigger.untrigger(); trigger.cancel();
trigger.finish();
} }
}, },
out:{ out:{
@ -1835,8 +1834,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
trigger:{player:'phaseDiscardBefore'}, trigger:{player:'phaseDiscardBefore'},
forced:true, forced:true,
content:function(){ content:function(){
trigger.untrigger(); trigger.cancel();
trigger.finish();
}, },
group:'boss_tanyu_hp', group:'boss_tanyu_hp',
subSkill:{ subSkill:{
@ -1894,8 +1892,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
return !player.isTurnedOver(); return !player.isTurnedOver();
}, },
content:function(){ content:function(){
trigger.untrigger(); trigger.cancel();
trigger.finish();
game.log(player,'取消了翻面'); game.log(player,'取消了翻面');
}, },
} }
@ -2008,8 +2005,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
return true; return true;
}, },
content:function(){ content:function(){
trigger.untrigger(); trigger.cancel();
trigger.finish();
}, },
ai:{ ai:{
effect:{ effect:{
@ -2402,8 +2398,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
return !player.isTurnedOver(); return !player.isTurnedOver();
}, },
content:function(){ content:function(){
trigger.untrigger(); trigger.cancel();
trigger.finish();
game.log(player,'取消了翻面'); game.log(player,'取消了翻面');
}, },
ai:{ ai:{
@ -3427,8 +3422,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
node.classList.add('thrownhighlight'); node.classList.add('thrownhighlight');
ui.arena.classList.add('thrownhighlight'); ui.arena.classList.add('thrownhighlight');
if(card){ if(card){
trigger.untrigger(); trigger.cancel();
trigger.finish();
trigger.result={ trigger.result={
card:card, card:card,
judge:trigger.judge(card), judge:trigger.judge(card),
@ -3864,8 +3858,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
return false; return false;
}, },
content:function(){ content:function(){
trigger.untrigger(); trigger.cancel();
trigger.finish();
} }
}, },
end:{ end:{
@ -4296,8 +4289,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
return lib.skill.tengjia1.filter(event,player); return lib.skill.tengjia1.filter(event,player);
}, },
content:function(){ content:function(){
trigger.untrigger(); trigger.cancel();
trigger.finish();
}, },
ai:{ ai:{
effect:{ effect:{
@ -4552,8 +4544,7 @@ game.import('mode',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();
}, },
ai:{ ai:{
noh:true, noh:true,
@ -4844,8 +4835,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
return false; return false;
}, },
content:function(){ content:function(){
trigger.untrigger(); trigger.cancel();
trigger.finish();
} }
}, },
huanhua3:{ huanhua3:{
@ -5008,8 +4998,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
return event.nature=='fire'; return event.nature=='fire';
}, },
content:function(){ content:function(){
trigger.untrigger(); trigger.cancel();
trigger.finish();
player.recover(); player.recover();
}, },
ai:{ ai:{
@ -5356,8 +5345,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
forced:true, forced:true,
priority:10, priority:10,
content:function(){ content:function(){
trigger.untrigger(); trigger.cancel();
trigger.finish();
player.loseHp(); player.loseHp();
}, },
audio:2, audio:2,

15
mode/guozhan.js
View File

@ -427,8 +427,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
player.$throw(card,1000); player.$throw(card,1000);
player.updateMarks('huangjintianbingfu'); player.updateMarks('huangjintianbingfu');
player.syncStorage('huangjintianbingfu'); player.syncStorage('huangjintianbingfu');
trigger.untrigger(); trigger.cancel();
trigger.finish();
player.logSkill('hongfa'); player.logSkill('hongfa');
game.delay(); game.delay();
} }
@ -726,8 +725,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
}, },
content:function(){ content:function(){
'step 0' 'step 0'
trigger.untrigger(); trigger.cancel();
trigger.finish();
trigger.card.fix(); trigger.card.fix();
player.showCards(get.translation(player)+'发动了【章武】',[trigger.card]); player.showCards(get.translation(player)+'发动了【章武】',[trigger.card]);
var owner=get.owner(trigger.card); var owner=get.owner(trigger.card);
@ -1349,8 +1347,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
return get.type(event.card,'trick')=='trick'&&get.color(event.card)=='black'; return get.type(event.card,'trick')=='trick'&&get.color(event.card)=='black';
}, },
content:function(){ content:function(){
trigger.untrigger(); trigger.cancel();
trigger.finish();
}, },
ai:{ ai:{
effect:{ effect:{
@ -1372,8 +1369,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
return event.card.name=='shunshou'||event.card.name=='lebu'; return event.card.name=='shunshou'||event.card.name=='lebu';
}, },
content:function(){ content:function(){
trigger.untrigger(); trigger.cancel();
trigger.finish();
}, },
ai:{ ai:{
effect:{ effect:{
@ -1395,8 +1391,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
return player.countCards('h')==0&&(event.card.name=='sha'||event.card.name=='juedou'); return player.countCards('h')==0&&(event.card.name=='sha'||event.card.name=='juedou');
}, },
content:function(){ content:function(){
trigger.untrigger(); trigger.cancel();
trigger.finish();
}, },
ai:{ ai:{
effect:{ effect:{

12
mode/stone.js
View File

@ -6129,8 +6129,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
forced:true, forced:true,
popup:false, popup:false,
content:function(){ content:function(){
trigger.untrigger(); trigger.cancel();
trigger.finish();
}, },
ai:{ ai:{
effect:{ effect:{
@ -7197,8 +7196,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
unique:true, unique:true,
popup:false, popup:false,
content:function(){ content:function(){
trigger.untrigger(); trigger.cancel();
trigger.finish();
}, },
ai:{ ai:{
threaten:0.1 threaten:0.1
@ -7210,8 +7208,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
unique:true, unique:true,
popup:false, popup:false,
content:function(){ content:function(){
trigger.untrigger(); trigger.cancel();
trigger.finish();
}, },
ai:{ ai:{
effect:{ effect:{
@ -8453,8 +8450,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
forced:true, forced:true,
popup:false, popup:false,
content:function(){ content:function(){
trigger.untrigger(); trigger.cancel();
trigger.finish();
}, },
ai:{ ai:{
effect:{ effect:{

12
mode/versus.js
View File

@ -3920,8 +3920,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
return bool&&num>=3; return bool&&num>=3;
}, },
content:function(){ content:function(){
trigger.untrigger(); trigger.cancel();
trigger.finish();
game.log(player,'跳过了判定阶段'); game.log(player,'跳过了判定阶段');
} }
}, },
@ -4776,8 +4775,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
content:'已获得大雾标记' content:'已获得大雾标记'
}, },
content:function(){ content:function(){
trigger.untrigger(); trigger.cancel();
trigger.finish();
}, },
ai:{ ai:{
nofire:true, nofire:true,
@ -4839,8 +4837,7 @@ game.import('mode',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();
event.cards=get.cards(2); event.cards=get.cards(2);
player.showCards(event.cards); player.showCards(event.cards);
"step 1" "step 1"
@ -4873,8 +4870,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
}, },
forced:true, forced:true,
content:function(){ content:function(){
trigger.untrigger(); trigger.cancel();
trigger.finish();
}, },
ai:{ ai:{
nofire:true, nofire:true,