diff --git a/game/asset.js b/game/asset.js index 99b44dd03..513b942cf 100644 --- a/game/asset.js +++ b/game/asset.js @@ -2487,8 +2487,14 @@ window.noname_asset_list=[ 'theme/style/hp/image/round3.png', 'theme/style/hp/image/round4.png', 'theme/style/player/bronze.png', + 'theme/style/player/bronze2.png', + 'theme/style/player/bronze3.png', 'theme/style/player/gold.png', + 'theme/style/player/gold2.png', + 'theme/style/player/gold3.png', 'theme/style/player/silver.png', + 'theme/style/player/silver2.png', + 'theme/style/player/silver3.png', ]; window.noname_skin_list={ bulianshi:4, diff --git a/game/game.js b/game/game.js index 8d2f07040..308aafc19 100644 --- a/game/game.js +++ b/game/game.js @@ -1527,6 +1527,10 @@ 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+'}'); + 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, @@ -5806,6 +5810,10 @@ 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+'}'); + 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'){ var str=''; @@ -30345,10 +30353,6 @@ script.remove(); var update=window.noname_update; delete window.noname_update; - if(update.version=='1.9.12'){ - update.version='1.9.12修复'; - // modify later - } if(forcecheck===false){ if(update.version==lib.config.check_version){ return; @@ -32603,7 +32607,7 @@ ui.arena=ui.create.div('#arena.nome',ui.window); ui.arena.setNumber=function(num){ this.dataset.number=num; - if(parseInt(num).card>.info>span, 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 { width: 100px; height: 100px; diff --git a/layout/mode/boss.css b/layout/mode/boss.css index fdd428672..acf5c0743 100644 --- a/layout/mode/boss.css +++ b/layout/mode/boss.css @@ -75,7 +75,7 @@ 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; } .player.bossplayer>.identity{ diff --git a/layout/mode/chess.css b/layout/mode/chess.css index e370b51ec..dce87e506 100644 --- a/layout/mode/chess.css +++ b/layout/mode/chess.css @@ -200,7 +200,7 @@ .player.playerblank{ background: none; } -.player.obstacle{ +#window .player.obstacle{ background: repeating-linear-gradient( 135deg, rgba(0,0,0,0.2), diff --git a/mode/chess.js b/mode/chess.js index 6240f6b3b..20dce8178 100644 --- a/mode/chess.js +++ b/mode/chess.js @@ -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(); }); ui.create.div(ui.chessinfo); diff --git a/theme/music/style.css b/theme/music/style.css index 1b69c31ae..8a6196c5b 100644 --- a/theme/music/style.css +++ b/theme/music/style.css @@ -6,7 +6,7 @@ html{ #system>div>div,#mebg,.control,.player,.card,.avatar,.avatar2,.button,#window>.dialog.popped, #arena:not(.long) .player.unseen .equips:not(*:empty), #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; background-image: linear-gradient(#4b4b4b, #464646); border-radius: 8px; diff --git a/theme/simple/style.css b/theme/simple/style.css index 71a9bd5fc..daec79b78 100644 --- a/theme/simple/style.css +++ b/theme/simple/style.css @@ -17,7 +17,7 @@ body{ #system>div>div,#mebg,.control,.player,.card,.avatar,.avatar2,.button,#window>.dialog.popped, #arena:not(.long) .player.unseen .equips:not(*:empty), #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; background-image: linear-gradient(rgba(0,0,0,0.4), rgba(0,0,0,0.4)); border-radius: 8px; diff --git a/theme/style/player/bronze.png b/theme/style/player/bronze.png index e08b96180..7b629e83f 100644 Binary files a/theme/style/player/bronze.png and b/theme/style/player/bronze.png differ diff --git a/theme/style/player/bronze2.png b/theme/style/player/bronze2.png new file mode 100755 index 000000000..d5e76ffc4 Binary files /dev/null and b/theme/style/player/bronze2.png differ diff --git a/theme/style/player/bronze3.png b/theme/style/player/bronze3.png new file mode 100644 index 000000000..e26f8b2a7 Binary files /dev/null and b/theme/style/player/bronze3.png differ diff --git a/theme/style/player/gold2.png b/theme/style/player/gold2.png new file mode 100755 index 000000000..e75b0099a Binary files /dev/null and b/theme/style/player/gold2.png differ diff --git a/theme/style/player/gold3.png b/theme/style/player/gold3.png new file mode 100644 index 000000000..0ac94a8b5 Binary files /dev/null and b/theme/style/player/gold3.png differ diff --git a/theme/style/player/silver2.png b/theme/style/player/silver2.png new file mode 100755 index 000000000..8cc6173e9 Binary files /dev/null and b/theme/style/player/silver2.png differ diff --git a/theme/style/player/silver3.png b/theme/style/player/silver3.png new file mode 100644 index 000000000..1d824ee01 Binary files /dev/null and b/theme/style/player/silver3.png differ diff --git a/theme/woodden/style.css b/theme/woodden/style.css index 8aab4356e..006da547d 100644 --- a/theme/woodden/style.css +++ b/theme/woodden/style.css @@ -91,7 +91,7 @@ html{ color: rgba(106, 27, 154, 1); } .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'); } .cardbg.button{