diff --git a/game/asset.js b/game/asset.js index 498656f19..311ccb80a 100644 --- a/game/asset.js +++ b/game/asset.js @@ -1,5 +1,5 @@ window.noname_asset_list=[ - '1.9.35.1', + '1.9.36', 'image/background/huangtian_bg.jpg', 'image/background/ol_bg.jpg', 'image/background/september_bg.jpg', diff --git a/game/game.js b/game/game.js index 138de67a8..cc81a683c 100644 --- a/game/game.js +++ b/game/game.js @@ -2563,7 +2563,7 @@ map.clear_log.hide(); } if(get.is.phoneLayout()){ - map.show_time2.show(); + map.show_time2.show(); map.show_time.hide(); if(lib.config.show_time2){ map.watchface.show(); @@ -2573,7 +2573,7 @@ } } else{ - map.show_time2.hide(); + map.show_time2.hide(); map.show_time.show(); map.watchface.hide(); } @@ -2690,6 +2690,11 @@ ui.roundmenu.dataset.watchface=item; } }, + show_time3:{ + name:'显示游戏时间', + init:false, + unfrequent:true + }, show_statusbar_android:{ name:'显示状态栏', init:false, @@ -2999,7 +3004,7 @@ unfrequent:true, onclick:function(bool){ game.saveConfig('show_cardpile',bool); - if(lib.config.show_cardpile){ + if(bool){ ui.cardPileButton.style.display=''; } else{ @@ -3007,6 +3012,20 @@ } } }, + show_cardpile_number:{ + name:'显示剩余牌数', + init:false, + unfrequent:true, + onclick:function(bool){ + game.saveConfig('show_cardpile_number',bool); + if(bool){ + ui.cardPileNumber.style.display=''; + } + else{ + ui.cardPileNumber.style.display='none'; + } + } + }, show_handcardbutton:{ name:'显示手牌按钮', init:true, @@ -28344,6 +28363,7 @@ } ui.arena.classList.remove('menupaused'); ui.historybar.classList.remove('menupaused'); + ui.window.classList.remove('touchinfohidden'); ui.config2.classList.remove('pressdown2'); } }; @@ -28604,6 +28624,7 @@ ui.config2.classList.add('pressdown2'); ui.arena.classList.add('menupaused'); ui.historybar.classList.add('menupaused'); + ui.window.classList.add('touchinfohidden'); menuContainer.classList.remove('hidden'); for(var i=0;i=3600){ + var num1=Math.floor(num/3600); + var num2=Math.floor((num-num1*3600)/60); + if(num2<10){ + num2='0'+num2.toString(); + } + var num3=num-num1*3600-num2*60; + if(num3<10){ + num3='0'+num3.toString(); + } + ui.time3.innerHTML=num+':'+num2+':'+num3; + } + else{ + var num1=Math.floor(num/60); + var num2=num-num1*60; + if(num2<10){ + num2='0'+num2.toString(); + } + ui.time3.innerHTML=num1+':'+num2; + } + },1000); + } if(get.is.nomenu()){ if(!['menu','system'].contains(lib.config.round_menu_func)){ lib.config.round_menu_func='system'; @@ -36298,7 +36362,7 @@ ui.controls=[]; ui.style={}; - ui.time=ui.create.div('#time',ui.window); + ui.time=ui.create.div(ui.gameinfo); var timeInterval=function(){ var date=new Date(); var hours=date.getHours(); @@ -36980,6 +37044,7 @@ ui.create.card(ui.cardPile).init(lib.card.list[i]); } } + ui.cardPileNumber.innerHTML='0轮 剩余牌: '+ui.cardPile.childElementCount; }, }, click:{ @@ -40036,6 +40101,7 @@ node.appendChild(ui.sidebar3); ui.historybar.classList.add('paused'); ui.arena.classList.add('paused'); + ui.window.classList.add('touchinfohidden'); ui.time.hide(); if(game.onpause){ game.onpause(); @@ -40050,6 +40116,7 @@ ui.time.show(); ui.historybar.classList.remove('paused'); ui.arena.classList.remove('paused'); + ui.window.classList.remove('touchinfohidden'); game.resume2(); e.stopPropagation(); if(game.onresume){ diff --git a/game/update.js b/game/update.js index e91ccb56f..7d987cd40 100644 --- a/game/update.js +++ b/game/update.js @@ -2,7 +2,8 @@ window.noname_update={ version:'1.9.36', // update:'1.9.35', changeLog:[ - '新武将', + '武将修改', + '显示剩余牌堆数' ], files:[ 'game/game.js', diff --git a/layout/default/layout.css b/layout/default/layout.css index ea7f422cd..dcb03f9f2 100644 --- a/layout/default/layout.css +++ b/layout/default/layout.css @@ -122,12 +122,20 @@ table { margin: 0; position: absolute; left: 0; - top: 16px; + top: 11px; text-align: center; pointer-events: none; display: block; font-family: 'xinwei' } +#time>div{ + margin: 0; + padding: 0; + display: inline-block; + margin-left: 6px; + margin-right: 6px; + position: relative; +} #shortcut { width: 100%; height: 100%; @@ -535,6 +543,27 @@ table { left: 8px; } +.touchinfo{ + padding: 6px; + position: absolute; + color: white; + text-shadow: black 0 0 2px; + top: 0; + margin: 0; + font-family: 'xinwei' +} +.touchinfo.left{ + left: 0; +} +.touchinfo.right{ + left: auto; + right: 0; + text-align: right; +} +#window.touchinfohidden>.touchinfo{ + opacity: 0; +} + .roundarenabutton { /*width: 50px; height: 50px;*/