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

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

Browse Source
This commit is contained in:
yuexin 2020-12-10 13:30:54 +08:00
commit 5e7e2ed27a
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,6 +8,7 @@ import {singleton} from "../../common/Singleton";
import {GameEnv} from "../../cfg/GameEnv"; import {GameEnv} from "../../cfg/GameEnv";
import {debugRoom} from "../../common/Debug"; import {debugRoom} from "../../common/Debug";
import {TurnEndCommand} from "./TurnEndCommand"; import {TurnEndCommand} from "./TurnEndCommand";
import {Card} from "../schema/Card";
/** /**
* 出牌 * 出牌
@ -72,6 +73,8 @@ export class DiscardCommand extends Command<CardGameState, { client: Client, car
if (cards.length === 1) { if (cards.length === 1) {
return [new NextSubCommand()]; return [new NextSubCommand()];
} else { } else {
let cardArr: Card[] = [...this.state.cards.values()];
this.room.battleMan.onCardLinkOver(player, cardArr);
this.state.gameState = GameStateConst.STATE_PICK_PET; this.state.gameState = GameStateConst.STATE_PICK_PET;
let self = this; let self = this;
let time = singleton(GameEnv).playerActTime * 1000 + player.extraTime; let time = singleton(GameEnv).playerActTime * 1000 + player.extraTime;

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

@ -11,7 +11,7 @@ export class PlayReadyCommand extends Command<CardGameState, {
client: Client client: Client
}> { }> {
execute({client}: { client: Client }) { async execute({client}: { client: Client }) {
this.state.players.get(client.sessionId).state = PlayerStateConst.PLAYER_READY; this.state.players.get(client.sessionId).state = PlayerStateConst.PLAYER_READY;
this.room.broadcast("player_ready_s2c", {player: client.sessionId}, {except: client}); this.room.broadcast("player_ready_s2c", {player: client.sessionId}, {except: client});
let readyCount = 0; let readyCount = 0;
@ -24,6 +24,7 @@ export class PlayReadyCommand extends Command<CardGameState, {
if (readyCount >= this.room.maxClients) { if (readyCount >= this.room.maxClients) {
// 比大小, 确定先手 // 比大小, 确定先手
// return [new PrepareCommand()]; // return [new PrepareCommand()];
await this.room.setPrivate(true);
this.room.state.gameState = GameStateConst.CHANGE_HERO; this.room.state.gameState = GameStateConst.CHANGE_HERO;
} }