修正2次生成卡组时,卡牌id重复的bug

This commit is contained in:
zhl 2020-12-29 12:40:23 +08:00
parent ad82682852
commit 949fa8d2f2
2 changed files with 4 additions and 4 deletions

View File

@ -15,8 +15,8 @@ export class BeginGameCommand extends Command<CardGameState, {}> {
async execute() { async execute() {
this.room.battleMan.onGameStart(); this.room.battleMan.onGameStart();
this.state.maxCardId = 0; this.state.maxCardId = 0;
let card0 = gameUtil.initCardQue(); let card0 = gameUtil.initCardQue(1);
let card1 = gameUtil.initCardQue(); let card1 = gameUtil.initCardQue(card0.length + 1);
let cardAll = card0.concat(card1); let cardAll = card0.concat(card1);
cardAll.randomSort(); cardAll.randomSort();
this.state.cardQueue = cardAll; this.state.cardQueue = cardAll;

View File

@ -16,13 +16,13 @@ let gameUtil = {
/** /**
* , * ,
*/ */
initCardQue() { initCardQue(beginNum: number) {
let cards: Card[] = []; let cards: Card[] = [];
let numCfgMap: Map<number, SystemCardCfg> = global.$cfg.get(BaseConst.SYSTEMCARD); let numCfgMap: Map<number, SystemCardCfg> = global.$cfg.get(BaseConst.SYSTEMCARD);
let effCfgMap: Map<number, EffectCardCfg> = global.$cfg.get(BaseConst.EFFECTCARD); let effCfgMap: Map<number, EffectCardCfg> = global.$cfg.get(BaseConst.EFFECTCARD);
let countMap: Map<number, number> = new Map(); let countMap: Map<number, number> = new Map();
let localId = 1; let localId = beginNum;
for (let [, cfg] of numCfgMap) { for (let [, cfg] of numCfgMap) {
for (let i = 0; i < cfg.count; i++) { for (let i = 0; i < cfg.count; i++) {
let [effid, effType] = this.getRandomEffect(cfg.weightArr, effCfgMap, countMap); let [effid, effType] = this.getRandomEffect(cfg.weightArr, effCfgMap, countMap);