From caa5d1b875c0a8fd12b08fc18737990ad8619995 Mon Sep 17 00:00:00 2001
From: yuexin <yuexin@kingsome.cn>
Date: Fri, 11 Dec 2020 13:51:19 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=98=9F=E5=8F=8B?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/rooms/logic/Handler/BattleHandler.ts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/rooms/logic/Handler/BattleHandler.ts b/src/rooms/logic/Handler/BattleHandler.ts
index 16353fa..2bc5f32 100644
--- a/src/rooms/logic/Handler/BattleHandler.ts
+++ b/src/rooms/logic/Handler/BattleHandler.ts
@@ -30,7 +30,15 @@ export class BattleHandler {
     public addPlayer(aplayer: Player): PlayerHandler{
         let ph = new PlayerHandler();
         ph.init(aplayer, this);
+        this._players.forEach((item: PlayerHandler) => {
+            if(item._player.team == aplayer.team && item._player != aplayer){
+                item._friend = ph;
+                ph._friend = item;
+            }
+        });
+
         this._players.set(aplayer, ph);
+
         return ph;
     };
 

From c8681265ebbde68b5002cddc681b8209bfc402dd Mon Sep 17 00:00:00 2001
From: yuexin <yuexin@kingsome.cn>
Date: Fri, 11 Dec 2020 16:01:55 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E8=AE=A2=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E5=88=A4=E5=AE=9A=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/rooms/logic/skill/TriggerMan.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/rooms/logic/skill/TriggerMan.ts b/src/rooms/logic/skill/TriggerMan.ts
index c50bba9..77b2626 100644
--- a/src/rooms/logic/skill/TriggerMan.ts
+++ b/src/rooms/logic/skill/TriggerMan.ts
@@ -58,11 +58,12 @@ let TriggerManager = {
             this._triggermap.set(tg_type, tobj);
         }
 
-        let cobj = this._conditionmap.get(tg_cond);
+        let key = Number(tg_cond) + '|' + Number(tg_cond_decide) + '|' + tg_cond_v;
+        let cobj = this._conditionmap.get(key);
         if (!cobj) {
             cobj = new Condition();
             cobj.init(tg_cond, tg_cond_decide, tg_cond_v);
-            this._conditionmap.set(tg_cond, cobj);
+            this._conditionmap.set(key, cobj);
         }
 
         let obj = new TriggerCtrl();

From f9e523a4cc295b5080889091308279bdbf259fa3 Mon Sep 17 00:00:00 2001
From: yuexin <yuexin@kingsome.cn>
Date: Fri, 11 Dec 2020 16:57:33 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=87=BA=E5=8D=95?=
 =?UTF-8?q?=E5=BC=A0=E7=89=8C=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/rooms/logic/Handler/BattleHandler.ts b/src/rooms/logic/Handler/BattleHandler.ts
index 2bc5f32..398f437 100644
--- a/src/rooms/logic/Handler/BattleHandler.ts
+++ b/src/rooms/logic/Handler/BattleHandler.ts
@@ -310,6 +310,16 @@ export class BattleHandler {
         ph && ph.onCardLinkEnd(linkcards, fromph);
     };
 
+    /**
+     * 出牌结束（出单张牌）
+     * @param aplayer : 玩家
+     * @param card : 单张牌
+     */
+    public onCardDiscarded(aplayer: Player, card: Card){
+        let ph = this.getPlayer(aplayer);
+        ph && ph.onCardDiscarded(card);
+    };
+
     /**
      * 使用卡牌结束（暂时自动回调，无需外部触发）
      * @param sp ：使用卡牌相关操作
diff --git a/src/rooms/logic/Handler/PlayerHandler.ts b/src/rooms/logic/Handler/PlayerHandler.ts
index 1705507..6888168 100644
--- a/src/rooms/logic/Handler/PlayerHandler.ts
+++ b/src/rooms/logic/Handler/PlayerHandler.ts
@@ -391,6 +391,10 @@ export class PlayerHandler {
         this.checkSkills(TriggerType.CARD_DROP_MYROUND);
     };
 
+    onCardDiscarded(discardcard: Card){
+        this.checkSkills(TriggerType.CARD_DISCARD_MYROUND);
+    };
+
     onCardGetted(getcards: Card[], srcplayer: PlayerHandler){
         getcards && (this._totalcc += getcards.length);
         this.checkSkills(TriggerType.CARD_GETTED);
diff --git a/src/rooms/logic/skill/SkillConst.ts b/src/rooms/logic/skill/SkillConst.ts
index 13668bb..3a72830 100644
--- a/src/rooms/logic/skill/SkillConst.ts
+++ b/src/rooms/logic/skill/SkillConst.ts
@@ -47,13 +47,13 @@ export const enum TriggerType
 
   CARD_USED = 3,
 
-  CARD_DROP_MYROUND = 4,
+  CARD_DISCARD_MYROUND = 4,
 
   ROUND_END_MYSELF = 5,
 
   CARD_GETTED = 6,
 
-  CARD_DROP_OTHERROUND = 7,
+  CARD_DROP_MYROUND = 7,
 
   ROUND_START_MYSELF = 8,
 };