1.9.8.1
This commit is contained in:
parent
6709fd635d
commit
96224a79b7
|
@ -1289,10 +1289,12 @@ card.gujian={
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
var target=list.randomGet();
|
var target=list.randomGet();
|
||||||
|
if(target){
|
||||||
player.logSkill('mapodoufu',target);
|
player.logSkill('mapodoufu',target);
|
||||||
target.discard(target.get('he').randomGet());
|
target.discard(target.get('he').randomGet());
|
||||||
target.addExpose(0.2);
|
target.addExpose(0.2);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
player.storage.mapodoufu_markcount--;
|
player.storage.mapodoufu_markcount--;
|
||||||
if(player.storage.mapodoufu_markcount==0){
|
if(player.storage.mapodoufu_markcount==0){
|
||||||
delete player.storage.mapodoufu;
|
delete player.storage.mapodoufu;
|
||||||
|
|
|
@ -94,7 +94,7 @@ card.sp={
|
||||||
player.chooseCard('h','将一张手牌交给'+get.translation(event.target1),true);
|
player.chooseCard('h','将一张手牌交给'+get.translation(event.target1),true);
|
||||||
}
|
}
|
||||||
'step 1'
|
'step 1'
|
||||||
player.$give(1,event.target1);
|
player.$giveAuto(result.cards,event.target1);
|
||||||
event.target1.gain(result.cards,player);
|
event.target1.gain(result.cards,player);
|
||||||
'step 2'
|
'step 2'
|
||||||
if(!event.target1.num('h')){
|
if(!event.target1.num('h')){
|
||||||
|
@ -113,7 +113,7 @@ card.sp={
|
||||||
if(!event.directresult){
|
if(!event.directresult){
|
||||||
event.directresult=result.cards;
|
event.directresult=result.cards;
|
||||||
}
|
}
|
||||||
event.target1.$give(event.directresult.length,event.target2);
|
event.target1.$giveAuto(event.directresult,event.target2);
|
||||||
event.target2.gain(event.directresult,event.target1);
|
event.target2.gain(event.directresult,event.target1);
|
||||||
},
|
},
|
||||||
ai:{
|
ai:{
|
||||||
|
|
|
@ -800,7 +800,7 @@ character.hearth={
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
peiyu:{
|
peiyu:{
|
||||||
trigger:{player:['phaseBegin','phaseEnd']},
|
trigger:{player:['phaseBegin']},
|
||||||
direct:true,
|
direct:true,
|
||||||
content:function(){
|
content:function(){
|
||||||
'step 0'
|
'step 0'
|
||||||
|
@ -5627,7 +5627,7 @@ character.hearth={
|
||||||
yingxi:'影袭',
|
yingxi:'影袭',
|
||||||
yingxi_info:'结束阶段,若你本回合未造成伤害,你可以将一张黑色牌当作杀对任意一名角色使用,若目标未受到伤害,此杀不可闪避',
|
yingxi_info:'结束阶段,若你本回合未造成伤害,你可以将一张黑色牌当作杀对任意一名角色使用,若目标未受到伤害,此杀不可闪避',
|
||||||
peiyu:'培育',
|
peiyu:'培育',
|
||||||
peiyu_info:'准备阶段和结束阶段,你可以令一名没有图腾的角色获得一个随机图腾直到其首次受到伤害',
|
peiyu_info:'准备阶段,你可以令一名没有图腾的角色获得一个随机图腾直到其首次受到伤害',
|
||||||
peiyu_old_info:'出牌阶段,你可以弃置一张牌令一名没有图腾的角色获得一个随机图腾,或令一名有图腾的角色替换一个图腾;你死亡时,其他角色失去以此法获得的图腾',
|
peiyu_old_info:'出牌阶段,你可以弃置一张牌令一名没有图腾的角色获得一个随机图腾,或令一名有图腾的角色替换一个图腾;你死亡时,其他角色失去以此法获得的图腾',
|
||||||
wzhanyi:'战意',
|
wzhanyi:'战意',
|
||||||
wzhanyi_info:'你可以跳过出牌阶段,改为摸三张牌并展示之,将摸到的装备牌置于装备区,然后可以使用手牌中的杀',
|
wzhanyi_info:'你可以跳过出牌阶段,改为摸三张牌并展示之,将摸到的装备牌置于装备区,然后可以使用手牌中的杀',
|
||||||
|
|
|
@ -1438,6 +1438,10 @@ character.refresh={
|
||||||
if(event.player==player) return ai.get.attitude(player,event.source)>-3;
|
if(event.player==player) return ai.get.attitude(player,event.source)>-3;
|
||||||
return ai.get.attitude(player,event.player)>-3;
|
return ai.get.attitude(player,event.player)>-3;
|
||||||
},
|
},
|
||||||
|
logTarget:function(event,player){
|
||||||
|
if(event.player==player) return event.source;
|
||||||
|
return event.player;
|
||||||
|
},
|
||||||
content:function(){
|
content:function(){
|
||||||
"step 0"
|
"step 0"
|
||||||
game.asyncDraw([trigger.player,trigger.source],trigger.num);
|
game.asyncDraw([trigger.player,trigger.source],trigger.num);
|
||||||
|
|
23
game/game.js
23
game/game.js
|
@ -21202,7 +21202,7 @@
|
||||||
event.nodes.push(ui.create.div('.shadowed.reduce_radius.choosedouble'));
|
event.nodes.push(ui.create.div('.shadowed.reduce_radius.choosedouble'));
|
||||||
}
|
}
|
||||||
event.moveAvatar=function(node,i){
|
event.moveAvatar=function(node,i){
|
||||||
if(!node.moved){
|
if(!node.classList.contains('moved')){
|
||||||
event.blank.push(node.index);
|
event.blank.push(node.index);
|
||||||
}
|
}
|
||||||
event.nodes[node.index].style.display='';
|
event.nodes[node.index].style.display='';
|
||||||
|
@ -21221,7 +21221,7 @@
|
||||||
event.aiMove=function(){
|
event.aiMove=function(){
|
||||||
var list=[];
|
var list=[];
|
||||||
for(var i=0;i<event.avatars.length;i++){
|
for(var i=0;i<event.avatars.length;i++){
|
||||||
if(!event.avatars[i].moved){
|
if(!event.avatars[i].classList.contains('moved')){
|
||||||
list.push(event.avatars[i]);
|
list.push(event.avatars[i]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -21229,7 +21229,7 @@
|
||||||
if(Math.random()<0.7||i==list.length-1){
|
if(Math.random()<0.7||i==list.length-1){
|
||||||
event.moveAvatar(list[i],event.enemy.length);
|
event.moveAvatar(list[i],event.enemy.length);
|
||||||
event.enemy.push(list[i]);
|
event.enemy.push(list[i]);
|
||||||
list[i].moved=true;
|
list[i].classList.add('moved');
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -21316,16 +21316,19 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
if(this.moved) return;
|
|
||||||
if(!event.imchoosing) return;
|
if(!event.imchoosing) return;
|
||||||
if(event.replacing){
|
if(event.replacing){
|
||||||
this.link=event.replacing;
|
this.link=event.replacing;
|
||||||
this.setBackground(event.replacing,'character');
|
this.setBackground(event.replacing,'character');
|
||||||
delete event.replacing;
|
delete event.replacing;
|
||||||
|
if(this.classList.contains('moved')){
|
||||||
|
event.custom.add.window();
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
if(this.classList.contains('moved')) return;
|
||||||
event.moveAvatar(this,event.friend.length+event.config.width*(event.config.height-1));
|
event.moveAvatar(this,event.friend.length+event.config.width*(event.config.height-1));
|
||||||
event.friend.push(this.link);
|
event.friend.push(this.link);
|
||||||
this.moved=true;
|
this.classList.add('moved');
|
||||||
game.resume();
|
game.resume();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -21357,9 +21360,9 @@
|
||||||
event.friend.length=0;
|
event.friend.length=0;
|
||||||
event.enemy.length=0;
|
event.enemy.length=0;
|
||||||
for(var i=0;i<event.avatars.length;i++){
|
for(var i=0;i<event.avatars.length;i++){
|
||||||
if(event.avatars[i].moved){
|
if(event.avatars[i].classList.contains('moved')){
|
||||||
event.moveAvatar(event.avatars[i],event.blank.randomRemove());
|
event.moveAvatar(event.avatars[i],event.blank.randomRemove());
|
||||||
delete event.avatars[i].moved;
|
delete event.avatars[i].classList.remove('moved');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
event.redoing=true;
|
event.redoing=true;
|
||||||
|
@ -21390,7 +21393,7 @@
|
||||||
e.stopPropagation();
|
e.stopPropagation();
|
||||||
event.freechoosedialog.style.transform='scale(0.8)';
|
event.freechoosedialog.style.transform='scale(0.8)';
|
||||||
if(event.replacing){
|
if(event.replacing){
|
||||||
event.prompt('用'+get.translation(event.replacing)+'替换一名未选择武将');
|
event.prompt('用'+get.translation(event.replacing)+'替换一名武将');
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
if(event.side==0){
|
if(event.side==0){
|
||||||
|
@ -21550,7 +21553,7 @@
|
||||||
if(event.reselectnode) event.reselectnode.delete();
|
if(event.reselectnode) event.reselectnode.delete();
|
||||||
if(event.freechoosenode) event.freechoosenode.delete();
|
if(event.freechoosenode) event.freechoosenode.delete();
|
||||||
for(var i=0;i<event.avatars.length;i++){
|
for(var i=0;i<event.avatars.length;i++){
|
||||||
if(!event.avatars[i].moved){
|
if(!event.avatars[i].classList.contains('moved')){
|
||||||
if(event.side<2){
|
if(event.side<2){
|
||||||
event.moveAvatar(event.avatars[i],event.friend.length+event.config.width*(event.config.height-1));
|
event.moveAvatar(event.avatars[i],event.friend.length+event.config.width*(event.config.height-1));
|
||||||
event.friend.push(event.avatars[i]);
|
event.friend.push(event.avatars[i]);
|
||||||
|
@ -21559,7 +21562,7 @@
|
||||||
event.moveAvatar(event.avatars[i],event.enemy.length);
|
event.moveAvatar(event.avatars[i],event.enemy.length);
|
||||||
event.enemy.push(event.avatars[i]);
|
event.enemy.push(event.avatars[i]);
|
||||||
}
|
}
|
||||||
event.avatars[i].moved=true;
|
event.avatars[i].classList.add('moved');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
game.delay();
|
game.delay();
|
||||||
|
|
|
@ -1714,6 +1714,9 @@ div:hover>.intro{opacity: 1;}
|
||||||
#window>.choosedouble.character{
|
#window>.choosedouble.character{
|
||||||
transform-origin: top left;
|
transform-origin: top left;
|
||||||
}
|
}
|
||||||
|
#window>.choosedouble.character.moved{
|
||||||
|
z-index: 1;
|
||||||
|
}
|
||||||
#window>.choosedouble.character>.name{
|
#window>.choosedouble.character>.name{
|
||||||
left: 6%;
|
left: 6%;
|
||||||
top: 8%;
|
top: 8%;
|
||||||
|
|
Loading…
Reference in New Issue