diff --git a/game/game.js b/game/game.js index 56c20eb63..1f98eb0d6 100755 --- a/game/game.js +++ b/game/game.js @@ -83,20 +83,9 @@ game.saveConfig('low_performance',bool); if(bool){ ui.arena.classList.add('low_performance'); - ui.updatehl(); } else{ ui.arena.classList.remove('low_performance'); - if(ui.me){ - var hs=ui.me.querySelectorAll('.handcards>.card'); - for(var i=0;i0){ @@ -8783,7 +8749,7 @@ } ui.arena.dataset.number=8; } - ui.updateh(true); + ui.updatehl(); for(var i=0;idiv:not(.playerfocus):not(.removing){ opacity: 0.3 !important; } -#arena.low_performance #me>div>div>.card{ +#arena #me>div>div>.card{ position: absolute; left:8px; } @@ -138,27 +138,27 @@ table{table-layout: fixed;} } #me,#mebg{width: 100%;height: 140px;top:calc(100% - 140px);left:0;} #mebg{z-index:-1} -#handcards1,#handcards2{width: calc(50% - 140px);height: 127px;padding: 10px;} -#handcards1,#handcards2{white-space:nowrap;overflow-x: scroll;overflow-y:hidden;display: block;text-align: center;} +#handcards1,#handcards2{ + width: calc(50% - 140px);height: 127px;padding: 10px; + text-align: left; +} +#handcards1,#handcards2{white-space:nowrap;overflow-x: hidden;overflow-y:hidden;display: block;} +#handcards1.scrollh,#handcards2.scrollh{overflow-x: scroll;} #handcards1{left: 0;top:calc(100% - 140px);} #handcards2{left: calc(50% + 120px);top:calc(100% - 140px);} #arena #handcards1>div, #arena #handcards2>div{ height: 100%; position: relative; - margin-right: 15px; - margin-left: -7px; -} -#arena.low_performance #handcards1, -#arena.low_performance #handcards2{ - text-align: left; -} -#arena.low_performance #handcards1>div, -#arena.low_performance #handcards2>div{ margin-left: 2px; margin-right: 10px; } +#arena:not(.mobile):not(.single-handcard) #handcards1>div, +#arena:not(.mobile):not(.single-handcard) #handcards2>div{ + left:-10px; +} #arena.single-handcard #handcards1{width: calc(100% - 120px);left:120px;} +#arena:not(.mobile).single-handcard #handcards1{width: calc(100% - 140px);} #arena.single-handcard #handcards2{display: none;} #system{padding: 6px;width: calc(100% - 12px);white-space: nowrap;z-index: 3;pointer-events: none} #system>div{height: 100%;position: relative;margin: 0;padding: 0;} diff --git a/layout/newlayout/global.css b/layout/newlayout/global.css index 78d4532c6..7b8ca9403 100644 --- a/layout/newlayout/global.css +++ b/layout/newlayout/global.css @@ -362,7 +362,7 @@ #control{ z-index:5; top:auto; - bottom:190px; + bottom:210px; width: calc(100% - 300px); left:150px; } diff --git a/manifest.json b/manifest.json index a89d07403..2dfa54a6d 100644 --- a/manifest.json +++ b/manifest.json @@ -1,6 +1,6 @@ { "name": "noname", - "xwalk_version": "1.6.2", + "xwalk_version": "1.6.3", "start_url": "index.html", "icons": [ { diff --git a/package.json b/package.json index 111dcec13..088013c0c 100755 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { "name" : "无名杀", - "version" : "1.6.2", + "version" : "1.6.3", "main" : "main.js" }