From 2633d197247f10200f3e0b55a549c4504b6eb7aa Mon Sep 17 00:00:00 2001
From: "y.x" <yuexin@kingsome.cn>
Date: Mon, 7 Dec 2020 13:43:03 +0800
Subject: [PATCH] condition handle(not finish)

---
 src/rooms/logic/Handler/BattleHandler.ts |  1 -
 src/rooms/logic/skill/Condition.ts       | 12 +++++-------
 src/rooms/logic/skill/Skill.ts           |  4 ++++
 src/rooms/logic/skill/TriggerCtrl.ts     |  3 ++-
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/rooms/logic/Handler/BattleHandler.ts b/src/rooms/logic/Handler/BattleHandler.ts
index b7fcbbd..ca5338d 100644
--- a/src/rooms/logic/Handler/BattleHandler.ts
+++ b/src/rooms/logic/Handler/BattleHandler.ts
@@ -155,7 +155,6 @@ export class BattleHandler {
         }
         return lst;
     };
-
     
     /**
      * 使用卡片
diff --git a/src/rooms/logic/skill/Condition.ts b/src/rooms/logic/skill/Condition.ts
index 54bbf98..b9d51ea 100644
--- a/src/rooms/logic/skill/Condition.ts
+++ b/src/rooms/logic/skill/Condition.ts
@@ -34,12 +34,6 @@ export class Condition {
             case CondType.CARD_COUNT_TOTAL:
                 v = tg_owner.getTotalCardCount();
                 return this._isok(v,this._v,this._cdt);
-            case CondType.CARD_ACTION_LINK:
-                return (tg_value == this._type);
-            case CondType.CARD_ACTION_LINK_OTHER:
-                return (tg_value == this._type);
-            case CondType.CARD_ACTION_LINK_SELF:
-                return (tg_value == this._type);
             default:
                 break;
         }
@@ -59,7 +53,11 @@ export class Condition {
             default:
                 return false;
         }
-    }
+    };
+
+    public isTempTotalCard(){
+        return this._type == CondType.CARD_COUNT_TOTAL;
+    };
 };
 
 // module.exports = Condition;
diff --git a/src/rooms/logic/skill/Skill.ts b/src/rooms/logic/skill/Skill.ts
index 2b36715..9755074 100644
--- a/src/rooms/logic/skill/Skill.ts
+++ b/src/rooms/logic/skill/Skill.ts
@@ -315,6 +315,10 @@ export class Skill {
         this._cb = cb;
     };
 
+    isTotalCardSkill(){
+        return this._tgctrl._cond.isTempTotalCard();
+    };
+
     clone() {
         let obj = new Skill();
         obj._currCount = 0; // 当前计数
diff --git a/src/rooms/logic/skill/TriggerCtrl.ts b/src/rooms/logic/skill/TriggerCtrl.ts
index 9d243dd..18165cb 100644
--- a/src/rooms/logic/skill/TriggerCtrl.ts
+++ b/src/rooms/logic/skill/TriggerCtrl.ts
@@ -16,7 +16,8 @@ import { Trigger } from "./Trigger";
 export class TriggerCtrl{
     private _id: number;
     private _tg: Trigger;
-    private _cond: Condition;
+    
+    _cond: Condition;
     
     init(id:number, tgobj:Trigger, condobj: Condition){
         this._id = id;