diff --git a/src/rooms/logic/Handler/PetHandler.ts b/src/rooms/logic/Handler/PetHandler.ts index 620a53a..47084a2 100644 --- a/src/rooms/logic/Handler/PetHandler.ts +++ b/src/rooms/logic/Handler/PetHandler.ts @@ -244,15 +244,17 @@ export class PetHandler { let n = -value; + let hv = 0; for( let [k, v] of this._effhalos){ if(v > 0){ n += v; + hv -= v; if(n >= 0){ this._effhalos.set(k, n); break; }else{ this._effhalos.set(k, 0); - n += v; + // n += v; } } } @@ -261,7 +263,7 @@ export class PetHandler { return -value; } - return this.addBaseAP(n, from); + return hv + this.addBaseAP(n, from); }; public addBaseAP(value: number, from: PetHandler): number{ @@ -284,6 +286,7 @@ export class PetHandler { this.dataChanged(from); this.addHP(tmp, from); }else{ + this._baseap = 0; this.dataChanged(from); this.die(); } diff --git a/src/rooms/logic/skill/Skill.ts b/src/rooms/logic/skill/Skill.ts index c3357b6..12833cb 100644 --- a/src/rooms/logic/skill/Skill.ts +++ b/src/rooms/logic/skill/Skill.ts @@ -322,9 +322,9 @@ export class Skill { }; _real_trigger(param: SkillParam, cb?: any) { - if(!this._sts){ - this._sts = this.getTargets(param); - } + // if(!this._sts){ + // this._sts = this.getTargets(param); + // } let res = TriggerManager.onTrigger(this, param, this._sts);