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

This commit is contained in:
yuexin 2020-12-23 11:44:00 +08:00
commit 74ccf76f3b

View File

@ -8,6 +8,7 @@ import {CardGameState} from "../rooms/schema/CardGameState";
import {Player} from "../rooms/schema/Player"; import {Player} from "../rooms/schema/Player";
import {HeroCfg} from "../cfg/parsers/HeroCfg"; import {HeroCfg} from "../cfg/parsers/HeroCfg";
import {EffectType} from "../cfg/enums/EffectType"; import {EffectType} from "../cfg/enums/EffectType";
import {CardType} from "../cfg/enums/CardType";
let assistantUtil = { let assistantUtil = {
@ -21,7 +22,7 @@ let assistantUtil = {
let pointMap: Map<number, Card[]> = new Map(); let pointMap: Map<number, Card[]> = new Map();
let cardIdSet: Set<number> = new Set(); let cardIdSet: Set<number> = new Set();
for (let c of cardArr) { for (let c of cardArr) {
if (c.type !== 1) { if (!(c.type == CardType.general || c.type == CardType.variable_unit)) {
continue; continue;
} }
if (pointMap.has(c.number)) { if (pointMap.has(c.number)) {
@ -155,7 +156,7 @@ let assistantUtil = {
if (effect.type_id == EffectType.unit) { if (effect.type_id == EffectType.unit) {
result = card; result = card;
break; break;
} else if (card.type == 1) { } else if (effect.type_id == EffectType.skill) {
spellCards.push(card); spellCards.push(card);
} }
} }
@ -205,7 +206,7 @@ let assistantUtil = {
//TODO: 增加效果卡 //TODO: 增加效果卡
let effCards: number[] = []; let effCards: number[] = [];
for (let card of cards) { for (let card of cards) {
if (card.type == 2 || card.type == 3) { if (card.type == CardType.double_effect || card.type == CardType.double_point) {
effCards.push(card.id); effCards.push(card.id);
} }
} }