This commit is contained in:
libccy 2016-08-11 21:06:43 +08:00
parent 09553004dd
commit 82b05b58b6
3 changed files with 26 additions and 33 deletions

View File

@ -3539,7 +3539,7 @@
lib.node={
fs:require('fs'),
debug:function(){
require('remote').getCurrentWindow().toggleDevTools();
require('electron').remote.getCurrentWindow().toggleDevTools();
}
};
game.download=function(url,folder,onsuccess,onerror,dev){

View File

@ -1,36 +1,9 @@
window.noname_update={
version:'1.8.20',
version:'1.8.20.1',
changeLog:[
'修bug',
'新武将',
],
files:{
global:[
'game/asset.js',
'game/game.js',
'game/phantom.js',
'character/swd.js',
'character/rank.js',
'character/sp.js',
'character/yijiang.js',
'character/yxs.js',
'character/hearth.js',
'character/xianjian.js',
'character/refresh.js',
'character/shenhua.js',
'character/standard.js',
'character/ow.js',
'character/gujian.js',
'card/extra.js',
'card/swd.js',
'card/standard.js',
'card/sp.js',
'card/hearth.js',
'mode/guozhan.js',
'mode/identity.js',
'layout/mobile/layout.css',
],
'1.8.19.7':[],
'1.8.20':[],
global:[],
}
}

View File

@ -133,13 +133,33 @@ mode.guozhan={
delete map[i];
}
}
if(choice.length<num){
if(choice.length==num-1){
for(var i=0;i<list.length;i++){
if(map[lib.character[list[i]][1]]){
choice.push(list[i]);
list.splice(i--,1);
if(choice.length>=num){
break;
break;
}
}
}
else if(choice.length<num-1){
var group=null
for(var i=0;i<list.length;i++){
if(group){
if(lib.character[list[i]][1]==group){
choice.push(list[i]);
list.splice(i--,1);
if(choice.length>=num){
console.log(group);
break;
}
}
}
else{
if(!map[lib.character[list[i]][1]]){
group=lib.character[list[i]][1];
choice.push(list[i]);
list.splice(i--,1);
}
}
}