From a6363d30fa478749bea3d25369bb82f5cfea851b Mon Sep 17 00:00:00 2001
From: zhl <zhl010101@gmail.com>
Date: Tue, 22 Dec 2020 13:28:29 +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=E7=94=9F=E6=88=90=E7=AD=96=E7=95=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/rooms/commands/SelectHeroCommand.ts | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/rooms/commands/SelectHeroCommand.ts b/src/rooms/commands/SelectHeroCommand.ts
index afd1b9e..9daa895 100644
--- a/src/rooms/commands/SelectHeroCommand.ts
+++ b/src/rooms/commands/SelectHeroCommand.ts
@@ -39,13 +39,28 @@ export class SelectHeroCommand extends Command<CardGameState, { client: Client,
         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[] = [];
-            subData.push(heroData[`follower${i}id`]);
-            subData.push(heroData[`follower${i}`]);
+            let unitId = heroData[`follower${i}id`];
+
+            let weight = 0;
+            let effectId;
+            for (let [,eff] of effectMap) {
+                if (eff.stageunit_id == unitId) {
+                    weight = eff.weight;
+                    effectId = eff.id;
+                    break;
+                }
+            }
+            if (!effectId) {
+                error(`未找到效果卡的配置: ${unitId}`);
+            }
+            subData.push(effectId);
+            subData.push(weight);
             petInitData.push(subData);
         }
         player.unitCfgs = petInitData;