diff --git a/src/rooms/logic/Handler/PetHandler.ts b/src/rooms/logic/Handler/PetHandler.ts index b795b84..cdfa88c 100644 --- a/src/rooms/logic/Handler/PetHandler.ts +++ b/src/rooms/logic/Handler/PetHandler.ts @@ -458,6 +458,14 @@ export class PetHandler { if(this._isSilent){ 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) => { item.checkTrigger(tgtype, tgtv, sp, cb); }); diff --git a/src/rooms/logic/Handler/PlayerHandler.ts b/src/rooms/logic/Handler/PlayerHandler.ts index dc5d605..80daba6 100644 --- a/src/rooms/logic/Handler/PlayerHandler.ts +++ b/src/rooms/logic/Handler/PlayerHandler.ts @@ -528,6 +528,7 @@ export class PlayerHandler { if(!sp){ sp = new SkillParam(0, 0, 0, this, this._self, null, null); } + let reslst: SkillTarget[] = []; this._self.checkSkills(tgttype, tgtvalue, sp, (skill: Skill, ap: SkillParam, res: SkillTarget[])=>{ if(res){ @@ -573,15 +574,23 @@ export class PlayerHandler { }; 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[] = []; 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){ reslst = reslst.concat(res); }else{ let st = new SkillTarget(skill); - st.LoadParam(ps); + st.LoadParam(sp); reslst.push(st); } });