diff --git a/src/rooms/logic/Handler/PetHandler.ts b/src/rooms/logic/Handler/PetHandler.ts index f603d77..5d89207 100644 --- a/src/rooms/logic/Handler/PetHandler.ts +++ b/src/rooms/logic/Handler/PetHandler.ts @@ -179,11 +179,10 @@ export class PetHandler { obj.setOrignParam(eddcnt < 0? this._orignEffCnt: eddcnt, cp < 0? this._orignCardPoint: cp, from? from: this, this, tgtflag); let bkeep = true; if(obj.isBornSkill()){ - if(from && from != this){ - bkeep = false; // 一次性技能使用 - }else{ + if(!from || from == this){ this._bornSkills.push(obj); } + bkeep = false; // 一次性技能使用 }else if(obj.isDieSkill()){ this._dieSkills.push(obj); }else if(obj.isAPHaloSkill() || obj.isBuffHaloSkill()){ @@ -422,7 +421,7 @@ export class PetHandler { if(ev != 0 && !isAtkBack){ rv *= ev; } - + let myap = isAtkBack? ev: rv; let bakap = apet.totalAP(); diff --git a/src/rooms/logic/skill/Skill.ts b/src/rooms/logic/skill/Skill.ts index 1433f1a..d0d601c 100644 --- a/src/rooms/logic/skill/Skill.ts +++ b/src/rooms/logic/skill/Skill.ts @@ -233,9 +233,7 @@ export class Skill { setTargets(tgt: SkillTarget[]){ // todo:是否需要拷贝 - if(tgt && tgt.length > 0){ - this._sts = tgt; - } + this._sts = tgt; }; getQuoteValue(count: number, maxcount: number, effcount: number){ @@ -321,54 +319,55 @@ export class Skill { } }; - _real_trigger(ncount: number, param: SkillParam, cb?: any) { + _real_trigger(param: SkillParam, cb?: any) { if(!this._sts){ this._sts = this.getTargets(param); } - for(let i=0; i