fix
This commit is contained in:
Spmario233
parent
95c3cf7def
commit
59b5e32726
|
|
@ -568,6 +568,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
|
|||
},
|
||||
_yongjian_zengyu:{
|
||||
enable:'phaseUse',
|
||||
forceLoad:true,
|
||||
filter:function(event,player){
|
||||
return player.hasCard((card)=>lib.skill._yongjian_zengyu.filterCard(card),'h');
|
||||
},
|
||||
|
|
|
|||
|
|
@ -623,7 +623,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
|||
event.score=score;
|
||||
game.log(player,'的演奏评级为','#y'+result.rank[0],'，获得积分点数','#y'+score,'分');
|
||||
if(score<3){
|
||||
if(score>2) player.draw();
|
||||
if(score>=2) player.draw();
|
||||
event.finish();
|
||||
return;
|
||||
}
|
||||
|
|
@ -1845,7 +1845,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
|||
target.judge(function(card){
|
||||
if(get.color(card)=='black') return -2;
|
||||
return 0.1;
|
||||
}).al2=function(result){
|
||||
}).judge2=function(result){
|
||||
return result.bool===false?true:false;
|
||||
};
|
||||
}
|
||||
|
|
@ -2095,14 +2095,17 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
|||
return get.effect(target,{name:'sha'},evt.source,evt.player);
|
||||
});
|
||||
}
|
||||
else event.finish();
|
||||
else{
|
||||
event._result={bool:false};
|
||||
event.goto(4);
|
||||
}
|
||||
'step 3'
|
||||
var target2=result.targets[0];
|
||||
player.line(target2,'green');
|
||||
target.chooseToUse(function(card,player,event){
|
||||
if(get.name(card)!='sha') return false;
|
||||
return lib.filter.filterCard.apply(this,arguments);
|
||||
},'对'+get.translation(target2)+'使用一张杀，否则本回合对'+get.translation(player)+'使用伤害牌时，需交给其两张牌才能生效').set('targetRequired',true).set('complexSelect',true).set('filterTarget',function(card,player,target){
|
||||
},'对'+get.translation(target2)+'使用一张杀，否则交给其两张牌').set('targetRequired',true).set('complexSelect',true).set('filterTarget',function(card,player,target){
|
||||
if(target!=_status.event.sourcex&&!ui.selected.targets.contains(_status.event.sourcex)) return false;
|
||||
return lib.filter.targetEnabled.apply(this,arguments);
|
||||
}).set('sourcex',target2).set('addCount',false);
|
||||
|
|
@ -2113,6 +2116,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
|||
else if(hs.length<=2) event._result={bool:true,cards:hs};
|
||||
else target.chooseCard(2,true,'交给'+get.translation(player)+'两张牌','he');
|
||||
}
|
||||
else event.finish();
|
||||
'step 5'
|
||||
if(result.bool) player.gain(result.cards,target,'giveAuto');
|
||||
},
|
||||
|
|
|
|||
|
|
@ -671,7 +671,13 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
|||
if(!target.storage.oljuanxia_counter) target.storage.oljuanxia_counter={};
|
||||
if(!target.storage.oljuanxia_counter[player.playerid]) target.storage.oljuanxia_counter[player.playerid]=0;
|
||||
target.storage.oljuanxia_counter[player.playerid]+=result.links.length;
|
||||
for(var i of result.links) player.useCard({name:i[2]},target,false);
|
||||
event.links=result.links;
|
||||
}
|
||||
'step 4'
|
||||
if(target.isIn()){
|
||||
var name=event.links.shift()[2];
|
||||
player.useCard({name:name,isCard:true},target,false);
|
||||
if(event.links.length) event.redo();
|
||||
}
|
||||
},
|
||||
subSkill:{
|
||||
|
|
|
|||
|
|
@ -1037,7 +1037,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
|||
},
|
||||
content:function(){
|
||||
'step 0'
|
||||
player.chooseCard('h',get.prompt('nhyanzheng2')).set('goon',function(){
|
||||
player.chooseCard('h',get.prompt('nhyanzheng')).set('goon',function(){
|
||||
var num=player.countCards('h')-1;
|
||||
return game.countPlayer(function(current){
|
||||
return get.damageEffect(current,player,player)>0;
|
||||
|
|
@ -1920,6 +1920,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
|||
return get.effect(target,card,target,player);
|
||||
}).set('cardType',event.cardType);
|
||||
'step 2'
|
||||
if(!result.bool) return;
|
||||
var target=result.targets[0];
|
||||
player.line(target,'green');
|
||||
var card=get.cardPile2(function(card){
|
||||
|
|
|
|||
|
|
@ -51282,11 +51282,12 @@
|
|||
type2:function(card,player){
|
||||
return get.type(card,'trick',player);
|
||||
},
|
||||
subtype:function(obj){
|
||||
subtype:function(obj,player){
|
||||
if(typeof obj=='string') obj={name:obj};
|
||||
if(typeof obj!='object') return;
|
||||
if(!lib.card[obj.name]) return;
|
||||
return lib.card[obj.name].subtype;
|
||||
var name=get.name(obj,player);
|
||||
if(!lib.card[name]) return;
|
||||
return lib.card[name].subtype;
|
||||
},
|
||||
equiptype:function(card,player){
|
||||
var subtype=get.subtype(card,player);
|
||||
|
|
|
|||
|
|
@ -1,9 +1,7 @@
|
|||
window.noname_update={
|
||||
version:'1.9.112',
|
||||
update:'1.9.111.1',
|
||||
version:'1.9.112.0.1',
|
||||
update:'1.9.112',
|
||||
changeLog:[
|
||||
'孙寒华、手杀崔琰、手杀张昌蒲、费祎、手杀蒋钦',
|
||||
'冯芳女、杨仪、韩猛、辛评、主公技加强、用间篇群曹操',
|
||||
'bug修复',
|
||||
],
|
||||
files:[
|
||||
|
|
@ -17,33 +15,33 @@ window.noname_update={
|
|||
//'card/standard.js',
|
||||
//'card/swd.js',
|
||||
//'card/yunchou.js',
|
||||
'card/yingbian.js',
|
||||
//'card/yongjian.js',
|
||||
//'card/yingbian.js',
|
||||
'card/yongjian.js',
|
||||
//'card/zhenfa.js',
|
||||
//'card/zhulu.js',
|
||||
//'character/diy.js',
|
||||
'character/extra.js',
|
||||
//'character/extra.js',
|
||||
//'character/hearth.js',
|
||||
//'character/gujian.js',
|
||||
//'character/gwent.js',
|
||||
//'character/hearth.js',
|
||||
'character/mobile.js',
|
||||
//'character/mtg.js',
|
||||
'character/offline.js',
|
||||
//'character/offline.js',
|
||||
//'character/old.js',
|
||||
//'character/ow.js',
|
||||
'character/rank.js',
|
||||
'character/refresh.js',
|
||||
'character/shenhua.js',
|
||||
//'character/rank.js',
|
||||
//'character/refresh.js',
|
||||
//'character/shenhua.js',
|
||||
'character/sp.js',
|
||||
'character/sp2.js',
|
||||
'character/tw.js',
|
||||
'character/standard.js',
|
||||
//'character/tw.js',
|
||||
//'character/standard.js',
|
||||
//'character/swd.js',
|
||||
//'character/xianjian.js',
|
||||
//'character/xinghuoliaoyuan.js',
|
||||
//'character/yingbian.js',
|
||||
'character/yijiang.js',
|
||||
//'character/yijiang.js',
|
||||
//'character/yxs.js',
|
||||
//'extension/boss/extension.js',
|
||||
//'layout/default/layout.css',
|
||||
|
|
@ -56,14 +54,14 @@ window.noname_update={
|
|||
//'mode/chess.js',
|
||||
//'mode/connect.js',
|
||||
//'mode/doudizhu.js',
|
||||
'mode/guozhan.js',
|
||||
//'mode/guozhan.js',
|
||||
//'mode/identity.js',
|
||||
//'mode/single.js',
|
||||
//'mode/stone.js',
|
||||
//'mode/tafang.js',
|
||||
'mode/versus.js',
|
||||
//'mode/versus.js',
|
||||
'game/game.js',
|
||||
'game/keyWords.js',
|
||||
//'game/keyWords.js',
|
||||
//'game/NoSleep.js',
|
||||
//'game/config.js',
|
||||
//'game/package.js',
|
||||
|
|
|
|||
Loading…
Reference in New Issue