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

src/rooms/RoomExtMethod.ts

@@ -48,6 +48,8 @@ Object.defineProperties(Room.prototype, {
         value: function (dstplayer: string, count: number){
             let player = this.state.players.get(dstplayer);
             let tmpCards = gameUtil.removeCard(player, count);
+            let time = this.battleMan.onCardDroped(player, tmpCards);
+            debugRoom(`giveUpCard add time: ${time}`);
             let cardIds = tmpCards.map(card => card.id);
             let msgData = {
                 player: dstplayer,

src/utils/game.util.ts

@@ -239,7 +239,8 @@ let gameUtil = {
     addCardToPlayer(room: Room, player: Player, cards: Card[], fromplayer?: Player) {
         this.pushInPlayerCards(player, cards);
         player.countTotal += cards.length;
-        room.battleMan.onCardGetted(player, cards, fromplayer);
+        let time = room.battleMan.onCardGetted(player, cards, fromplayer);
+        cardLog(`addCardToPlayer add time: ${time}`);
     },
     /**
      * 更换相同数量的卡