YunFeiyang
/
noname
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

l

This commit is contained in:
libccy 2017-03-16 22:41:05 +08:00
parent 6761ce7eb3
commit dae1f3d25d
5 changed files with 95 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
game/game.js
View File

@ -864,31 +864,12 @@
else{ else{
ui.arena.classList.remove('uslim_player'); ui.arena.classList.remove('uslim_player');
} }
} if(item=='normal'&&(game.layout=='long'||game.layout=='long2')){
}, ui.arena.classList.add('lslim_player');
player_border_long:{ }
name:'边框宽度', else{
init:'normal', ui.arena.classList.remove('lslim_player');
intro:'设置角色的边框宽度', }
unfrequent:true,
item:{
slim:'窄',
normal:'中',
},
onclick:function(item){
game.saveConfig('player_border',item);
if(item!='wide'||game.layout=='long'||game.layout=='long2'){
ui.arena.classList.add('slim_player');
}
else{
ui.arena.classList.remove('slim_player');
}
if(item=='slim'){
ui.arena.classList.add('uslim_player');
}
else{
ui.arena.classList.remove('uslim_player');
}
} }
}, },
radius_size:{ radius_size:{
@ -1516,14 +1497,14 @@
else{ else{
map.change_skin_auto.hide(); map.change_skin_auto.hide();
} }
if(game.layout=='long'||game.layout=='long2'){ // if(game.layout=='long'||game.layout=='long2'){
map.player_border.hide(); // map.player_border.hide();
map.player_border_long.show(); // map.player_border_long.show();
} // }
else{ // else{
map.player_border.show(); // map.player_border.show();
map.player_border_long.hide(); // map.player_border_long.hide();
} // }
if(lib.config.image_background=='default'){ if(lib.config.image_background=='default'){
map.image_background_blur.hide(); map.image_background_blur.hide();
} }
@ -5762,6 +5743,12 @@
else{ else{
ui.arena.classList.remove('slim_player'); ui.arena.classList.remove('slim_player');
} }
if(lib.config.player_border=='normal'&&(game.layout=='long'||game.layout=='long2')){
ui.arena.classList.add('lslim_player');
}
else{
ui.arena.classList.remove('lslim_player');
}
if(lib.config.player_border=='slim'){ if(lib.config.player_border=='slim'){
ui.arena.classList.add('uslim_player'); ui.arena.classList.add('uslim_player');
} }
@ -31276,6 +31263,9 @@
if(lib.config.player_border=='slim'){ if(lib.config.player_border=='slim'){
ui.arena.classList.add('uslim_player'); ui.arena.classList.add('uslim_player');
} }
if(lib.config.player_border=='normal'&&(game.layout=='long'||game.layout=='long2')){
ui.arena.classList.add('lslim_player');
}
ui.window.dataset.radius_size=lib.config.radius_size||'default'; ui.window.dataset.radius_size=lib.config.radius_size||'default';
if(game.layout=='default'&&lib.config.hp_style=='official'){ if(game.layout=='default'&&lib.config.hp_style=='official'){
ui.arena.classList.add('hpimage'); ui.arena.classList.add('hpimage');

6
game/update.js
View File

@ -27,10 +27,10 @@ window.noname_update={
// 'theme/simple/style.css', // 'theme/simple/style.css',
// 'layout/default/layout.css', // 'layout/default/layout.css',
'layout/default/menu.css', 'layout/default/menu.css',
// 'layout/long/layout.css', 'layout/long/layout.css',
// 'layout/long2/layout.css', 'layout/long2/layout.css',
// 'layout/mobile/layout.css', // 'layout/mobile/layout.css',
// 'layout/newlayout/global.css', 'layout/newlayout/global.css',
// 'layout/mode/chess.css', // 'layout/mode/chess.css',
// 'extension/boss/extension.js', // 'extension/boss/extension.js',
] ]

25
layout/long/layout.css
View File

@ -61,6 +61,12 @@
height: calc(100% - 6px) !important; height: calc(100% - 6px) !important;
background-position: 50% !important; background-position: 50% !important;
} }
#arena.lslim_player:not(.fewplayer)>.player:not(.minskin):not(*[data-position='0'])>.avatar,
#arena.lslim_player:not(.fewplayer)>.player:not(.minskin):not(*[data-position='0'])>.avatar2{
width: calc(100% - 10px) !important;
height: calc(100% - 10px) !important;
background-position: 50% !important;
}
#arena:not(.fewplayer)>.player.fullskin2:not(.minskin):not(*[data-position='0'])>.avatar, #arena:not(.fewplayer)>.player.fullskin2:not(.minskin):not(*[data-position='0'])>.avatar,
#arena:not(.fewplayer)>.player.fullskin2:not(.minskin):not(*[data-position='0'])>.avatar2{ #arena:not(.fewplayer)>.player.fullskin2:not(.minskin):not(*[data-position='0'])>.avatar2{
height: 50% !important; height: 50% !important;
@ -71,6 +77,10 @@
#arena.uslim_player:not(.fewplayer)>.player.fullskin2:not(.minskin):not(*[data-position='0'])>.avatar2{ #arena.uslim_player:not(.fewplayer)>.player.fullskin2:not(.minskin):not(*[data-position='0'])>.avatar2{
height: calc(50% + 4px) !important; height: calc(50% + 4px) !important;
} }
#arena.lslim_player:not(.fewplayer)>.player.fullskin2:not(.minskin):not(*[data-position='0'])>.avatar,
#arena.lslim_player:not(.fewplayer)>.player.fullskin2:not(.minskin):not(*[data-position='0'])>.avatar2{
height: calc(50% + 2px) !important;
}
#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'])>.avatar,
#window[data-radius_size='reduce'] #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'])>.avatar2{
border-radius: 4px !important; border-radius: 4px !important;
@ -104,6 +114,16 @@
#arena.uslim_player:not(.fewplayer)[data-player_height='short']>.player.fullskin2:not(.minskin):not(.unseen2):not(*[data-position='0'])>.avatar{ #arena.uslim_player:not(.fewplayer)[data-player_height='short']>.player.fullskin2:not(.minskin):not(.unseen2):not(*[data-position='0'])>.avatar{
-webkit-clip-path: polygon(-10px -10px, 124px -10px, 124px 76px, 114px 76px, 0px 98px, -10px 98px); -webkit-clip-path: polygon(-10px -10px, 124px -10px, 124px 76px, 114px 76px, 0px 98px, -10px 98px);
} }
#arena.lslim_player:not(.fewplayer)>.player.fullskin2:not(.minskin):not(.unseen2):not(*[data-position='0'])>.avatar{
height: calc(50% + 18px) !important;
-webkit-clip-path: polygon(-10px -10px, 120px -10px, 120px 94px, 110px 94px, 0px 116px, -10px 116px);
}
#arena.lslim_player:not(.fewplayer)[data-player_height='default']>.player.fullskin2:not(.minskin):not(.unseen2):not(*[data-position='0'])>.avatar{
-webkit-clip-path: polygon(-10px -10px, 120px -10px, 120px 84px, 110px 84px, 0px 106px, -10px 106px);
}
#arena.lslim_player:not(.fewplayer)[data-player_height='short']>.player.fullskin2:not(.minskin):not(.unseen2):not(*[data-position='0'])>.avatar{
-webkit-clip-path: polygon(-10px -10px, 120px -10px, 120px 74px, 110px 74px, 0px 96px, -10px 96px);
}
#window[data-radius_size='reduce'] #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; border-radius: 4px 4px 0 0 !important;
} }
@ -125,6 +145,11 @@
height: calc(50% + 18px) !important; height: calc(50% + 18px) !important;
-webkit-clip-path: polygon(-10px 32px, 0 32px, 114px 10px, 124px 10px, 124px 138px, -10px 138px); -webkit-clip-path: polygon(-10px 32px, 0 32px, 114px 10px, 124px 10px, 124px 138px, -10px 138px);
} }
#arena.lslim_player:not(.fewplayer)>.player.fullskin2:not(.minskin):not(.unseen):not(*[data-position='0'])>.avatar2{
top: calc(50% - 21px) !important;
height: calc(50% + 16px) !important;
-webkit-clip-path: polygon(-10px 32px, 0 32px, 110px 10px, 120px 10px, 120px 136px, -10px 136px);
}
#window[data-radius_size='reduce'] #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; border-radius: 0 0 4px 4px !important;
} }

