diff --git a/game/game.js b/game/game.js index e9aabf1af..207e3ad26 100644 --- a/game/game.js +++ b/game/game.js @@ -10582,7 +10582,7 @@ var directh=true; for(var i=0;i=height1&&height2>=210)){ + if(!ui.dialog._scrollset&&(height1<=190||(height2>=height1&&height2>=210))){ ui.dialog.classList.remove('scroll1'); ui.dialog.classList.remove('scroll2'); } else{ ui.dialog.classList.add('scroll1'); ui.dialog.classList.add('scroll2'); + if(game.layout!='default'){ + ui.dialog.style.height=Math.min(height1,400)+'px'; + ui.dialog._scrollset=true; + } } if(game.layout=='long2'){ if(height1+240>=ui.arena.offsetHeight){ diff --git a/mode/guozhan.js b/mode/guozhan.js index 23a87994a..46d560483 100644 --- a/mode/guozhan.js +++ b/mode/guozhan.js @@ -2314,8 +2314,10 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ } dialog.add(ui.create.div('.placeholder')); - dialog.add(ui.create.div('.placeholder')); - dialog.add(ui.create.div('.placeholder')); + if(game.layout=='default'){ + dialog.add(ui.create.div('.placeholder')); + dialog.add(ui.create.div('.placeholder')); + } }; var removeSetting=function(){ var dialog=_status.event.dialog; diff --git a/mode/identity.js b/mode/identity.js index 66cd64b66..427e7671b 100644 --- a/mode/identity.js +++ b/mode/identity.js @@ -782,8 +782,10 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ } dialog.add(ui.create.div('.placeholder')); - dialog.add(ui.create.div('.placeholder')); - dialog.add(ui.create.div('.placeholder')); + if(game.layout=='default'){ + dialog.add(ui.create.div('.placeholder')); + dialog.add(ui.create.div('.placeholder')); + } }; var removeSetting=function(){ var dialog=_status.event.dialog; diff --git a/mode/versus.js b/mode/versus.js index ad382bf3b..0cff2507f 100644 --- a/mode/versus.js +++ b/mode/versus.js @@ -834,8 +834,10 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ } dialog.add(ui.create.div('.placeholder')); - dialog.add(ui.create.div('.placeholder')); - dialog.add(ui.create.div('.placeholder')); + if(game.layout=='default'){ + dialog.add(ui.create.div('.placeholder')); + dialog.add(ui.create.div('.placeholder')); + } }; var removeSetting=function(){ var dialog=_status.event.dialog; @@ -1129,8 +1131,10 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ } dialog.add(ui.create.div('.placeholder')); - dialog.add(ui.create.div('.placeholder')); - dialog.add(ui.create.div('.placeholder')); + if(game.layout=='default'){ + dialog.add(ui.create.div('.placeholder')); + dialog.add(ui.create.div('.placeholder')); + } }; var removeSetting=function(){ var dialog=_status.event.dialog;