diff --git a/src/rooms/logic/Handler/PetHandler.ts b/src/rooms/logic/Handler/PetHandler.ts index 1f7c10e..f89bba4 100644 --- a/src/rooms/logic/Handler/PetHandler.ts +++ b/src/rooms/logic/Handler/PetHandler.ts @@ -72,9 +72,7 @@ export class PetHandler { this.addSkill(skillid); }); - if(this._halos.length > 0){ - this._owner.onHaloAdd(this, false); - } + this._owner.onHaloAdd(this, false); this.born(param); }; diff --git a/src/rooms/logic/skill/Skill.ts b/src/rooms/logic/skill/Skill.ts index 26ad6d2..07da471 100644 --- a/src/rooms/logic/skill/Skill.ts +++ b/src/rooms/logic/skill/Skill.ts @@ -144,12 +144,17 @@ export class Skill { switch(this._data.targetid){ case GameUnitType.BATTLEUNIT: tgok = this.isInRange(srcpet, dstpet); + break; case GameUnitType.HERO: tgok = dstpet._isHero; + break; case GameUnitType.PET: if(!dstpet._isHero){ tgok = this.isInRange(srcpet, dstpet); } + break; + default: + break; } return tgok; };