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

cx

This commit is contained in:
libccy 2017-11-05 15:46:54 +08:00
parent 8d386ad6e6
commit 50c10f67d3
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
character/sp.js
View File

@ -590,7 +590,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
var target=player.storage.xianfu2; var target=player.storage.xianfu2;
player.line(target,'green'); player.line(target,'green');
target.logSkill('xianfu'); target.logSkill('xianfu');
target[trigger.name](trigger.num); target[trigger.name](trigger.num,trigger.source||'nosource');
game.delay(); game.delay();
}, },
group:'xianfu3', group:'xianfu3',
@ -1416,6 +1416,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
chuanxin:{ chuanxin:{
trigger:{source:'damageBefore'}, trigger:{source:'damageBefore'},
filter:function(event,player){ filter:function(event,player){
if(_status.currentPhase!=player) return false;
if(!_status.event.getParent('phaseUse')) return false;
if(event.card&&(event.card.name=='sha'||event.card.name=='juedou')){ if(event.card&&(event.card.name=='sha'||event.card.name=='juedou')){
if(get.mode()=='guozhan'){ if(get.mode()=='guozhan'){
return (event.player.identity!='qun'||player.identity=='ye')&& return (event.player.identity!='qun'||player.identity=='ye')&&

3
game/game.js
View File

@ -17265,7 +17265,7 @@
if(player.identity=='unknown'||player.identity=='ye') return false; if(player.identity=='unknown'||player.identity=='ye') return false;
return this.identity==player.identity; return this.identity==player.identity;
} }
if(typeof this.side=='boolean'&&typeof player.side=='boolean'){ if(this.side!=undefined&&typeof player.side=='boolean'){
return this.side==player.side; return this.side==player.side;
} }
return this==player; return this==player;
@ -19445,6 +19445,7 @@
cancel:function(){ cancel:function(){
this.untrigger.call(this,arguments); this.untrigger.call(this,arguments);
this.finish(); this.finish();
this.trigger(this.name+'Cancelled');
}, },
goto:function(step){ goto:function(step){
this.step=step-1; this.step=step-1;

6
game/update.js
View File

@ -2,10 +2,10 @@ window.noname_update={
version:'1.9.40', version:'1.9.40',
// update:'1.9.38.1', // update:'1.9.38.1',
changeLog:[ changeLog:[
'原7武将', '原7武将、新张宝',
'诸侯伐董', '诸侯伐董、神之试炼',
'武将称号', '武将称号',
'bug修复（父魂）' 'bug修复（父魂、截辎、穿心、先辅、魔箭）'
], ],
files:[ files:[
// 'game/game.js', // 'game/game.js',