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

fix

This commit is contained in:
libccy 2016-05-15 10:32:58 +08:00
parent 024dbd38c6
commit 408ca9dc46
5 changed files with 63 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
game/game.js
View File

@ -479,8 +479,31 @@
else{ else{
lib.init.layout(layout); lib.init.layout(layout);
} }
if((lib.config.layout=='phone'||lib.config.layout=='mobile')&&lib.config.textequip=='text'){
ui.arena.classList.add('textequip');
}
else{
ui.arena.classList.remove('textequip');
}
} }
}, },
textequip:{
name:'装备显示',
init:'image',
item:{
image:'图片',
text:'文字',
},
onclick:function(item){
game.saveConfig('textequip',item);
if((lib.config.layout=='phone'||lib.config.layout=='mobile')&&item=='text'){
ui.arena.classList.add('textequip');
}
else{
ui.arena.classList.remove('textequip');
}
}
},
// background_color_music:{ // background_color_music:{
// name:'背景色', // name:'背景色',
// init:'black', // init:'black',
@ -1138,6 +1161,12 @@
else{ else{
map.remember_round_button.hide(); map.remember_round_button.hide();
map.reset_round_button.hide(); map.reset_round_button.hide();
}
if(lib.config.layout=='phone'||lib.config.layout=='mobile'){
map.textequip.show();
}
else{
map.textequip.hide();
} }
// if(config.theme=='woodden'&&config.image_background=='default'){ // if(config.theme=='woodden'&&config.image_background=='default'){
// map.background_color_wood.show(); // map.background_color_wood.show();
@ -20831,7 +20860,7 @@
} }
download.link=i; download.link=i;
download.name=list[i].name; download.name=list[i].name;
download.files=list[i].files; download.files=list[i].files||[];
} }
},function(){ },function(){
loading.innerHTML='连接失败'; loading.innerHTML='连接失败';
@ -22448,6 +22477,9 @@
if(lib.config.layout=='default'&&lib.config.hp_style=='official'){ if(lib.config.layout=='default'&&lib.config.hp_style=='official'){
ui.arena.classList.add('hpimage'); ui.arena.classList.add('hpimage');
} }
if((lib.config.layout=='phone'||lib.config.layout=='mobile')&&lib.config.textequip=='text'){
ui.arena.classList.add('textequip');
}
// var themeentry='background_color_'+lib.config.theme; // var themeentry='background_color_'+lib.config.theme;
// if(lib.config[themeentry]){ // if(lib.config[themeentry]){
// document.body.dataset[themeentry]=lib.config[themeentry]; // document.body.dataset[themeentry]=lib.config[themeentry];

5
game/update.js
View File

@ -1,6 +1,7 @@
window.noname_update={ window.noname_update={
version:'1.8.10.1', version:'1.8.10.2',
changeLog:[ changeLog:[
'扩展改进' '扩展改进',
'装备显示选项'
] ]
} }

42
layout/mobile/equip.css
View File

@ -1,4 +1,4 @@
#arena.textequip .player[data-position='0'] .equips, #arena:not(.chess).textequip .player[data-position='0'] .equips,
.player:not([data-position='0']) .equips, .player:not([data-position='0']) .equips,
#arena.chess .player .equips{ #arena.chess .player .equips{
width:120px; width:120px;
@ -18,7 +18,7 @@
transform:scale(0.73); transform:scale(0.73);
transform-origin:bottom left; transform-origin:bottom left;
} }
#arena.textequip .player[data-position='0'] .equips>.card, #arena:not(.chess).textequip .player[data-position='0'] .equips>.card,
.player:not([data-position='0']) .equips>.card, .player:not([data-position='0']) .equips>.card,
#arena.chess .player .equips>.card{ #arena.chess .player .equips>.card{
position:relative; position:relative;
@ -47,24 +47,24 @@
linear-gradient(135deg,rgba(0,0,0,0.5) ,transparent 80%,transparent) !important; linear-gradient(135deg,rgba(0,0,0,0.5) ,transparent 80%,transparent) !important;
box-shadow:none; box-shadow:none;
} }
#arena.textequip .player[data-position='0'] .equips>.card>.image, #arena:not(.chess).textequip .player[data-position='0'] .equips>.card>.image,
.player:not([data-position='0']) .equips>.card>.image, .player:not([data-position='0']) .equips>.card>.image,
#arena.chess .player .equips>.card>.image{ #arena.chess .player .equips>.card>.image{
display:none; display:none;
} }
#arena.textequip .player[data-position='0'].unseen .equips>.card, #arena:not(.chess).textequip .player[data-position='0'].unseen .equips>.card,
.player:not([data-position='0']).unseen .equips>.card, .player:not([data-position='0']).unseen .equips>.card,
#arena.chess .player.unseen .equips>.card{ #arena.chess .player.unseen .equips>.card{
background:none; background:none;
/*border-image:linear-gradient(to right, transparent,rgba(0,0,0,0.4) 10%,rgba(0, 0, 0,0.4) 70%,transparent) 100% 0 0;*/ /*border-image:linear-gradient(to right, transparent,rgba(0,0,0,0.4) 10%,rgba(0, 0, 0,0.4) 70%,transparent) 100% 0 0;*/
} }
#arena.textequip .player[data-position='0'].unseen .equips>.card, #arena:not(.chess).textequip .player[data-position='0'].unseen .equips>.card,
.player:not([data-position='0']).unseen .equips>.card, .player:not([data-position='0']).unseen .equips>.card,
#arena.chess .player.unseen .equips>.card{ #arena.chess .player.unseen .equips>.card{
border-image:linear-gradient(to right, transparent,rgba(0,0,0,0.4) 10%,rgba(0, 0, 0,0.4) 70%,transparent) 100% 0 0; border-image:linear-gradient(to right, transparent,rgba(0,0,0,0.4) 10%,rgba(0, 0, 0,0.4) 70%,transparent) 100% 0 0;
} }
#arena.textequip .player[data-position='0'].unseen .equips>.card:first-child, #arena:not(.chess).textequip .player[data-position='0'].unseen .equips>.card:first-child,
.player:not([data-position='0']).unseen .equips>.card:first-child, .player:not([data-position='0']).unseen .equips>.card:first-child,
#arena.chess .player.unseen .equips>.card:first-child{ #arena.chess .player.unseen .equips>.card:first-child{
border-image:linear-gradient(transparent,transparent); border-image:linear-gradient(transparent,transparent);
@ -72,56 +72,56 @@
.player:not([data-position='0']) .equips>.card.selected, .player:not([data-position='0']) .equips>.card.selected,
#arena.chess .player .equips>.card.selected{ #arena.chess .player .equips>.card.selected{
background:linear-gradient(to right,rgba(0, 133, 255,0.3),transparent), background:linear-gradient(to right,rgba(0, 133, 255,0.3),transparent),
linear-gradient(135deg,rgba(0, 133, 255,0.5) ,transparent 80%,transparent); linear-gradient(135deg,rgba(0, 133, 255,0.5) ,transparent 80%,transparent) !important;
box-shadow:none !important; box-shadow:none !important;
border-width: 1px 0 0; border-width: 1px 0 0;
border-style:solid; border-style:solid;
border-image:linear-gradient(to right, rgba(0, 103, 205,0.4) 70%,transparent) 100% 0 0; border-image:linear-gradient(to right, rgba(0, 103, 205,0.4) 70%,transparent) 100% 0 0;
} }
#arena.textequip .player[data-position='0'] .equips>.card.selected{ #arena:not(.chess).textequip .player[data-position='0'] .equips>.card.selected{
background:linear-gradient(rgba(0, 133, 255,0.6),rgba(0, 133, 255,0.5)) !important; background:linear-gradient(rgba(0, 133, 255,0.6),rgba(0, 133, 255,0.5)) !important;
box-shadow: rgba(0,0,0,0.4) 0 1px 0 0 !important; box-shadow: rgba(0,0,0,0.4) 0 1px 0 0 !important;
} }
#arena.textequip .player[data-position='0'] .equips>.card.fire, #arena:not(.chess).textequip .player[data-position='0'] .equips>.card.fire,
.player:not([data-position='0']) .equips>.card.fire, .player:not([data-position='0']) .equips>.card.fire,
#arena.chess .player .equips>.card.fire{ #arena.chess .player .equips>.card.fire{
color: rgb(255,119,63); color: rgb(255,119,63);
} }
#arena.textequip .player[data-position='0'] .equips>.card.thunder, #arena:not(.chess).textequip .player[data-position='0'] .equips>.card.thunder,
.player:not([data-position='0']) .equips>.card.thunder, .player:not([data-position='0']) .equips>.card.thunder,
#arena.chess .player .equips>.card.thunder{ #arena.chess .player .equips>.card.thunder{
color: rgb(117,186,255); color: rgb(117,186,255);
} }
#arena.textequip .player[data-position='0'] .equips>.card.poison, #arena:not(.chess).textequip .player[data-position='0'] .equips>.card.poison,
.player:not([data-position='0']) .equips>.card.poison, .player:not([data-position='0']) .equips>.card.poison,
#arena.chess .player .equips>.card.poison{ #arena.chess .player .equips>.card.poison{
color: rgb(104,221,127); color: rgb(104,221,127);
} }
#arena.textequip .player[data-position='0'] .equips>.card.brown, #arena:not(.chess).textequip .player[data-position='0'] .equips>.card.brown,
.player:not([data-position='0']) .equips>.card.brown, .player:not([data-position='0']) .equips>.card.brown,
#arena.chess .player .equips>.card.brown{ #arena.chess .player .equips>.card.brown{
color: rgb(195,161,223); color: rgb(195,161,223);
} }
#arena.textequip .player[data-position='0'] .equips>.card>.background, #arena:not(.chess).textequip .player[data-position='0'] .equips>.card>.background,
.player:not([data-position='0']) .equips>.card>.background, .player:not([data-position='0']) .equips>.card>.background,
#arena.chess .player .equips>.card>.background{ #arena.chess .player .equips>.card>.background{
display:none !important; display:none !important;
} }
#arena.textequip .player[data-position='0'] .equips>.card>.name2, #arena:not(.chess).textequip .player[data-position='0'] .equips>.card>.name2,
.player:not([data-position='0']) .equips>.card>.name2, .player:not([data-position='0']) .equips>.card>.name2,
#arena.chess .player .equips>.card>.name2{ #arena.chess .player .equips>.card>.name2{
display:block; display:block;
margin-left:5px; margin-left:5px;
} }
#arena.textequip .player[data-position='0'] .equips>.card>div, #arena:not(.chess).textequip .player[data-position='0'] .equips>.card>div,
.player:not([data-position='0']) .equips>.card>div, .player:not([data-position='0']) .equips>.card>div,
#arena.chess .player .equips>.card>div{ #arena.chess .player .equips>.card>div{
animation:none !important; animation:none !important;
-webkit-animation:none !important; -webkit-animation:none !important;
} }
#arena.textequip .player[data-position='0'] .equips>.card>.name, #arena:not(.chess).textequip .player[data-position='0'] .equips>.card>.name,
#arena.textequip .player[data-position='0'] .equips>.card>.info, #arena:not(.chess).textequip .player[data-position='0'] .equips>.card>.info,
.player:not([data-position='0']) .equips>.card>.name, .player:not([data-position='0']) .equips>.card>.name,
.player:not([data-position='0']) .equips>.card>.info, .player:not([data-position='0']) .equips>.card>.info,
#arena.chess .player .equips>.card>.name, #arena.chess .player .equips>.card>.name,
@ -129,7 +129,7 @@
display:none !important; display:none !important;
} }
#arena.textequip .player[data-position='0'] .equips>.removing, #arena:not(.chess).textequip .player[data-position='0'] .equips>.removing,
.player:not([data-position='0']) .equips>.removing, .player:not([data-position='0']) .equips>.removing,
#arena.chess .player .equips>.removing{ #arena.chess .player .equips>.removing{
margin-top:-12px !important; margin-top:-12px !important;
@ -137,14 +137,14 @@
transform:scale(1); transform:scale(1);
} }
#arena.textequip .player[data-position='0'] .equips>.removing+.removing, #arena:not(.chess).textequip .player[data-position='0'] .equips>.removing+.removing,
.player:not([data-position='0']) .equips>.removing+.removing, .player:not([data-position='0']) .equips>.removing+.removing,
#arena.chess .player .equips>.removing+.removing{ #arena.chess .player .equips>.removing+.removing{
margin-top:-23px !important; margin-top:-23px !important;
} }
#arena.textequip .player[data-position='0'].linked .equips, #arena:not(.chess).textequip .player[data-position='0'].linked .equips,
.player:not([data-position='0']).linked .equips, .player:not([data-position='0']).linked .equips,
#arena.chess .player.linked .equips{ #arena.chess .player.linked .equips{
transform:rotate(90deg) translate(-152px,-6px); transform:rotate(90deg) translate(-152px,-6px);
@ -169,7 +169,7 @@
transform:rotate(90deg); transform:rotate(90deg);
} }
#arena.textequip .player[data-position='0'] .equips>.card{ #arena:not(.chess).textequip .player[data-position='0'] .equips>.card{
border-radius: 0px !important; border-radius: 0px !important;
left:0 !important; left:0 !important;
right: auto !important; right: auto !important;

2
layout/newlayout/equip.css
View File

@ -55,7 +55,7 @@
} }
.player .equips>.card.selected{ .player .equips>.card.selected{
background:linear-gradient(to right,rgba(0, 133, 255,0.3),transparent), background:linear-gradient(to right,rgba(0, 133, 255,0.3),transparent),
linear-gradient(135deg,rgba(0, 133, 255,0.5) ,transparent 80%,transparent); linear-gradient(135deg,rgba(0, 133, 255,0.5) ,transparent 80%,transparent) !important;
box-shadow:none !important; box-shadow:none !important;
border-width: 1px 0 0; border-width: 1px 0 0;
border-style:solid; border-style:solid;

10
theme/woodden/style.css
View File

@ -64,24 +64,24 @@ html{
#arena.mobile:not(.chess) .player[data-position='0'] .equips,.playerbg{ #arena.mobile:not(.chess) .player[data-position='0'] .equips,.playerbg{
background: url('wood.jpg'); background: url('wood.jpg');
} }
#arena.textequip .player[data-position='0'] .equips>.card{ #arena:not(.chess).textequip .player[data-position='0'] .equips>.card{
background: url('wood.jpg') !important; background: url('wood.jpg') !important;
color:rgb(77, 60, 51) !important; color:rgb(77, 60, 51) !important;
text-shadow: none; text-shadow: none;
box-shadow: rgba(0,0,0,0.4) 1px 0 0 1px; box-shadow: rgba(0,0,0,0.4) 1px 0 0 1px;
} }
#arena.textequip .player[data-position='0'] .equips>.card:first-child{ #arena:not(.chess).textequip .player[data-position='0'] .equips>.card:first-child{
box-shadow: rgba(0,0,0,0.4) 0 1px 0 0; box-shadow: rgba(0,0,0,0.4) 0 1px 0 0;
} }
#arena.textequip .player[data-position='0'] .equips>.card.selected{ #arena:not(.chess).textequip .player[data-position='0'] .equips>.card.selected{
background-image: linear-gradient(rgba(47,101,150,1), rgba(43, 90, 132,1)) !important; background-image: linear-gradient(rgba(47,101,150,1), rgba(43, 90, 132,1)) !important;
color: white !important; color: white !important;
box-shadow: rgba(0,0,0,0.4) 1px 0 0 1px !important; box-shadow: rgba(0,0,0,0.4) 1px 0 0 1px !important;
} }
#arena.textequip .player[data-position='0'] .equips>.card.selected:first-child{ #arena:not(.chess).textequip .player[data-position='0'] .equips>.card.selected:first-child{
box-shadow: rgba(0,0,0,0.4) 0 1px 0 0 !important; box-shadow: rgba(0,0,0,0.4) 0 1px 0 0 !important;
} }
#arena.textequip .player[data-position='0'] .equips>.card>.name2{ #arena:not(.chess).textequip .player[data-position='0'] .equips>.card>.name2{
transition: opacity 0.5s, color 0s; transition: opacity 0.5s, color 0s;
} }