This commit is contained in:
libccy 2017-02-01 00:33:29 +08:00
parent afcddbf2d3
commit bc5dab5413
1 changed files with 44 additions and 13 deletions

View File

@ -1006,6 +1006,11 @@
name:'显示收藏菜单', name:'显示收藏菜单',
init:true, init:true,
unfrequent:true unfrequent:true
},
show_ban_menu:{
name:'显示禁将菜单',
init:true,
unfrequent:true
}, },
hide_card_image:{ hide_card_image:{
name:'隐藏卡牌背景', name:'隐藏卡牌背景',
@ -3788,13 +3793,11 @@
lib.config.all.plays=[]; lib.config.all.plays=[];
lib.config.all.mode=[]; lib.config.all.mode=[];
if(lib.config.debug){ lib.init.js(lib.assetURL+'game','asset',function(){
lib.init.js('game','asset',function(){
lib.skin=window.noname_skin_list; lib.skin=window.noname_skin_list;
delete window.noname_skin_list; delete window.noname_skin_list;
delete window.noname_asset_list; delete window.noname_asset_list;
}); });
}
if(window.isNonameServer){ if(window.isNonameServer){
lib.config.mode='connect'; lib.config.mode='connect';
@ -5457,7 +5460,9 @@
'default':"默认", 'default':"默认",
zhenfa:'阵法', zhenfa:'阵法',
mode_derivation_card_config:'衍生', mode_derivation_card_config:'衍生',
mode_ban_card_config:'禁卡',
mode_favourite_character_config:'收藏', mode_favourite_character_config:'收藏',
mode_ban_character_config:'禁将',
heart:"♥︎", heart:"♥︎",
diamond:"♦︎", diamond:"♦︎",
spade:"♠︎", spade:"♠︎",
@ -22471,6 +22476,7 @@
} }
node.link=page; node.link=page;
node.mode=mode; node.mode=mode;
page.node=node;
var list=[]; var list=[];
for(var i in info){ for(var i in info){
list.push(i); list.push(i);
@ -22542,7 +22548,7 @@
updateBanned._buttons=updateBanned._buttons.concat(buttons); updateBanned._buttons=updateBanned._buttons.concat(buttons);
for(var i=0;i<buttons.length;i++){ for(var i=0;i<buttons.length;i++){
buttons[i].classList.add('noclick'); buttons[i].classList.add('noclick');
buttons[i].listen(banCharacter); buttons[i].listen(ui.click.intro);
buttons[i].node.hp.style.transition='all 0s'; buttons[i].node.hp.style.transition='all 0s';
buttons[i].node.hp._innerHTML=buttons[i].node.hp.innerHTML; buttons[i].node.hp._innerHTML=buttons[i].node.hp.innerHTML;
} }
@ -22572,11 +22578,20 @@
lib.characterPack.mode_favourite[favname]=lib.character[favname]; lib.characterPack.mode_favourite[favname]=lib.character[favname];
} }
} }
if(!get.is.empty(lib.characterPack.mode_favourite)){
ui.favouriteCharacter=createModeConfig('mode_favourite',start.firstChild).link; ui.favouriteCharacter=createModeConfig('mode_favourite',start.firstChild).link;
if(get.is.empty(lib.characterPack.mode_favourite)){
ui.favouriteCharacter.node.style.display='none';
} }
delete lib.characterPack.mode_favourite; delete lib.characterPack.mode_favourite;
} }
if(lib.config.show_ban_menu){
for(var i=0;i<lib.config.all.mode.length;i++){
var modecfg=lib.config.mode_config[lib.config.all.mode[i]];
if(modecfg&&modecfg.banned&&modecfg.banned.length){
}
}
}
var characterlist=connectMenu?lib.connectCharacterPack:lib.config.all.characters; var characterlist=connectMenu?lib.connectCharacterPack:lib.config.all.characters;
for(var i=0;i<characterlist.length;i++){ for(var i=0;i<characterlist.length;i++){
createModeConfig(characterlist[i],start.firstChild); createModeConfig(characterlist[i],start.firstChild);
@ -22592,6 +22607,9 @@
var active=start.firstChild.querySelector('.active'); var active=start.firstChild.querySelector('.active');
if(!active){ if(!active){
active=start.firstChild.firstChild; active=start.firstChild.firstChild;
if(active.style.display=='none'){
active=active.nextSibling;
}
active.classList.add('active'); active.classList.add('active');
} }
rightPane.appendChild(active.link); rightPane.appendChild(active.link);
@ -28334,7 +28352,7 @@
} }
} }
if(i==ui.favouriteCharacter.childElementCount){ if(i==ui.favouriteCharacter.childElementCount){
ui.create.button(this.link,'character',ui.favouriteCharacter).classList.add('noclick'); ui.create.button(this.link,'character',ui.favouriteCharacter).listen(ui.click.intro).classList.add('noclick');
} }
} }
else{ else{
@ -28345,6 +28363,19 @@
} }
} }
} }
var shownode=false;
for(var i=0;i<lib.config.favouriteCharacter.length;i++){
var favname=lib.config.favouriteCharacter[i];
if(lib.character[favname]){
shownode=true;break;
}
}
if(shownode){
ui.favouriteCharacter.node.style.display='';
}
else{
ui.favouriteCharacter.node.style.display='none';
}
} }
game.saveConfig('favouriteCharacter',lib.config.favouriteCharacter); game.saveConfig('favouriteCharacter',lib.config.favouriteCharacter);
} }
@ -32759,7 +32790,7 @@
else{ else{
uiintro.add(ui.create.div('.placeholder.slim')); uiintro.add(ui.create.div('.placeholder.slim'));
} }
if(lib.config.change_skin||lib.skin){ if(lib.config.change_skin||(lib.skin&&node.parentNode.classList.contains('menu-buttons'))){
var num=1; var num=1;
var introadded=false; var introadded=false;
var createButtons=function(num){ var createButtons=function(num){