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

config/compound_tbl.json

@@ -1 +1 @@
-[{"id":99001,"type_id":1,"value":6},{"id":99002,"type_id":1,"value":2},{"id":99003,"type_id":2,"value":20},{"id":99004,"type_id":1,"value":2},{"id":99005,"type_id":1,"value":1},{"id":99006,"type_id":1,"value":20},{"id":99007,"type_id":1,"value":12},{"id":99008,"type_id":2,"value":12},{"id":99009,"type_id":2,"value":15},{"id":99010,"type_id":2,"value":15},{"id":99011,"type_id":2,"value":20},{"id":99012,"type_id":2,"value":8},{"id":99013,"type_id":1,"value":3},{"id":99014,"type_id":2,"value":5},{"id":99015,"type_id":1,"value":10},{"id":99016,"type_id":1,"value":10},{"id":99017,"type_id":2,"value":7},{"id":99018,"type_id":2,"value":7},{"id":99019,"type_id":2,"value":5},{"id":99020,"type_id":2,"value":30},{"id":99021,"type_id":3,"value":15},{"id":99022,"type_id":3,"value":35},{"id":99023,"type_id":1,"value":2},{"id":99024,"type_id":1,"value":3},{"id":99025,"type_id":1,"value":3},{"id":99026,"type_id":2,"value":1},{"id":99027,"type_id":1,"value":5},{"id":99028,"type_id":1,"value":5},{"id":99029,"type_id":1,"value":6},{"id":99030,"type_id":1,"value":6},{"id":99031,"type_id":4,"value":90001},{"id":99032,"type_id":4,"value":90002},{"id":99033,"type_id":2,"value":15},{"id":99034,"type_id":4,"value":80031},{"id":99035,"type_id":4,"value":80029},{"id":99036,"type_id":4,"value":80030},{"id":99037,"type_id":4,"value":80032},{"id":99038,"type_id":1,"value":20},{"id":99039,"type_id":5,"value":0},{"id":99040,"type_id":5,"value":0},{"id":99041,"type_id":3,"value":50},{"id":99042,"type_id":3,"value":0},{"id":99043,"type_id":3,"value":50},{"id":99044,"type_id":3,"value":70},{"id":99045,"type_id":3,"value":90},{"id":99046,"type_id":3,"value":0},{"id":99047,"type_id":3,"value":10},{"id":99048,"type_id":3,"value":25},{"id":99049,"type_id":3,"value":50}]
+[{"id":99001,"type_id":1,"value":6},{"id":99002,"type_id":1,"value":2},{"id":99003,"type_id":2,"value":20},{"id":99004,"type_id":1,"value":2},{"id":99005,"type_id":1,"value":1},{"id":99006,"type_id":1,"value":20},{"id":99007,"type_id":1,"value":12},{"id":99008,"type_id":2,"value":12},{"id":99009,"type_id":2,"value":15},{"id":99010,"type_id":2,"value":15},{"id":99011,"type_id":2,"value":20},{"id":99012,"type_id":2,"value":8},{"id":99013,"type_id":1,"value":3},{"id":99014,"type_id":2,"value":5},{"id":99015,"type_id":1,"value":10},{"id":99016,"type_id":1,"value":10},{"id":99017,"type_id":2,"value":7},{"id":99018,"type_id":2,"value":7},{"id":99019,"type_id":2,"value":5},{"id":99020,"type_id":2,"value":30},{"id":99021,"type_id":3,"value":15},{"id":99022,"type_id":3,"value":35},{"id":99023,"type_id":1,"value":2},{"id":99024,"type_id":1,"value":3},{"id":99025,"type_id":1,"value":3},{"id":99026,"type_id":2,"value":1},{"id":99027,"type_id":1,"value":5},{"id":99028,"type_id":1,"value":5},{"id":99029,"type_id":1,"value":6},{"id":99030,"type_id":1,"value":6},{"id":99031,"type_id":4,"value":90001},{"id":99032,"type_id":4,"value":90002},{"id":99033,"type_id":2,"value":15},{"id":99034,"type_id":4,"value":80031},{"id":99035,"type_id":4,"value":80029},{"id":99036,"type_id":4,"value":80030},{"id":99037,"type_id":4,"value":80032},{"id":99038,"type_id":1,"value":20},{"id":99039,"type_id":5,"value":0},{"id":99040,"type_id":5,"value":0},{"id":99041,"type_id":3,"value":50},{"id":99042,"type_id":3,"value":0},{"id":99043,"type_id":3,"value":45},{"id":99044,"type_id":3,"value":68},{"id":99045,"type_id":3,"value":80},{"id":99046,"type_id":3,"value":0},{"id":99047,"type_id":3,"value":5},{"id":99048,"type_id":3,"value":15},{"id":99049,"type_id":3,"value":30}]

src/rooms/logic/Handler/BattleHandler.ts

@@ -759,6 +759,20 @@ export class BattleHandler {
         return ph? ph.getTransEffCardRate(): 0;
     };
 
+    /**
+     * 下随从
+     * @param aplayer： Player对象 
+     * @param cardid: effectcard内的id（只能是随从卡） 
+     */
+    public addPet(aplayer: Player, cardid: number): PetHandler{
+        let ph = this.getPlayer(aplayer);
+        if(!ph){
+            return null;
+        }
+
+        return ph.addPet(cardid);
+    };
+
     /**
      * 替换随从操作
      * @param playerid 

src/rooms/logic/Handler/PlayerHandler.ts

@@ -177,6 +177,33 @@ export class PlayerHandler {
         return dst;
     };
 
+    public addPet(cardid: number): PetHandler{
+        let cfg = CfgMan.findEffCardCfg(cardid);
+        if(!cfg){
+            return null;
+        }
+        let lst = [];
+        cfg.quoteskill1id && lst.push(cfg.quoteskill1id);
+        cfg.quoteskill2id && lst.push(cfg.quoteskill2id);
+        cfg.quoteskill3id && lst.push(cfg.quoteskill3id);
+        cfg.quoteskill4id && lst.push(cfg.quoteskill4id);
+
+        if(cfg.type_id == EffectCardType.NPC || cfg.type_id == EffectCardType.NPC_CUSTOM){
+            let exap = 0;
+
+            let pet = this.newPet();
+            if(!pet){
+                return null;
+            }
+
+            pet.loadData(cfg.stageunit_id, null, lst, exap);
+
+            return pet;
+        }
+
+        return null;
+    };
+
     public useCard(obj: SkillParam, oldpos?: number)
     {
         let cfg = CfgMan.findEffCardCfg(obj.cardid);