This commit is contained in:
libccy 2017-06-16 00:31:00 +08:00
parent a65b147988
commit ed0f9f5b80
5 changed files with 15 additions and 8 deletions

View File

@ -525,7 +525,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
yunhuo:{ yunhuo:{
trigger:{player:'phaseBegin'}, trigger:{player:'phaseBegin'},
filter:function(event,player){ filter:function(event,player){
return game.roundNumber%4==0&&event.skill!='yunhuo2'; return game.roundNumber%4==0&&event.skill!='yunhuo';
}, },
forced:true, forced:true,
content:function(){ content:function(){

View File

@ -1002,7 +1002,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
return get.max(list,get.skillRank,'item'); return get.max(list,get.skillRank,'item');
}; };
if(event.isMine()){ if(event.isMine()){
var dialog=ui.create.dialog(); var dialog=ui.create.dialog('forcebutton');
dialog.add('选择获得一项技能'); dialog.add('选择获得一项技能');
var clickItem=function(){ var clickItem=function(){
_status.event._result=this.link; _status.event._result=this.link;
@ -3236,7 +3236,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
return get.max(list,get.skillRank,'item'); return get.max(list,get.skillRank,'item');
}; };
if(event.isMine()){ if(event.isMine()){
var dialog=ui.create.dialog(); var dialog=ui.create.dialog('forcebutton');
dialog.add('选择获得一项技能'); dialog.add('选择获得一项技能');
var clickItem=function(){ var clickItem=function(){
_status.event._result=this.link; _status.event._result=this.link;

View File

@ -6777,7 +6777,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
return get.max(list,get.skillRank,'item'); return get.max(list,get.skillRank,'item');
}; };
if(event.isMine()){ if(event.isMine()){
var dialog=ui.create.dialog(); var dialog=ui.create.dialog('forcebutton');
dialog.add('选择获得一项技能'); dialog.add('选择获得一项技能');
_status.event.list=list; _status.event.list=list;
var clickItem=function(){ var clickItem=function(){
@ -6896,7 +6896,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
} }
} }
if(onlylist) return list; if(onlylist) return list;
var dialog=ui.create.dialog(); var dialog=ui.create.dialog('forcebutton');
dialog.add('选择获得一项技能'); dialog.add('选择获得一项技能');
_status.event.list=list; _status.event.list=list;
var clickItem=function(){ var clickItem=function(){
@ -8624,9 +8624,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
player.removeSkill('mailun8'); player.removeSkill('mailun8');
if(event.isMine()){ if(event.isMine()){
ui.auto.hide(); ui.auto.hide();
event.dialog=ui.create.dialog('脉轮:选择一个效果'); event.dialog=ui.create.dialog('脉轮:选择一个效果','forcebutton');
event.dialog.forcebutton=true;
event.dialog.classList.add('forcebutton');
var effects=lib.skill.mailun.effects; var effects=lib.skill.mailun.effects;
var clickItem=function(){ var clickItem=function(){
event.choice=this.link; event.choice=this.link;

View File

@ -2964,6 +2964,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
return event.skill=='zhanjue'; return event.skill=='zhanjue';
}, },
content:function(){ content:function(){
if(typeof player.storage.zhanjue!='number'){
player.storage.zhanjue=0;
}
if(player.storage.zhanjue2==player){ if(player.storage.zhanjue2==player){
player.draw(2); player.draw(2);
player.storage.zhanjue+=2; player.storage.zhanjue+=2;

View File

@ -35071,6 +35071,7 @@
var i; var i;
var hidden=false; var hidden=false;
var notouchscroll=false; var notouchscroll=false;
var forcebutton=false;
var dialog=ui.create.div('.dialog'); var dialog=ui.create.div('.dialog');
dialog.contentContainer=ui.create.div('.content-container',dialog); dialog.contentContainer=ui.create.div('.content-container',dialog);
dialog.content=ui.create.div('.content',dialog.contentContainer); dialog.content=ui.create.div('.content',dialog.contentContainer);
@ -35084,6 +35085,7 @@
if(typeof arguments[i]=='boolean') dialog.static=arguments[i]; if(typeof arguments[i]=='boolean') dialog.static=arguments[i];
else if(arguments[i]=='hidden') hidden=true; else if(arguments[i]=='hidden') hidden=true;
else if(arguments[i]=='notouchscroll') notouchscroll=true; else if(arguments[i]=='notouchscroll') notouchscroll=true;
else if(arguments[i]=='forcebutton') forcebutton=true;
else dialog.add(arguments[i]); else dialog.add(arguments[i]);
} }
if(!hidden){ if(!hidden){
@ -35096,6 +35098,10 @@
dialog.contentContainer.style.WebkitOverflowScrolling='touch'; dialog.contentContainer.style.WebkitOverflowScrolling='touch';
dialog.ontouchstart=ui.click.dragtouchdialog; dialog.ontouchstart=ui.click.dragtouchdialog;
} }
if(forcebutton){
dialog.forcebutton=true;
dialog.classList.add('forcebutton');
}
return dialog; return dialog;
}, },
line2:function(){ line2:function(){