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

d

This commit is contained in:
libccy 2016-07-10 09:25:12 +08:00
parent 96f142e8fa
commit b2f233ca9f
3 changed files with 30 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
card/swd.js
View File

@ -103,6 +103,7 @@ card.swd={
vanish:true,
enable:true,
derivation:true,
derivationpack:'swd',
filterTarget:function(card,player,target){
return target.num('he')>0;
},
@ -124,6 +125,7 @@ card.swd={
vanish:true,
enable:true,
derivation:true,
derivationpack:'swd',
filterTarget:true,
content:function(){
'step 0'
@ -169,6 +171,7 @@ card.swd={
vanish:true,
enable:true,
derivation:true,
derivationpack:'swd',
filterTarget:function(card,player,target){
return target==player;
},
@ -201,6 +204,7 @@ card.swd={
vanish:true,
enable:true,
derivation:true,
derivationpack:'swd',
filterTarget:function(card,player,target){
return target!=player&&target.num('e')>0;
},
@ -230,6 +234,7 @@ card.swd={
vanish:true,
enable:true,
derivation:true,
derivationpack:'swd',
filterTarget:function(card,player,target){
return !target.isTurnedOver()&&target!=player;
},
@ -252,6 +257,7 @@ card.swd={
vanish:true,
enable:true,
derivation:true,
derivationpack:'swd',
filterTarget:function(card,player,target){
return !target.hasSkill('hslingjian_chaofeng');
},
@ -277,6 +283,7 @@ card.swd={
vanish:true,
enable:true,
derivation:true,
derivationpack:'swd',
filterTarget:function(card,player,target){
return player!=target&&!target.hasSkill('hslingjian_yinshen');
},

31
game/game.js
View File

@ -3861,16 +3861,6 @@
var ia=connect_avatar_list[i];
lib.mode.connect.config.connect_avatar.item[ia]=lib.translate[ia];
}
if(lib.cardPack.mode_derivation){
for(var i=0;i<lib.cardPack.mode_derivation.length;i++){
if(typeof lib.card[lib.cardPack.mode_derivation[i]].derivation=='string'&&!lib.character[lib.card[lib.cardPack.mode_derivation[i]].derivation]){
lib.cardPack.mode_derivation.splice(i--,1);
}
}
if(lib.cardPack.mode_derivation.length==0){
delete lib.cardPack.mode_derivation;
}
}
if(lib.config.mode!='connect'){
var pilecfg=lib.config.customcardpile[get.config('cardpilename')];
if(pilecfg){
@ -3952,6 +3942,19 @@
}
}
}
if(lib.cardPack.mode_derivation){
for(var i=0;i<lib.cardPack.mode_derivation.length;i++){
if(typeof lib.card[lib.cardPack.mode_derivation[i]].derivation=='string'&&!lib.character[lib.card[lib.cardPack.mode_derivation[i]].derivation]){
lib.cardPack.mode_derivation.splice(i--,1);
}
else if(typeof lib.card[lib.cardPack.mode_derivation[i]].derivationpack=='string'&&!lib.config.cards.contains(lib.card[lib.cardPack.mode_derivation[i]].derivationpack)){
lib.cardPack.mode_derivation.splice(i--,1);
}
}
if(lib.cardPack.mode_derivation.length==0){
delete lib.cardPack.mode_derivation;
}
}
for(i in play){
if(lib.config.hiddenPlayPack.contains(i)) continue;
if(play[i].forbid&&play[i].forbid.contains(lib.config.mode)) continue;
@ -28373,6 +28376,14 @@
else if(lib.card[name]&&lib.card[name].addinfomenu){
uiintro.add('<div class="text center">'+lib.card[name].addinfomenu+'</div>');
}
else if(lib.card[name]&&lib.card[name].derivation){
if(typeof lib.card[name].derivation=='string'){
uiintro.add('<div class="text center">来源：'+get.translation(lib.card[name].derivation)+'</div>');
}
else if(lib.card[name].derivationpack){
uiintro.add('<div class="text center">来源：'+get.translation(lib.card[name].derivationpack+'_card_config')+'包</div>');
}
}
uiintro._place_text=uiintro.add('<div class="text" style="display:inline">'+lib.translate[name+'_info']+'</div>');
}
uiintro.add(ui.create.div('.placeholder.slim'));

27
game/update.js
View File

@ -1,35 +1,12 @@
window.noname_update={
version:'1.8.17',
version:'1.8.17.1',
changeLog:[
'修bug',
'新卡'
],
files:{
global:[
'game/game.js',
'game/config.js',
'game/asset.js',
'game/package.js',
'game/source.js',
'character/hearth.js',
'character/swd.js',
'character/sp.js',
'character/ow.js',
'character/yijiang.js',
'character/shenhua.js',
'character/gujian.js',
'character/standard.js',
'character/refresh.js',
'character/extra.js',
'character/yxs.js',
'card/swd.js',
'card/hearth.js',
'card/yunchou.js',
'card/standard.js',
'card/compensate.js',
'card/sp.js',
'layout/default/layout.css',
'theme/woodden/style.css',
'card/swd.js'
],
'1.8.16.3':[]
}