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