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

1

This commit is contained in:
libccy 2016-04-08 22:25:38 +08:00
parent 9800bfd673
commit 05bc90d97d
1 changed files with 27 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
game/game.js
View File

@ -16581,9 +16581,7 @@
lib.setPopped(chat,function(){ lib.setPopped(chat,function(){
if(game.getRoomInfo){ if(game.getRoomInfo){
var uiintro=ui.create.dialog('hidden'); var uiintro=ui.create.dialog('hidden');
// uiintro.style.textAlign='left';
game.getRoomInfo(uiintro); game.getRoomInfo(uiintro);
console.log(uiintro);
return uiintro; return uiintro;
} }
},180); },180);
@ -16989,6 +16987,7 @@
dialog:function(){ dialog:function(){
var i; var i;
var hidden=false; var hidden=false;
var noscroll=false;
var dialog=ui.create.div('.dialog'); var dialog=ui.create.div('.dialog');
dialog.contentContainer=ui.create.div('.content-container',dialog); dialog.contentContainer=ui.create.div('.content-container',dialog);
dialog.content=ui.create.div('.content',dialog.contentContainer); dialog.content=ui.create.div('.content',dialog.contentContainer);
@ -17001,16 +17000,19 @@
for(i=0;i<arguments.length;i++){ for(i=0;i<arguments.length;i++){
if(typeof arguments[i]=='boolean') dialog.static=arguments[i]; if(typeof arguments[i]=='boolean') dialog.static=arguments[i];
else if(arguments[i]=='hidden') hidden=true; else if(arguments[i]=='hidden') hidden=true;
else if(arguments[i]=='noscroll') noscroll=true;
else dialog.add(arguments[i]); else dialog.add(arguments[i]);
} }
if(!hidden){ if(!hidden){
dialog.open(); dialog.open();
} }
if(!lib.config.touchscreen) dialog.contentContainer.onscroll=ui.update; if(!lib.config.touchscreen) dialog.contentContainer.onscroll=ui.update;
if(!noscroll){
dialog.contentContainer.ontouchstart=ui.click.dialogtouchStart; dialog.contentContainer.ontouchstart=ui.click.dialogtouchStart;
dialog.contentContainer.ontouchmove = ui.click.touchScroll; dialog.contentContainer.ontouchmove = ui.click.touchScroll;
dialog.contentContainer.style.WebkitOverflowScrolling='touch'; dialog.contentContainer.style.WebkitOverflowScrolling='touch';
dialog.ontouchstart=ui.click.dragtouchdialog; dialog.ontouchstart=ui.click.dragtouchdialog;
}
return dialog; return dialog;
}, },
line2:function(){ line2:function(){
@ -21187,21 +21189,16 @@
roundmenu:function(){ roundmenu:function(){
switch(lib.config.round_menu_func){ switch(lib.config.round_menu_func){
case 'system': case 'system':
if((_status.removinground&&lib.config.touchscreen)|| ui.click.window();
ui.system2.classList.contains('shown')){
_status.removinground=false;
game.pause2();
ui.click.configMenu();
ui.system1.classList.remove('shown');
ui.system2.classList.remove('shown');
}
else{
ui.system1.classList.add('shown'); ui.system1.classList.add('shown');
ui.system2.classList.add('shown'); ui.system2.classList.add('shown');
ui.click.shortcut(); if(!ui.menuContainer.classList.contains('hidden')){
ui.click.configMenu();
} }
ui.click.shortcut();
break; break;
case 'menu': case 'menu':
ui.click.window();
game.pause2(); game.pause2();
ui.click.configMenu(); ui.click.configMenu();
ui.system1.classList.remove('shown'); ui.system1.classList.remove('shown');
@ -21870,20 +21867,16 @@
var goswipe=function(action){ var goswipe=function(action){
switch(action){ switch(action){
case 'system': case 'system':
// if(ui.system2.classList.contains('shown')|| ui.click.window();
// lib.config.layout!='phone'){
// game.pause2();
// ui.click.configMenu();
// ui.system1.classList.remove('shown');
// ui.system2.classList.remove('shown');
// }
// else{
// }
ui.system1.classList.add('shown'); ui.system1.classList.add('shown');
ui.system2.classList.add('shown'); ui.system2.classList.add('shown');
if(!ui.menuContainer.classList.contains('hidden')){
ui.click.configMenu();
}
ui.click.shortcut(); ui.click.shortcut();
break; break;
case 'menu': case 'menu':
ui.click.window();
game.pause2(); game.pause2();
ui.click.configMenu(); ui.click.configMenu();
ui.system1.classList.remove('shown'); ui.system1.classList.remove('shown');
@ -21894,9 +21887,6 @@
break; break;
case 'auto': case 'auto':
ui.click.auto(); ui.click.auto();
// if(!ui.system1.classList.contains('shown')){
// ui.system1.classList.add('shown');
// }
break; break;
case 'chat': case 'chat':
if(ui.chatButton){ if(ui.chatButton){
@ -22696,6 +22686,7 @@
if(_status.clicked) return; if(_status.clicked) return;
if(ui.intro) return; if(ui.intro) return;
if(this.classList.contains('connect')){ if(this.classList.contains('connect')){
if(game.online) return;
if(this.playerid){ if(this.playerid){
if(this.ws){ if(this.ws){
if(confirm('是否踢出'+this.nickname+'？')){ if(confirm('是否踢出'+this.nickname+'？')){
@ -24614,7 +24605,7 @@
} }
}, },
nodeintro:function(node,simple){ nodeintro:function(node,simple){
var uiintro=ui.create.dialog('hidden'); var uiintro=ui.create.dialog('hidden','noscroll');
if(node.classList.contains('player')&&!node.name){ if(node.classList.contains('player')&&!node.name){
return uiintro; return uiintro;
} }
@ -24963,6 +24954,9 @@
uiintro.add('<div class="text center" style="padding-bottom:5px">'+_status.enemyRage+'/100</div>'); uiintro.add('<div class="text center" style="padding-bottom:5px">'+_status.enemyRage+'/100</div>');
} }
} }
if(lib.config.touchscreen){
lib.setScroll(uiintro.contentContainer);
}
return uiintro; return uiintro;
}, },
groups:function(){ groups:function(){