diff --git a/config/hero_tbl.json b/config/hero_tbl.json index 2e41454..7f779f5 100644 --- a/config/hero_tbl.json +++ b/config/hero_tbl.json @@ -1 +1 @@ -[{"id":30011,"herounit_id":50011,"ex_skill":0},{"id":30021,"herounit_id":50021,"ex_skill":0},{"id":30031,"herounit_id":50031,"ex_skill":0},{"id":30041,"herounit_id":50041,"ex_skill":0},{"id":30051,"herounit_id":50051,"ex_skill":0},{"id":30061,"herounit_id":50061,"ex_skill":0},{"id":30071,"herounit_id":50071,"ex_skill":0},{"id":30081,"herounit_id":50081,"ex_skill":0}] \ No newline at end of file +[{"id":30011,"herounit_id":50011,"ex_skill":0,"follower1id":51011,"follower1":"熊战士","follower2id":51021,"follower2":"蛙博士","follower3id":51031,"follower3":"狮子王","follower4id":51041,"follower4":"波斯猫"},{"id":30021,"herounit_id":50021,"ex_skill":0,"follower1id":51011,"follower1":"熊战士","follower2id":51021,"follower2":"蛙博士","follower3id":51061,"follower3":"小火龙","follower4id":51051,"follower4":"偷油鼠"},{"id":30031,"herounit_id":50031,"ex_skill":0,"follower1id":51011,"follower1":"熊战士","follower2id":51021,"follower2":"蛙博士","follower3id":51031,"follower3":"狮子王","follower4id":51041,"follower4":"波斯猫"},{"id":30041,"herounit_id":50041,"ex_skill":0,"follower1id":51011,"follower1":"熊战士","follower2id":51021,"follower2":"蛙博士","follower3id":51061,"follower3":"小火龙","follower4id":51051,"follower4":"偷油鼠"},{"id":30051,"herounit_id":50051,"ex_skill":0,"follower1id":51011,"follower1":"熊战士","follower2id":51021,"follower2":"蛙博士","follower3id":51031,"follower3":"狮子王","follower4id":51041,"follower4":"波斯猫"},{"id":30061,"herounit_id":50061,"ex_skill":0,"follower1id":51011,"follower1":"熊战士","follower2id":51021,"follower2":"蛙博士","follower3id":51061,"follower3":"小火龙","follower4id":51051,"follower4":"偷油鼠"},{"id":30071,"herounit_id":50071,"ex_skill":0,"follower1id":51011,"follower1":"熊战士","follower2id":51021,"follower2":"蛙博士","follower3id":51031,"follower3":"狮子王","follower4id":51041,"follower4":"波斯猫"},{"id":30081,"herounit_id":50081,"ex_skill":0,"follower1id":51011,"follower1":"熊战士","follower2id":51021,"follower2":"蛙博士","follower3id":51061,"follower3":"小火龙","follower4id":51051,"follower4":"偷油鼠"}] \ No newline at end of file diff --git a/doc/todolist8.3.xmind b/doc/todolist8.3.xmind index 00efddd..83f6284 100644 Binary files a/doc/todolist8.3.xmind and b/doc/todolist8.3.xmind differ diff --git a/src/cfg/parsers/HeroCfg.ts b/src/cfg/parsers/HeroCfg.ts index aa50c92..335dd5d 100644 --- a/src/cfg/parsers/HeroCfg.ts +++ b/src/cfg/parsers/HeroCfg.ts @@ -6,11 +6,27 @@ export class HeroCfg implements Cfg{ public id: number; public herounit_id: number; public ex_skill: number; + public follower1id: number; + public follower1: number; + public follower2id: number; + public follower2: number; + public follower3id: number; + public follower3: number; + public follower4id: number; + public follower4: number; public decode(data: any) { this.id = data.id; this.herounit_id = data.herounit_id; this.ex_skill = data.ex_skill; + this.follower1id = data.follower1id; + this.follower1 = data.follower1; + this.follower2id = data.follower2id; + this.follower2 = data.follower2; + this.follower3id = data.follower3id; + this.follower3 = data.follower3; + this.follower4id = data.follower4id; + this.follower4 = data.follower4; }; public isOK (uniqueID: number, param1: any, param2: any): boolean { diff --git a/src/rooms/logic/CfgMan.ts b/src/rooms/logic/CfgMan.ts index 3fcd48b..224be77 100644 --- a/src/rooms/logic/CfgMan.ts +++ b/src/rooms/logic/CfgMan.ts @@ -58,7 +58,7 @@ let CfgMan = { eVMax: number, aP: number ): number{ - let n = eV; + let n = this.roundV(eV, eVMax); switch(eST){ case SkillEffectSignType.PERCENT: n /= 100; diff --git a/src/rooms/logic/skill/SkillConst.ts b/src/rooms/logic/skill/SkillConst.ts index 255c0d5..819a1fc 100644 --- a/src/rooms/logic/skill/SkillConst.ts +++ b/src/rooms/logic/skill/SkillConst.ts @@ -6,9 +6,6 @@ * 3.胡牌(吃牌/自摸)(就是无条件,所以废弃) * 4.吃别人牌(吃牌) * 5.自己胡牌(自摸) - * 6.自己受到来自他人的冲锋后 - * 7.受到伤害后 - * 8.发动冲锋技能(ID40122)前 */ export const enum CondType @@ -48,6 +45,9 @@ export const enum CondDecideType { * 6.获得新的卡牌后 * 7.丢弃一张卡牌后:自己回合出一张牌,不算此列 * 8.自己回合开始 + * 10.不处理 + * 11.受到伤害后 + * 12.发动冲锋技能(ID40122)前 */ export const enum TriggerType { @@ -69,11 +69,9 @@ export const enum TriggerType ROUND_START_MYSELF = 8, - BE_ATTACK = 9, + BE_HURT = 11, - BE_HURT = 10, - - BEFORE_ATTACK = 11, + BEFORE_ATTACK = 12, }; // 技能大类