Merge branch 'second' of git.kingsome.cn:node/card_svr into second

This commit is contained in:
zhl 2021-01-19 14:04:44 +08:00
commit 4a5ea36c81

View File

@ -431,7 +431,7 @@ export class PlayerHandler {
public onPetDied(apet: PetHandler): boolean{
// 遗愿
if(!apet.isSilent()){
this.simpleCheckSkills(apet._dieSkills, true);
this.simpleCheckSkills(apet._dieSkills, true, apet);
}
if(apet.isAlive()){
@ -555,6 +555,9 @@ export class PlayerHandler {
};
public onBeHurt(apet: PetHandler, value: number, from: PetHandler){
if(!from){
console.log('[error]behurt not from!' + value);
}
this.singleCheckSkills(apet, TriggerType.BE_HURT, from._owner);
};