node/card_svr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'second' of git.kingsome.cn:node/card_svr into second

Browse Source
This commit is contained in:
zhl 2020-12-23 13:47:42 +08:00
commit b9525867cf
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/rooms/logic/Handler/PetHandler.ts
View File

@ -458,6 +458,14 @@ export class PetHandler {
if(this._isSilent){ if(this._isSilent){
return; return;
} }
if(sp && sp.cardid == 0){
if(!sp.edd_cnt){
sp.edd_cnt = this._orignEffCnt;
}
if(!sp.cardpoint){
sp.cardpoint = this._orignCardPoint;
}
}
this._waitskills.forEach((item: Skill) => { this._waitskills.forEach((item: Skill) => {
item.checkTrigger(tgtype, tgtv, sp, cb); item.checkTrigger(tgtype, tgtv, sp, cb);
}); });

15
src/rooms/logic/Handler/PlayerHandler.ts
View File

@ -528,6 +528,7 @@ export class PlayerHandler {
if(!sp){ if(!sp){
sp = new SkillParam(0, 0, 0, this, this._self, null, null); sp = new SkillParam(0, 0, 0, this, this._self, null, null);
} }
let reslst: SkillTarget[] = []; let reslst: SkillTarget[] = [];
this._self.checkSkills(tgttype, tgtvalue, sp, (skill: Skill, ap: SkillParam, res: SkillTarget[])=>{ this._self.checkSkills(tgttype, tgtvalue, sp, (skill: Skill, ap: SkillParam, res: SkillTarget[])=>{
if(res){ if(res){
@ -573,15 +574,23 @@ export class PlayerHandler {
}; };
simpleCheckSkills(skills: Skill[], apet?: PetHandler, param?: SkillParam): SkillTarget[]{ simpleCheckSkills(skills: Skill[], apet?: PetHandler, param?: SkillParam): SkillTarget[]{
let ps = param? param: new SkillParam(0, 0, 0, this, apet, this, apet); let sp = param? param: new SkillParam(0, 0, 0, this, apet, this, apet);
if(sp && sp.cardid == 0 && apet){
if(!sp.edd_cnt){
sp.edd_cnt = apet._orignEffCnt;
}
if(!sp.cardpoint){
sp.cardpoint = apet._orignCardPoint;
}
}
let reslst: SkillTarget[] = []; let reslst: SkillTarget[] = [];
skills.forEach((item: Skill)=>{ skills.forEach((item: Skill)=>{
item.checkTrigger(TriggerType.NO_COND, 0, ps, (skill: Skill, ap: SkillParam, res: SkillTarget[])=>{ item.checkTrigger(TriggerType.NO_COND, 0, sp, (skill: Skill, ap: SkillParam, res: SkillTarget[])=>{
if(res){ if(res){
reslst = reslst.concat(res); reslst = reslst.concat(res);
}else{ }else{
let st = new SkillTarget(skill); let st = new SkillTarget(skill);
st.LoadParam(ps); st.LoadParam(sp);
reslst.push(st); reslst.push(st);
} }
}); });