This commit is contained in:
libccy 2016-04-19 18:48:55 +08:00
parent 240b376228
commit a9ad47b1d7
2 changed files with 22 additions and 13 deletions

View File

@ -4844,15 +4844,10 @@ character.sp={
target.draw(2); target.draw(2);
} }
target.storage.songci=true; target.storage.songci=true;
target.mark('songci',{ target.markSkill('songci');
name:'颂词', },
intro:{
content:'已发动' content:'已发动'
});
game.addVideo('mark',target,{
name:'颂词',
content:'已发动',
id:'songci'
});
}, },
ai:{ ai:{
order:7, order:7,

View File

@ -3675,8 +3675,8 @@
} }
} }
lib.connectCharacterPack=[]; var connectCharacterPack=[];
lib.connectCardPack=[]; var connectCardPack=[];
for(i in character){ for(i in character){
if(character[i].character){ if(character[i].character){
lib.characterPack[i]=character[i].character lib.characterPack[i]=character[i].character
@ -3684,7 +3684,7 @@
for(j in character[i]){ for(j in character[i]){
if(j=='mode'||j=='forbid') continue; if(j=='mode'||j=='forbid') continue;
if(j=='connect'){ if(j=='connect'){
lib.connectCharacterPack.push(i); connectCharacterPack.push(i);
continue; continue;
} }
if(j=='character'&&!lib.config.characters.contains(i)&&lib.config.mode!='connect'){ if(j=='character'&&!lib.config.characters.contains(i)&&lib.config.mode!='connect'){
@ -3781,7 +3781,7 @@
for(j in card[i]){ for(j in card[i]){
if(j=='mode'||j=='forbid') continue; if(j=='mode'||j=='forbid') continue;
if(j=='connect'){ if(j=='connect'){
lib.connectCardPack.push(i); connectCardPack.push(i);
continue; continue;
} }
if(j=='list'){ if(j=='list'){
@ -3882,6 +3882,20 @@
if(typeof play[i].arenaReady=='function') lib.arenaReady.push(play[i].arenaReady); if(typeof play[i].arenaReady=='function') lib.arenaReady.push(play[i].arenaReady);
} }
lib.connectCharacterPack=[];
lib.connectCardPack=[];
for(var i=0;i<lib.config.all.characters.length;i++){
var packname=lib.config.all.characters[i];
if(connectCharacterPack.contains(packname)){
lib.connectCharacterPack.push(packname)
}
}
for(var i=0;i<lib.config.all.cards.length;i++){
var packname=lib.config.all.cards[i];
if(connectCardPack.contains(packname)){
lib.connectCardPack.push(packname)
}
}
if(lib.config.mode!='connect'){ if(lib.config.mode!='connect'){
for(i=0;i<lib.card.list.length;i++){ for(i=0;i<lib.card.list.length;i++){
if(lib.card.list[i][2]=='huosha'){ if(lib.card.list[i][2]=='huosha'){