This commit is contained in:
libccy 2017-04-05 10:31:25 +08:00
parent abd2a5237c
commit 18140b468f
5 changed files with 56 additions and 5 deletions

View File

@ -2766,6 +2766,7 @@ character.hearth={
target.$draw(); target.$draw();
target.addExpose(0.2); target.addExpose(0.2);
player.line(target,'green'); player.line(target,'green');
game.log(player,'和',target,'获得了一张锦囊牌');
} }
'step 1' 'step 1'
game.delay(); game.delay();

View File

@ -236,7 +236,12 @@
show_splash:{ show_splash:{
name:'显示开始界面', name:'显示开始界面',
intro:'游戏开始前进入模式选择画面', intro:'游戏开始前进入模式选择画面',
init:false, init:'init',
item:{
off:'关闭',
init:'首次启动',
always:'保持开启',
}
}, },
game_speed:{ game_speed:{
name:'游戏速度', name:'游戏速度',
@ -5919,11 +5924,21 @@
} }
} }
}; };
var show_splash=lib.config.show_splash;
if(show_splash=='off'){
show_splash=false;
}
else if(show_splash=='init'){
if(localStorage.getItem('show_splash_off')){
show_splash=false;
}
}
localStorage.removeItem('show_splash_off');
if(localStorage.getItem(lib.configprefix+'playback')){ if(localStorage.getItem(lib.configprefix+'playback')){
toLoad++; toLoad++;
lib.init.js(lib.assetURL+'mode',lib.config.mode,packLoaded,packLoaded); lib.init.js(lib.assetURL+'mode',lib.config.mode,packLoaded,packLoaded);
} }
else if((localStorage.getItem(lib.configprefix+'directstart')||!lib.config.show_splash)&& else if((localStorage.getItem(lib.configprefix+'directstart')||!show_splash)&&
lib.config.all.mode.indexOf(lib.config.mode)!=-1){ lib.config.all.mode.indexOf(lib.config.mode)!=-1){
toLoad++; toLoad++;
lib.init.js(lib.assetURL+'mode',lib.config.mode,packLoaded,packLoaded); lib.init.js(lib.assetURL+'mode',lib.config.mode,packLoaded,packLoaded);
@ -7150,6 +7165,10 @@
splash.classList.add('touch'); splash.classList.add('touch');
lib.setScroll(splash); lib.setScroll(splash);
} }
if(lib.config.player_border!='wide'){
splash.classList.add('slim');
}
splash.dataset.radius_size=lib.config.radius_size;
for(var i=0;i<lib.config.all.mode.length;i++){ for(var i=0;i<lib.config.all.mode.length;i++){
var node=ui.create.div('.hidden',splash,clickNode); var node=ui.create.div('.hidden',splash,clickNode);
node.link=lib.config.all.mode[i]; node.link=lib.config.all.mode[i];
@ -21973,6 +21992,7 @@
if(_status.video&&!_status.replayvideo){ if(_status.video&&!_status.replayvideo){
localStorage.removeItem(lib.configprefix+'playbackmode'); localStorage.removeItem(lib.configprefix+'playbackmode');
} }
localStorage.setItem('show_splash_off',true);
window.location.reload(); window.location.reload();
}, },
exit:function(){ exit:function(){

View File

@ -26,7 +26,8 @@ window.noname_update={
// 'mode/stone.js', // 'mode/stone.js',
// 'theme/music/style.css', // 'theme/music/style.css',
// 'theme/woodden/style.css', // 'theme/woodden/style.css',
// 'layout/default/layout.css', 'theme/simple/style.css',
'layout/default/layout.css',
// 'layout/default/phone.css', // 'layout/default/phone.css',
'layout/default/menu.css', 'layout/default/menu.css',
// 'theme/style/cardback/*', // 'theme/style/cardback/*',

View File

@ -266,6 +266,30 @@ not(.removing):not(.dialog):not(.centermenu):not(.popup-container):not(.forceopa
background-size: cover; background-size: cover;
} }
#splash.slim>div>.splashtext{
right: 5px;
bottom: 5px;
}
#splash.slim>div>.avatar{
width: 90px;
height: calc(100% - 10px);
left: 5px;
top: 5px;
}
#splash[data-radius_size='reduce']>div>div,
#splash[data-radius_size='reduce']>div {
border-radius: 4px;
}
#splash[data-radius_size='off']>div>div,
#splash[data-radius_size='off']>div {
border-radius: 0px;
}
#splash[data-radius_size='increase']>div>div,
#splash[data-radius_size='increase']>div {
border-radius: 12px;
}
#arena[data-global_font='xiaozhuan'] { #arena[data-global_font='xiaozhuan'] {
font-family: 'xiaozhuan'; font-family: 'xiaozhuan';
} }
@ -3864,6 +3888,7 @@ div:hover>.wunature {
#window[data-radius_size='reduce'] #window>.dialog.popped, #window[data-radius_size='reduce'] #window>.dialog.popped,
#window[data-radius_size='reduce'] .player.unseen .equips:not(*:empty), #window[data-radius_size='reduce'] .player.unseen .equips:not(*:empty),
#window[data-radius_size='reduce'] .menu, #window[data-radius_size='reduce'] .menu,
#window[data-radius_size='reduce'] .left.pane>.menubutton,
#window[data-radius_size='reduce'] #splash>div, #window[data-radius_size='reduce'] #splash>div,
#window[data-radius_size='reduce'].mobile:not(.chess) .player[data-position='0'] .equips { #window[data-radius_size='reduce'].mobile:not(.chess) .player[data-position='0'] .equips {
border-radius: 4px; border-radius: 4px;
@ -3884,6 +3909,7 @@ div:hover>.wunature {
#window[data-radius_size='off'] #window>.dialog.popped, #window[data-radius_size='off'] #window>.dialog.popped,
#window[data-radius_size='off'] .player.unseen .equips:not(*:empty), #window[data-radius_size='off'] .player.unseen .equips:not(*:empty),
#window[data-radius_size='off'] .menu, #window[data-radius_size='off'] .menu,
#window[data-radius_size='off'] .left.pane>.menubutton,
#window[data-radius_size='off'] #splash>div, #window[data-radius_size='off'] #splash>div,
#window[data-radius_size='off'].mobile:not(.chess) .player[data-position='0'] .equips { #window[data-radius_size='off'].mobile:not(.chess) .player[data-position='0'] .equips {
border-radius: 0px; border-radius: 0px;
@ -3904,6 +3930,7 @@ div:hover>.wunature {
#window[data-radius_size='increase'] #window>.dialog.popped, #window[data-radius_size='increase'] #window>.dialog.popped,
#window[data-radius_size='increase'] .player.unseen .equips:not(*:empty), #window[data-radius_size='increase'] .player.unseen .equips:not(*:empty),
#window[data-radius_size='increase'] .menu, #window[data-radius_size='increase'] .menu,
#window[data-radius_size='increase'] .left.pane>.menubutton,
#window[data-radius_size='increase'] #splash>div, #window[data-radius_size='increase'] #splash>div,
#window[data-radius_size='increase'].mobile:not(.chess) .player[data-position='0'] .equips { #window[data-radius_size='increase'].mobile:not(.chess) .player[data-position='0'] .equips {
border-radius: 16px; border-radius: 16px;

View File

@ -189,11 +189,13 @@ body{
.popup-container>.menu.visual>.button.dashedmenubutton{ .popup-container>.menu.visual>.button.dashedmenubutton{
box-shadow: rgba(0, 0, 0, 0.4) 0 0 0 1px, rgba(0, 0, 0, 0.2) 0 3px 10px !important; box-shadow: rgba(0, 0, 0, 0.4) 0 0 0 1px, rgba(0, 0, 0, 0.2) 0 3px 10px !important;
width: 90px;
height: 90px;
border: none; border: none;
background-image: linear-gradient(rgba(0,0,0,0.4), rgba(0,0,0,0.4)) !important; background-image: linear-gradient(rgba(0,0,0,0.4), rgba(0,0,0,0.4)) !important;
} }
.popup-container>.menu.visual>.button.dashedmenubutton:not(.hpbutton){
width: 90px;
height: 90px;
}
.popup-container>.menu.visual>.button.dashedmenubutton.controlbutton{ .popup-container>.menu.visual>.button.dashedmenubutton.controlbutton{
height: 26px; height: 26px;
} }