diff --git a/doc/细化.xmind b/doc/细化.xmind index e17f4d4..9dccf62 100644 Binary files a/doc/细化.xmind and b/doc/细化.xmind differ diff --git a/src/rooms/logic/Handler/PetHandler.ts b/src/rooms/logic/Handler/PetHandler.ts index 47084a2..d388e1a 100644 --- a/src/rooms/logic/Handler/PetHandler.ts +++ b/src/rooms/logic/Handler/PetHandler.ts @@ -11,6 +11,7 @@ import { PetInfo, PetInfoMsg } from "../../../message/PetInfo"; import { SkillParam, SkillTarget } from "../skill/SkillParam"; import { RemovePetMsg } from "../../../message/RemovePetMsg"; import { SKillEffectData } from "message/SkillInfo"; +import { error } from "../../../common/Debug"; export class PetHandler { _pet: Pet; @@ -179,7 +180,11 @@ export class PetHandler { }else if(obj.isAPHaloSkill() || obj.isBuffHaloSkill()){ this._halos.push(obj); }else{ - this._waitskills.push(obj); + if(obj.triggerType() == TriggerType.NO_COND){ + error('waitskill no cond!' + obj._id); + }else{ + this._waitskills.push(obj); + } } lst.push(obj); if(bkeep){