From 708bc37b72143ff9fad8bb631658209c88debd85 Mon Sep 17 00:00:00 2001
From: zhl <zhl010101@gmail.com>
Date: Tue, 22 Dec 2020 14:41:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8B=B1=E9=9B=84=E5=8D=A1?=
 =?UTF-8?q?=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/rooms/commands/SelectHeroCommand.ts | 7 +------
 src/rooms/schema/Player.ts              | 6 ++++--
 src/utils/assistant.util.ts             | 9 +--------
 src/utils/game.util.ts                  | 2 +-
 4 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/src/rooms/commands/SelectHeroCommand.ts b/src/rooms/commands/SelectHeroCommand.ts
index 9daa895..897dd99 100644
--- a/src/rooms/commands/SelectHeroCommand.ts
+++ b/src/rooms/commands/SelectHeroCommand.ts
@@ -38,13 +38,11 @@ export class SelectHeroCommand extends Command<CardGameState, { client: Client,
         if (unitData.base_skill1id) heroPet.skills.push(unitData.base_skill1id);
         if (unitData.base_skill2id) heroPet.skills.push(unitData.base_skill2id);
         if (unitData.base_skill3id) heroPet.skills.push(unitData.base_skill3id);
-        let petInitData: number[][] = [];
         const effectMap = global.$cfg.get(BaseConst.EFFECTCARD);
         for (let i = 1; i < 10; i++) {
             if (!heroData[`follower${i}id`]) {
                 break;
             }
-            let subData: number[] = [];
             let unitId = heroData[`follower${i}id`];
 
             let weight = 0;
@@ -59,11 +57,8 @@ export class SelectHeroCommand extends Command<CardGameState, { client: Client,
             if (!effectId) {
                 error(`未找到效果卡的配置: ${unitId}`);
             }
-            subData.push(effectId);
-            subData.push(weight);
-            petInitData.push(subData);
+            player.unitCfgs.set(effectId+'', weight);
         }
-        player.unitCfgs = petInitData;
         this.room.battleMan.addPlayer(player);
         this.room.bSelectHero({errocode: 0, errmsg: '', player: client.sessionId, heroId: heroId});
         let readyCount = 0;
diff --git a/src/rooms/schema/Player.ts b/src/rooms/schema/Player.ts
index f4574fe..3effda1 100644
--- a/src/rooms/schema/Player.ts
+++ b/src/rooms/schema/Player.ts
@@ -72,9 +72,11 @@ export class Player extends Schema {
 
     /**
      * 英雄绑定的卡组, 选好英雄后, 从默认配置或玩家卡组(待实现)中获取
-     * [随从id, 权重]
+     * key = 效果卡id
+     * val = weight
      */
-    unitCfgs: number[][];
+    @type({ map: "number" })
+    unitCfgs = new MapSchema<number>();
 
     constructor(id: string, heroId: number, team: number) {
         super();
diff --git a/src/utils/assistant.util.ts b/src/utils/assistant.util.ts
index b2368fa..fb4a7e0 100644
--- a/src/utils/assistant.util.ts
+++ b/src/utils/assistant.util.ts
@@ -150,14 +150,7 @@ let assistantUtil = {
         // 优先取随从
         for (let card of cards) {
             let effect = effectMap.get(card.effect);
-            let hasCard = false;
-            for (let [id, weight] of dstPlayer.unitCfgs) {
-                if (id === card.effect) {
-                    hasCard = true;
-                    break;
-                }
-            }
-            if (effect.type_id == 1 && hasCard) {
+            if (effect.type_id == 1 && dstPlayer.unitCfgs.has(card.effect + '')) {
                 result = card;
                 break;
             } else if (card.type == 1) {
diff --git a/src/utils/game.util.ts b/src/utils/game.util.ts
index 63705ab..3daf104 100644
--- a/src/utils/game.util.ts
+++ b/src/utils/game.util.ts
@@ -64,7 +64,7 @@ let gameUtil = {
         let tmpArr: number[][] = [];
         for (let [id, weight] of player.unitCfgs) {
             total += weight;
-            tmpArr.push([id, total]);
+            tmpArr.push([parseInt(id), total]);
         }
         let num = Math.random() * total;
         let result;