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

4

This commit is contained in:
libccy 2017-09-15 15:58:04 +08:00
parent ae0031c4d1
commit ec8a717df3
5 changed files with 17 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
character/hearth.js
View File

@ -280,8 +280,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
trigger.num++; trigger.num++;
} }
else{ else{
trigger.untrigger(); trigger.cancel();
trigger.finish();
} }
} }
}, },
@ -749,8 +748,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
return player.hp>0&&event.num>0; return player.hp>0&&event.num>0;
}, },
content:function(){ content:function(){
trigger.untrigger(); trigger.cancel();
trigger.finish();
player.changeHujia(trigger.num); player.changeHujia(trigger.num);
} }
}, },
@ -762,8 +760,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}, },
unique:true, unique:true,
content:function(){ content:function(){
trigger.untrigger(); trigger.cancel();
trigger.finish();
player.addSkill('qianfu2'); player.addSkill('qianfu2');
player.hp=1; player.hp=1;
player.update(); player.update();
@ -804,8 +801,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:{
nothunder:true, nothunder:true,
@ -822,8 +818,7 @@ game.import('character',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();
} }
}, },
revive:{ revive:{
@ -2577,8 +2572,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
content:function(){ content:function(){
'step 0' 'step 0'
event.cards=get.cards(3); event.cards=get.cards(3);
trigger.untrigger(); trigger.cancel();
trigger.finish();
player.$draw(event.cards.slice(0)); player.$draw(event.cards.slice(0));
for(var i=0;i<event.cards.length;i++){ for(var i=0;i<event.cards.length;i++){
if(get.type(event.cards[i])=='equip'){ if(get.type(event.cards[i])=='equip'){
@ -4374,8 +4368,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
next.logSkill=['biri',trigger.targets]; next.logSkill=['biri',trigger.targets];
"step 1" "step 1"
if(result.bool){ if(result.bool){
trigger.untrigger(); trigger.cancel();
trigger.finish();
} }
}, },
ai:{ ai:{
@ -5271,8 +5264,7 @@ game.import('character',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,
@ -6025,8 +6017,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
"step 1" "step 1"
if(result.bool){ if(result.bool){
game.log(trigger.player,'收回了',trigger.cards); game.log(trigger.player,'收回了',trigger.cards);
trigger.untrigger(); trigger.cancel();
trigger.finish();
game.delay(); game.delay();
} }
else{ else{

6
character/jiange.js
View File

@ -258,8 +258,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}, },
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"
@ -348,8 +347,7 @@ game.import('character',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,

3
character/old.js
View File

@ -279,8 +279,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();
trigger.player.loseMaxHp(true); trigger.player.loseMaxHp(true);
} }
} }

9
character/ow.js
View File

@ -222,8 +222,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}).set('eff',eff); }).set('eff',eff);
"step 1" "step 1"
if(result.bool==false){ if(result.bool==false){
trigger.finish(); trigger.cancel();
trigger.untrigger();
} }
}, },
ai:{ ai:{
@ -1413,8 +1412,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
return event.num>0; return event.num>0;
}, },
content:function(){ content:function(){
trigger.untrigger(); trigger.cancel();
trigger.finish();
trigger.player.recover(trigger.num); trigger.player.recover(trigger.num);
}, },
ai:{ ai:{
@ -1970,8 +1968,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,

6
character/refresh.js
View File

@ -401,8 +401,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
content:function(){ content:function(){
"step 0" "step 0"
player.addTempSkill('reluoyi2',{player:'phaseBefore'}); player.addTempSkill('reluoyi2',{player:'phaseBefore'});
trigger.untrigger(); trigger.cancel();
trigger.finish();
"step 1" "step 1"
event.cards=get.cards(3); event.cards=get.cards(3);
player.showCards(event.cards,'裸衣'); player.showCards(event.cards,'裸衣');
@ -1442,8 +1441,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}, },
content:function(){ content:function(){
"step 0" "step 0"
trigger.untrigger(); trigger.cancel();
trigger.finish();
event.cards=get.cards(4); event.cards=get.cards(4);
player.chooseCardButton(event.cards,2,'选择获得两张牌').set('ai',get.buttonValue); player.chooseCardButton(event.cards,2,'选择获得两张牌').set('ai',get.buttonValue);
"step 1" "step 1"