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 2021-01-18 19:39:33 +08:00
commit 2705946bf9
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -244,15 +244,17 @@ export class PetHandler {
let n = -value; let n = -value;
let hv = 0;
for( let [k, v] of this._effhalos){ for( let [k, v] of this._effhalos){
if(v > 0){ if(v > 0){
n += v; n += v;
hv -= v;
if(n >= 0){ if(n >= 0){
this._effhalos.set(k, n); this._effhalos.set(k, n);
break; break;
}else{ }else{
this._effhalos.set(k, 0); this._effhalos.set(k, 0);
n += v; // n += v;
} }
} }
} }
@ -261,7 +263,7 @@ export class PetHandler {
return -value; return -value;
} }
return this.addBaseAP(n, from); return hv + this.addBaseAP(n, from);
}; };
public addBaseAP(value: number, from: PetHandler): number{ public addBaseAP(value: number, from: PetHandler): number{
@ -284,6 +286,7 @@ export class PetHandler {
this.dataChanged(from); this.dataChanged(from);
this.addHP(tmp, from); this.addHP(tmp, from);
}else{ }else{
this._baseap = 0;
this.dataChanged(from); this.dataChanged(from);
this.die(); this.die();
} }

6
src/rooms/logic/skill/Skill.ts
View File

@ -322,9 +322,9 @@ export class Skill {
}; };
_real_trigger(param: SkillParam, cb?: any) { _real_trigger(param: SkillParam, cb?: any) {
if(!this._sts){ // if(!this._sts){
this._sts = this.getTargets(param); // this._sts = this.getTargets(param);
} // }
let res = TriggerManager.onTrigger(this, param, this._sts); let res = TriggerManager.onTrigger(this, param, this._sts);