From cabd725d93de95bc17b32f5880227b8a01365409 Mon Sep 17 00:00:00 2001 From: libccy Date: Sat, 21 Jan 2017 16:06:45 +0800 Subject: [PATCH] rad --- game/config.js | 1 + game/game.js | 33 +++++++------- layout/default/layout.css | 90 ++++++++++++++++++++++++++++++++++--- layout/default/menu.css | 14 ++++-- layout/long/layout.css | 28 ++++++++++-- layout/mode/boss.css | 9 ++++ layout/mode/chess.css | 22 +++++++-- layout/newlayout/global.css | 17 ++++++- theme/music/style.css | 15 ------- theme/woodden/style.css | 15 ------- 10 files changed, 178 insertions(+), 66 deletions(-) diff --git a/game/config.js b/game/config.js index e7a59437d..b866b2278 100644 --- a/game/config.js +++ b/game/config.js @@ -263,6 +263,7 @@ window.config={ damage_shake:true, log_highlight:true, player_border:'normal', + radius_size:'default', modeconfig:false, gameconfig:false, diff --git a/game/game.js b/game/game.js index 1eb43ef12..607ee3b4c 100644 --- a/game/game.js +++ b/game/game.js @@ -835,20 +835,21 @@ } } }, - reduce_radius:{ - name:'减小圆角', - init:false, - unfrequent:true, - onclick:function(bool){ - game.saveConfig('reduce_radius',bool); - if(bool){ - ui.window.classList.add('reduce_radius'); - } - else{ - ui.window.classList.remove('reduce_radius'); - } - } - }, + radius_size:{ + name:'圆角大小', + init:'default', + item:{ + off:'关闭', + reduce:'减小', + default:'默认', + increase:'增大', + }, + unfrequent:true, + onclick:function(item){ + game.saveConfig('radius_size',item); + ui.window.dataset.radius_size=item; + } + }, show_time:{ name:'显示时间', init:false, @@ -28075,9 +28076,7 @@ if(lib.config.player_border=='slim'){ ui.arena.classList.add('uslim_player'); } - if(lib.config.reduce_radius){ - ui.window.classList.add('reduce_radius'); - } + ui.window.dataset.radius_size=lib.config.radius_size||'default'; if(lib.config.layout=='default'&&lib.config.hp_style=='official'){ ui.arena.classList.add('hpimage'); } diff --git a/layout/default/layout.css b/layout/default/layout.css index 24637c8f6..3de20b4be 100644 --- a/layout/default/layout.css +++ b/layout/default/layout.css @@ -949,9 +949,15 @@ div:not(.handcards)>.card>.info>span, border-radius:6px; transition: opacity 0.3s; } -#window.reduce_radius>.dialog.popped{ +#window[data-radius_size='reduce']>.dialog.popped{ border-radius:4px; } +#window[data-radius_size='off']>.dialog.popped{ + border-radius:0px; +} +#window[data-radius_size='increase']>.dialog.popped{ + border-radius:12px; +} #window>.dialog.popped>.bar{ display:none !important; } @@ -1504,9 +1510,15 @@ margin-bottom: 5px; left:10px; background-size:cover; } -#window.reduce_radius #me>.fakeme.avatar{ +#window[data-radius_size='reduce'] #me>.fakeme.avatar{ border-radius:4px; } +#window[data-radius_size='off'] #me>.fakeme.avatar{ + border-radius:0px; +} +#window[data-radius_size='increase'] #me>.fakeme.avatar{ + border-radius:16px; +} .card.removing{transform:scale(0);} #me>div>div>.card.removing{margin-left: -52px;margin-right: -52px;} @@ -1636,8 +1648,14 @@ div:hover>.intro{opacity: 1;} border-radius:8px; color: white !important; } -#window.reduce_radius .shadowed{ - border-radius: 4px; +#window[data-radius_size='reduce'] .shadowed{ + border-radius:4px; +} +#window[data-radius_size='off'] .shadowed{ + border-radius:0px; +} +#window[data-radius_size='increase'] .shadowed{ + border-radius:16px; } .underline,.underlinenode{ padding:3px; @@ -2204,11 +2222,69 @@ div:hover>.wunature{ border-radius:8px; min-height:240px; } -#window.reduce_radius .dialog.scroll1, -#window.reduce_radius .dialog.scroll2, -#window.reduce_radius .dialog.withbg{ +#window[data-radius_size='reduce'] .dialog.scroll1, +#window[data-radius_size='reduce'] .dialog.scroll2, +#window[data-radius_size='reduce'] .dialog.withbg{ border-radius:4px; } +#window[data-radius_size='off'] .dialog.scroll1, +#window[data-radius_size='off'] .dialog.scroll2, +#window[data-radius_size='off'] .dialog.withbg{ + border-radius:0px; +} +#window[data-radius_size='increase'] .dialog.scroll1, +#window[data-radius_size='increase'] .dialog.scroll2, +#window[data-radius_size='increase'] .dialog.withbg{ + border-radius:16px; +} + + + +#window[data-radius_size='reduce'] #system>div>div, +#window[data-radius_size='reduce'] #mebg, +#window[data-radius_size='reduce'] .control, +#window[data-radius_size='reduce'] .player, +#window[data-radius_size='reduce'] .card, +#window[data-radius_size='reduce'] .avatar, +#window[data-radius_size='reduce'] .avatar2, +#window[data-radius_size='reduce'] .button, +#window[data-radius_size='reduce'] #window>.dialog.popped, +#window[data-radius_size='reduce'] .player.unseen .equips:not(*:empty), +#window[data-radius_size='reduce'] .menu, +#window[data-radius_size='reduce'] #splash>div, +#window[data-radius_size='reduce'].mobile:not(.chess) .player[data-position='0'] .equips{ + border-radius: 4px; +} +#window[data-radius_size='off'] #system>div>div, +#window[data-radius_size='off'] #mebg, +#window[data-radius_size='off'] .control, +#window[data-radius_size='off'] .player, +#window[data-radius_size='off'] .card, +#window[data-radius_size='off'] .avatar, +#window[data-radius_size='off'] .avatar2, +#window[data-radius_size='off'] .button, +#window[data-radius_size='off'] #window>.dialog.popped, +#window[data-radius_size='off'] .player.unseen .equips:not(*:empty), +#window[data-radius_size='off'] .menu, +#window[data-radius_size='off'] #splash>div, +#window[data-radius_size='off'].mobile:not(.chess) .player[data-position='0'] .equips{ + border-radius: 0px; +} +#window[data-radius_size='increase'] #system>div>div, +#window[data-radius_size='increase'] #mebg, +#window[data-radius_size='increase'] .control, +#window[data-radius_size='increase'] .player, +#window[data-radius_size='increase'] .card, +#window[data-radius_size='increase'] .avatar, +#window[data-radius_size='increase'] .avatar2, +#window[data-radius_size='increase'] .button, +#window[data-radius_size='increase'] #window>.dialog.popped, +#window[data-radius_size='increase'] .player.unseen .equips:not(*:empty), +#window[data-radius_size='increase'] .menu, +#window[data-radius_size='increase'] #splash>div, +#window[data-radius_size='increase'].mobile:not(.chess) .player[data-position='0'] .equips{ + border-radius: 16px; +} /*--------动画--------*/ @keyframes cardeffect{ diff --git a/layout/default/menu.css b/layout/default/menu.css index 5bead7ef3..30a74a68a 100644 --- a/layout/default/menu.css +++ b/layout/default/menu.css @@ -434,9 +434,17 @@ top:0; position: absolute; } -#window.reduce_radius .menu-buttons>.new_character>.avatar>input, -#window.reduce_radius .menu-buttons>.new_character>.card>input{ - border-radius: 4px; +#window[data-radius_size='reduce'] .menu-buttons>.new_character>.avatar>input, +#window[data-radius_size='reduce'] .menu-buttons>.new_character>.card>input{ + border-radius:4px; +} +#window[data-radius_size='off'] .menu-buttons>.new_character>.avatar>input, +#window[data-radius_size='off'] .menu-buttons>.new_character>.card>input{ + border-radius:0px; +} +#window[data-radius_size='increase'] .menu-buttons>.new_character>.avatar>input, +#window[data-radius_size='increase'] .menu-buttons>.new_character>.card>input{ + border-radius:16px; } .menu-buttons>.new_character>.avatar>.select_avatar, .menu-buttons>.new_character>.card>.select_avatar{ diff --git a/layout/long/layout.css b/layout/long/layout.css index 3ee216970..247009ccd 100644 --- a/layout/long/layout.css +++ b/layout/long/layout.css @@ -29,10 +29,18 @@ #arena.uslim_player:not(.fewplayer)>.player.fullskin2:not(.minskin):not(*[data-position='0'])>.avatar2{ height: 107px !important; } -#window.reduce_radius #arena:not(.fewplayer)>.player.fullskin2:not(.minskin):not(*[data-position='0'])>.avatar, -#window.reduce_radius #arena:not(.fewplayer)>.player.fullskin2:not(.minskin):not(*[data-position='0'])>.avatar2{ +#window[data-radius_size='reduce'] #arena:not(.fewplayer)>.player.fullskin2:not(.minskin):not(*[data-position='0'])>.avatar, +#window[data-radius_size='reduce'] #arena:not(.fewplayer)>.player.fullskin2:not(.minskin):not(*[data-position='0'])>.avatar2{ border-radius: 4px !important; } +#window[data-radius_size='off'] #arena:not(.fewplayer)>.player.fullskin2:not(.minskin):not(*[data-position='0'])>.avatar, +#window[data-radius_size='off'] #arena:not(.fewplayer)>.player.fullskin2:not(.minskin):not(*[data-position='0'])>.avatar2{ + border-radius: 0px !important; +} +#window[data-radius_size='increase'] #arena:not(.fewplayer)>.player.fullskin2:not(.minskin):not(*[data-position='0'])>.avatar, +#window[data-radius_size='increase'] #arena:not(.fewplayer)>.player.fullskin2:not(.minskin):not(*[data-position='0'])>.avatar2{ + border-radius: 16px !important; +} #arena:not(.fewplayer)>.player.fullskin2:not(.minskin):not(.unseen2):not(*[data-position='0'])>.avatar{ border-radius: 8px 8px 0 0 !important; height: 124px !important; @@ -42,9 +50,15 @@ height: 128px !important; -webkit-clip-path: polygon(-10px -10px, 124px -10px, 124px 96px, 114px 96px, 0px 118px, -10px 118px); } -#window.reduce_radius #arena:not(.fewplayer)>.player.fullskin2:not(.minskin):not(.unseen2):not(*[data-position='0'])>.avatar{ +#window[data-radius_size='reduce'] #arena:not(.fewplayer)>.player.fullskin2:not(.minskin):not(.unseen2):not(*[data-position='0'])>.avatar{ border-radius: 4px 4px 0 0 !important; } +#window[data-radius_size='off'] #arena:not(.fewplayer)>.player.fullskin2:not(.minskin):not(.unseen2):not(*[data-position='0'])>.avatar{ + border-radius: 0 0 0 0 !important; +} +#window[data-radius_size='increase'] #arena:not(.fewplayer)>.player.fullskin2:not(.minskin):not(.unseen2):not(*[data-position='0'])>.avatar{ + border-radius: 16px 16px 0 0 !important; +} #arena:not(.fewplayer)>.player.fullskin2:not(.minskin):not(.unseen):not(*[data-position='0'])>.avatar2{ border-radius: 0 0 8px 8px !important; top: 89px !important; @@ -57,9 +71,15 @@ height: 128px !important; -webkit-clip-path: polygon(-10px 32px, 0 32px, 114px 10px, 124px 10px, 124px 138px, -10px 138px); } -#window.reduce_radius #arena:not(.fewplayer)>.player.fullskin2:not(.minskin):not(.unseen):not(*[data-position='0'])>.avatar2{ +#window[data-radius_size='reduce'] #arena:not(.fewplayer)>.player.fullskin2:not(.minskin):not(.unseen):not(*[data-position='0'])>.avatar2{ border-radius: 0 0 4px 4px !important; } +#window[data-radius_size='off'] #arena:not(.fewplayer)>.player.fullskin2:not(.minskin):not(.unseen):not(*[data-position='0'])>.avatar2{ + border-radius: 0 0 0 0 !important; +} +#window[data-radius_size='increase'] #arena:not(.fewplayer)>.player.fullskin2:not(.minskin):not(.unseen):not(*[data-position='0'])>.avatar2{ + border-radius: 0 0 16px 16px !important; +} #arena:not(.fewplayer)>.player.fullskin2:not(.minskin):not(*[data-position='0'])>.avatar2{ top: 110px !important; } diff --git a/layout/mode/boss.css b/layout/mode/boss.css index 73200f654..b08a58a6f 100644 --- a/layout/mode/boss.css +++ b/layout/mode/boss.css @@ -8,6 +8,15 @@ z-index:1; overflow-x:scroll; } +#window[data-radius_size='reduce'] #bosslist.slim>.player{ + border-radius:4px; +} +#window[data-radius_size='off'] #bosslist.slim>.player{ + border-radius:0px; +} +#window[data-radius_size='increase'] #bosslist.slim>.player{ + border-radius:20px; +} #bosslist.slim>.player{ border-radius: 10px; } diff --git a/layout/mode/chess.css b/layout/mode/chess.css index b71541a64..44d565716 100644 --- a/layout/mode/chess.css +++ b/layout/mode/chess.css @@ -73,8 +73,14 @@ box-shadow: rgba(0, 0, 0, 0.3) 0 0 0 1px; border-radius:8px; } -#window.reduce_radius>.dialog{ - border-radius:4px; +#window[data-radius_size='reduce']>.dialog{ + border-radius:4px; +} +#window[data-radius_size='off']>.dialog{ + border-radius:0px; +} +#window[data-radius_size='increase']>.dialog{ + border-radius:16px; } #arena>.dialog.slim:not(.center){ top:40px; @@ -154,10 +160,18 @@ box-shadow: rgba(0, 0, 0, 0.3) 0 0 0 1px; border-radius:8px; } -#window.reduce_radius .player.playergrid, -#window.reduce_radius .player.obstacle{ +#window[data-radius_size='reduce'] .player.playergrid, +#window[data-radius_size='reduce'] .player.obstacle{ border-radius:4px; } +#window[data-radius_size='off'] .player.playergrid, +#window[data-radius_size='off'] .player.obstacle{ + border-radius:0px; +} +#window[data-radius_size='increase'] .player.playergrid, +#window[data-radius_size='increase'] .player.obstacle{ + border-radius:16px; +} .player.playerblank{ background: none; } diff --git a/layout/newlayout/global.css b/layout/newlayout/global.css index 4a7eb2e0f..2c8e3b2d6 100644 --- a/layout/newlayout/global.css +++ b/layout/newlayout/global.css @@ -101,9 +101,24 @@ .player.fullskin2 .avatar{ border-radius:8px 0 0 8px; } -#window.reduce_radius .player.fullskin2 .avatar{ +#window[data-radius_size='reduce'] .player.fullskin2 .avatar{ border-radius:4px 0 0 4px; } +#window[data-radius_size='off'] .player.fullskin2 .avatar{ + border-radius:0 0 0 0; +} +#window[data-radius_size='increase'] .player.fullskin2 .avatar{ + border-radius:16px 0 0 16px; +} +#window[data-radius_size='reduce'] .player.fullskin2 .avatar2{ + border-radius:0 4px 4px 0; +} +#window[data-radius_size='off'] .player.fullskin2 .avatar2{ + border-radius:0 0 0 0; +} +#window[data-radius_size='increase'] .player.fullskin2 .avatar2{ + border-radius:0 16px 16px 0; +} .player.fullskin2 .avatar2{ top:10px; left:auto; diff --git a/theme/music/style.css b/theme/music/style.css index f511fcd2d..56c7fab63 100644 --- a/theme/music/style.css +++ b/theme/music/style.css @@ -14,21 +14,6 @@ html{ background: linear-gradient(#4b4b4b, #464646) !important; } -#window.reduce_radius #system>div>div, -#window.reduce_radius #mebg, -#window.reduce_radius .control, -#window.reduce_radius .player, -#window.reduce_radius .card, -#window.reduce_radius .avatar, -#window.reduce_radius .avatar2, -#window.reduce_radius .button, -#window.reduce_radius #window>.dialog.popped, -#window.reduce_radius .player.unseen .equips:not(*:empty), -#window.reduce_radius .menu,#splash>div, -#window.reduce_radius.mobile:not(.chess) .player[data-position='0'] .equips{ - border-radius: 4px; -} - body[data-background_color_music='blue'] #system>div>div, body[data-background_color_music='blue'] #mebg, body[data-background_color_music='blue'] .control, diff --git a/theme/woodden/style.css b/theme/woodden/style.css index 393018cca..f96326dbd 100644 --- a/theme/woodden/style.css +++ b/theme/woodden/style.css @@ -9,21 +9,6 @@ html{ border-radius: 8px; } -#window.reduce_radius #system>div>div, -#window.reduce_radius #mebg, -#window.reduce_radius .control, -#window.reduce_radius .player, -#window.reduce_radius .card, -#window.reduce_radius .avatar, -#window.reduce_radius .avatar2, -#window.reduce_radius .button, -#window.reduce_radius .dialog>.bar, -#window.reduce_radius .menu, -#window.reduce_radius #splash>div, -#window.reduce_radius.mobile:not(.chess) .player[data-position='0'] .equips{ - border-radius: 4px; -} - .button-downloading>.button-progress{ background: rgba(77,224,100,0.45); }