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

src/rooms/GeneralRoom.ts

@@ -49,7 +49,7 @@ export class GeneralRoom extends Room {
 
     this.onMessage("select_pet_c2s", (client, message) => {
       console.log('select_pet from ', client.sessionId, message);
-      this.dispatcher.dispatch(new SelectPetCommand(), {client, cardId: message.cardId, playerId: message.player, pos: message.pos, effCards: message.effCards });
+      this.dispatcher.dispatch(new SelectPetCommand(), {client, cardId: message.card, playerId: message.player, pos: message.pos, effCards: message.effCards });
     });
 
     this.onMessage("select_hero_c2s", (client, message) => {

src/rooms/commands/SelectPetCommand.ts

@@ -14,7 +14,7 @@ export class SelectPetCommand extends Command<CardGameState, {client: Client,
     cardId: number,
     playerId: string,
     pos: number,
-    effCards: string[]
+    effCards: number[]
     }> {
     execute({client, cardId, playerId, pos, effCards} = this.payload) {
         let sessionId = this.state.currentTurn;
@@ -22,27 +22,30 @@ export class SelectPetCommand extends Command<CardGameState, {client: Client,
         let ap = 0;
         let moreAp = 0;
         let count = 0;
+        let targetCard;
         for (let card of this.state.cards.values()) {
             ap += card.number;
             count ++;
             if (count > 2) {
                 moreAp += 10;
             }
-        }
+            if (card.id == cardId) {
-        for (let [key, pet] of player.pets) {
+                targetCard = card;
-            if (pet.ap == 0 ) {
-                pet.ap = ap + moreAp;
-                break;
             }
         }
+        if (!targetCard) {
+            return;
+        }
+        let eff_cnt = effCards.length;
+
         let dstplayer = this.state.players.get(playerId);
         let dstpet;
         if (pos != undefined) {
             dstpet = dstplayer.pets.get(pos+'');
         }
-        let cardpoint = 10;
+        let cardpoint = moreAp;
-        let eff_cnt = effCards.length;
+        //TODO:
-        let data = {srcplayer: player, card: cardId, cardpoint, eff_cnt, dstplayer, dstpet}
+        let data = {srcplayer: player, card: targetCard.effect, cardpoint, eff_cnt, dstplayer, dstpet, dbpt_cnt: 0}
         this.room.battleMan.useCard(data);
         return [new TurnEndCommand()];
 

src/rooms/logic/Handler/BattleHandler.ts

@@ -48,7 +48,7 @@ export class BattleHandler {
     public useCard(obj:
         {srcplayer: Player, card: number, cardpoint: number, dbpt_cnt: number, eff_cnt: number, dstplayer: Player, dstpet: Pet})
     {
-        if(!obj || obj.card){
+        if(!obj || !obj.card){
             return false;
         }
 

src/rooms/logic/Handler/PetHandler.ts

@@ -16,9 +16,9 @@ export class PetHandler {
     _cfg: UnitCfg;
     _skills: Map<number, Skill> = new Map();
 
-    _bornSkills: Skill[];
+    _bornSkills: Skill[] = [];
-    _dieSkills: Skill[];
+    _dieSkills: Skill[] = [];
-    _halos: Skill[];
+    _halos: Skill[] = [];
 
     _baseap: number;    // 基础
 

src/rooms/logic/Handler/PlayerHandler.ts

@@ -19,11 +19,11 @@ export class PlayerHandler {
 
     public _unitcfg: UnitCfg;
 
-    public _pets: PetHandler[];
+    public _pets: PetHandler[] = [];
 
-    public _skills: Skill[];
+    public _skills: Skill[] = [];
 
-    public _exskills: Skill[];
+    public _exskills: Skill[] = [];
 
     private _owner: BattleHandler;
 
@@ -52,8 +52,7 @@ export class PlayerHandler {
     public newPet(): PetHandler {
         let res = null;
         let pr = null;
-        for(let key in this._player.pets){
+        for(let [key, obj] of this._player.pets){
-            let obj = this._player.pets.get(key);
             if(obj.ap == 0){
                 res = obj;
                 break;

src/utils/game.util.ts

@@ -18,7 +18,7 @@ let gameUtil = {
         let countMap: Map<number, number> = new Map();
         let localId = 1;
         for (let [id, cfg] of numCfgMap) {
-            for (let i = 0; i < cfg.count; i++) {
+            for (let i = 0; i <= cfg.count; i++) {
                 if (cfg.type_id == 1) {
                     let effid = this.getRandomEffect(cfg.weightArr, effCfgMap, countMap);
                     let card = new Card(localId ++, cfg.point, cfg.type_id, effid);