diff --git a/config/hero_tbl.json b/config/hero_tbl.json index ed4f037..e7de294 100644 --- a/config/hero_tbl.json +++ b/config/hero_tbl.json @@ -1 +1 @@ -[{"id":30012,"herounit_id":52012,"ex_skill":0,"follower1id":51072,"follower2id":51082,"follower3id":51032,"follower4id":51052},{"id":30022,"herounit_id":52022,"ex_skill":0,"follower1id":51062,"follower2id":51022,"follower3id":51032,"follower4id":51072},{"id":30032,"herounit_id":52032,"ex_skill":0,"follower1id":51062,"follower2id":51052,"follower3id":51072,"follower4id":51022},{"id":30042,"herounit_id":52042,"ex_skill":0,"follower1id":51062,"follower2id":51052,"follower3id":51072,"follower4id":51022},{"id":30052,"herounit_id":52052,"ex_skill":0,"follower1id":51012,"follower2id":51082,"follower3id":51032,"follower4id":51042},{"id":30062,"herounit_id":52062,"ex_skill":0,"follower1id":51022,"follower2id":51012,"follower3id":51042,"follower4id":51062},{"id":30072,"herounit_id":52072,"ex_skill":0,"follower1id":51012,"follower2id":51082,"follower3id":51032,"follower4id":51042},{"id":30082,"herounit_id":52082,"ex_skill":0,"follower1id":51062,"follower2id":51072,"follower3id":51032,"follower4id":51052},{"id":30092,"herounit_id":52092,"ex_skill":0,"follower1id":51012,"follower2id":51082,"follower3id":51032,"follower4id":51042},{"id":30102,"herounit_id":52102,"ex_skill":0,"follower1id":51062,"follower2id":51072,"follower3id":51032,"follower4id":51052}] \ No newline at end of file +[{"id":30012,"herounit_id":52012,"ex_skill":0,"follower1id":51072,"follower2id":51082,"follower3id":51032,"follower4id":51052},{"id":30022,"herounit_id":52022,"ex_skill":0,"follower1id":51062,"follower2id":51142,"follower3id":51032,"follower4id":51072},{"id":30032,"herounit_id":52032,"ex_skill":0,"follower1id":51062,"follower2id":51052,"follower3id":51072,"follower4id":51022},{"id":30042,"herounit_id":52042,"ex_skill":0,"follower1id":51062,"follower2id":51122,"follower3id":51112,"follower4id":51042},{"id":30052,"herounit_id":52052,"ex_skill":0,"follower1id":51132,"follower2id":51082,"follower3id":51032,"follower4id":51112},{"id":30062,"herounit_id":52062,"ex_skill":0,"follower1id":51122,"follower2id":51132,"follower3id":51112,"follower4id":51042},{"id":30072,"herounit_id":52072,"ex_skill":0,"follower1id":51012,"follower2id":51082,"follower3id":51032,"follower4id":51022},{"id":30082,"herounit_id":52082,"ex_skill":0,"follower1id":51062,"follower2id":51112,"follower3id":51142,"follower4id":51052},{"id":30092,"herounit_id":52092,"ex_skill":0,"follower1id":51072,"follower2id":51102,"follower3id":51052,"follower4id":51062},{"id":30102,"herounit_id":52102,"ex_skill":0,"follower1id":51112,"follower2id":51092,"follower3id":51082,"follower4id":51022}] \ No newline at end of file diff --git a/doc/todolist8.3.xmind b/doc/todolist8.3.xmind index 0216ba5..a8c2671 100644 Binary files a/doc/todolist8.3.xmind and b/doc/todolist8.3.xmind differ diff --git a/src/rooms/logic/skill/Skill.ts b/src/rooms/logic/skill/Skill.ts index a323155..f659e45 100644 --- a/src/rooms/logic/skill/Skill.ts +++ b/src/rooms/logic/skill/Skill.ts @@ -121,7 +121,7 @@ export class Skill { }; isBuffHaloSkill(){ - return false; + return this._type == SkillType.HALO_SKILL; }; isSingleTarget(){ diff --git a/src/rooms/logic/skill/SkillConst.ts b/src/rooms/logic/skill/SkillConst.ts index 03cb435..5a37aad 100644 --- a/src/rooms/logic/skill/SkillConst.ts +++ b/src/rooms/logic/skill/SkillConst.ts @@ -81,6 +81,18 @@ export const enum TriggerType }; // 技能大类 +/** + * 1.法术:选择发动法术牌候,生效 + * 2.战吼:选择发动带战吼的随从牌后,生效 + * 3.遗志:场上的英雄、随从死亡之后,生效 + * 4.光环:场上的英雄、随从生存期间,生效 + * 5.被动 + * 6.效果强化 + * 7.点数翻倍 + + * 11.主动:需要玩家亲自点击,才能发动的技能 + * 12.团队技能:技能拥有者,存活期间,给予自己全体一个技能;死亡后,收回 + */ export const enum SkillType{ NONE = 0, MAGIC = 1, @@ -90,6 +102,7 @@ export const enum SkillType{ NORMAL = 5, EN_EFF = 6, EN_POINT = 7, + HALO_SKILL = 12, }; // 技能作用范围(对单位而言) diff --git a/src/rooms/logic/skill/TriggerMan.ts b/src/rooms/logic/skill/TriggerMan.ts index 953ac04..2dcf531 100644 --- a/src/rooms/logic/skill/TriggerMan.ts +++ b/src/rooms/logic/skill/TriggerMan.ts @@ -113,6 +113,7 @@ let TriggerManager = { break; case SkillEffectType.SUMMON_NPC: case SkillEffectType.SUMMON_SKILL: + case SkillEffectType.SKILL_GET: tgts.forEach((item)=>{ sender.summon(effectid, param, item); });