From 53ca2c44042374c19ea50bfda0ca2f5174535cad Mon Sep 17 00:00:00 2001 From: libccy Date: Wed, 31 May 2017 23:56:06 +0800 Subject: [PATCH] x --- character/xianjian.js | 1 + game/game.js | 4 ++-- mode/guozhan.js | 5 ++++- mode/identity.js | 5 ++++- mode/versus.js | 14 ++++++++++---- 5 files changed, 21 insertions(+), 8 deletions(-) diff --git a/character/xianjian.js b/character/xianjian.js index c539c5f3a..b575667db 100644 --- a/character/xianjian.js +++ b/character/xianjian.js @@ -4349,6 +4349,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ liefeng:'冽风', liefeng_info:'锁定技，当你在回合内使用第二张牌时，你本回合获得【炎斩】；当你在回合内使用第三张牌时，你本回合获得【天剑】；当你在回合内使用第四张牌时，你本回合获得【御风】', yuexing:'越行', + yuexing2:'越行', yuexing_info:'出牌阶段限一次，你可以指定一名角色，本阶段内将你与该角色到其他角色的距离基数互换', lingdi:'灵笛', lingdi_info:'出牌阶段，你可以弃置一张本回合与此法弃置的牌花色均不同的手牌，然后选择一名与你距离为X的角色与其各摸一张牌，X为本回合发动灵笛的次数（含此次）', diff --git a/game/game.js b/game/game.js index 3b656f7cc..b96170ccd 100644 --- a/game/game.js +++ b/game/game.js @@ -34954,7 +34954,7 @@ _status.clicked2=true; }); if(heightset){ - dialog.style.height=(game.layout=='long2'?410:350)+'px'; + dialog.style.height=(game.layout=='long2'?380:350)+'px'; dialog._scrollset=true; } dialog.getCurrentCapt=function(link,capt,noalph){ @@ -39979,7 +39979,7 @@ ui.dialog.classList.add('scroll1'); ui.dialog.classList.add('scroll2'); if(game.layout!='default'){ - ui.dialog.style.height=Math.min(height1,(game.layout=='long2'&&ui.arena.classList.contains('choose-character'))?410:350)+'px'; + ui.dialog.style.height=Math.min(height1,(game.layout=='long2'&&ui.arena.classList.contains('choose-character'))?380:350)+'px'; ui.dialog._scrollset=true; } } diff --git a/mode/guozhan.js b/mode/guozhan.js index 320330aaf..0fb87e6a2 100644 --- a/mode/guozhan.js +++ b/mode/guozhan.js @@ -2318,11 +2318,14 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ seats.style.display='none'; } - dialog.add(ui.create.div('.placeholder')); + dialog.add(ui.create.div('.placeholder.add-setting')); if(game.layout=='default'){ dialog.add(ui.create.div('.placeholder.add-setting')); dialog.add(ui.create.div('.placeholder.add-setting')); } + else{ + dialog.content.lastChild.style.height='0px'; + } }; var removeSetting=function(){ var dialog=_status.event.dialog; diff --git a/mode/identity.js b/mode/identity.js index a15178203..92232942d 100644 --- a/mode/identity.js +++ b/mode/identity.js @@ -792,11 +792,14 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ seats.style.display='none'; } - dialog.add(ui.create.div('.placeholder')); + dialog.add(ui.create.div('.placeholder.add-setting')); if(game.layout=='default'){ dialog.add(ui.create.div('.placeholder.add-setting')); dialog.add(ui.create.div('.placeholder.add-setting')); } + else{ + dialog.content.lastChild.style.height='0px'; + } }; var removeSetting=function(){ var dialog=_status.event.dialog; diff --git a/mode/versus.js b/mode/versus.js index 2b02a8918..bbc163e7a 100644 --- a/mode/versus.js +++ b/mode/versus.js @@ -838,11 +838,14 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ seats.style.display='none'; } - dialog.add(ui.create.div('.placeholder')); + dialog.add(ui.create.div('.placeholder.add-setting')); if(game.layout=='default'){ - dialog.add(ui.create.div('.placeholder')); - dialog.add(ui.create.div('.placeholder')); + dialog.add(ui.create.div('.placeholder.add-setting')); + dialog.add(ui.create.div('.placeholder.add-setting')); } + else{ + dialog.content.lastChild.style.height='0px'; + } }; var removeSetting=function(){ var dialog=_status.event.dialog; @@ -1142,11 +1145,14 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ seats.style.display='none'; } - dialog.add(ui.create.div('.placeholder')); + dialog.add(ui.create.div('.placeholder.add-setting')); if(game.layout=='default'){ dialog.add(ui.create.div('.placeholder.add-setting')); dialog.add(ui.create.div('.placeholder.add-setting')); } + else{ + dialog.content.lastChild.style.height='0px'; + } }; var removeSetting=function(){ var dialog=_status.event.dialog;