From ee3a58e80b44e112460ad98ffb515bbb679622d4 Mon Sep 17 00:00:00 2001 From: libccy Date: Fri, 20 Jan 2017 22:17:25 +0800 Subject: [PATCH] t --- game/game.js | 41 +++++++++---- layout/long/layout.css | 129 +++++++++++++++++++++++++++++++++++++++ layout/mobile/layout.css | 2 +- 3 files changed, 160 insertions(+), 12 deletions(-) diff --git a/game/game.js b/game/game.js index 351a7dd6b..bb1afe8ef 100644 --- a/game/game.js +++ b/game/game.js @@ -495,6 +495,7 @@ default:'旧版', newlayout:'对称', mobile:'默认', + long:'手杀' }, onclick:function(layout){ if(lib.config.layoutfixed.contains(lib.config.mode)&&layout=='default'){ @@ -818,7 +819,7 @@ if(bool){ ui.arena.classList.add('slim_player'); } - else{ + else if(lib.config.layout!='long'){ ui.arena.classList.remove('slim_player'); } } @@ -4841,17 +4842,9 @@ } if(lib.config.cardshape=='oblong'&&(lib.config.layout=='long'||lib.config.layout=='mobile')){ ui.arena.classList.add('oblongcard'); - if(game.me&&game.me.classList.contains('linked')){ - game.me.classList.remove('linked'); - game.me.classList.add('linked2'); - } } else{ ui.arena.classList.remove('oblongcard'); - if(game.me&&lib.config.link_style!='mark'&&game.me.classList.contains('linked2')){ - game.me.classList.remove('linked2'); - game.me.classList.add('linked'); - } } if(lib.config.textequip=='text'&&(lib.config.layout=='long'||lib.config.layout=='mobile')){ ui.arena.classList.add('textequip'); @@ -4866,6 +4859,26 @@ else{ ui.css.phone.href=''; ui.roundmenu.style.display='none'; + } + for(var i=0;i.player:not(.minskin):not(*[data-position='0']){ + width: 120px !important; + height: 220px !important; +} +#arena:not(.stone)>.player:not(.minskin):not(*[data-position='0'])>.avatar, +#arena:not(.stone)>.player:not(.minskin):not(*[data-position='0'])>.avatar2{ + width: 106px !important; + height: 206px !important; + background-position: 50% !important; +} +#arena:not(.stone)>.player.fullskin2:not(.minskin):not(*[data-position='0'])>.avatar, +#arena:not(.stone)>.player.fullskin2:not(.minskin):not(*[data-position='0'])>.avatar2{ + height: 103px !important; + background-position: 0 0 !important; + border-radius: 8px !important; +} +#window.reduce_radius #arena:not(.stone)>.player.fullskin2:not(.minskin):not(*[data-position='0'])>.avatar, +#window.reduce_radius #arena:not(.stone)>.player.fullskin2:not(.minskin):not(*[data-position='0'])>.avatar2{ + border-radius: 4px !important; +} +#arena:not(.stone)>.player.fullskin2:not(.minskin):not(.unseen2):not(*[data-position='0'])>.avatar{ + border-radius: 8px 8px 0 0 !important; + height: 125px !important; + -webkit-clip-path: polygon(-10px -10px, 116px -10px, 116px 103px, 106px 103px, 0px 125px, -10px 125px); +} +#window.reduce_radius #arena:not(.stone)>.player.fullskin2:not(.minskin):not(.unseen2):not(*[data-position='0'])>.avatar{ + border-radius: 4px 4px 0 0 !important; +} +#arena:not(.stone)>.player.fullskin2:not(.minskin):not(.unseen):not(*[data-position='0'])>.avatar2{ + border-radius: 0 0 8px 8px !important; + top: 100px !important; + height: 113px !important; + background-position: 0 10px !important; + -webkit-clip-path: polygon(-10px 32px, 0 32px, 106px 10px, 116px 10px, 116px 125px, -10px 125px); +} +#window.reduce_radius #arena:not(.stone)>.player.fullskin2:not(.minskin):not(.unseen):not(*[data-position='0'])>.avatar2{ + border-radius: 0 0 4px 4px !important; +} +#arena:not(.stone)>.player.fullskin2:not(.minskin):not(*[data-position='0'])>.avatar2{ + top: 110px !important; +} +#arena:not(.stone)>.player:not(.minskin):not(*[data-position='0'])>.identity{ + left: 102px; +} +#arena:not(.stone)>.player:not(.minskin):not(*[data-position='0'])>.hp{ + left: 93px; +} +#arena:not(.stone)>.player:not(.minskin):not(*[data-position='0'])>.hp.text{ + left: 89px; +} + +/*--------位置(8人)------*/ +[data-number='8']>.player[data-position='1']{top:calc(200% / 3 - 340px);left:calc(100% - 120px);} +[data-number='8']>.player[data-position='2']{top:calc(60% / 3 - 108px);left:calc(500% / 6 - 100px);} +[data-number='8']>.player[data-position='3']{top:0;left:calc(400% / 6 - 80px);} +[data-number='8']>.player[data-position='4']{top:0;left:calc(300% / 6 - 60px);} +[data-number='8']>.player[data-position='5']{top:0;left:calc(200% / 6 - 40px);} +[data-number='8']>.player[data-position='6']{top:calc(60% / 3 - 108px);left:calc(100% / 6 - 20px);} +[data-number='8']>.player[data-position='7']{top:calc(200% / 3 - 340px);left:0;} +/*--------位置(7人)------*/ +[data-number='7']>.player[data-position='1']{top:calc(200% / 3 - 160px);left:calc(100% - 150px);} +[data-number='7']>.player[data-position='2']{top:calc(100% / 3 - 170px);left:calc(100% - 150px);} +[data-number='7']>.player[data-position='3']{top:0;left:calc(62.5% - 75px);} +[data-number='7']>.player[data-position='4']{top:0;left:calc(37.5% - 75px);} +[data-number='7']>.player[data-position='5']{top:calc(100% / 3 - 170px);left:0;} +[data-number='7']>.player[data-position='6']{top:calc(200% / 3 - 160px);left:0;} +[data-number='7']>.card[data-position='1']{top:calc(200% / 3 - 122px);left:calc(100% - 127px);} +[data-number='7']>.card[data-position='2']{top:calc(100% / 3 - 132px);left:calc(100% - 127px);} +[data-number='7']>.card[data-position='3']{top:38px;left:calc(62.5% - 52px);} +[data-number='7']>.card[data-position='4']{top:38px;left:calc(37.5% - 52px);} +[data-number='7']>.card[data-position='5']{top:calc(100% / 3 - 132px);left:23px;} +[data-number='7']>.card[data-position='6']{top:calc(200% / 3 - 122px);left:23px;} +[data-number='7']>.popup[data-position='1']{top:calc(200% / 3 - 150px);left:calc(100% - 186px);} +[data-number='7']>.popup[data-position='2']{top:calc(100% / 3 - 160px);left:calc(100% - 186px);} +[data-number='7']>.popup[data-position='3']{top:190px;left:calc(62.5% + 48px);} +[data-number='7']>.popup[data-position='4']{top:190px;left:calc(37.5% - 75px);} +[data-number='7']>.popup[data-position='5']{top:calc(100% / 3 - 160px);left:160px;} +[data-number='7']>.popup[data-position='6']{top:calc(200% / 3 - 150px);left:160px;} +/*--------位置(6人)------*/ +[data-number='6']>.player[data-position='1']{top:calc(200% / 3 - 160px);left:calc(100% - 150px);} +[data-number='6']>.player[data-position='2']{top:calc(100% / 3 - 170px);left:calc(100% - 150px);} +[data-number='6']>.player[data-position='3']{top:0;left:calc(50% - 75px);} +[data-number='6']>.player[data-position='4']{top:calc(100% / 3 - 170px);left:0;} +[data-number='6']>.player[data-position='5']{top:calc(200% / 3 - 160px);left:0;} +[data-number='6']>.card[data-position='1']{top:calc(200% / 3 - 122px);left:calc(100% - 127px);} +[data-number='6']>.card[data-position='2']{top:calc(100% / 3 - 132px);left:calc(100% - 127px);} +[data-number='6']>.card[data-position='3']{top:38px;left:calc(50% - 52px);} +[data-number='6']>.card[data-position='4']{top:calc(100% / 3 - 132px);left:23px;} +[data-number='6']>.card[data-position='5']{top:calc(200% / 3 - 122px);left:23px;} +[data-number='6']>.popup[data-position='1']{top:calc(200% / 3 - 150px);left:calc(100% - 186px);} +[data-number='6']>.popup[data-position='2']{top:calc(100% / 3 - 160px);left:calc(100% - 186px);} +[data-number='6']>.popup[data-position='3']{top:190px;left:calc(50% - 61px);} +[data-number='6']>.popup[data-position='4']{top:calc(100% / 3 - 160px);left:160px;} +[data-number='6']>.popup[data-position='5']{top:calc(200% / 3 - 150px);left:160px;} +/*--------位置(5人)------*/ +[data-number='5']>.player[data-position='1']{top:calc(200% / 3 - 220px);left:calc(100% - 150px);} +[data-number='5']>.player[data-position='2']{top:0;left:calc(200% / 3 - 50px);} +[data-number='5']>.player[data-position='3']{top:0;left:calc(100% / 3 - 100px);} +[data-number='5']>.player[data-position='4']{top:calc(200% / 3 - 220px);left:0;} +[data-number='5']>.card[data-position='1']{top:calc(150% / 3 - 65px);left:calc(100% - 127px);} +[data-number='5']>.card[data-position='2']{top:38px;left:calc(200% / 3 - 27px);} +[data-number='5']>.card[data-position='3']{top:38px;left:calc(100% / 3 - 77px);} +[data-number='5']>.card[data-position='4']{top:calc(150% / 3 - 65px);left:23px;} +[data-number='5']>.popup[data-position='1']{top:calc(200% / 3 - 210px);left:calc(100% - 186px);} +[data-number='5']>.popup[data-position='2']{top:190px;left:calc(200% / 3 + 73px);} +[data-number='5']>.popup[data-position='3']{top:190px;left:calc(100% / 3 - 100px);} +[data-number='5']>.popup[data-position='4']{top:calc(200% / 3 - 210px);left:160px;} +/*--------位置(4人)------*/ +[data-number='4']>.player[data-position='1']{top:calc(100% / 3 - 40px);left:calc(100% - 150px);} +[data-number='4']>.player[data-position='2']{top:0;left:calc(50% - 75px);} +[data-number='4']>.player[data-position='3']{top:calc(100% / 3 - 40px);left:0;} +[data-number='4']>.card[data-position='1']{top:calc(100% / 3 - 2px);left:calc(100% - 127px);} +[data-number='4']>.card[data-position='2']{top:38px;left:calc(50% - 52px);} +[data-number='4']>.card[data-position='3']{top:calc(100% / 3 - 2px);left:23px;} +[data-number='4']>.popup[data-position='1']{top:calc(100% / 3 - 30px);left:calc(100% - 186px);} +[data-number='4']>.popup[data-position='2']{top:190px;left:calc(50% - 61px);} +[data-number='4']>.popup[data-position='3']{top:calc(100% / 3 - 30px);left:160px;} +/*--------位置(3人)------*/ +[data-number='3']>.player[data-position='1']{top:20px;left:calc(75% + 30px);} +[data-number='3']>.player[data-position='2']{top:20px;left:calc(25% - 180px);} +[data-number='3']>.card[data-position='1']{top:58px;left:calc(75% + 53px);} +[data-number='3']>.card[data-position='2']{top:58px;left:calc(25% - 157px);} +[data-number='3']>.popup[data-position='1']{top:210px;left:calc(75% + 153px);} +[data-number='3']>.popup[data-position='2']{top:210px;left:calc(25% - 180px);} +/*--------位置(2人)------*/ +[data-number='2']>.player[data-position='1']{top:0;left:calc(50% - 75px);} +[data-number='2']>.card[data-position='1']{top:0;left:calc(50% - 52px);} +[data-number='2']>.popup[data-position='1']{top:190px;left:calc(50% - 61px);} diff --git a/layout/mobile/layout.css b/layout/mobile/layout.css index 618a5495f..ef2351f29 100644 --- a/layout/mobile/layout.css +++ b/layout/mobile/layout.css @@ -290,7 +290,7 @@ #me>.fakeme.avatar{ width:120px; - height:120px; + height:100%; border-radius:0px; top:0; left:0;