diff --git a/src/rooms/commands/BeginGameCommand.ts b/src/rooms/commands/BeginGameCommand.ts index 8f637c2..6fe14ec 100644 --- a/src/rooms/commands/BeginGameCommand.ts +++ b/src/rooms/commands/BeginGameCommand.ts @@ -15,8 +15,8 @@ export class BeginGameCommand extends Command { async execute() { this.room.battleMan.onGameStart(); this.state.maxCardId = 0; - let card0 = gameUtil.initCardQue(); - let card1 = gameUtil.initCardQue(); + let card0 = gameUtil.initCardQue(1); + let card1 = gameUtil.initCardQue(card0.length + 1); let cardAll = card0.concat(card1); cardAll.randomSort(); this.state.cardQueue = cardAll; diff --git a/src/utils/game.util.ts b/src/utils/game.util.ts index 154a3e3..258cf42 100644 --- a/src/utils/game.util.ts +++ b/src/utils/game.util.ts @@ -16,13 +16,13 @@ let gameUtil = { /** * 游戏开始时, 初始化卡组 */ - initCardQue() { + initCardQue(beginNum: number) { let cards: Card[] = []; let numCfgMap: Map = global.$cfg.get(BaseConst.SYSTEMCARD); let effCfgMap: Map = global.$cfg.get(BaseConst.EFFECTCARD); let countMap: Map = new Map(); - let localId = 1; + let localId = beginNum; for (let [, cfg] of numCfgMap) { for (let i = 0; i < cfg.count; i++) { let [effid, effType] = this.getRandomEffect(cfg.weightArr, effCfgMap, countMap);