diff --git a/card/standard.js b/card/standard.js index cf07d70fb..744840a4c 100644 --- a/card/standard.js +++ b/card/standard.js @@ -1622,7 +1622,7 @@ card.standard={ if(translation.length>=4){ translation=lib.translate[card.name+'_ab']||translation.slice(0,2); } - ui.tempnowuxie=ui.create.div('不无懈'+translation,ui.click.tempnowuxie,ui.arena,'.nowuxie.controltop'); + ui.tempnowuxie=ui.create.control('不无懈'+translation,ui.click.tempnowuxie); ui.tempnowuxie._origin=id2; } var next=player.chooseToUse({ diff --git a/game/game.js b/game/game.js index 6cc0cf012..c5b6b21df 100644 --- a/game/game.js +++ b/game/game.js @@ -1103,6 +1103,11 @@ } } }, + wuxie_right:{ + name:'无懈按钮靠右', + init:true, + unfrequent:true, + }, show_discardpile:{ name:'暂停时显示弃牌堆', init:false, @@ -21073,25 +21078,58 @@ else next.num=num; next.setContent('gameDraw'); }, - chooseCharacterDouble:function(config,list){ + chooseCharacterDouble:function(){ var next=game.createEvent('chooseCharacter',false); - if(Array.isArray(config)||typeof config=='function'||!config){ + var config,width,num,ratio,func,update,list,first; + for(var i=0;i.avatar>.action{ margin: 5px; diff --git a/layout/default/phone.css b/layout/default/phone.css index 84b34cb73..af7a4e3f5 100644 --- a/layout/default/phone.css +++ b/layout/default/phone.css @@ -5,12 +5,10 @@ #arena.oblongcard:not(.chess):not(.nome){ height: calc(97% + 10px); } -#arena.mobile>#control, -#arena.mobile>.controltop{ +#arena.mobile>#control{ top:calc(100% - 205px); } -#arena.chess.mobile>#control, -#arena.chess.mobile>.controltop{ +#arena.chess.mobile>#control{ top:calc(100% - 175px); } #control>div,#system>div>div{ diff --git a/layout/long2/layout.css b/layout/long2/layout.css index 513b79c3d..624e619f6 100644 --- a/layout/long2/layout.css +++ b/layout/long2/layout.css @@ -8,11 +8,7 @@ bottom:150px; height: 40px; } -.controltop{ - bottom:150px; -} -#arena.phone #control, -#arena.phone .controltop{ +#arena.phone #control{ bottom:160px; } #arena:not(.chess)>#me, diff --git a/layout/mobile/layout.css b/layout/mobile/layout.css index 76689c843..bcf3d8b71 100644 --- a/layout/mobile/layout.css +++ b/layout/mobile/layout.css @@ -22,9 +22,6 @@ bottom:150px; height: 40px; } -.controltop{ - bottom: 150px; -} #arena:not(.chess)>#me, #arena:not(.chess)>#mebg, #arena:not(.chess)>#autonode{ diff --git a/layout/mode/chess.css b/layout/mode/chess.css index dac8d2fb6..2f982e89c 100644 --- a/layout/mode/chess.css +++ b/layout/mode/chess.css @@ -89,7 +89,7 @@ #arena>.dialog.slim:not(.center){ top:40px; } -#control,.controltop{ +#control{ top:calc(100% - 155px); } .fakeme{ diff --git a/layout/newlayout/global.css b/layout/newlayout/global.css index c94e1776a..ef3ec1311 100644 --- a/layout/newlayout/global.css +++ b/layout/newlayout/global.css @@ -491,10 +491,6 @@ width: calc(100% - 300px); left:150px; } -.controltop{ - top:auto; - left:150px; -} .popup{z-index:6} .dialog.scroll1, .dialog.scroll2, diff --git a/mode/versus.js b/mode/versus.js index 8c2a4d248..fe8d412be 100644 --- a/mode/versus.js +++ b/mode/versus.js @@ -1081,11 +1081,7 @@ mode.versus={ event.goto(2); } else{ - game.chooseCharacterDouble({ - update:function(i){ - return i==1?'主帅':'前锋'; - } - },function(i){ + game.chooseCharacterDouble(function(i){ if(get.config('enable_all_three')){ if(lib.filter.characterDisabled(i)) return false; return !lib.filter.characterDisabled(i); @@ -1093,6 +1089,8 @@ mode.versus={ else{ return lib.choiceThree.contains(i); } + },function(i){ + return i==1?'主帅':'前锋'; }); } "step 1"