diff --git a/game/game.js b/game/game.js index 9dd548e54..e83d4c50d 100755 --- a/game/game.js +++ b/game/game.js @@ -2811,7 +2811,6 @@ dialog._place_text.style.marginLeft='14px'; } } - if(e.touches&&e.touches[0]){ e=e.touches[0]; } @@ -21477,9 +21476,6 @@ if(!this._poppedfunc){ return; } - // if(this._poppedalready){ - // return; - // } if(lib.config.touchscreen||this.forceclick){ _status.touchpopping=true; setTimeout(function(){ @@ -21492,22 +21488,29 @@ ui.currentpopped._uiintro.delete(); delete ui.currentpopped._uiintro; } - // this._poppedalready=true; ui.currentpopped=this; - uiintro.classList.add('popped'); + uiintro.classList.add('popped'); + uiintro.classList.add('hoverdialog'); uiintro.classList.add('static'); this._uiintro=uiintro; ui.window.appendChild(uiintro); var width=this._poppedwidth||330; uiintro.style.width=width+'px'; + if(lib.config.layout=='phone'){ + width*=1.3; + } if(uiintro._heightfixed){ uiintro.style.height=uiintro.content.scrollHeight+'px'; } else{ var height=this._poppedheight||uiintro.content.scrollHeight; - uiintro.style.height=Math.min(ui.window.offsetHeight-260,height)+'px'; + var height2=ui.window.offsetHeight-260; + if(lib.config.layout=='phone'){ + height2=(ui.window.offsetHeight-80)/1.3; + } + uiintro.style.height=Math.min(height2,height)+'px'; } if(lib.config.layout=='phone'){ uiintro.style.top='70px'; diff --git a/game/update.js b/game/update.js index 2f2c40fdb..677f32148 100644 --- a/game/update.js +++ b/game/update.js @@ -1,5 +1,5 @@ window.noname_update={ - version:'1.8.4.0', + version:'1.8.4', changeLog:[ '修复完杀和双将bug', '旁观可切换视角', diff --git a/layout/phone/layout.css b/layout/phone/layout.css index f945bb5cd..7c015bd97 100644 --- a/layout/phone/layout.css +++ b/layout/phone/layout.css @@ -47,7 +47,7 @@ /*opacity: 0;*/ /*width: 50%; min-width: 50%;*/ - transform: translateY(-80px); */ + transform: translateY(-80px); } #system>div.shown{ width: auto; @@ -77,6 +77,10 @@ .player>.identity{ transform: scale(1.3); } +#window>.dialog.popped.hoverdialog{ + transform: scale(1.3); + transform-origin: left top; +} .player:not([data-position='0']).linked .identity, #arena.chess .player.linked .identity{ transform:scale(1.3) rotate(90deg);