diff --git a/game/game.js b/game/game.js index aaf5f030d..746680ac4 100755 --- a/game/game.js +++ b/game/game.js @@ -2326,6 +2326,8 @@ for(i in music.pack){ lib.configMenu.audio.config.background_music.item[i]=music.pack[i]; } + lib.configMenu.audio.config.background_music.item.music_random='随机'; + lib.configMenu.audio.config.background_music.item.music_off='关闭'; } delete character.pack; delete card.pack; diff --git a/game/package.js b/game/package.js index 0285cefdf..b366d38aa 100755 --- a/game/package.js +++ b/game/package.js @@ -61,6 +61,4 @@ music.pack={ music_diaochan:'貂蝉', music_shezhan:'舌战', music_danji:'单骑', - music_random:'随机', - music_off:'关闭', } diff --git a/layout/default/layout.css b/layout/default/layout.css index 76ec66d5e..ec2254119 100755 --- a/layout/default/layout.css +++ b/layout/default/layout.css @@ -143,7 +143,7 @@ table{table-layout: fixed;} text-align: left; } #handcards1,#handcards2{white-space:nowrap;overflow-x: visible;overflow-y:visible;display: block;} -#handcards1.scrollh,#handcards2.scrollh{overflow-x: scroll;} +#handcards1.scrollh,#handcards2.scrollh{overflow-x: scroll;overflow-y:hidden} #handcards1{left: 0;top:calc(100% - 140px);} #handcards2{left: calc(50% + 120px);top:calc(100% - 140px);} #arena #handcards1>div,