This commit is contained in:
libccy 2016-08-16 01:06:18 +08:00
parent 5be0e0c997
commit 003ccb99b3
5 changed files with 80 additions and 63 deletions

View File

@ -1031,6 +1031,14 @@
} }
} }
}, },
show_handcardbutton:{
name:'显示手牌按钮',
init:true,
unfrequent:true,
onclick:function(bool){
game.saveConfig('show_handcardbutton',bool);
}
},
show_wuxie:{ show_wuxie:{
name:'显示不询问无懈', name:'显示不询问无懈',
init:false, init:false,
@ -1245,6 +1253,12 @@
} }
else{ else{
map.clear_log.hide(); map.clear_log.hide();
}
if(lib.config.mode=='versus'||lib.config.mode=='chess'||lib.config.mode=='tafang'||lib.config.mode=='boss'){
map.show_handcardbutton.show();
}
else{
map.show_handcardbutton.hide();
} }
// if(config.theme=='woodden'&&config.image_background=='default'){ // if(config.theme=='woodden'&&config.image_background=='default'){
// map.background_color_wood.show(); // map.background_color_wood.show();
@ -31317,6 +31331,11 @@
} }
uiintro.add(capt); uiintro.add(capt);
if(node.isUnderControl()){
uiintro.add('<div class="text center">手牌</div>');
uiintro.addSmall(node.get('h'));
}
var skills=node.skills; var skills=node.skills;
var skills2=game.filterSkills(node.skills,node); var skills2=game.filterSkills(node.skills,node);
for(i=0;i<skills.length;i++){ for(i=0;i<skills.length;i++){
@ -31342,13 +31361,6 @@
} }
} }
} }
// var forbidden=node.forbiddenSkills;
// for(i=0;i<forbidden.length;i++){
// if(lib.translate[forbidden[i]+'_info']){
// translation=get.translation(forbidden[i]).slice(0,2);
// uiintro.add('<div><div class="skill">『'+translation+'』</div><div>'+'已禁用'+'</div></div>');
// }
// }
if(lib.config.show_favourite&&lib.character[node.name]&&get.mode()!='story'){ if(lib.config.show_favourite&&lib.character[node.name]&&get.mode()!='story'){
var addFavourite=ui.create.div('.text.center'); var addFavourite=ui.create.div('.text.center');

View File

@ -233,6 +233,7 @@ mode.boss={
game.onSwapControl(); game.onSwapControl();
// ui.fakemebg.show(); // ui.fakemebg.show();
if(lib.config.show_handcardbutton){
lib.setPopped(ui.create.system('手牌',null,true),function(){ lib.setPopped(ui.create.system('手牌',null,true),function(){
var uiintro=ui.create.dialog('hidden'); var uiintro=ui.create.dialog('hidden');
@ -253,6 +254,7 @@ mode.boss={
return uiintro; return uiintro;
},220); },220);
} }
}
lib.setPopped(ui.create.system('重整',null,true),function(){ lib.setPopped(ui.create.system('重整',null,true),function(){
var uiintro=ui.create.dialog('hidden'); var uiintro=ui.create.dialog('hidden');

View File

@ -296,6 +296,7 @@ mode.chess={
lib.posmap[enemy.dataset.position]=enemy; lib.posmap[enemy.dataset.position]=enemy;
} }
if(lib.config.show_handcardbutton){
lib.setPopped(ui.create.system('手牌',null,true),function(){ lib.setPopped(ui.create.system('手牌',null,true),function(){
var uiintro=ui.create.dialog('hidden'); var uiintro=ui.create.dialog('hidden');
var added=false; var added=false;
@ -318,6 +319,8 @@ mode.chess={
return uiintro; return uiintro;
},220); },220);
}
if(!event.video&&_status.mode=='combat'&&!_status.vsboss&&(_status.replacelist.length||get.config('additional_player'))){ if(!event.video&&_status.mode=='combat'&&!_status.vsboss&&(_status.replacelist.length||get.config('additional_player'))){
_status.enemyDied=0; _status.enemyDied=0;
_status.friendDied=0; _status.friendDied=0;

View File

@ -221,9 +221,8 @@ mode.tafang={
event.obs.push(cg.toString()); event.obs.push(cg.toString());
} }
} }
_status.enemyCount=0;
_status.friendCount=0;
if(lib.config.show_handcardbutton){
lib.setPopped(ui.create.system('手牌',null,true),function(){ lib.setPopped(ui.create.system('手牌',null,true),function(){
var uiintro=ui.create.dialog('hidden'); var uiintro=ui.create.dialog('hidden');
var added=false; var added=false;
@ -245,6 +244,7 @@ mode.tafang={
} }
return uiintro; return uiintro;
},220); },220);
}
ui.create.me(); ui.create.me();
ui.create.fakeme(); ui.create.fakeme();

View File

@ -294,7 +294,7 @@ mode.versus={
// ui.versusreplace=ui.create.system('换人',null,true); // ui.versusreplace=ui.create.system('换人',null,true);
// lib.setPopped(ui.versusreplace,game.versusHoverReplace); // lib.setPopped(ui.versusreplace,game.versusHoverReplace);
if(game.players.length>2){ if(game.players.length>2&&lib.config.show_handcardbutton){
ui.versushs=ui.create.system('手牌',null,true); ui.versushs=ui.create.system('手牌',null,true);
lib.setPopped(ui.versushs,game.versusHoverHandcards,220); lib.setPopped(ui.versushs,game.versusHoverHandcards,220);
} }