This commit is contained in:
parent
6985dfc56d
commit
72ab453f19
|
@ -205,7 +205,6 @@ window.noname_asset_list=[
|
||||||
'image/card/zhuque.png',
|
'image/card/zhuque.png',
|
||||||
'image/card/zhuquezhizhang.png',
|
'image/card/zhuquezhizhang.png',
|
||||||
'image/card/zixin.png',
|
'image/card/zixin.png',
|
||||||
'image/card/zuzhoumojie.png',
|
|
||||||
'image/character/baiwuchang.jpg',
|
'image/character/baiwuchang.jpg',
|
||||||
'image/character/bulianshi.jpg',
|
'image/character/bulianshi.jpg',
|
||||||
'image/character/buzhi.jpg',
|
'image/character/buzhi.jpg',
|
||||||
|
@ -2367,34 +2366,19 @@ window.noname_asset_list=[
|
||||||
'font/huangcao.ttf',
|
'font/huangcao.ttf',
|
||||||
'font/xinwei.ttf',
|
'font/xinwei.ttf',
|
||||||
'theme/music/grid.png',
|
'theme/music/grid.png',
|
||||||
'theme/music/style.css',
|
|
||||||
'theme/music/wood.png',
|
'theme/music/wood.png',
|
||||||
'theme/music/wood3.png',
|
'theme/music/wood3.png',
|
||||||
'theme/simple/card.png',
|
'theme/simple/card.png',
|
||||||
'theme/simple/grid.png',
|
'theme/simple/grid.png',
|
||||||
'theme/simple/style.css',
|
|
||||||
'theme/simple/unknown.png',
|
'theme/simple/unknown.png',
|
||||||
'theme/simple/wood.png',
|
'theme/simple/wood.png',
|
||||||
'theme/simple/wood3.png',
|
'theme/simple/wood3.png',
|
||||||
'theme/woodden/grid.png',
|
'theme/woodden/grid.png',
|
||||||
'theme/woodden/style.css',
|
|
||||||
'theme/woodden/wood.jpg',
|
'theme/woodden/wood.jpg',
|
||||||
'theme/woodden/wood.png',
|
'theme/woodden/wood.png',
|
||||||
'theme/woodden/wood2.jpg',
|
'theme/woodden/wood2.jpg',
|
||||||
'theme/woodden/wood2.png',
|
'theme/woodden/wood2.png',
|
||||||
'theme/style/card/default.css',
|
|
||||||
'theme/style/card/music.css',
|
|
||||||
'theme/style/card/simple.css',
|
|
||||||
'theme/style/card/wood.css',
|
|
||||||
'theme/style/card/new.css',
|
|
||||||
'theme/style/card/image/new.png',
|
'theme/style/card/image/new.png',
|
||||||
'theme/style/cardback/default.css',
|
|
||||||
'theme/style/cardback/music.css',
|
|
||||||
'theme/style/cardback/official.css',
|
|
||||||
'theme/style/cardback/wood.css',
|
|
||||||
'theme/style/cardback/new.css',
|
|
||||||
'theme/style/cardback/feicheng.css',
|
|
||||||
'theme/style/cardback/liusha.css',
|
|
||||||
'theme/style/cardback/image/feicheng.png',
|
'theme/style/cardback/image/feicheng.png',
|
||||||
'theme/style/cardback/image/feicheng2.png',
|
'theme/style/cardback/image/feicheng2.png',
|
||||||
'theme/style/cardback/image/liusha.png',
|
'theme/style/cardback/image/liusha.png',
|
||||||
|
@ -2403,8 +2387,6 @@ window.noname_asset_list=[
|
||||||
'theme/style/cardback/image/new2.png',
|
'theme/style/cardback/image/new2.png',
|
||||||
'theme/style/cardback/image/official.png',
|
'theme/style/cardback/image/official.png',
|
||||||
'theme/style/cardback/image/official2.png',
|
'theme/style/cardback/image/official2.png',
|
||||||
'theme/style/hp/default.css',
|
|
||||||
'theme/style/hp/official.css',
|
|
||||||
'theme/style/hp/image/hp1.png',
|
'theme/style/hp/image/hp1.png',
|
||||||
'theme/style/hp/image/hp2.png',
|
'theme/style/hp/image/hp2.png',
|
||||||
'theme/style/hp/image/hp3.png',
|
'theme/style/hp/image/hp3.png',
|
||||||
|
|
26
game/game.js
26
game/game.js
|
@ -4093,7 +4093,6 @@
|
||||||
else{
|
else{
|
||||||
url=get.url()+url;
|
url=get.url()+url;
|
||||||
}
|
}
|
||||||
if(lib.config.dev) game.print(url);
|
|
||||||
var dir=folder.split('/');
|
var dir=folder.split('/');
|
||||||
var str='';
|
var str='';
|
||||||
var download=function(){
|
var download=function(){
|
||||||
|
@ -4219,7 +4218,6 @@
|
||||||
else{
|
else{
|
||||||
url=get.url()+url;
|
url=get.url()+url;
|
||||||
}
|
}
|
||||||
if(lib.config.dev) game.print(url);
|
|
||||||
var fileTransfer = new FileTransfer();
|
var fileTransfer = new FileTransfer();
|
||||||
folder=lib.assetURL+folder;
|
folder=lib.assetURL+folder;
|
||||||
fileTransfer.download(encodeURI(url),encodeURI(folder),onsuccess,onerror);
|
fileTransfer.download(encodeURI(url),encodeURI(folder),onsuccess,onerror);
|
||||||
|
@ -9180,6 +9178,7 @@
|
||||||
this.node.hp.innerHTML='';
|
this.node.hp.innerHTML='';
|
||||||
this.roomfull=false;
|
this.roomfull=false;
|
||||||
this.roomgaming=false;
|
this.roomgaming=false;
|
||||||
|
this.versionOL=null;
|
||||||
if(info=='server'){
|
if(info=='server'){
|
||||||
this.serving=true;
|
this.serving=true;
|
||||||
this.node.serving.show();
|
this.node.serving.show();
|
||||||
|
@ -16026,6 +16025,12 @@
|
||||||
if(lib.node&&lib.node.fs){
|
if(lib.node&&lib.node.fs){
|
||||||
lib.node.fs.access(__dirname+'/'+updates[i],(function(entry){
|
lib.node.fs.access(__dirname+'/'+updates[i],(function(entry){
|
||||||
return function(err){
|
return function(err){
|
||||||
|
if(!err){
|
||||||
|
var stat=lib.node.fs.statSync(__dirname+'/'+entry);
|
||||||
|
if(stat.size==0){
|
||||||
|
err=true;
|
||||||
|
}
|
||||||
|
}
|
||||||
if(err){
|
if(err){
|
||||||
n--;
|
n--;
|
||||||
if(n==0){
|
if(n==0){
|
||||||
|
@ -16878,6 +16883,7 @@
|
||||||
},
|
},
|
||||||
multiDownload:function(list,onsuccess,onerror,onfinish,process,dev){
|
multiDownload:function(list,onsuccess,onerror,onfinish,process,dev){
|
||||||
list=list.slice(0);
|
list=list.slice(0);
|
||||||
|
if(lib.config.dev) game.print(get.url());
|
||||||
var download=function(){
|
var download=function(){
|
||||||
if(list.length){
|
if(list.length){
|
||||||
var current=list.shift();
|
var current=list.shift();
|
||||||
|
@ -16888,7 +16894,13 @@
|
||||||
else{
|
else{
|
||||||
current2=current;
|
current2=current;
|
||||||
}
|
}
|
||||||
if(!lib.config.dev){
|
if(current.indexOf('theme')==0){
|
||||||
|
game.print(current.slice(6));
|
||||||
|
}
|
||||||
|
else if(current.indexOf('image/skin')==0){
|
||||||
|
game.print(current.slice(11));
|
||||||
|
}
|
||||||
|
else{
|
||||||
game.print(current.slice(current.lastIndexOf('/')+1));
|
game.print(current.slice(current.lastIndexOf('/')+1));
|
||||||
}
|
}
|
||||||
game.download(current,current2,function(){
|
game.download(current,current2,function(){
|
||||||
|
@ -25740,7 +25752,8 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if(updates[i].indexOf('image/card')==0){
|
else if(updates[i].indexOf('image/card')==0){
|
||||||
if(skipcard.contains(updates[i].slice(11,updates[i].lastIndexOf('.')))){
|
var skipname=updates[i].slice(11,updates[i].lastIndexOf('.'));
|
||||||
|
if(skipcard.contains(skipname)||skipname.indexOf('hs')==0||skipname.indexOf('tuteng')==0){
|
||||||
updates.splice(i--,1);
|
updates.splice(i--,1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -30202,7 +30215,10 @@
|
||||||
alert('房间已满');
|
alert('房间已满');
|
||||||
}
|
}
|
||||||
else if(this.roomgaming&&!game.onlineID){
|
else if(this.roomgaming&&!game.onlineID){
|
||||||
alert('房间不允许旁观')
|
alert('房间不允许旁观');
|
||||||
|
}
|
||||||
|
else if(this.versionOL!=lib.versionOL){
|
||||||
|
alert('版本不匹配');
|
||||||
}
|
}
|
||||||
else if(this.hasOwnProperty('roomindex')){
|
else if(this.hasOwnProperty('roomindex')){
|
||||||
if(!_status.enteringroom){
|
if(!_status.enteringroom){
|
||||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 39 KiB |
Loading…
Reference in New Issue