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

增加一些delay

Browse Source
This commit is contained in:
zhl 2020-12-30 17:21:52 +08:00
parent e58e3f99d7
commit 03a52351ed
4 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/rooms/commands/DiscardCommand.ts
View File

@ -22,7 +22,7 @@ export class DiscardCommand extends Command<CardGameState, { client: Client, car
// return player !== undefined && gameUtil.checkCardsExists(player.cards, cards);
// }
execute({ client, cards , dtype} = this.payload) {
async execute({ client, cards , dtype} = this.payload) {
const player = this.state.players.get(client.sessionId);
if (!player) {
this.room.send(client,'discard_card_s2c', {errcode: 1, errmsg: 'player不存在'});
@ -75,7 +75,8 @@ export class DiscardCommand extends Command<CardGameState, { client: Client, car
this.room.send(client,'discard_card_s2c', {errcode: 0, cards: cards, type: dtype})
if (cards.length === 1) {
let cardArr: Card[] = [...this.state.cards.values()];
this.room.battleMan.onCardDiscarded(player, cardArr[0])
let time =this.room.battleMan.onCardDiscarded(player, cardArr[0])
await this.delay(time);
// return [new NextSubCommand()];
if (cardArr[0].type == CardType.general || cardArr[0].type == CardType.variable_unit) {
return [new NextSubCommand()];
@ -86,7 +87,8 @@ export class DiscardCommand extends Command<CardGameState, { client: Client, car
let cardArr: Card[] = [...this.state.cards.values()];
let self = this;
this.room.send(client,'eat_card_s2c', {player: player.id, errcode: 0, errmsg: ''});
this.room.battleMan.onCardLinkOver(player, cardArr);
let delay = this.room.battleMan.onCardLinkOver(player, cardArr);
await this.delay(delay);
let time = new GameEnv().playerActTime * 1000 + player.extraTime;
this.state.updateGameState(GameStateConst.STATE_PICK_PET);
// 开启选随从计时, 计时结束后结束当前轮

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

@ -15,7 +15,7 @@ import gameUtil from "../../utils/game.util";
export class EatConfirmCommand extends Command<CardGameState, { timeUp: boolean }> {
execute({timeUp} = this.payload) {
async execute({timeUp} = this.payload) {
let giveUpCount = 0;
const playerCount = this.room.maxClients - 1;
const sessionIds = [...this.state.players.keys()];
@ -98,9 +98,11 @@ export class EatConfirmCommand extends Command<CardGameState, { timeUp: boolean
this.room.broadcast('eat_card_s2c', {player: player.id, errcode: 0, errmsg: ''}, {except: client});
this.room.send(client,'eat_card_s2c', {player: player.id, errcode: 0, errmsg: ''});
if (fromPlayer.id !== player.id) {
this.room.battleMan.onCardLinkOver(player, cardArr, fromPlayer);
let delay = this.room.battleMan.onCardLinkOver(player, cardArr, fromPlayer);
await this.delay(delay);
} else {
this.room.battleMan.onCardLinkOver(player, cardArr);
let delay = this.room.battleMan.onCardLinkOver(player, cardArr);
await this.delay(delay);
}
// 开启选随从计时, 计时结束后结束当前轮
this.state.updateGameState(GameStateConst.STATE_PICK_PET);

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

@ -39,7 +39,8 @@ export class NextTurnCommand extends Command<CardGameState, {}> {
if (!player) {
error('未找到玩家');
}
this.room.battleMan.onPlayerRoundStart(player);
let time = this.room.battleMan.onPlayerRoundStart(player);
await this.delay(time);
if (player.state == PlayerStateConst.PLAYER_DEAD) {
return [new TurnEndCommand()];
} else {

6
src/rooms/commands/TurnEndCommand.ts
View File

@ -13,12 +13,12 @@ import gameUtil from "../../utils/game.util";
*/
export class TurnEndCommand extends Command<CardGameState, {}> {
execute() : Array<Command> | void{
const sessionIds = [...this.state.players.keys()];
async execute(): Promise<Command[]> {
if (this.state.currentTurn) {
let player = this.state.players.get(this.state.currentTurn);
if (player) {
this.room.battleMan.onPlayerRoundEnd(player);
let delay = this.room.battleMan.onPlayerRoundEnd(player);
await this.delay(delay);
}
}
// if (this.state.currentTurn