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

Merge pull request #344 from nonameShijian/PR-Branch 

fix bug
This commit is contained in:
Spmario233 2023-09-18 13:21:52 +08:00 committed by GitHub
parent 544fab6569 5af0d87194
commit b0893eb3a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
game/game.js
View File

@ -19168,8 +19168,9 @@
},
},
player:{
//新函数
/**
* version 1.2
* version 1.3
*
* 链式创建一次性技能的api。
*
@ -19182,14 +19183,18 @@
while(lib.skill[skillName]!=null){
skillName='player_when_'+Math.random().toString(36).slice(-8);
}
triggerNames.push(`${skillName}After`);
var skill={
trigger:{player:triggerNames},
forced:true,
charlotte:true,
popup:false,
filterFuns:[],
filterFuns:[(event,player,name)=>{
return !name||(triggerNames.includes(name)&&event.player==player);
}],
contentFuns:[],
get filter(){
return function(event, player, name){
return function(event,player,name){
if(name==`${skillName}After`){
skill.popup=false;
return true;
@ -19198,12 +19203,9 @@
}
},
};
skill.trigger={player:triggerNames};
skill.filterFuns.push((event, player, name) => {
return !name||(triggerNames.includes(name)&&event.player==player);
});
Object.defineProperty(lib.skill,skillName,{
configurable:true,
//这类技能不需要被遍历到
enumerable:false,
writable:true,
value:skill
@ -19211,25 +19213,24 @@
this.addSkill(skillName);
return{
filter(fun){
if(!lib.skill[skillName]) throw `This skill has been destroyed`;
if(lib.skill[skillName]!=skill) throw `This skill has been destroyed`;
skill.filterFuns.push(fun);
return this;
},
removeFilter(fun){
if(!lib.skill[skillName]) throw `This skill has been destroyed`;
if(lib.skill[skillName]!=skill) throw `This skill has been destroyed`;
skill.filterFuns.remove(fun);
return this;
},
then(fun){
if(!lib.skill[skillName]) throw `This skill has been destroyed`;
if(lib.skill[skillName]!=skill) throw `This skill has been destroyed`;
skill.contentFuns.push(fun);
var str=`
function content(){
if(event.triggername=='${skillName}After'){
player.removeSkill('${skillName}');
delete lib.skill['${skillName}'];
delete lib.translate['${skillName}']
console.log('remove ${skillName}');
delete lib.translate['${skillName}'];
return event.finish();
}
`;
@ -19244,23 +19245,22 @@
return this;
},
popup(str){
if(!lib.skill[skillName]) throw `This skill has been destroyed`;
if(lib.skill[skillName]!=skill) throw `This skill has been destroyed`;
if(typeof str=='string') skill.popup=str;
return this;
},
translation(translation){
if(!lib.skill[skillName]) throw `This skill has been destroyed`;
if(lib.skill[skillName]!=skill) throw `This skill has been destroyed`;
if(typeof translation=='string') lib.translate[skillName]=translation;
return this;
},
assgin(obj) {
if(!lib.skill[skillName]) throw `This skill has been destroyed`;
if(lib.skill[skillName]!=skill) throw `This skill has been destroyed`;
if(typeof obj=='object'&&obj!==null) Object.assign(skill,obj);
return this;
}
};
},
//新函数
//让一名角色明置一些手牌
addShownCards:function(){
const cards=[];
@ -19905,7 +19905,7 @@
},
removeGaintag:function(tag,cards){
cards=cards||this.getCards('h');
game.addVideo('removeGaintag',this,[tag,cards]);
game.addVideo('removeGaintag',this,[tag,get.cardsInfo(cards)]);
game.broadcastAll(function(player,tag,cards){
for(var i of cards) i.removeGaintag(tag);
},this,tag,cards);