This commit is contained in:
libccy 2016-04-07 15:40:32 +08:00
parent 01885ffad1
commit 6a264add30
4 changed files with 25 additions and 13 deletions

View File

@ -24,8 +24,7 @@ window.config={
'september_bg','xueji_bg','yinxiang_bg','chunhui_bg', 'september_bg','xueji_bg','yinxiang_bg','chunhui_bg',
'grass_bg','huangtian_bg'], 'grass_bg','huangtian_bg'],
image_background_filter:['default','blur','gray','sepia','invert','saturate','contrast','hue','brightness'], image_background_filter:['default','blur','gray','sepia','invert','saturate','contrast','hue','brightness'],
background_music:['music_default','music_diaochan','music_shezhan', background_music:['music_default','music_diaochan','music_shezhan','music_danji','music_random','music_off']
'music_danji','music_random','music_off']
}, },
translate:{ translate:{
character_play_config:'技能卡牌', character_play_config:'技能卡牌',
@ -366,3 +365,4 @@ window.play={};
window.background={}; window.background={};
window.music={}; window.music={};
window.font={}; window.font={};
window.theme={};

View File

@ -443,11 +443,7 @@
theme:{ theme:{
name:'主题', name:'主题',
init:'woodden', init:'woodden',
item:{ item:{},
woodden:'木纹',
music:'音乐',
simple:'简约',
},
onclick:function(theme){ onclick:function(theme){
game.saveConfig('theme',theme); game.saveConfig('theme',theme);
ui.arena.hide(); ui.arena.hide();
@ -3067,6 +3063,12 @@
delete lib.configMenu.audio.config.background_music.item.music_custom; delete lib.configMenu.audio.config.background_music.item.music_custom;
} }
} }
if(theme&&theme.pack){
for(i in theme.pack){
lib.configMenu.appearence.config.theme.item[i]=theme.pack[i];
}
}
ui.fontsheet=document.createElement('style'); ui.fontsheet=document.createElement('style');
document.head.appendChild(ui.fontsheet); document.head.appendChild(ui.fontsheet);
if(font&&font.pack){ if(font&&font.pack){
@ -3787,7 +3789,7 @@
clickedNode=true; clickedNode=true;
lib.config.mode=this.link; lib.config.mode=this.link;
game.saveConfig('mode',this.link); game.saveConfig('mode',this.link);
splash.delete(); splash.delete(1000);
delete window.inSplash; delete window.inSplash;
var proceed2=function(){ var proceed2=function(){

View File

@ -62,4 +62,9 @@ font.pack={
xiaozhuan:'小篆', xiaozhuan:'小篆',
xinwei:'新魏', xinwei:'新魏',
huangcao:'黄草', huangcao:'黄草',
};
theme.pack={
woodden:'木纹',
music:'音乐',
simple:'简约',
} }

View File

@ -53,6 +53,9 @@ table{table-layout: fixed;}
overflow-x: scroll; overflow-x: scroll;
white-space: nowrap; white-space: nowrap;
} }
#splash.removing{
pointer-events: none;
}
#splash>div{ #splash>div{
width:100px; width:100px;
height:300px; height:300px;
@ -62,10 +65,6 @@ table{table-layout: fixed;}
position: relative; position: relative;
transition: all 0.8s; transition: all 0.8s;
} }
/*#splash>div:not(.hidden){
animation: splash 0.7s;
-webkit-animation: splash 0.7s;
}*/
#splash>div:hover{ #splash>div:hover{
transform: translateY(-20px); transform: translateY(-20px);
} }
@ -75,7 +74,13 @@ table{table-layout: fixed;}
opacity: 0; opacity: 0;
} }
#splash>div.hidden{ #splash>div.hidden{
transform: translateY(-300px); transform: translateY(-300px) scale(0.5);
}
#splash.low_performance>div.hidden{
transform: scale(0.8);
}
#splash.low_performance>div{
transition: all 0.5s;
} }
#splash>div>.splashtext{ #splash>div>.splashtext{
font-family: 'huangcao','xinwei'; font-family: 'huangcao','xinwei';