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

This commit is contained in:
yuexin 2021-01-04 14:17:20 +08:00
commit d26b633d80
2 changed files with 4 additions and 1 deletions

View File

@ -48,6 +48,8 @@ Object.defineProperties(Room.prototype, {
value: function (dstplayer: string, count: number){ value: function (dstplayer: string, count: number){
let player = this.state.players.get(dstplayer); let player = this.state.players.get(dstplayer);
let tmpCards = gameUtil.removeCard(player, count); 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 cardIds = tmpCards.map(card => card.id);
let msgData = { let msgData = {
player: dstplayer, player: dstplayer,

View File

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