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

h

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
game/game.js
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');

32
mode/boss.js
View File

@ -233,25 +233,27 @@ mode.boss={
game.onSwapControl(); game.onSwapControl();
// ui.fakemebg.show(); // ui.fakemebg.show();
lib.setPopped(ui.create.system('手牌',null,true),function(){ if(lib.config.show_handcardbutton){
var uiintro=ui.create.dialog('hidden'); lib.setPopped(ui.create.system('手牌',null,true),function(){
var uiintro=ui.create.dialog('hidden');
var players=game.players.concat(game.dead); var players=game.players.concat(game.dead);
for(var i=0;i<players.length;i++){ for(var i=0;i<players.length;i++){
if(players[i].side==game.me.side&&players[i]!=game.me){ if(players[i].side==game.me.side&&players[i]!=game.me){
uiintro.add(get.translation(players[i])); uiintro.add(get.translation(players[i]));
var cards=players[i].get('h'); var cards=players[i].get('h');
if(cards.length){ if(cards.length){
uiintro.addSmall(cards,true); uiintro.addSmall(cards,true);
} }
else{ else{
uiintro.add('（无）'); uiintro.add('（无）');
}
} }
} }
}
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');

41
mode/chess.js
View File

@ -296,28 +296,31 @@ mode.chess={
lib.posmap[enemy.dataset.position]=enemy; lib.posmap[enemy.dataset.position]=enemy;
} }
lib.setPopped(ui.create.system('手牌',null,true),function(){ if(lib.config.show_handcardbutton){
var uiintro=ui.create.dialog('hidden'); lib.setPopped(ui.create.system('手牌',null,true),function(){
var added=false; var uiintro=ui.create.dialog('hidden');
for(var i=0;i<game.players.length;i++){ var added=false;
if(game.players[i].side==game.me.side&&game.players[i]!=game.me){ for(var i=0;i<game.players.length;i++){
added=true; if(game.players[i].side==game.me.side&&game.players[i]!=game.me){
uiintro.add(get.translation(game.players[i])); added=true;
var cards=game.players[i].get('h'); uiintro.add(get.translation(game.players[i]));
if(cards.length){ var cards=game.players[i].get('h');
uiintro.addSmall(cards,true); if(cards.length){
} uiintro.addSmall(cards,true);
else{ }
uiintro.add('（无）'); else{
uiintro.add('（无）');
}
} }
} }
} if(!added){
if(!added){ uiintro.add('无队友');
uiintro.add('无队友'); }
}
return uiintro;
},220);
}
return uiintro;
},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;

42
mode/tafang.js
View File

@ -221,30 +221,30 @@ mode.tafang={
event.obs.push(cg.toString()); event.obs.push(cg.toString());
} }
} }
_status.enemyCount=0;
_status.friendCount=0;
lib.setPopped(ui.create.system('手牌',null,true),function(){ if(lib.config.show_handcardbutton){
var uiintro=ui.create.dialog('hidden'); lib.setPopped(ui.create.system('手牌',null,true),function(){
var added=false; var uiintro=ui.create.dialog('hidden');
for(var i=0;i<game.players.length;i++){ var added=false;
if(game.players[i].side==game.me.side&&game.players[i]!=game.me){ for(var i=0;i<game.players.length;i++){
added=true; if(game.players[i].side==game.me.side&&game.players[i]!=game.me){
uiintro.add(get.translation(game.players[i])); added=true;
var cards=game.players[i].get('h'); uiintro.add(get.translation(game.players[i]));
if(cards.length){ var cards=game.players[i].get('h');
uiintro.addSmall(cards,true); if(cards.length){
} uiintro.addSmall(cards,true);
else{ }
uiintro.add('（无）'); else{
uiintro.add('（无）');
}
} }
} }
} if(!added){
if(!added){ uiintro.add('无队友');
uiintro.add('无队友'); }
} return uiintro;
return uiintro; },220);
},220); }
ui.create.me(); ui.create.me();
ui.create.fakeme(); ui.create.fakeme();

2
mode/versus.js
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);
} }