node/card_svr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

确认吃牌时,判断卡牌是否在玩家手牌中

Browse Source
This commit is contained in:
zhl 2020-12-25 16:31:36 +08:00
parent 2ebcaee257
commit 2254dade50
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/rooms/commands/EatCardCommand.ts
View File

@ -5,6 +5,7 @@ import gameUtil from "../../utils/game.util";
import {GameStateConst} from "../../constants/GameStateConst"; import {GameStateConst} from "../../constants/GameStateConst";
import {EatConfirmCommand} from "./EatConfirmCommand"; import {EatConfirmCommand} from "./EatConfirmCommand";
import {GameEnv} from "../../cfg/GameEnv"; import {GameEnv} from "../../cfg/GameEnv";
import {error} from "../../common/Debug";
/** /**
* 吃牌 * 吃牌
@ -16,9 +17,18 @@ export class EatCardCommand extends Command<CardGameState, { client: Client, car
this.room.send(client,'eat_card_s2c', {errcode: 1, errmsg: 'player不存在或者'}); this.room.send(client,'eat_card_s2c', {errcode: 1, errmsg: 'player不存在或者'});
return; return;
} }
if (!gameUtil.checkCardsExists(player.cards, cards)) { let tmpCards = [];
this.room.send(client,'eat_card_s2c', {errcode: 2, errmsg: '要出的牌在手牌中不存在'}); for (let id of cards) {
return; if (player.cards.has(id + '')) {
if (!player.cards.get(id + '').number) {
error(`${player.id} 的手牌 ${id} 数据有问题`);
}
tmpCards.push(player.cards.get(id + ''));
} else {
error(`${player.id} 出的牌 ${id} 在手牌中不存在`)
this.room.send(client,'eat_card_s2c', {errcode: 2, errmsg: `要出的牌 ${id} 在手牌中不存在`});
return;
}
} }
if (this.state.currentTurn == client.sessionId) { if (this.state.currentTurn == client.sessionId) {
this.room.send(client,'eat_card_s2c', {errcode: 3, errmsg: '不能吃自己的牌'}); this.room.send(client,'eat_card_s2c', {errcode: 3, errmsg: '不能吃自己的牌'});
@ -28,22 +38,19 @@ export class EatCardCommand extends Command<CardGameState, { client: Client, car
this.room.send(client,'eat_card_s2c', {errcode: 4, errmsg: '找不到要吃的牌'}); this.room.send(client,'eat_card_s2c', {errcode: 4, errmsg: '找不到要吃的牌'});
return; return;
} }
let tmpCards = [];
for (let id of cards) {
tmpCards.push(player.cards.get(id + ''));
}
tmpCards.push(this.state.cards.get(target + '')); tmpCards.push(this.state.cards.get(target + ''));
if (!gameUtil.checkDiscard(tmpCards, new GameEnv().otherEatCount)) { if (!gameUtil.checkDiscard(tmpCards, new GameEnv().otherEatCount)) {
this.room.send(client,'discard_card_s2c', {errcode: 5, errmsg: '不符合吃牌规则'}); this.room.send(client,'eat_card_s2c', {errcode: 5, errmsg: '不符合吃牌规则'});
return; return;
} }
if (this.state.gameState !== GameStateConst.STATE_BEGIN_EAT) { if (this.state.gameState !== GameStateConst.STATE_BEGIN_EAT) {
this.room.send(client,'discard_card_s2c', {errcode: 7, errmsg: '不是吃牌轮'}); this.room.send(client,'eat_card_s2c', {errcode: 7, errmsg: '不是吃牌轮'});
return; return;
} }
//将吃牌数据临时保存 //将吃牌数据临时保存
if (this.state.tmpActionMap.has(client.sessionId)) { if (this.state.tmpActionMap.has(client.sessionId)) {
this.room.send(client,'discard_card_s2c', {errcode: 8, errmsg: '不可更改操作'}); this.room.send(client,'eat_card_s2c', {errcode: 8, errmsg: '不可更改操作'});
return ; return ;
} }
this.state.tmpActionMap.set(client.sessionId, cards); this.state.tmpActionMap.set(client.sessionId, cards);

3
src/rooms/commands/EatConfirmCommand.ts
View File

@ -74,6 +74,9 @@ export class EatConfirmCommand extends Command<CardGameState, { timeUp: boolean
player.cardQueue.clear(); player.cardQueue.clear();
player.cardQueue.push(this.state.cards.values().next().value); player.cardQueue.push(this.state.cards.values().next().value);
for (let id of cards) { for (let id of cards) {
if (!player.cards.has(id + '')) {
continue;
}
this.state.cards.set(id + '', player.cards.get(id + '')); this.state.cards.set(id + '', player.cards.get(id + ''));
player.cardQueue.push(player.cards.get(id + '')); player.cardQueue.push(player.cards.get(id + ''));
player.cards.delete(id + ''); player.cards.delete(id + '');