diff --git a/src/rooms/logic/Handler/BattleHandler.ts b/src/rooms/logic/Handler/BattleHandler.ts index e9f743c..a5b5143 100644 --- a/src/rooms/logic/Handler/BattleHandler.ts +++ b/src/rooms/logic/Handler/BattleHandler.ts @@ -440,8 +440,8 @@ export class BattleHandler { public onPlayerAddDirectCardNotify(aplayer: PlayerHandler, count: number, cardid: number, from?: PlayerHandler){ - this._room.generateCard({player: aplayer.getId(), count, effectId: cardid, fromplayer: from? from.getId(): null}); - return 0; + return this._room.generateCard({player: aplayer.getId(), count, effectId: cardid, + fromplayer: from? from.getId(): null}); }; public onSkillResultNotify(skillres: SkillTarget[]){ diff --git a/src/rooms/logic/skill/Skill.ts b/src/rooms/logic/skill/Skill.ts index 3032cb8..90c4374 100644 --- a/src/rooms/logic/skill/Skill.ts +++ b/src/rooms/logic/skill/Skill.ts @@ -240,7 +240,7 @@ export class Skill { } }; - handleCard(efftype: SkillEffectType, effvalue: number, tgt: SkillTarget, cardid?: number){ + handleCard(efftype: SkillEffectType, effvalue: number, tgt: SkillTarget){ let res = effvalue; switch(efftype){ case SkillEffectType.CARD_ADD: @@ -278,6 +278,7 @@ export class Skill { break; case SkillEffectType.CARD_GETDIRECT: if(tgt.dsttype == GameUnitType.PLAYER){ + let cardid = this._data.quotecardid; let n = (tgt.dst as PlayerHandler).addDirectCard(cardid, res, tgt.srcplayer); if(n >= 0){ tgt.success(efftype, n);