触发条件优化

src/rooms/logic/Handler/PetHandler.ts

@@ -356,7 +356,7 @@ export class PetHandler {
         if(this._isHero){
             if(this._owner.canBeKill(value) && this.canReborn()){
                 // 直接复活
-                this._owner.simpleCheckSkills([this._rebornskill], this);
+                this._owner.simpleCheckSkills([this._rebornskill], true, this);
                 return 0;
             }
             return this._owner.addHP(value, from);

src/rooms/logic/Handler/PlayerHandler.ts

@@ -266,7 +266,7 @@ export class PlayerHandler {
                 pet.dataChanged(pet);
             }
         }
-        return this.simpleCheckSkills(lst, pet, param);
+        return this.simpleCheckSkills(lst, false, pet, param);
     };
 
     public summonPet(petid: number, count: number = 1, exparam: SkillParam):number{
@@ -408,7 +408,7 @@ export class PlayerHandler {
         this.onEMChanged(apet._enmagic);//增加法强
         // 战吼
         if(!apet.isSilent()){
-            this.simpleCheckSkills(apet._bornSkills, apet, param);
+            this.simpleCheckSkills(apet._bornSkills, true, apet, param);
         }
 
         this.checkSkills(TriggerType.PET_BORN, null, null, apet);
@@ -417,7 +417,7 @@ export class PlayerHandler {
     public onPetDied(apet: PetHandler): boolean{
         // 遗愿
         if(!apet.isSilent()){
-            this.simpleCheckSkills(apet._dieSkills);
+            this.simpleCheckSkills(apet._dieSkills, true);
         }
 
         if(apet.isAlive()){
@@ -748,7 +748,7 @@ export class PlayerHandler {
         this._owner.onSkillResult(reslst);
     };
 
-    simpleCheckSkills(skills: Skill[], apet?: PetHandler, param?: SkillParam): SkillTarget[]{
+    simpleCheckSkills(skills: Skill[], runimm: boolean, apet?: PetHandler, param?: SkillParam): SkillTarget[]{
         if(!skills || skills.length <= 0){
             return null;
         }
@@ -763,7 +763,7 @@ export class PlayerHandler {
         }
         let reslst: SkillTarget[] = [];
         skills.forEach((item: Skill)=>{
-            item.checkTrigger(TriggerType.NO_COND, null, sp, (skill: Skill, ap: SkillParam, res: SkillTarget[])=>{
+            item.checkTrigger(runimm? TriggerType.NO_COND: TriggerType.NORMAL, null, sp, (skill: Skill, ap: SkillParam, res: SkillTarget[])=>{
                 if(res){
                     reslst.push(...res);
                 }else{

src/rooms/logic/skill/SkillConst.ts

@@ -61,7 +61,7 @@ export const enum CondDecideType {
  * 6.获得新的卡牌后
  * 7.丢弃一张卡牌后：自己回合出一张牌，不算此列
  * 8.自己回合开始
- * 10.不处理
+ * 10.正常检查
  * 11.受到伤害后
  * 12.发动冲锋技能（ID40122）前
  * 13.被冲锋后
@@ -93,6 +93,8 @@ export const enum TriggerType
 
   ROUND_START_MYSELF = 8,
 
+  NORMAL = 9,
+
   BE_HURT = 11,
 
   BEFORE_ATTACK = 12,
@@ -240,8 +242,8 @@ export const enum SkillEffectType
     BUFF_SHIELD = 30,
     HP_STEAL_ENHANCE = 31,
 
-    CHG_HP = 10001,
-    CHG_AP = 10002,
+    CHG_AP = 10001,
+    CHG_HP = 10002,
 };
 
 // 技能效果参数类型

src/rooms/logic/skill/Trigger.ts

@@ -7,6 +7,9 @@ export class Trigger {
     };
 
     isOK(tg_type: any){
+        if(this._type == TriggerType.NO_COND){
+            return true;
+        }
         return this._type == tg_type;
     };
 }