This commit is contained in:
libccy 2016-09-09 11:49:50 +08:00
parent 286a9c73a8
commit 1af8ba986a
9 changed files with 66 additions and 56 deletions

View File

@ -122,6 +122,10 @@ window.characterRank={
'ow_heibaihe', 'ow_heibaihe',
'ow_maikelei', 'ow_maikelei',
'ow_kuangshu', 'ow_kuangshu',
'ow_tuobiang',
'ow_banzang',
'ow_laiyinhate',
'wanglang',
], ],
am:[ am:[
'pal_wangpengxu', 'pal_wangpengxu',
@ -205,6 +209,7 @@ window.characterRank={
'hs_brann', 'hs_brann',
're_liubei', 're_liubei',
'liyan', 'liyan',
'yanbaihu',
], ],
bp:[ bp:[
'hs_hallazeal', 'hs_hallazeal',
@ -327,7 +332,8 @@ window.characterRank={
'hs_zhouzhuo', 'hs_zhouzhuo',
'hs_liadrin', 'hs_liadrin',
'hs_anomalus', 'hs_anomalus',
'yanbaihu', 'sp_pangde',
'sp_jiaxu',
], ],
b:[ b:[
'xin_liru', 'xin_liru',

View File

@ -4095,12 +4095,7 @@ character.swd={
return ai.get.attitude(player,event.player)<0; return ai.get.attitude(player,event.player)<0;
}, },
content:function(){ content:function(){
"step 0" player.discardPlayerCard(trigger.player).logSkill=['guanhu',trigger.player];
player.discardPlayerCard(trigger.player);
"step 1"
if(result.bool){
player.logSkill('guanhu',trigger.player);
}
}, },
ai:{ ai:{
expose:0.2 expose:0.2
@ -5731,7 +5726,7 @@ character.swd={
direct:true, direct:true,
content:function(){ content:function(){
"step 0" "step 0"
var next=player.chooseToDiscard('朱羽:是否弃置一张红色牌使受到一点火焰伤害?','he',function(card){ var next=player.chooseToDiscard('朱羽:是否弃置一张红色牌使'+get.translation(trigger.player)+'受到一点火焰伤害?','he',function(card){
return get.color(card)=='red'; return get.color(card)=='red';
}); });
next.logSkill=['zhuyu',trigger.player,'fire']; next.logSkill=['zhuyu',trigger.player,'fire'];

View File

@ -10,7 +10,7 @@ play.cardpile={
}, },
huosha:{ huosha:{
diamond:2, diamond:2,
hearth:3 heart:3
}, },
leisha:{ leisha:{
spade:5, spade:5,
@ -76,9 +76,12 @@ play.cardpile={
for(var j in data[i]){ for(var j in data[i]){
var n=Math.round(dn*data[i][j]/num); var n=Math.round(dn*data[i][j]/num);
while(n--){ while(n--){
if(i=='huosha'||i=='leisha'){ if(i=='huosha'){
lib.card.list.push([j,rand(),'sha',i.slice(0,3)]); lib.card.list.push([j,rand(),'sha','fire']);
} }
else if(i=='leisha'){
lib.card.list.push([j,rand(),'sha','thunder']);
}
else{ else{
lib.card.list.push([j,rand(),i]); lib.card.list.push([j,rand(),i]);
} }

View File

@ -4733,7 +4733,7 @@
var list=lib.rank.s.concat(lib.rank.ap).concat(lib.rank.a).concat(lib.rank.am). var list=lib.rank.s.concat(lib.rank.ap).concat(lib.rank.a).concat(lib.rank.am).
concat(lib.rank.bp).concat(lib.rank.b).concat(lib.rank.bm).concat(lib.rank.c).concat(lib.rank.d); concat(lib.rank.bp).concat(lib.rank.b).concat(lib.rank.bm).concat(lib.rank.c).concat(lib.rank.d);
for(var i in lib.character){ for(var i in lib.character){
if(i!='zuoci'&&i.indexOf('boss_')!=0&&!list.contains(i)&&!lib.customCharacters.contains(i)) console.log(i); if(i!='zuoci'&&i.indexOf('boss_')!=0&&i.indexOf('tafang_')!=0&&!list.contains(i)&&!lib.customCharacters.contains(i)) console.log(i);
} }
}, },
h:function(player){ h:function(player){
@ -30871,19 +30871,21 @@
return num/list.length; return num/list.length;
}, },
rank:function(name,num){ rank:function(name,num){
if(name==_status.lord) return num?8:'ap'; if(num==true) num=9;
if(typeof num!='number') num=false;
if(name==_status.lord) return num?Math.round(7*(num-1)/8+1):'ap';
var rank=lib.rank; var rank=lib.rank;
if(rank.s.contains(name)) return num?9:'s'; if(rank.s.contains(name)) return num?Math.round(8*(num-1)/8+1):'s';
if(rank.ap.contains(name)) return num?8:'ap'; if(rank.ap.contains(name)) return num?Math.round(7*(num-1)/8+1):'ap';
if(rank.a.contains(name)) return num?7:'a'; if(rank.a.contains(name)) return num?Math.round(6*(num-1)/8+1):'a';
if(rank.am.contains(name)) return num?6:'am'; if(rank.am.contains(name)) return num?Math.round(5*(num-1)/8+1):'am';
if(rank.bp.contains(name)) return num?5:'bp'; if(rank.bp.contains(name)) return num?Math.round(4*(num-1)/8+1):'bp';
if(rank.b.contains(name)) return num?4:'b'; if(rank.b.contains(name)) return num?Math.round(3*(num-1)/8+1):'b';
if(rank.bm.contains(name)) return num?3:'bm'; if(rank.bm.contains(name)) return num?Math.round(2*(num-1)/8+1):'bm';
if(rank.c.contains(name)) return num?2:'c'; if(rank.c.contains(name)) return num?Math.round(1*(num-1)/8+1):'c';
if(rank.d.contains(name)) return num?1:'d'; if(rank.d.contains(name)) return num?Math.round(0*(num-1)/8+1):'d';
if(lib.customCharacters.contains(name)) return num?9:'s'; if(lib.customCharacters.contains(name)) return num?Math.round(8*(num-1)/8+1):'s';
if(lib.characterPack.boss&&lib.characterPack.boss[name]) return num?10:'sp'; if(lib.characterPack.boss&&lib.characterPack.boss[name]) return num?Math.round(9*(num-1)/8+1):'sp';
return num?1:'x'; return num?1:'x';
}, },
targetsInfo:function(targets){ targetsInfo:function(targets){

Binary file not shown.

Before

Width:  |  Height:  |  Size: 35 KiB

After

Width:  |  Height:  |  Size: 44 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 62 KiB

After

Width:  |  Height:  |  Size: 61 KiB

BIN
image/mode/.DS_Store vendored

Binary file not shown.

Binary file not shown.

View File

@ -385,6 +385,7 @@ mode.tafang={
next.setContent(function(){ next.setContent(function(){
'step 0' 'step 0'
_status.turnCount++; _status.turnCount++;
_status.remainingCount-=_status.friends.length;
ui.turnCount.innerHTML='回合'+get.cnNumber(_status.turnCount,true); ui.turnCount.innerHTML='回合'+get.cnNumber(_status.turnCount,true);
var dialog=ui.create.dialog('剩余行动点:'+(10+_status.remainingCount),'hidden'); var dialog=ui.create.dialog('剩余行动点:'+(10+_status.remainingCount),'hidden');
dialog.style.height='260px'; dialog.style.height='260px';
@ -393,6 +394,9 @@ mode.tafang={
dialog.classList.add('noupdate'); dialog.classList.add('noupdate');
event.dialog=dialog; event.dialog=dialog;
var list=_status.characterList.splice(0,6); var list=_status.characterList.splice(0,6);
list.sort(function(a,b){
return get.rank(a,true)-get.rank(b,true);
});
var map={}; var map={};
map.bufang=ui.create.buttons(lib.mechlist,'character',dialog.content); map.bufang=ui.create.buttons(lib.mechlist,'character',dialog.content);
var difficulty=parseInt(get.config('tafang_difficulty')); var difficulty=parseInt(get.config('tafang_difficulty'));
@ -418,7 +422,7 @@ mode.tafang={
var button=map.zhaomu[i]; var button=map.zhaomu[i];
button.node.intro.classList.add('showintro'); button.node.intro.classList.add('showintro');
button.node.intro.classList.add('tafang'); button.node.intro.classList.add('tafang');
button.count=difficulty+4; button.count=difficulty+get.rank(button.link,3.9)+3;
button.node.intro.innerHTML=get.cnNumber(button.count,true); button.node.intro.innerHTML=get.cnNumber(button.count,true);
button._link='招募'; button._link='招募';
} }
@ -457,7 +461,7 @@ mode.tafang={
if(map[i][j].count>count){ if(map[i][j].count>count){
map[i][j].classList.add('unselectable'); map[i][j].classList.add('unselectable');
} }
else if(i=='zhaomu'&&_status.friends.length+selectedZhaomu>=ui.chesswidth){ else if(i=='zhaomu'&&_status.friends.length+selectedZhaomu>=5){
map[i][j].classList.add('unselectable'); map[i][j].classList.add('unselectable');
} }
else if(i=='bufang'){ else if(i=='bufang'){
@ -514,9 +518,8 @@ mode.tafang={
} }
_status.lastTafangCommand=link; _status.lastTafangCommand=link;
} }
event.control=ui.create.control('布防','招募','行动',function(link,node){ event.control=ui.create.control('布防','招募',function(link,node){
if(link=='行动'&&_status.friends.length==0) return; if(node.disabled) return;
if(link=='招募'&&_status.friends.length>=ui.chesswidth) return;
var current=node.parentNode.querySelector('.thundertext'); var current=node.parentNode.querySelector('.thundertext');
if(current==node) return; if(current==node) return;
if(current){ if(current){
@ -524,16 +527,17 @@ mode.tafang={
} }
update(link); update(link);
}); });
if(!_status.friends.length){ // if(!_status.friends.length){
event.control.lastChild.style.opacity=0.5; // event.control.lastChild.style.opacity=0.5;
if(_status.lastTafangCommand=='行动'){ // if(_status.lastTafangCommand=='行动'){
_status.lastTafangCommand='招募'; // _status.lastTafangCommand='招募';
} // }
} // }
if(_status.friends.length>=ui.chesswidth){ if(_status.friends.length>=5){
event.control.childNodes[1].style.opacity=0.5; event.control.childNodes[1].style.opacity=0.5;
event.control.childNodes[1].disabled=true;
if(_status.lastTafangCommand=='招募'){ if(_status.lastTafangCommand=='招募'){
_status.lastTafangCommand='行动'; _status.lastTafangCommand='布防';
} }
} }
_status.imchoosing=true; _status.imchoosing=true;
@ -542,24 +546,24 @@ mode.tafang={
var selected=dialog.querySelectorAll('.button.selected'); var selected=dialog.querySelectorAll('.button.selected');
event.bufang=[]; event.bufang=[];
event.zhaomu=[]; event.zhaomu=[];
event.xingdong=[]; event.xingdong=_status.friends.slice(0);
var xingdongs=[]; // var xingdongs=[];
_status.remainingCount+=10; _status.remainingCount+=10;
for(var i=0;i<selected.length;i++){ for(var i=0;i<selected.length;i++){
switch(selected[i]._link){ switch(selected[i]._link){
case '布防':event.bufang.push(selected[i].link);break; case '布防':event.bufang.push(selected[i].link);break;
case '招募':event.zhaomu.push(selected[i].link);break; case '招募':event.zhaomu.push(selected[i].link);break;
case '行动':xingdongs.push(selected[i]);break; // case '行动':xingdongs.push(selected[i]);break;
} }
_status.remainingCount-=selected[i].count; _status.remainingCount-=selected[i].count;
} }
_status.remainingCount=Math.ceil(_status.remainingCount/2); _status.remainingCount=Math.floor(_status.remainingCount/2);
xingdongs.sort(function(a,b){ // xingdongs.sort(function(a,b){
return a._clickOrder-b._clickOrder; // return a._clickOrder-b._clickOrder;
}); // });
for(var i=0;i<xingdongs.length;i++){ // for(var i=0;i<xingdongs.length;i++){
event.xingdong.push(xingdongs[i].link); // event.xingdong.push(xingdongs[i].link);
} // }
game.resume(); game.resume();
}; };
event.done=ui.create.control('完成',eventdong); event.done=ui.create.control('完成',eventdong);
@ -580,7 +584,7 @@ mode.tafang={
updateSelected(); updateSelected();
},50); },50);
event.switchToAuto=eventdong; event.switchToAuto=eventdong;
if(!_status.auto){ if(!_status.auto&&10+_status.remainingCount>0){
game.pause(); game.pause();
} }
else{ else{
@ -1195,12 +1199,12 @@ mode.tafang={
}, },
characterPack:{ characterPack:{
mode_tafang:{ mode_tafang:{
tafang_mech_dubiaoxianjing:['','',4,[],['boss']], // tafang_mech_dubiaoxianjing:['','',4,[],['boss']],
tafang_mech_jiqishi:['','',4,[],['boss']], // tafang_mech_jiqishi:['','',4,[],['boss']],
tafang_mech_shenmidiaoxiang:['','',4,[],['boss']], // tafang_mech_shenmidiaoxiang:['','',4,[],['boss']],
tafang_mech_shenpanxianjing:['','',4,[],['boss']], // tafang_mech_shenpanxianjing:['','',4,[],['boss']],
tafang_mech_shiyuansu:['','',4,[],['boss']], // tafang_mech_shiyuansu:['','',4,[],['boss']],
tafang_mech_wuyashenxiang:['','',4,[],['boss']], // tafang_mech_wuyashenxiang:['','',4,[],['boss']],
tafang_mech_guangmingquan:['','',3,['tafang_mech_guangmingquan_skill'],['boss']], tafang_mech_guangmingquan:['','',3,['tafang_mech_guangmingquan_skill'],['boss']],
tafang_mech_nengliangqiu:['','',3,['tafang_mech_nengliangqiu_skill'],['boss']], tafang_mech_nengliangqiu:['','',3,['tafang_mech_nengliangqiu_skill'],['boss']],
@ -1217,9 +1221,9 @@ mode.tafang={
help:{ help:{
'塔防模式': '塔防模式':
'<ul><li>阻上敌人到达最下方的出口,坚持到给定的回合数即获得胜利<li>'+ '<ul><li>阻上敌人到达最下方的出口,坚持到给定的回合数即获得胜利<li>'+
'每轮可获得10个行动点用来布置机关、招募武将,或令武将行动。游戏难度将影响不同操作消耗的行动点数。未用完的行动点将减半(向上取整)并累积到下一轮<li>'+ '每轮可获得10个行动点用来布置机关、招募武将。场上每有一个友方武将,行动点数-1。游戏难度将影响不同操作消耗的行动点数。未用完的行动点将减半向下取整)并累积到下一轮<li>'+
'每一轮在最上方的一个随机位置增加一名敌人,若最上方已有角色,则将其下移一格<li>'+ '每一轮在最上方的一个随机位置增加一名敌人,若最上方已有角色,则将其下移一格<li>'+
'战场上最多出现3个相同的机关每个机关在置入战场3轮后消失。战场上最多招募10名友方角色。<li>'+ '战场上最多出现3个相同的机关每个机关在置入战场3轮后消失。战场上最多招募5名友方角色。<li>'+
'敌方角色到达底部出口时游戏失败,已方角色到达底部出口,将被移出游戏', '敌方角色到达底部出口时游戏失败,已方角色到达底部出口,将被移出游戏',
}, },
} }