From 949fa8d2f2f8fd0637406a7e3f6fb61c2c1f675a Mon Sep 17 00:00:00 2001
From: zhl <zhl010101@gmail.com>
Date: Tue, 29 Dec 2020 12:40:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A32=E6=AC=A1=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E5=8D=A1=E7=BB=84=E6=97=B6,=E5=8D=A1=E7=89=8Cid=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/rooms/commands/BeginGameCommand.ts | 4 ++--
 src/utils/game.util.ts                 | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

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<CardGameState, {}> {
     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<number, SystemCardCfg> = global.$cfg.get(BaseConst.SYSTEMCARD);
         let effCfgMap: Map<number, EffectCardCfg> = global.$cfg.get(BaseConst.EFFECTCARD);
 
         let countMap: Map<number, number> = 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);