YunFeiyang
/
noname
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

zoom

This commit is contained in:
libccy 2016-04-08 19:00:00 +08:00
parent 8e545df871
commit 219b0f2625
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
game/game.js
View File

@ -2811,7 +2811,6 @@
dialog._place_text.style.marginLeft='14px'; dialog._place_text.style.marginLeft='14px';
} }
} }
if(e.touches&&e.touches[0]){ if(e.touches&&e.touches[0]){
e=e.touches[0]; e=e.touches[0];
} }
@ -21477,9 +21476,6 @@
if(!this._poppedfunc){ if(!this._poppedfunc){
return; return;
} }
// if(this._poppedalready){
// return;
// }
if(lib.config.touchscreen||this.forceclick){ if(lib.config.touchscreen||this.forceclick){
_status.touchpopping=true; _status.touchpopping=true;
setTimeout(function(){ setTimeout(function(){
@ -21492,22 +21488,29 @@
ui.currentpopped._uiintro.delete(); ui.currentpopped._uiintro.delete();
delete ui.currentpopped._uiintro; delete ui.currentpopped._uiintro;
} }
// this._poppedalready=true;
ui.currentpopped=this; ui.currentpopped=this;
uiintro.classList.add('popped'); uiintro.classList.add('popped');
uiintro.classList.add('hoverdialog');
uiintro.classList.add('static'); uiintro.classList.add('static');
this._uiintro=uiintro; this._uiintro=uiintro;
ui.window.appendChild(uiintro); ui.window.appendChild(uiintro);
var width=this._poppedwidth||330; var width=this._poppedwidth||330;
uiintro.style.width=width+'px'; uiintro.style.width=width+'px';
if(lib.config.layout=='phone'){
width*=1.3;
}
if(uiintro._heightfixed){ if(uiintro._heightfixed){
uiintro.style.height=uiintro.content.scrollHeight+'px'; uiintro.style.height=uiintro.content.scrollHeight+'px';
} }
else{ else{
var height=this._poppedheight||uiintro.content.scrollHeight; 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'){ if(lib.config.layout=='phone'){
uiintro.style.top='70px'; uiintro.style.top='70px';

2
game/update.js
View File

@ -1,5 +1,5 @@
window.noname_update={ window.noname_update={
version:'1.8.4.0', version:'1.8.4',
changeLog:[ changeLog:[
'修复完杀和双将bug', '修复完杀和双将bug',
'旁观可切换视角', '旁观可切换视角',

6
layout/phone/layout.css
View File

@ -47,7 +47,7 @@
/*opacity: 0;*/ /*opacity: 0;*/
/*width: 50%; /*width: 50%;
min-width: 50%;*/ min-width: 50%;*/
transform: translateY(-80px); */ transform: translateY(-80px);
} }
#system>div.shown{ #system>div.shown{
width: auto; width: auto;
@ -77,6 +77,10 @@
.player>.identity{ .player>.identity{
transform: scale(1.3); transform: scale(1.3);
} }
#window>.dialog.popped.hoverdialog{
transform: scale(1.3);
transform-origin: left top;
}
.player:not([data-position='0']).linked .identity, .player:not([data-position='0']).linked .identity,
#arena.chess .player.linked .identity{ #arena.chess .player.linked .identity{
transform:scale(1.3) rotate(90deg); transform:scale(1.3) rotate(90deg);