From 9f9971bff3952f049043b27f88fe842b5aa65f4d Mon Sep 17 00:00:00 2001
From: "y.x" <yuexin@kingsome.cn>
Date: Tue, 15 Dec 2020 01:47:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=8E=B7=E5=8F=96=E6=8C=87?=
 =?UTF-8?q?=E5=AE=9A=E6=8A=80=E8=83=BD=E5=8D=A1=E7=9A=84=E6=8A=80=E8=83=BD?=
 =?UTF-8?q?=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/rooms/logic/Handler/BattleHandler.ts | 4 ++--
 src/rooms/logic/skill/Skill.ts           | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

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);