v1.9.12.1

This commit is contained in:
libccy 2017-03-19 17:37:24 +08:00
parent b4c4c4d666
commit 956d73d9ed
17 changed files with 52 additions and 21 deletions

View File

@ -2487,8 +2487,14 @@ window.noname_asset_list=[
'theme/style/hp/image/round3.png', 'theme/style/hp/image/round3.png',
'theme/style/hp/image/round4.png', 'theme/style/hp/image/round4.png',
'theme/style/player/bronze.png', 'theme/style/player/bronze.png',
'theme/style/player/bronze2.png',
'theme/style/player/bronze3.png',
'theme/style/player/gold.png', 'theme/style/player/gold.png',
'theme/style/player/gold2.png',
'theme/style/player/gold3.png',
'theme/style/player/silver.png', 'theme/style/player/silver.png',
'theme/style/player/silver2.png',
'theme/style/player/silver3.png',
]; ];
window.noname_skin_list={ window.noname_skin_list={
bulianshi:4, bulianshi:4,

View File

@ -1527,6 +1527,10 @@
default:str='url("'+lib.assetURL+'theme/style/player/'+layout+'.png");background-size:100% 100%';break; default:str='url("'+lib.assetURL+'theme/style/player/'+layout+'.png");background-size:100% 100%';break;
} }
ui.css.player_stylesheet=lib.init.sheet('#window .player{background-image:'+str+'}'); ui.css.player_stylesheet=lib.init.sheet('#window .player{background-image:'+str+'}');
if(['bronze','silver','gold'].contains(layout)){
ui.css.player_stylesheet.sheet.insertRule('#window .player>.framebg{display:block;background-image:url("'+lib.assetURL+'theme/style/player/'+layout+'2.png")}',0);
ui.css.player_stylesheet.sheet.insertRule('#window #arena.long:not(.fewplayer) .player>.framebg{background-image:url("'+lib.assetURL+'theme/style/player/'+lib.config.player_style+'3.png")}',0);
}
} }
}, },
unfrequent:true, unfrequent:true,
@ -5806,6 +5810,10 @@
default:str='url("'+lib.assetURL+'theme/style/player/'+lib.config.player_style+'.png");background-size:100% 100%';break; default:str='url("'+lib.assetURL+'theme/style/player/'+lib.config.player_style+'.png");background-size:100% 100%';break;
} }
ui.css.player_stylesheet=lib.init.sheet('#window .player{background-image:'+str+'}'); ui.css.player_stylesheet=lib.init.sheet('#window .player{background-image:'+str+'}');
if(['bronze','silver','gold'].contains(lib.config.player_style)){
ui.css.player_stylesheet.sheet.insertRule('#window .player>.framebg{display:block;background-image:url("'+lib.assetURL+'theme/style/player/'+lib.config.player_style+'2.png")}',0);
ui.css.player_stylesheet.sheet.insertRule('#window #arena.long:not(.fewplayer) .player>.framebg{background-image:url("'+lib.assetURL+'theme/style/player/'+lib.config.player_style+'3.png")}',0);
}
} }
if(lib.config.control_style&&lib.config.control_style!='default'&&lib.config.control_style!='custom'){ if(lib.config.control_style&&lib.config.control_style!='default'&&lib.config.control_style!='custom'){
var str=''; var str='';
@ -30345,10 +30353,6 @@
script.remove(); script.remove();
var update=window.noname_update; var update=window.noname_update;
delete window.noname_update; delete window.noname_update;
if(update.version=='1.9.12'){
update.version='1.9.12修复';
// modify later
}
if(forcecheck===false){ if(forcecheck===false){
if(update.version==lib.config.check_version){ if(update.version==lib.config.check_version){
return; return;
@ -32603,7 +32607,7 @@
ui.arena=ui.create.div('#arena.nome',ui.window); ui.arena=ui.create.div('#arena.nome',ui.window);
ui.arena.setNumber=function(num){ ui.arena.setNumber=function(num){
this.dataset.number=num; this.dataset.number=num;
if(parseInt(num)<parseInt(lib.config.fewplayer)){ if(game.layout=='long'&&parseInt(num)<parseInt(lib.config.fewplayer)){
this.classList.add('fewplayer'); this.classList.add('fewplayer');
} }
else{ else{
@ -33245,6 +33249,7 @@
node.node={ node.node={
avatar:ui.create.div('.avatar',node,ui.click.avatar).hide(), avatar:ui.create.div('.avatar',node,ui.click.avatar).hide(),
avatar2:ui.create.div('.avatar2',node,ui.click.avatar2).hide(), avatar2:ui.create.div('.avatar2',node,ui.click.avatar2).hide(),
framebg:ui.create.div('.framebg',node),
intro:ui.create.div('.intro',node), intro:ui.create.div('.intro',node),
identity:ui.create.div('.identity',node), identity:ui.create.div('.identity',node),
hp:ui.create.div('.hp',node), hp:ui.create.div('.hp',node),

View File

@ -1,15 +1,22 @@
window.noname_update={ window.noname_update={
version:'1.9.12', version:'1.9.12.1',
// update:'1.9.11', update:'1.9',
changeLog:[ changeLog:[
'新外观选项', '新外观选项',
], ],
files:[ files:[
'game/game.js', 'game/*',
'game/package.js', 'card/*',
'game/config.js', 'character/*',
'mode/*',
'game/../theme/*',
'layout/*',
'extension/*'
// 'game/game.js',
// 'game/package.js',
// 'game/config.js',
// 'game/source.js', // 'game/source.js',
'game/asset.js', // 'game/asset.js',
// 'card/guozhan.js', // 'card/guozhan.js',
// 'character/rank.js', // 'character/rank.js',
// 'character/gwent.js', // 'character/gwent.js',
@ -24,10 +31,10 @@ window.noname_update={
// 'mode/guozhan.js', // 'mode/guozhan.js',
// 'mode/identity.js', // 'mode/identity.js',
// 'mode/stone.js', // 'mode/stone.js',
'theme/woodden/style.css', // 'theme/woodden/style.css',
'layout/default/layout.css', // 'layout/default/layout.css',
'layout/default/phone.css', // 'layout/default/phone.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',

View File

@ -1888,6 +1888,19 @@ div:not(.handcards)>.card>.info>span,
transform: scale(1) rotate(90deg); transform: scale(1) rotate(90deg);
} }
.player>.framebg{
width: 100%;
height: 100%;
left: 0;
top: 0;
background-size: 100% 100%;
display: none;
pointer-events: none;
}
#window #arena.mobile:not(.chess) .player[data-position='0']>.framebg{
display: none;
}
.avatar { .avatar {
width: 100px; width: 100px;
height: 100px; height: 100px;

View File

@ -75,7 +75,7 @@
animation:game_start 0.5s; animation:game_start 0.5s;
-webkit-animation:game_start 0.5s; -webkit-animation:game_start 0.5s;
} }
.player.bossplayer>div:not(.hp):not(.identity):not(.avatar){ .player.bossplayer>div:not(.hp):not(.identity):not(.avatar):not(.framebg){
display:none !important; display:none !important;
} }
.player.bossplayer>.identity{ .player.bossplayer>.identity{

View File

@ -200,7 +200,7 @@
.player.playerblank{ .player.playerblank{
background: none; background: none;
} }
.player.obstacle{ #window .player.obstacle{
background: repeating-linear-gradient( background: repeating-linear-gradient(
135deg, 135deg,
rgba(0,0,0,0.2), rgba(0,0,0,0.2),

View File

@ -449,7 +449,7 @@ mode.chess={
} }
} }
ui.chessinfo=ui.create.div('.fakeme.player',ui.me,function(e){ ui.chessinfo=ui.create.div('.fakeme.player.playerbg',ui.me,function(e){
e.stopPropagation(); e.stopPropagation();
}); });
ui.create.div(ui.chessinfo); ui.create.div(ui.chessinfo);

View File

@ -6,7 +6,7 @@ html{
#system>div>div,#mebg,.control,.player,.card,.avatar,.avatar2,.button,#window>.dialog.popped, #system>div>div,#mebg,.control,.player,.card,.avatar,.avatar2,.button,#window>.dialog.popped,
#arena:not(.long) .player.unseen .equips:not(*:empty), #arena:not(.long) .player.unseen .equips:not(*:empty),
#arena.long .player.unseen2 .equips:not(*:empty),.menu,#splash>div, #arena.long .player.unseen2 .equips:not(*:empty),.menu,#splash>div,
#arena.mobile:not(.chess) .player[data-position='0'] .equips,.playerbg,.menubg,.mebg{ #arena.mobile:not(.chess) .player[data-position='0'] .equips,.playerbg,#window .player.playerbg,.menubg,.mebg{
box-shadow: rgba(0, 0, 0, 0.2) 0 0 0 1px, rgba(0, 0, 0, 0.2) 0 3px 10px; box-shadow: rgba(0, 0, 0, 0.2) 0 0 0 1px, rgba(0, 0, 0, 0.2) 0 3px 10px;
background-image: linear-gradient(#4b4b4b, #464646); background-image: linear-gradient(#4b4b4b, #464646);
border-radius: 8px; border-radius: 8px;

View File

@ -17,7 +17,7 @@ body{
#system>div>div,#mebg,.control,.player,.card,.avatar,.avatar2,.button,#window>.dialog.popped, #system>div>div,#mebg,.control,.player,.card,.avatar,.avatar2,.button,#window>.dialog.popped,
#arena:not(.long) .player.unseen .equips:not(*:empty), #arena:not(.long) .player.unseen .equips:not(*:empty),
#arena.long .player.unseen2 .equips:not(*:empty),.menu,.menubutton,#splash>div, #arena.long .player.unseen2 .equips:not(*:empty),.menu,.menubutton,#splash>div,
#arena.mobile:not(.chess) .player[data-position='0'] .equips,.playerbg,.menubg,.mebg{ #arena.mobile:not(.chess) .player[data-position='0'] .equips,.playerbg,#window .player.playerbg,.menubg,.mebg{
box-shadow: rgba(0, 0, 0, 0.4) 0 0 0 1px, rgba(0, 0, 0, 0.2) 0 3px 10px; box-shadow: rgba(0, 0, 0, 0.4) 0 0 0 1px, rgba(0, 0, 0, 0.2) 0 3px 10px;
background-image: linear-gradient(rgba(0,0,0,0.4), rgba(0,0,0,0.4)); background-image: linear-gradient(rgba(0,0,0,0.4), rgba(0,0,0,0.4));
border-radius: 8px; border-radius: 8px;

Binary file not shown.

Before

Width:  |  Height:  |  Size: 288 KiB

After

Width:  |  Height:  |  Size: 288 KiB

BIN
theme/style/player/bronze2.png Executable file

Binary file not shown.

After

Width:  |  Height:  |  Size: 121 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 117 KiB

BIN
theme/style/player/gold2.png Executable file

Binary file not shown.

After

Width:  |  Height:  |  Size: 117 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 114 KiB

BIN
theme/style/player/silver2.png Executable file

Binary file not shown.

After

Width:  |  Height:  |  Size: 122 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 118 KiB

View File

@ -91,7 +91,7 @@ html{
color: rgba(106, 27, 154, 1); color: rgba(106, 27, 154, 1);
} }
.player,.card,.dialog>.bar,.cardbg, .player,.card,.dialog>.bar,.cardbg,
#arena.mobile:not(.chess) .player[data-position='0'] .equips,.playerbg{ #arena.mobile:not(.chess) .player[data-position='0'] .equips,.playerbg,#window .player.playerbg{
background: url('wood.jpg'); background: url('wood.jpg');
} }
.cardbg.button{ .cardbg.button{