This commit is contained in:
parent
60e9103387
commit
293979e5ad
|
@ -49,7 +49,7 @@ character.standard={
|
||||||
trigger:{player:'chooseToRespondBegin'},
|
trigger:{player:'chooseToRespondBegin'},
|
||||||
filter:function(event,player){
|
filter:function(event,player){
|
||||||
if(event.responded) return false;
|
if(event.responded) return false;
|
||||||
if(!player.hasZhuSkill('jianxiong')) return false;
|
if(!player.hasZhuSkill('hujia')) return false;
|
||||||
if(event.filterCard({name:'shan'})==false) return false;
|
if(event.filterCard({name:'shan'})==false) return false;
|
||||||
for(var i=0;i<game.players.length;i++){
|
for(var i=0;i<game.players.length;i++){
|
||||||
if(game.players[i]!=player&&game.players[i].group=='wei') return true;
|
if(game.players[i]!=player&&game.players[i].group=='wei') return true;
|
||||||
|
|
35
game/game.js
35
game/game.js
|
@ -12073,9 +12073,38 @@
|
||||||
notLink:function(){
|
notLink:function(){
|
||||||
return this.getParent().name!='_lianhuan'&&this.getParent().name!='_lianhuan2';
|
return this.getParent().name!='_lianhuan'&&this.getParent().name!='_lianhuan2';
|
||||||
},
|
},
|
||||||
triggerx:function(name){
|
// triggerx:function(name){
|
||||||
|
// if(_status.video) return;
|
||||||
},
|
// if(name=='gameStart'){
|
||||||
|
// _status.gameStarted=true;
|
||||||
|
// }
|
||||||
|
// for(i=0;i<game.players.length;i++){
|
||||||
|
// for(j in game.players[i].tempSkills){
|
||||||
|
// var expire=game.players[i].tempSkills[j];
|
||||||
|
// if(expire==name||
|
||||||
|
// (get.objtype(expire)=='array'&&expire.contains(name))||
|
||||||
|
// (typeof expire=='function'&&expire(event,game.players[i],name))){
|
||||||
|
// delete game.players[i].tempSkills[j];
|
||||||
|
// game.players[i].removeSkill(j);
|
||||||
|
// }
|
||||||
|
// else if(typeof expire=='object'){
|
||||||
|
// if(expire.player==name&&event.player==game.players[i]||
|
||||||
|
// expire.target==name&&event.target==game.players[i]||
|
||||||
|
// expire.source==name&&event.source==game.players[i]){
|
||||||
|
// delete game.players[i].tempSkills[j];
|
||||||
|
// game.players[i].removeSkill(j);
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// var event=this;
|
||||||
|
// var start=event.player||game.me||game.players[0];
|
||||||
|
// if(!game.players.contains(start)){
|
||||||
|
// start=game.findNext(start);
|
||||||
|
// }
|
||||||
|
// var list=[];
|
||||||
|
//
|
||||||
|
// },
|
||||||
trigger:function(name){
|
trigger:function(name){
|
||||||
if(_status.video) return;
|
if(_status.video) return;
|
||||||
if(name=='gameStart'){
|
if(name=='gameStart'){
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
window.noname_update={
|
window.noname_update={
|
||||||
version:'1.9.0',
|
version:'1.8.20.3',
|
||||||
changeLog:[
|
changeLog:[
|
||||||
'半成品,建议退回1.8',
|
'修bug'
|
||||||
// '性能提升',
|
|
||||||
],
|
],
|
||||||
files:{
|
files:{
|
||||||
global:[
|
global:[
|
||||||
'game/game.js',
|
// 'game/game.js',
|
||||||
|
'character/standard.js',
|
||||||
],
|
],
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue