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

fix

This commit is contained in:
libccy 2016-04-11 18:14:04 +08:00
parent 6770fb3371
commit dd1f1629b3
4 changed files with 80 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
card/standard.js
View File

@ -1013,6 +1013,20 @@ card.standard={
notarget:true, notarget:true,
content:function(){ content:function(){
event.result='wuxied'; event.result='wuxied';
if(player.isOnline()){
player.send(function(player){
if(ui.tempnowuxie&&!player.hasWuxie()){
ui.tempnowuxie.close();
delete ui.tempnowuxie;
}
},player);
}
else if(player==game.me){
if(ui.tempnowuxie&&!player.hasWuxie()){
ui.tempnowuxie.close();
delete ui.tempnowuxie;
}
}
}, },
}, },
lebu:{ lebu:{

71
game/game.js
View File

@ -50,6 +50,7 @@
versionOL:3, versionOL:3,
updateURL:localStorage.getItem('noname_download_source')||'http://isha.applinzi.com/', updateURL:localStorage.getItem('noname_download_source')||'http://isha.applinzi.com/',
assetURL:'', assetURL:'',
hallURL:'23.105.208.119',
changeLog:[], changeLog:[],
updates:[], updates:[],
canvasUpdates:[], canvasUpdates:[],
@ -2737,6 +2738,28 @@
game.reload(); game.reload();
} }
}, },
hall_ip:{
name:'联机大厅',
input:true,
frequent:true,
init:'23.105.208.119'
},
hall_button:{
name:'联机大厅按钮',
init:true,
frequent:true,
onclick:function(bool){
game.saveConfig('hall_button',bool,'connect');
if(ui.hall_button){
if(bool){
ui.hall_button.style.display='';
}
else{
ui.hall_button.style.display='none';
}
}
}
},
update:function(config,map){ update:function(config,map){
if(lib.node){ if(lib.node){
map.connect_start.show(); map.connect_start.show();
@ -4476,7 +4499,7 @@
} }
return; return;
} }
if(ui.tempnowuxie&&ui.tempnowuxie.classList.contains('glow')&&event.getParent().state){ if(ui.tempnowuxie&&ui.tempnowuxie.classList.contains('glow')&&event.state>0){
event.result={ event.result={
bool:false bool:false
} }
@ -12006,6 +12029,9 @@
} }
}, },
reinit:function(config,state,state2,ip,observe){ reinit:function(config,state,state2,ip,observe){
ui.auto.show();
ui.pause.show();
game.clearConnect(); game.clearConnect();
clearTimeout(_status.createNodeTimeout); clearTimeout(_status.createNodeTimeout);
game.online=true; game.online=true;
@ -16302,6 +16328,10 @@
ui.recentIP.remove(); ui.recentIP.remove();
delete ui.recentIP; delete ui.recentIP;
} }
if(ui.hall_button){
ui.hall_button.remove();
delete ui.hall_button;
}
if(ui.rooms){ if(ui.rooms){
for(var i=0;i<ui.rooms.length;i++){ for(var i=0;i<ui.rooms.length;i++){
ui.rooms[i].remove(); ui.rooms[i].remove();
@ -18036,24 +18066,36 @@
else if(config.input){ else if(config.input){
node.classList.add('switcher'); node.classList.add('switcher');
var input=ui.create.div(node); var input=ui.create.div(node);
input.innerHTML=config.init||'无名玩家';
input.contentEditable=true; input.contentEditable=true;
input.style.webkitUserSelect='text'; input.style.webkitUserSelect='text';
input.style.minWidth='10px'; input.style.minWidth='10px';
input.onkeydown=function(e){ input.onkeydown=function(e){
if(e.keyCode==13){ if(e.keyCode==13){
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
input.blur(); input.blur();
} }
}; };
input.onblur=function(){ if(config.name=='联机昵称'){
input.innerHTML=input.innerHTML.replace(/\<br\>/g,''); input.innerHTML=config.init||'无名玩家';
if(!input.innerHTML){ input.onblur=function(){
input.innerHTML='无名玩家'; input.innerHTML=input.innerHTML.replace(/\<br\>/g,'');
if(!input.innerHTML){
input.innerHTML='无名玩家';
}
game.saveConfig('connect_nickname',input.innerHTML);
game.saveConfig('connect_nickname',input.innerHTML,'connect');
}
}
else if(config.name=='联机大厅'){
input.innerHTML=config.init||lib.hallURL;
input.onblur=function(){
if(!input.innerHTML){
input.innerHTML=lib.hallURL;
}
input.innerHTML=input.innerHTML.replace(/\<br\>/g,'');
game.saveConfig('hall_ip',input.innerHTML,'connect');
} }
game.saveConfig('connect_nickname',input.innerHTML);
game.saveConfig('connect_nickname',input.innerHTML,'connect');
} }
} }
else{ else{
@ -24461,6 +24503,7 @@
}, },
cnNumber:function(num,two){ cnNumber:function(num,two){
if(num==Infinity) return '∞'; if(num==Infinity) return '∞';
if(isNaN(num)) return '';
if(typeof num!='number') return num; if(typeof num!='number') return num;
if(num<0||num>99) return num; if(num<0||num>99) return num;
if(num<=10){ if(num<=10){

3
game/update.js
View File

@ -1,6 +1,7 @@
window.noname_update={ window.noname_update={
version:'1.8.5', version:'1.8.5.1',
changeLog:[ changeLog:[
'联机大厅', '联机大厅',
'修复bug'
] ]
} }

7
mode/connect.js
View File

@ -54,6 +54,13 @@ mode.connect={
ui.window.appendChild(button); ui.window.appendChild(button);
ui.ipbutton=button; ui.ipbutton=button;
ui.hall_button=ui.create.system('联机大厅',function(){
node.innerHTML=get.config('hall_ip')||lib.hallURL;
connect();
},true);
if(!get.config('hall_button')){
ui.hall_button.style.display='none';
}
ui.recentIP=ui.create.system('最近连接',null,true); ui.recentIP=ui.create.system('最近连接',null,true);
var clickLink=function(){ var clickLink=function(){
node.innerHTML=this.innerHTML; node.innerHTML=this.innerHTML;