From 50e8ed6a991d98b9b98aa4db73cfe18404b69fbb Mon Sep 17 00:00:00 2001 From: zhl Date: Fri, 19 Mar 2021 15:29:29 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=87=BA=E7=89=8C=E6=97=B6,?= =?UTF-8?q?=20=E6=9B=BF=E6=8D=A2=E5=9C=BA=E4=B8=8A=E7=9A=84=E5=8F=AF?= =?UTF-8?q?=E5=90=83=E7=89=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/cfg/RoomOptions.ts | 2 +- src/utils/clock.util.ts | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/cfg/RoomOptions.ts b/src/cfg/RoomOptions.ts index 44c70fb..315a113 100644 --- a/src/cfg/RoomOptions.ts +++ b/src/cfg/RoomOptions.ts @@ -60,7 +60,7 @@ export class RoomOptions { * @param opt */ public multipleEat(opt?: any) { - return 1 + return 0 } /** diff --git a/src/utils/clock.util.ts b/src/utils/clock.util.ts index c5ec8dc..7d44bb9 100644 --- a/src/utils/clock.util.ts +++ b/src/utils/clock.util.ts @@ -6,6 +6,7 @@ import { TurnEndCommand } from '../rooms/commands/TurnEndCommand' import { ClockNameConst } from '../constants/ClockNameConst' import { GameEnv } from '../cfg/GameEnv' import { Player } from '../rooms/schema/Player' +import { EatCard } from '../message/EatCard' /** * 添加出牌计时器 @@ -22,6 +23,17 @@ export function addDrawCardClock(room: Room) { const client = room.getClient(sessionId) const card = player.cards.values().next().value debugRoom('出牌时间到, 自动出牌: ', card.id) + let old: EatCard = null + if (room.state.cards.size > 0) { + let card = room.state.cards.values().next().value + old = EatCard.fromCard(card) + } + for (let [key, val] of room.state.cards) { + room.state.cards.delete(key) + } + card.round = room.state.round + room.state.cards.set(card.id + '', card) + room.bEatChange({type: 'replace', old, current: EatCard.fromCard(card)}) player.extraTime = 0 if (client && card) { room.dispatcher.dispatch(new DiscardCommand(), {