diff --git a/doc/细化.xmind b/doc/细化.xmind index 1d9b86a..b3a9b61 100644 Binary files a/doc/细化.xmind and b/doc/细化.xmind differ diff --git a/src/rooms/logic/Handler/PlayerHandler.ts b/src/rooms/logic/Handler/PlayerHandler.ts index 394eb82..7f22359 100644 --- a/src/rooms/logic/Handler/PlayerHandler.ts +++ b/src/rooms/logic/Handler/PlayerHandler.ts @@ -213,6 +213,7 @@ export class PlayerHandler { if(oldpet && CfgMan.hasSummonPetSkill(lst)){ this.delPet(oldpet); } + obj.srcpet = this._self; this.useSkills(lst, obj); } return true; @@ -559,7 +560,7 @@ export class PlayerHandler { if(!from){ console.log('[error]behurt not from!' + value); } - this.singleCheckSkills(apet, TriggerType.BE_HURT, from._owner); + this.singleCheckSkills(apet, TriggerType.BE_HURT, from? from._owner: null); }; public onShieldUsed(apet: PetHandler){