From 0ba50a066983a3ed4f2d9cbf44686a6b1b27d6a4 Mon Sep 17 00:00:00 2001 From: libccy Date: Wed, 29 Apr 2015 15:54:01 +0800 Subject: [PATCH] config --- character/test.md | 25 +----------------------- game/background.js | 36 +++++++++++++++++++--------------- game/config.js | 43 ++++++++++++++--------------------------- theme/music/style.css | 3 --- theme/woodden/style.css | 3 --- 5 files changed, 36 insertions(+), 74 deletions(-) diff --git a/character/test.md b/character/test.md index 6c2349aa4..cb56c43b8 100644 --- a/character/test.md +++ b/character/test.md @@ -1,24 +1 @@ -御剑＋诸方神石 -诸葛诞 观星 安恤 利奴 - -赛特 -徐暮云 -皇甫朝云 -云天河 -拓跋玉儿 -慕容诗 -慕容紫英 -水镜 - -柳梦璃 -壶中仙 -古月圣 -轩辕剑仙 -于小雪 -方兰生 - -独孤宁珂 -王思月 -陈靖仇 -车芸 -阿阮 +利奴 diff --git a/game/background.js b/game/background.js index e8fb27935..8599f2164 100644 --- a/game/background.js +++ b/game/background.js @@ -2,24 +2,28 @@ var temp; try{ temp=JSON.parse(localStorage.getItem('noname_0.9_config')); + if(!temp){ + throw('err'); + } } - catch(err){} - if(temp&&temp.background&&temp.background!='default'){ - document.querySelector('.background').style.backgroundImage="url('image/background/"+temp.background+".jpg')"; - if(temp.background_stretch!=false) document.querySelector('.background').style.backgroundSize="cover"; + catch(err){ + return; } - if(temp&&temp.background_filter){ - switch (temp.background_filter){ - case 'blur':document.querySelector('.background').style.webkitFilter='blur(8px)'; - document.querySelector('.background').style.webkitTransform='scale(1.05)';break; - case 'gray':document.querySelector('.background').style.webkitFilter='grayscale(1)';break; - case 'sepia':document.querySelector('.background').style.webkitFilter='sepia(0.5)';break; - case 'invert':document.querySelector('.background').style.webkitFilter='invert(1)';break; - case 'saturate':document.querySelector('.background').style.webkitFilter='saturate(5)';break; - case 'contrast':document.querySelector('.background').style.webkitFilter='contrast(1.4)';break; - case 'hue':document.querySelector('.background').style.webkitFilter='hue-rotate(180deg)';break; - case 'brightness':document.querySelector('.background').style.webkitFilter='brightness(5)';break; - default:document.querySelector('.background').style.webkitFilter=''; + var bg=document.querySelector('.background'); + if(temp.image_background&&temp.image_background!='default'){ + bg.style.backgroundImage="url('image/background/"+temp.image_background+".jpg')"; + bg.style.backgroundSize="cover"; + + switch (temp.image_background_filter){ + case 'blur':bg.style.webkitFilter='blur(8px)';bg.style.webkitTransform='scale(1.05)';break; + case 'gray':bg.style.webkitFilter='grayscale(1)';break; + case 'sepia':bg.style.webkitFilter='sepia(0.5)';break; + case 'invert':bg.style.webkitFilter='invert(1)';break; + case 'saturate':bg.style.webkitFilter='saturate(5)';break; + case 'contrast':bg.style.webkitFilter='contrast(1.4)';break; + case 'hue':bg.style.webkitFilter='hue-rotate(180deg)';break; + case 'brightness':bg.style.webkitFilter='brightness(5)';break; + default:bg.style.webkitFilter=''; } } }()) diff --git a/game/config.js b/game/config.js index 914394d47..da570ae03 100644 --- a/game/config.js +++ b/game/config.js @@ -15,15 +15,12 @@ window.config={ theme:['woodden','music'], card_font:['xiaozhuan','huangcao','caoshu','xingshu'], double_hp:['hejiansan','pingjun','zuidazhi','zuixiaozhi','zonghe'], - image:{ - // card:['default','white'], - character:['default'], - background:['default','huangyueying_bg','zhulian_bg', - 'september_bg','xueji_bg','yinxiang_bg','chunhui_bg', - 'grass_bg','huangtian_bg'], - background_filter:['default','blur','gray','sepia','invert','saturate','contrast','hue','brightness'], - dynamic_background:['none','round_dybg'] - } + + image_character:['default'], + image_background:['default','huangyueying_bg','zhulian_bg', + 'september_bg','xueji_bg','yinxiang_bg','chunhui_bg', + 'grass_bg','huangtian_bg'], + image_background_filter:['default','blur','gray','sepia','invert','saturate','contrast','hue','brightness'], }, translate:{ identity:'身份', @@ -148,13 +145,11 @@ window.config={ hejiansan:'相加', zonghe:'总和', xiangcheng:'相乘', - card_config:'卡牌图片包', - character_config:'角色头像', - card_font_config:'卡牌字体', - background_config:'游戏背景', - background_filter_config:'背景效果', - background_stretch_config:'背景拉伸', - dynamic_background_config:'动态背景', + + image_character_config:'角色头像', + image_background_config:'游戏背景', + image_background_filter_config:'背景效果', + show_playerids_config:'显示身份按钮', show_replay_config:'显示重来按钮', show_pause_config:'显示暂停按钮', @@ -197,11 +192,6 @@ window.config={ duration:500, hoveration:1000, cheat:false, - // change_choice:false, - // free_choose:true, - // change_card:false, - // change_identity:true, - // swap:true, auto_skill:true, auto_confirm:true, @@ -214,13 +204,10 @@ window.config={ theme:'woodden', layout:'newlayout', - image:{ - // card:'default', - character:'default', - background:'default', - background_stretch:true, - dynamic_background:'none' - }, + + image_character:'default', + image_background:'default', + card_font:'xiaozhuan', show_name:false, show_replay:false, diff --git a/theme/music/style.css b/theme/music/style.css index 905c44038..9711f9972 100644 --- a/theme/music/style.css +++ b/theme/music/style.css @@ -19,9 +19,6 @@ html{ .player,#mebg{ /*background:url('wood.png') left repeat-y,url('wood.png') right repeat-y,linear-gradient(#4b4b4b, #464646);*/ } -#paused{ - background-color: rgba(0,0,0,0.5); -} .player.selectable{ box-shadow: rgba(0, 0, 0, 0.2) 0 0 0 1px, rgba(0, 133, 255, 0.8) 0 0 15px; } diff --git a/theme/woodden/style.css b/theme/woodden/style.css index 5cb05b83a..166a8ca9f 100644 --- a/theme/woodden/style.css +++ b/theme/woodden/style.css @@ -43,9 +43,6 @@ html{ .control,#system>div>div,.popup,.dialog>.bar{ box-shadow: rgba(0, 0, 0, 0.2) 0 0 0 1px, rgba(0, 0, 0, 0.2) 0 2px 10px; } -#paused{ - background-color: rgba(0,0,0,0.5); -} .player.selectable{ box-shadow: rgba(0, 0, 0, 0.2) 0 0 0 1px, rgba(0, 133, 255, 0.8) 0 0 15px; }