diff --git a/game/game.js b/game/game.js index 0e5e5c395..8be880bc2 100755 --- a/game/game.js +++ b/game/game.js @@ -8909,6 +8909,7 @@ if(lib.config.layout=='mobile'||lib.config.layout=='phone'){ ui.arena.classList.add('mobile'); } + ui.updatePhone(); ui.backgroundMusic=document.createElement('audio'); ui.backgroundMusic.volume=lib.config.volumn_background/8; game.playBackgroundMusic(); @@ -12912,24 +12913,23 @@ ui.dialog.classList.add('scroll2'); } } - - // if(lib.config.touchscreen||lib.config.layout=='newlayout'){ - // ui.dialog.classList.add('scroll1'); - // ui.dialog.classList.add('scroll2'); - // } - // if(ui.dialog.contentContainer.scrollTop>0){ - // ui.dialog.classList.add('scroll1'); - // } - // else{ - // ui.dialog.classList.remove('scroll1'); - // } - // if(ui.dialog.contentContainer.scrollTop+ui.dialog.contentContainer.offsetHeight>= - // ui.dialog.contentContainer.scrollHeight-1){ - // ui.dialog.classList.remove('scroll2'); - // } - // else{ - // ui.dialog.classList.add('scroll2'); - // } + } + // ui.updatePhone(); + }, + updatePhone:function(){ + if(lib.config.layout=='phone'&&lib.config.touchscreen){ + if(document.body.offsetWidth - + 无名杀 diff --git a/layout/default/layout.css b/layout/default/layout.css index dcdfb0ec0..c0d1dc9e6 100755 --- a/layout/default/layout.css +++ b/layout/default/layout.css @@ -1,5 +1,5 @@ /*--------标签--------*/ -html{font-size: 16px;cursor: default;overflow: hidden;-webkit-user-select:none;-webkit-font-smoothing: subpixel-antialiased;-webkit-tap-highlight-color:rgba(0,0,0,0);} +html{width: 100%;height: 100%;font-size: 16px;cursor: default;overflow: hidden;-webkit-user-select:none;-webkit-font-smoothing: subpixel-antialiased;-webkit-tap-highlight-color:rgba(0,0,0,0);} body{width: 100%;height: 100%;padding: 0; margin: 0;text-rendering:optimizeLegibility;font-family:'STHeiti','SimHei','Microsoft JhengHei','Microsoft YaHei','WenQuanYi Micro Hei',Helvetica,Arial,sans-serif} div{display: inline-block;position: absolute;transition: all 0.5s;} table{table-layout: fixed;} diff --git a/layout/phone/layout.css b/layout/phone/layout.css index 00ab63ea9..075d7e075 100644 --- a/layout/phone/layout.css +++ b/layout/phone/layout.css @@ -41,26 +41,5 @@ @media screen and (orientation:portrait) { - /*--------位置(8人)------*/ - [data-number='8']>.player[data-position='1']{top: calc(100% - 350px)} - [data-number='8']>.player[data-position='2']{top:calc(50% - 175px)} - [data-number='8']>.player[data-position='3']{left:calc(100% - 150px);} - [data-number='8']>.player[data-position='4']{top:0;left:calc(50% - 75px);} - [data-number='8']>.player[data-position='5']{left:0;} - [data-number='8']>.player[data-position='6']{top:calc(50% - 175px)} - [data-number='8']>.player[data-position='7']{top:calc(100% - 350px)} - [data-number='8']>.card[data-position='1']{top:calc(200% / 3 - 122px);left:calc(100% - 127px);} - [data-number='8']>.card[data-position='2']{top:calc(100% / 3 - 132px);left:calc(100% - 127px);} - [data-number='8']>.card[data-position='3']{top:38px;left:calc(75% - 89.5px);} - [data-number='8']>.card[data-position='4']{top:38px;left:calc(50% - 52px);} - [data-number='8']>.card[data-position='5']{top:38px;left:calc(25% - 14.5px);} - [data-number='8']>.card[data-position='6']{top:calc(100% / 3 - 132px);left:23px;} - [data-number='8']>.card[data-position='7']{top:calc(200% / 3 - 122px);left:23px;} - [data-number='8']>.popup[data-position='1']{top:calc(200% / 3 - 150px);left:calc(100% - 186px);} - [data-number='8']>.popup[data-position='2']{top:calc(100% / 3 - 160px);left:calc(100% - 186px);} - [data-number='8']>.popup[data-position='3']{top:190px;left:calc(75% + 10.5px);} - [data-number='8']>.popup[data-position='4']{top:190px;left:calc(50% - 61px);} - [data-number='8']>.popup[data-position='5']{top:190px;left:calc(25% - 37.5px);} - [data-number='8']>.popup[data-position='6']{top:calc(100% / 3 - 160px);left:160px;} - [data-number='8']>.popup[data-position='7']{top:calc(200% / 3 - 150px);left:160px;} + }