diff --git a/game/asset.js b/game/asset.js index 513b942cf..83db21093 100644 --- a/game/asset.js +++ b/game/asset.js @@ -1,5 +1,5 @@ window.noname_asset_list=[ - '1.9.12', + '1.9.12.3', 'image/background/huangtian_bg.jpg', 'image/background/september_bg.jpg', 'image/background/shengshi_bg.jpg', @@ -2486,13 +2486,13 @@ window.noname_asset_list=[ 'theme/style/hp/image/round2.png', 'theme/style/hp/image/round3.png', 'theme/style/hp/image/round4.png', - 'theme/style/player/bronze.png', + 'theme/style/player/bronze1.png', 'theme/style/player/bronze2.png', 'theme/style/player/bronze3.png', - 'theme/style/player/gold.png', + 'theme/style/player/gold1.png', 'theme/style/player/gold2.png', 'theme/style/player/gold3.png', - 'theme/style/player/silver.png', + 'theme/style/player/silver1.png', 'theme/style/player/silver2.png', 'theme/style/player/silver3.png', ]; diff --git a/game/game.js b/game/game.js index 3b8244067..e9f1b819a 100644 --- a/game/game.js +++ b/game/game.js @@ -1463,6 +1463,7 @@ visualMenu:function(node,link,name,config){ node.className='button character'; node.style.backgroundSize=''; + node.style.height='108px'; switch(link){ case 'default':case 'custom':{ if(lib.config.theme=='simple'){ @@ -1589,6 +1590,7 @@ visualMenu:function(node,link,name,config){ node.className='button character'; node.style.backgroundSize=''; + node.style.height='108px'; switch(link){ case 'default':case 'custom':{ if(lib.config.theme=='simple'){ @@ -1601,7 +1603,7 @@ } break; } - default:node.setBackgroundImage('theme/style/player/'+link+'2.png');node.style.backgroundSize='100% 100%';break; + default:node.setBackgroundImage('theme/style/player/'+link+'1.png');node.style.backgroundSize='100% 100%';break; } if(link=='custom'){ node.classList.add('transparent'); @@ -1643,8 +1645,8 @@ } else if(layout!='default'){ ui.css.border_stylesheet=lib.init.sheet(); - ui.css.border_stylesheet.sheet.insertRule('#window .player>.framebg{display:block;background-image:url("'+lib.assetURL+'theme/style/player/'+layout+'2.png")}',0); - ui.css.border_stylesheet.sheet.insertRule('#window #arena.long:not(.fewplayer) .player>.framebg{background-image:url("'+lib.assetURL+'theme/style/player/'+layout+'3.png")}',0); + ui.css.border_stylesheet.sheet.insertRule('#window .player>.framebg{display:block;background-image:url("'+lib.assetURL+'theme/style/player/'+layout+'1.png")}',0); + ui.css.border_stylesheet.sheet.insertRule('#window #arena.long:not(.fewplayer) .player>.framebg, #arena.oldlayout .player>.framebg{background-image:url("'+lib.assetURL+'theme/style/player/'+layout+'3.png")}',0); ui.css.border_stylesheet.sheet.insertRule('.player>.count{z-index: 3 !important;border-radius: 2px !important;text-align: center !important;}',0); } }, @@ -5929,8 +5931,8 @@ } if(lib.config.border_style&&lib.config.border_style!='default'&&lib.config.border_style!='custom'){ ui.css.border_stylesheet=lib.init.sheet(); - ui.css.border_stylesheet.sheet.insertRule('#window .player>.framebg{display:block;background-image:url("'+lib.assetURL+'theme/style/player/'+lib.config.border_style+'2.png")}',0); - ui.css.border_stylesheet.sheet.insertRule('#window #arena.long:not(.fewplayer) .player>.framebg{background-image:url("'+lib.assetURL+'theme/style/player/'+lib.config.border_style+'3.png")}',0); + ui.css.border_stylesheet.sheet.insertRule('#window .player>.framebg{display:block;background-image:url("'+lib.assetURL+'theme/style/player/'+lib.config.border_style+'1.png")}',0); + ui.css.border_stylesheet.sheet.insertRule('#window #arena.long:not(.fewplayer) .player>.framebg, #arena.oldlayout .player>.framebg{background-image:url("'+lib.assetURL+'theme/style/player/'+lib.config.border_style+'3.png")}',0); ui.css.border_stylesheet.sheet.insertRule('.player>.count{z-index: 3 !important;border-radius: 2px !important;text-align: center !important;}',0); } if(lib.config.control_style&&lib.config.control_style!='default'&&lib.config.control_style!='custom'){ diff --git a/game/update.js b/game/update.js index e61c3c61c..c65426d33 100644 --- a/game/update.js +++ b/game/update.js @@ -30,7 +30,7 @@ window.noname_update={ // 'layout/default/menu.css', // 'layout/long/layout.css', // 'layout/long2/layout.css', - // 'layout/mobile/layout.css', + 'layout/mobile/layout.css', // 'layout/newlayout/global.css', // 'layout/mode/chess.css', // 'extension/boss/extension.js', diff --git a/layout/default/layout.css b/layout/default/layout.css index 9df0d3552..fb25c3f14 100644 --- a/layout/default/layout.css +++ b/layout/default/layout.css @@ -1897,6 +1897,12 @@ div:not(.handcards)>.card>.info>span, display: none; pointer-events: none; } +#arena.oldlayout .player>.framebg{ + transform: rotate(90deg) translateY(-240px); + width: 120px; + height: 240px; + transform-origin: top left; +} #window #arena.mobile:not(.chess) .player[data-position='0']>.framebg{ display: none; } diff --git a/layout/mobile/layout.css b/layout/mobile/layout.css index 68a0cc721..5f4c90d60 100644 --- a/layout/mobile/layout.css +++ b/layout/mobile/layout.css @@ -165,13 +165,13 @@ transition-property: opacity,transform; transition-duration: 0.5s; pointer-events: auto; - -webkit-clip-path: polygon(-10px 0, 130px 0, 130px 130px, -10px 130px); + /*-webkit-clip-path: polygon(-10px 0, 130px 0, 130px 180px, -10px 180px);*/ } -#window.compatiblemode #arena:not(.chess) .player[data-position='0']:not(.minskin)>.avatar, +/*#window.compatiblemode #arena:not(.chess) .player[data-position='0']:not(.minskin)>.avatar, #window.compatiblemode #arena:not(.chess) .player[data-position='0']:not(.minskin)>.avatar2, #window.compatiblemode #arena:not(.chess) .player[data-position='0']:not(.minskin)>.equips{ -webkit-clip-path: none; -} +}*/ #arena:not(.chess) .player[data-position='0']:not(.minskin)>.identity{ pointer-events: auto; }