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

修复 info.chooseButton 中当只有一个可选项时自动确认的相关事宜

This commit is contained in:
copcap 2023-08-07 20:29:58 +08:00
parent 6295e29f29
commit 93317a9030
No known key found for this signature in database
GPG Key ID: 9AE7B8AF097EC926
2 changed files with 72 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
character/clan.js
View File

@ -435,7 +435,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}
},
prompt:function(result){
if(result.index) return '点击“确定”以观看牌堆顶牌';
if(result.index>0) return '点击“确定”以观看牌堆顶牌';
return '观骨：选择观看牌的目标';
},
},

77
game/game.js
View File

@ -13076,6 +13076,8 @@
var dialog=info.chooseButton.dialog(event,player);
if(info.chooseButton.chooseControl){
var next=player.chooseControl(info.chooseButton.chooseControl(event,player));
if(dialog.direct) next.direct=true;
if(dialog.forceDirect) next.forceDirect=true;
next.dialog=dialog;
next.set('ai',info.chooseButton.check||function(){return 0;});
if(event.id) next._parent_id=event.id;
@ -13083,6 +13085,8 @@
}
else{
var next=player.chooseButton(dialog);
if(dialog.direct) next.direct=true;
if(dialog.forceDirect) next.forceDirect=true;
next.set('ai',info.chooseButton.check||function(){return 1;});
next.set('filterButton',info.chooseButton.filter||function(){return true;});
next.set('selectButton',info.chooseButton.select||1);
@ -13101,6 +13105,7 @@
}
"step 3"
if(event.buttoned){
debugger
if(result.bool||result.control&&result.control!='cancel2'){
var info=get.info(event.buttoned).chooseButton;
lib.skill[event.buttoned+'_backup']=info.backup(info.chooseControl?result:result.links,player);
@ -13257,11 +13262,15 @@
var dialog=info.chooseButton.dialog(event,player);
if(info.chooseButton.chooseControl){
var next=player.chooseControl(info.chooseButton.chooseControl(event,player));
if(dialog.direct) next.direct=true;
if(dialog.forceDirect) next.forceDirect=true;
next.dialog=dialog;
next.set('ai',info.chooseButton.check||function(){return 0;});
}
else{
var next=player.chooseButton(dialog);
if(dialog.direct) next.direct=true;
if(dialog.forceDirect) next.forceDirect=true;
next.set('ai',info.chooseButton.check||function(){return 1;});
next.set('filterButton',info.chooseButton.filter||function(){return true;});
next.set('selectButton',info.chooseButton.select||1);
@ -14151,16 +14160,50 @@
event.dialog.style.display='';
event.dialog.open();
}
var filterButton=event.filterButton||function(){return true};
var selectButton=get.select(event.selectButton);
var buttons=event.dialog.buttons;
var buttonsx=[];
var num=0;
for(var i=0;i<buttons.length;i++){
var button=buttons[i];
if(filterButton(button,player)){
num++;
buttonsx.add(button);
}
}
if(event.isMine()){
game.check();
if(event.direct&&num==selectButton[0]||event.forceDirect){
var buttons=buttonsx.slice(0,num);
event.result={
bool:true,
button:[buttons],
links:get.links(buttons),
};
event.dialog.close();
}
else{
game.check();
game.pause();
}
if(event.hsskill&&!event.forced&&_status.prehidden_skills.contains(event.hsskill)){
ui.click.cancel();
return;
}
game.pause();
}
else if(event.isOnline()){
event.send();
if(event.direct&&num==1||event.forceDirect){
var buttons=buttonsx.slice(0,num);
event.result={
bool:true,
button:[buttons],
links:get.links(buttons),
};
event.dialog.close();
}
else{
event.send();
}
delete event.callback;
}
else{
@ -14642,12 +14685,34 @@
}
else{
if(event.seperate||lib.config.seperate_control){
event.controlbars=[];
for(var i=0;i<event.controls.length;i++){
event.controlbars.push(ui.create.control([event.controls[i]]));
var controls=event.controls.slice(0);
var num=0;
controls.remove('cancel2');
if(event.direct&&controls.length==1||event.forceDirect){
event.result={
control:event.controls[0].link,
links:get.links([event.controls[0]]),
};
return;
}
else{
event.controlbars=[];
for(var i=0;i<event.controls.length;i++){
event.controlbars.push(ui.create.control([event.controls[i]]));
}
}
}
else{
var controls=event.controls.slice(0);
var num=0;
controls.remove('cancel2');
if(event.direct&&controls.length==1||event.forceDirect){
event.result={
control:event.controls[0].link,
links:get.links([event.controls[0]]),
};
return;
}
event.controlbar=ui.create.control(event.controls);
}
if(event.dialog){