From 93317a9030a855c5feb2820c3b505ed296f58ef7 Mon Sep 17 00:00:00 2001
From: copcap <copcap@outlook.com>
Date: Mon, 7 Aug 2023 20:29:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20info.chooseButton=20?=
 =?UTF-8?q?=E4=B8=AD=E5=BD=93=E5=8F=AA=E6=9C=89=E4=B8=80=E4=B8=AA=E5=8F=AF?=
 =?UTF-8?q?=E9=80=89=E9=A1=B9=E6=97=B6=E8=87=AA=E5=8A=A8=E7=A1=AE=E8=AE=A4?=
 =?UTF-8?q?=E7=9A=84=E7=9B=B8=E5=85=B3=E4=BA=8B=E5=AE=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 character/clan.js |  2 +-
 game/game.js      | 77 +++++++++++++++++++++++++++++++++++++++++++----
 2 files changed, 72 insertions(+), 7 deletions(-)

diff --git a/character/clan.js b/character/clan.js
index 677866d9f..f1254b1ac 100644
--- a/character/clan.js
+++ b/character/clan.js
@@ -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 '观骨：选择观看牌的目标';
 					},
 				},
diff --git a/game/game.js b/game/game.js
index 12a2362e0..063800a16 100644
--- a/game/game.js
+++ b/game/game.js
@@ -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){