29
layout/long2/layout.css
View File

@ -242,6 +242,12 @@
height: calc(100% - 6px) !important; height: calc(100% - 6px) !important;
background-position: 50% !important; background-position: 50% !important;
} }
#arena.lslim_player>.player:not(.minskin)>.avatar,
#arena.lslim_player>.player:not(.minskin)>.avatar2{
width: calc(100% - 10px) !important;
height: calc(100% - 10px) !important;
background-position: 50% !important;
}
#arena>.player.fullskin2:not(.minskin)>.avatar, #arena>.player.fullskin2:not(.minskin)>.avatar,
#arena>.player.fullskin2:not(.minskin)>.avatar2{ #arena>.player.fullskin2:not(.minskin)>.avatar2{
height: 50% !important; height: 50% !important;
@ -252,6 +258,10 @@
#arena.uslim_player>.player.fullskin2:not(.minskin)>.avatar2{ #arena.uslim_player>.player.fullskin2:not(.minskin)>.avatar2{
height: calc(50% + 4px) !important; height: calc(50% + 4px) !important;
} }
#arena.lslim_player>.player.fullskin2:not(.minskin)>.avatar,
#arena.lslim_player>.player.fullskin2:not(.minskin)>.avatar2{
height: calc(50% + 2px) !important;
}
#window[data-radius_size='reduce'] #arena>.player.fullskin2:not(.minskin)>.avatar, #window[data-radius_size='reduce'] #arena>.player.fullskin2:not(.minskin)>.avatar,
#window[data-radius_size='reduce'] #arena>.player.fullskin2:not(.minskin)>.avatar2{ #window[data-radius_size='reduce'] #arena>.player.fullskin2:not(.minskin)>.avatar2{
border-radius: 4px !important; border-radius: 4px !important;
@ -291,6 +301,19 @@
#arena.uslim_player[data-player_height='short']>.player.fullskin2:not(.minskin).unseen2[data-position='0']>.avatar{ #arena.uslim_player[data-player_height='short']>.player.fullskin2:not(.minskin).unseen2[data-position='0']>.avatar{
-webkit-clip-path: polygon(-10px -10px, 124px -10px, 124px 76px, 114px 76px, 0px 98px, -10px 98px); -webkit-clip-path: polygon(-10px -10px, 124px -10px, 124px 76px, 114px 76px, 0px 98px, -10px 98px);
} }
#arena.lslim_player>.player.fullskin2:not(.minskin):not(.unseen2)>.avatar,
#arena.lslim_player>.player.fullskin2:not(.minskin).unseen2[data-position='0']>.avatar{
height: calc(50% + 16px) !important;
-webkit-clip-path: polygon(-10px -10px, 120px -10px, 120px 94px, 110px 94px, 0px 116px, -10px 116px);
}
#arena.lslim_player[data-player_height='default']>.player.fullskin2:not(.minskin):not(.unseen2)>.avatar,
#arena.lslim_player[data-player_height='default']>.player.fullskin2:not(.minskin).unseen2[data-position='0']>.avatar{
-webkit-clip-path: polygon(-10px -10px, 120px -10px, 120px 84px, 110px 84px, 0px 106px, -10px 106px);
}
#arena.lslim_player[data-player_height='short']>.player.fullskin2:not(.minskin):not(.unseen2)>.avatar,
#arena.lslim_player[data-player_height='short']>.player.fullskin2:not(.minskin).unseen2[data-position='0']>.avatar{
-webkit-clip-path: polygon(-10px -10px, 120px -10px, 120px 74px, 110px 74px, 0px 96px, -10px 96px);
}
#window[data-radius_size='reduce'] #arena>.player.fullskin2:not(.minskin):not(.unseen2)>.avatar, #window[data-radius_size='reduce'] #arena>.player.fullskin2:not(.minskin):not(.unseen2)>.avatar,
#window[data-radius_size='reduce'] #arena>.player.fullskin2:not(.minskin).unseen2[data-position='0']>.avatar{ #window[data-radius_size='reduce'] #arena>.player.fullskin2:not(.minskin).unseen2[data-position='0']>.avatar{
border-radius: 4px 4px 0 0 !important; border-radius: 4px 4px 0 0 !important;
@ -317,6 +340,12 @@
height: calc(50% + 18px) !important; height: calc(50% + 18px) !important;
-webkit-clip-path: polygon(-10px 32px, 0 32px, 114px 10px, 124px 10px, 124px 138px, -10px 138px); -webkit-clip-path: polygon(-10px 32px, 0 32px, 114px 10px, 124px 10px, 124px 138px, -10px 138px);
} }
#arena.lslim_player>.player.fullskin2:not(.minskin):not(.unseen)>.avatar2,
#arena.lslim_player>.player.fullskin2:not(.minskin).unseen[data-position='0']>.avatar2{
top: calc(50% - 21px) !important;
height: calc(50% + 16px) !important;
-webkit-clip-path: polygon(-10px 32px, 0 32px, 110px 10px, 120px 10px, 120px 136px, -10px 136px);
}
#window[data-radius_size='reduce'] #arena>.player.fullskin2:not(.minskin):not(.unseen)>.avatar2, #window[data-radius_size='reduce'] #arena>.player.fullskin2:not(.minskin):not(.unseen)>.avatar2,
#window[data-radius_size='reduce'] #arena>.player.fullskin2:not(.minskin).unseen[data-position='0']>.avatar2{ #window[data-radius_size='reduce'] #arena>.player.fullskin2:not(.minskin).unseen[data-position='0']>.avatar2{
border-radius: 0 0 4px 4px !important; border-radius: 0 0 4px 4px !important;

