From 5435b67daa3af898ed99f6d2d156097f9ee74d5b Mon Sep 17 00:00:00 2001
From: zhl <zhl010101@gmail.com>
Date: Thu, 4 Feb 2021 18:45:53 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B6=85=E6=97=B6=E6=B2=A1=E9=80=89=E8=8B=B1?=
 =?UTF-8?q?=E9=9B=84=E6=97=B6,=20=E6=A0=B9=E6=8D=AE=E7=8E=A9=E5=AE=B6?=
 =?UTF-8?q?=E5=8F=AF=E7=94=A8=E8=8B=B1=E9=9B=84=E9=9A=8F=E6=9C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/rooms/commands/OnJoinCommand.ts    |  3 ++-
 src/rooms/commands/PlayReadyCommand.ts | 14 ++++++++++----
 src/rooms/schema/Player.ts             |  2 ++
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/rooms/commands/OnJoinCommand.ts b/src/rooms/commands/OnJoinCommand.ts
index 0e54420..c338604 100644
--- a/src/rooms/commands/OnJoinCommand.ts
+++ b/src/rooms/commands/OnJoinCommand.ts
@@ -44,9 +44,10 @@ export class OnJoinCommand extends Command<CardGameState, {
     // end of set seat and team
     let player = new Player(client.sessionId, idx, team);
     this.state.players.set(client.sessionId, player);
-    let uinfo: {nickname: string, avatar: string, score: number, accountid: string}
+    let uinfo: {nickname: string, avatar: string, score: number, accountid: string, heros: number[]}
     if (accountId && accountId != 'robot') {
       uinfo = await getUserInfo(accountId, !!this.room.match)
+      player.heros = uinfo.heros.map(o => parseInt(o+''))
     } else {
       const fc = global.$cfg.get(BaseConst.FORMULA);
       let low = (this.room.score * fc.get(70034).number / 100) | 0;
diff --git a/src/rooms/commands/PlayReadyCommand.ts b/src/rooms/commands/PlayReadyCommand.ts
index 6df7e3b..2ebf482 100644
--- a/src/rooms/commands/PlayReadyCommand.ts
+++ b/src/rooms/commands/PlayReadyCommand.ts
@@ -44,11 +44,17 @@ export class PlayReadyCommand extends Command<CardGameState, {
             let pickHeroTimeOut = function () {
                 for (let [, curPlayer] of self.state.players) {
                     if (curPlayer.state == PlayerStateConst.PLAYER_READY ) {
-                        let heroMap: Map<number, HeroCfg> = global.$cfg.get(BaseConst.HERO);
-                        let heroArr: HeroCfg[] = [...heroMap.values()];
-                        let hero: HeroCfg = heroArr.randomOne();
+                        let heroId: number
+                        if (curPlayer.heros) {
+                           heroId = curPlayer.heros.randomOne()
+                        } else {
+                            let heroMap: Map<number, HeroCfg> = global.$cfg.get(BaseConst.HERO);
+                            let heroArr: HeroCfg[] = [...heroMap.values()];
+                            let hero: HeroCfg = heroArr.randomOne();
+                            heroId = hero.id
+                        }
                         let targetClient = self.room.getClient(curPlayer);
-                        self.room.dispatcher.dispatch(new SelectHeroCommand(), {client: targetClient, heroId: hero.id});
+                        self.room.dispatcher.dispatch(new SelectHeroCommand(), {client: targetClient, heroId});
                     }
                 }
             }
diff --git a/src/rooms/schema/Player.ts b/src/rooms/schema/Player.ts
index 3356292..39ebd67 100644
--- a/src/rooms/schema/Player.ts
+++ b/src/rooms/schema/Player.ts
@@ -108,6 +108,8 @@ export class Player extends Schema {
    */
   petData: Map<number, number> = new Map();
 
+  heros: number[];
+
   /**
    * 英雄绑定的卡组, 选好英雄后, 从默认配置或玩家卡组(待实现)中获取
    * key = 效果卡id