生成卡的时候返回生成的数量

This commit is contained in:
zhl 2020-12-14 17:46:20 +08:00
parent e3ac1d1901
commit 204f4fec3e
2 changed files with 15 additions and 9 deletions

5
src/global.d.ts vendored
View File

@ -234,11 +234,12 @@ declare module "colyseus" {
count: number, count: number,
effectId: number, effectId: number,
fromplayer?: string | Player, fromplayer?: string | Player,
options?: any}): void; options?: any}): number;
/** /**
* *
* @param playerId
*/ */
addRobot():void; addRobot(playerId?: string):void;
} }
} }

View File

@ -162,20 +162,24 @@ Object.defineProperties(Room.prototype, {
*/ */
generateCard: { generateCard: {
value: function ({player, count, effectId, fromplayer, options} value: function ({player, count, effectId, fromplayer, options}
: {player: string | Player, count: number, effectId: number, fromplayer?: string | Player, options?: any}): void { : {player: string | Player, count: number, effectId: number, fromplayer?: string | Player, options?: any}): number {
let tmpCards = []; let tmpCards = [];
for (let i = 0; i < count; i++) { let maxCount = singleton(GameEnv).maxCardNum;
let cardId = 1000 + (this.state.maxCardId ++ );
let card = gameUtil.generateCardWithEffect(effectId, cardId, options);
tmpCards.push(card);
}
let dstplayer; let dstplayer;
if (typeof player == 'string') { if (typeof player == 'string') {
dstplayer = this.state.players.get(player); dstplayer = this.state.players.get(player);
} else { } else {
dstplayer = player; dstplayer = player;
} }
let realCount = Math.min(count, maxCount - dstplayer.cards.size);
for (let i = 0; i < realCount; i++) {
let cardId = 1000 + (this.state.maxCardId ++ );
let card = gameUtil.generateCardWithEffect(effectId, cardId, options);
tmpCards.push(card);
}
let sourcePlayer; let sourcePlayer;
if (typeof fromplayer == 'string') { if (typeof fromplayer == 'string') {
sourcePlayer = this.state.players.get(fromplayer); sourcePlayer = this.state.players.get(fromplayer);
@ -197,6 +201,7 @@ Object.defineProperties(Room.prototype, {
source: 1 source: 1
}; };
this.bDrawCard(bData, {except: client}); this.bDrawCard(bData, {except: client});
return realCount;
} }
} }
}); });