16
layout/newlayout/global.css
View File

@ -22,6 +22,10 @@
left:3px; left:3px;
top:3px; top:3px;
} }
#arena.lslim_player .player:not(.minskin):not(.fakeme) .avatar{
left:5px;
top:5px;
}
#arena:not(.mobile).uslim_player .player:not(.minskin):not(.fakeme) .avatar, #arena:not(.mobile).uslim_player .player:not(.minskin):not(.fakeme) .avatar,
#arena.mobile.uslim_player .player:not(.minskin):not(.fakeme):not(*[data-position='0']) .avatar{ #arena.mobile.uslim_player .player:not(.minskin):not(.fakeme):not(*[data-position='0']) .avatar{
box-shadow: rgba(0, 0, 0, 0.2) 0 0 0 1px; box-shadow: rgba(0, 0, 0, 0.2) 0 0 0 1px;
@ -54,6 +58,10 @@
top:3px; top:3px;
box-shadow: rgba(0, 0, 0, 0.2) 0 0 0 1px; box-shadow: rgba(0, 0, 0, 0.2) 0 0 0 1px;
} }
#arena.uslim_player .player.minskin:not(.fakeme) .avatar:not(.fakeme){
left:5px;
top:5px;
}
.player.minskin .hp, .player.minskin .hp,
.player.minskin .hp.text{ .player.minskin .hp.text{
left:88px; left:88px;
@ -144,6 +152,10 @@
height: 174px; height: 174px;
box-shadow: rgba(0, 0, 0, 0.2) 0 0 0 1px; box-shadow: rgba(0, 0, 0, 0.2) 0 0 0 1px;
} }
#arena.lslim_player .player.fullskin2:not(.minskin) .avatar2{
top:5px;
right:5px;
}
.player .marks, .player .marks,
.player .judges{ .player .judges{
width:36px; width:36px;
@ -230,7 +242,9 @@
} }
#arena.mobile.uslim_player .player:not([data-position='0'])>.count, #arena.mobile.uslim_player .player:not([data-position='0'])>.count,
#arena:not(.mobile).uslim_player .player>.count{ #arena.mobile.lslim_player .player:not([data-position='0'])>.count,
#arena:not(.mobile).uslim_player .player>.count,
#arena:not(.mobile).lslim_player .player>.count{
z-index: 3 !important; z-index: 3 !important;
border-radius: 2px !important; border-radius: 2px !important;
text-align: center !important; text-align: center !important;