Merge branch 'master' of git.kingsome.cn:node/card_svr

src/rooms/logic/Handler/BattleHandler.ts

@@ -44,13 +44,12 @@ export class BattleHandler {
     };
 
 
-
     /**
      * 使用卡片
      * @param obj
      */
     public useCard(obj:
-        {srcplayer: Player, card: number, cardpoint: number, eff_cnt: number, dstplayer: Player, dstpet: Pet})
+        {srcplayer: Player, card: number, cardpoint: number, dbpt_cnt: number, eff_cnt: number, dstplayer: Player, dstpet: Pet})
     {
         if(!obj || !obj.card){
             return false;
@@ -66,7 +65,7 @@ export class BattleHandler {
             return false;
         }
 
-        let ps = new SkillParam(obj.card, obj.cardpoint, obj.eff_cnt, ph, dstph, dstpt);
+        let ps = new SkillParam(obj.card, obj.cardpoint, obj.dbpt_cnt, obj.eff_cnt, ph, dstph, dstpt);
 
         ph.useCard(ps);
     };
@@ -81,6 +80,15 @@ export class BattleHandler {
 
     };
 
+    /**
+     * 确认玩家是否有换效果牌技能
+     * @param aplayer 
+     */
+    public hasTransEffCardSkill(aplayer: Player): boolean{
+        let ph = this.getPlayer(aplayer);
+        return ph && ph.hasTransEffCardSkill();
+    };
+
     /**
      * 吃牌/胡牌确认
      * @param aplayer : 玩家

src/rooms/logic/Handler/PlayerHandler.ts

@@ -138,5 +138,20 @@ export class PlayerHandler {
 
     public isMyPet(apet: PetHandler){
         return this._pets.includes(apet);
-    }
+    };
+
+    public hasTransEffCardSkill(): boolean{
+        if(!this._self){
+            return false;
+        }
+        
+        let bok = false;
+        for(let [key, val] of this._self._skills){
+            if(val.isTransEffCardSkill()){
+                bok = true;
+                break;
+            }
+        }
+        return bok;
+    };
 }

src/rooms/logic/skill/Skill.ts

@@ -115,6 +115,10 @@ export class Skill {
         return this._data.effect_typeid == SkillEffectType.TAUNT;
     };
 
+    isTransEffCardSkill(){
+        return this._data.effect_typeid == SkillEffectType.CARD_CHG_EN;
+    };
+
     // 是否是稀有技能
     isRareSkill() {
         return false;

src/rooms/logic/skill/SkillConst.ts

@@ -70,6 +70,22 @@ export const enum SkillRangeUnitType{
 };
 
 // 技能效果类型
+/**
+ * 0. 无
+ * 1.补牌
+ * 2.补牌至多少张
+ * 3.抽别人牌
+ * 4.将几张点数卡变为一张效果强化卡
+ * 5.强化战力（HP性质的战力）
+ * 6.强化战力（护盾性质的战力）
+ * 7.扣除战力（伤害）
+ * 8.召唤随从（需引用ID）
+ * 9.触发技能（需引用ID）
+ * 10.嘲讽
+ * 11.扣除HP
+ * 12.增加出场战力
+ * 13.自己受到的伤害降低
+ */
 export const enum SkillEffectType
 {
     NONE = 0,

src/rooms/logic/skill/SkillParam.ts

@@ -4,14 +4,16 @@ import {PetHandler} from "../Handler/PetHandler";
 export class SkillParam{
     cardid: number;
     cardpoint: number;
+    pt_cnt: number;
     eff_cnt: number; 
     srcplayer: PlayerHandler;
     dstplayer: PlayerHandler;
     dstpet: PetHandler;
     
-    constructor(cardid: number, cardpoint: number, effcnt: number, srcplayer: PlayerHandler, dstplayer: PlayerHandler, dstpet: PetHandler){
+    constructor(cardid: number, cardpoint: number, ptcnt: number, effcnt: number, srcplayer: PlayerHandler, dstplayer: PlayerHandler, dstpet: PetHandler){
         this.cardid = cardid;
         this.cardpoint = cardpoint;
+        this.pt_cnt = ptcnt;
         this.eff_cnt = effcnt;
         this.srcplayer = srcplayer;
         this.dstplayer = dstplayer;

src/rooms/logic/skill/TriggerMan.ts

@@ -83,8 +83,8 @@ let TriggerManager = {
             case SkillEffectType.CARD_ADD_LIMIT:
             case SkillEffectType.CARD_STEAL:
             case SkillEffectType.CARD_CHG_EN:
+                
             case SkillEffectType.POWER_ENHANCE:
-            case SkillEffectType.HALO_ENHANCE:
             case SkillEffectType.HURT_POWER:
             case SkillEffectType.SUMMON_NPC:
             case SkillEffectType.SUMMON_SKILL: