refactor: 统一将 pool_lv 重命名为 card_lv 并清理废弃代码

本次提交完成了全项目范围内的术语统一重构： 1. 将所有`pool_lv`相关变量、字段、注释替换为`card_lv`，对齐卡牌等级的业务含义 2. 移除了配置中冗余的默认`pool_lv`赋值，简化数据结构 3. 删除了废弃的`HlistComp.ts`组件及其元文件 4. 修正了多处逻辑错误，确保卡牌等级正确驱动背景框切换 5. 更新了相关注释和文档，保持代码一致性
2026-07-27 15:54:53 +08:00
parent 62264deeed
commit 9f2599e9ec
21 changed files with 137 additions and 467 deletions
--- a/assets/script/game/common/config/CardSet.ts
+++ b/assets/script/game/common/config/CardSet.ts
@@ -82,11 +82,10 @@ export interface CardConfig {
    cost: number
    weight: number
    kind: CKind
-    pool_lv: CardLV
+    card_lv: number        // 卡牌等级（驱动 bg_node 颜色：1=green 2=blue 3=purple 4=red 5=yellow）
    wave?: number           // 针对技能卡：仅在指定波次(wave)才能抽到
    hero_lv?: number
-    card_lv?: number
-    base_pool_lv?: number
+    base_card_lv?: number

    // 技能卡扩展属性
    skill?: number          // 关联的技能 UUID
@@ -151,11 +150,10 @@ HeroList.forEach(uuid => {
        type: CardType.Hero,
        cost: baseCost,
        weight: baseWeight,
-        pool_lv: CardLV.LV1,
+        card_lv: hero.card_lv ?? 1,
        kind: CKind.Hero,
        hero_lv: 1,
-        card_lv: 1,
-        base_pool_lv: 1,
+        base_card_lv: hero.card_lv ?? 1,
    });
 });

@@ -192,22 +190,22 @@ export interface SpecialRefreshCardConfig extends CardConfig {
 */
 export const SpecialUpgradeCardList: Record<number, SpecialUpgradeCardConfig> = {
    7001: {
-        uuid: 7001, type: CardType.SpecialUpgrade, cost: 10, weight: 18, pool_lv: CardLV.LV1, kind: CKind.Card, card_lv: 1, name: t("scard_name_7001"), info: t("scard_info_7001"),
+        uuid: 7001, type: CardType.SpecialUpgrade, cost: 10, weight: 18, card_lv: 1, kind: CKind.Card, name: t("scard_name_7001"), info: t("scard_info_7001"),
        currentLv: 0, targetLv: 0,
    },
 }

 export const SpecialRefreshCardList: Record<number, SpecialRefreshCardConfig> = {
    7101: {
-        uuid: 7101, type: CardType.SpecialRefresh, cost: 3, weight: 14, pool_lv: CardLV.LV1, kind: CKind.Card, card_lv: 1, name: t("scard_name_7101"), info: t("scard_info_7101"),
+        uuid: 7101, type: CardType.SpecialRefresh, cost: 3, weight: 14, card_lv: 1, kind: CKind.Card, name: t("scard_name_7101"), info: t("scard_info_7101"),
        refreshLv: 0, refreshHeroType: SpecialRefreshHeroType.Melee,
    },
    7102: {
-        uuid: 7102, type: CardType.SpecialRefresh, cost: 3, weight: 14, pool_lv: CardLV.LV1, kind: CKind.Card, card_lv: 1, name: t("scard_name_7102"), info: t("scard_info_7102"),
+        uuid: 7102, type: CardType.SpecialRefresh, cost: 3, weight: 14, card_lv: 1, kind: CKind.Card, name: t("scard_name_7102"), info: t("scard_info_7102"),
        refreshLv: 0, refreshHeroType: SpecialRefreshHeroType.Ranged,
    },
    7103: {
-        uuid: 7103, type: CardType.SpecialRefresh, cost: 4, weight: 12, pool_lv: CardLV.LV1, kind: CKind.Card, card_lv: 1, name: t("scard_name_7103"), info: t("scard_info_7103"),
+        uuid: 7103, type: CardType.SpecialRefresh, cost: 4, weight: 12, card_lv: 1, kind: CKind.Card, name: t("scard_name_7103"), info: t("scard_info_7103"),
        refreshLv: 0, refreshHeroType: SpecialRefreshHeroType.Any,
    },
 }
--- a/assets/script/game/common/config/EquipSet.ts
+++ b/assets/script/game/common/config/EquipSet.ts
@@ -11,11 +11,11 @@
 *   → EquipBoxComp（trigger_type=Field，被动驻场）→ FieldSkillHelper 全局聚合属性加成
 *
 * 依赖：
- *   - CardConfig / CardTriggerType / CardType / CKind / CardLV（CardSet）
+ *   - CardConfig / CardTriggerType / CardType / CKind（CardSet）
 *   - SKILL_CARD_WAVES（GameSet）—— wave 档位定义
 *   - FieldSkillSet（SkillSet）—— 属性词条配置
 */
-import { CardConfig, CardType, CardLV, CKind, CardTriggerType } from "./CardSet";
+import { CardConfig, CardType, CKind, CardTriggerType } from "./CardSet";
 import { SKILL_CARD_WAVES } from "./GameSet";

 /** wave → card_lv 映射（wave 1→lv1, wave 5→lv2, wave 8→lv3） */
@@ -103,7 +103,6 @@ export const EquipPoolList: CardConfig[] = EquipRawList.map(data => ({
    type: CardType.Skill,
    cost: data.cost ?? 0,
    weight: 10,
-    pool_lv: CardLV.LV1,
    wave: data.wave,
    kind: CKind.Skill,
    card_lv: waveToCardLv[data.wave] ?? 1,
--- a/assets/script/game/common/config/ICardSet.ts
+++ b/assets/script/game/common/config/ICardSet.ts
@@ -13,10 +13,10 @@
 *   - kind 为 CKind.Potion（药水类）。
 *
 * 依赖：
- *   - CardSet —— CardConfig / CardType / CKind / CardLV / CardTriggerType
+ *   - CardSet —— CardConfig / CardType / CKind / CardTriggerType
 *   - SkillSet —— SkillOverrides
 */
-import { CardConfig, CardType, CardLV, CKind, CardTriggerType } from "./CardSet";
+import { CardConfig, CardType, CKind, CardTriggerType } from "./CardSet";
 import { SkillOverrides } from "./SkillSet";

 /** 商品/药品卡原始数据（平铺字段，构建后转为 CardConfig） */
@@ -68,7 +68,6 @@ export const ItemCardList: CardConfig[] = ItemCardData.map(data => ({
    type: CardType.Skill,
    cost: data.cost,
    weight: data.weight,
-    pool_lv: CardLV.LV1,
    kind: CKind.Potion,
    card_lv: 1,
    icon: data.icon,
--- a/assets/script/game/common/config/SCardSet.ts
+++ b/assets/script/game/common/config/SCardSet.ts
@@ -11,10 +11,10 @@
 *   - card_lv 直接显式配置，不再依赖 wave 推导。
 *
 * 依赖：
- *   - CardSet —— CardConfig / CardType / CKind / CardLV / CardTriggerType
+ *   - CardSet —— CardConfig / CardType / CKind / CardTriggerType
 *   - SkillSet —— SkillOverrides
 */
-import { CardConfig, CardType, CardLV, CKind, CardTriggerType } from "./CardSet";
+import { CardConfig, CardType, CKind, CardTriggerType } from "./CardSet";
 import { SkillOverrides } from "./SkillSet";

 /** 技能卡原始数据（平铺字段，构建后转为 CardConfig） */
@@ -65,7 +65,6 @@ export const SkillCardList: CardConfig[] = SkillCardData.map(data => {
        type: CardType.Skill,
        cost: 0,
        weight: 10,
-        pool_lv: CardLV.LV1,
        kind: CKind.Skill,
        card_lv: data.card_lv,
        icon: data.icon,
--- a/assets/script/game/common/config/heroSet.ts
+++ b/assets/script/game/common/config/heroSet.ts
@@ -154,7 +154,7 @@ export interface heroInfo {
    fac: FacSet;         // 阵营（FacSet.HERO 或 FacSet.MON）
    kind?: number;        // 未使用
    lv: number;           // 英雄等级
-    pool_lv?: number;     // 卡片等级
+    card_lv?: number;     // 卡牌等级（驱动 bg_node 颜色：1=green 2=blue 3=purple 4=red 5=yellow）
    type: HType;         // 攻击定位（近战/中程/远程）
    monType?: MonType;   // 怪物专属类型
    hp: number;          // 生命值上限
@@ -224,7 +224,7 @@ export interface HeroEvolve {
 export const HeroInfo: Record<number, heroInfo> = {
    // ========== atked 类（战士 · 自身强化） ==========
    5011: {
-        uuid: 5011, name: "小铁卫", path: "hk1", fac: FacSet.HERO, pool_lv: 1, lv: 1, type: HType.Melee, hp: 300, ap: 28,
+        uuid: 5011, name: "小铁卫", path: "hk1", fac: FacSet.HERO, card_lv: 1, lv: 1, type: HType.Melee, hp: 300, ap: 28,
        skills: { 6001: { uuid: 6001, lv: 1, cd: AtkSpeedSet[AtkSpeedLv.Slow3].cd, ccd: 0 } },
        atked: [{ s_uuid: 6301, t_num: 3, overrides: { TGroup: TGroup.Self, ap: 4 } }],
        // 成长主线：护盾层数 4→5→6（等效减伤 57%→67%），6 级追加治疗形成“盾挡+回血”双循环
@@ -252,7 +252,7 @@ export const HeroInfo: Record<number, heroInfo> = {
        ]
    },
    5012: {
-        uuid: 5012, name: "不死小强", path: "hk2", fac: FacSet.HERO, pool_lv: 2, lv: 1, type: HType.Melee, hp: 600, ap: 57,
+        uuid: 5012, name: "不死小强", path: "hk2", fac: FacSet.HERO, card_lv: 2, lv: 1, type: HType.Melee, hp: 600, ap: 57,
        skills: { 6001: { uuid: 6001, lv: 1, cd: AtkSpeedSet[AtkSpeedLv.Slow3].cd, ccd: 0 } },
        atked: [{ s_uuid: 6302, t_num: 3, overrides: { TGroup: TGroup.Self, ap: 250 } }],
        evolve: {
@@ -278,26 +278,26 @@ export const HeroInfo: Record<number, heroInfo> = {
        ]
    },
    // 以下英雄暂时注释，保留待后续扩展
-    // 5012:{uuid:5012,name:"不死小强",path:"hk2", fac:FacSet.HERO,pool_lv:2,lv:1,type:HType.Melee,hp:600,ap:57,
+    // 5012:{uuid:5012,name:"不死小强",path:"hk2", fac:FacSet.HERO,card_lv:2,lv:1,type:HType.Melee,hp:600,ap:57,
    //     skills:{6001:{uuid:6001,lv:1,cd:AtkSpeedSet[AtkSpeedLv.Slow3].cd,ccd:0}},
    //     atked:[{s_uuid:6302,t_num:3,overrides:{TGroup:TGroup.Self,ap:250}}],
    //     info:"每受击3次为自身回复攻击力250%的生命值"},
-    // 5013:{uuid:5013,name:"铁骨头",path:"hk3", fac:FacSet.HERO,pool_lv:2,lv:1,type:HType.Melee,hp:600,ap:57,
+    // 5013:{uuid:5013,name:"铁骨头",path:"hk3", fac:FacSet.HERO,card_lv:2,lv:1,type:HType.Melee,hp:600,ap:57,
    //     skills:{6001:{uuid:6001,lv:1,cd:AtkSpeedSet[AtkSpeedLv.Slow3].cd,ccd:0}},
    //     atked:[{s_uuid:6402,t_num:5,overrides:{TGroup:TGroup.Self,ap:100}}],
    //     info:"每受击5次永久提升自身最大生命值100点"},
-    // 5014:{uuid:5014,name:"怒火武者",path:"hk4", fac:FacSet.HERO,pool_lv:3,lv:1,type:HType.Melee,hp:900,ap:85,
+    // 5014:{uuid:5014,name:"怒火武者",path:"hk4", fac:FacSet.HERO,card_lv:3,lv:1,type:HType.Melee,hp:900,ap:85,
    //     skills:{6001:{uuid:6001,lv:1,cd:AtkSpeedSet[AtkSpeedLv.Slow1].cd,ccd:0}},
    //     atked:[{s_uuid:6401,t_num:3,overrides:{TGroup:TGroup.Self,ap:12}}],
    //     info:"每受击3次永久提升自身攻击力12点"},
-    // 5015:{uuid:5015,name:"血刃武者",path:"hk5", fac:FacSet.HERO,pool_lv:4,lv:1,type:HType.Melee,hp:1200,ap:113,
+    // 5015:{uuid:5015,name:"血刃武者",path:"hk5", fac:FacSet.HERO,card_lv:4,lv:1,type:HType.Melee,hp:1200,ap:113,
    //     skills:{6001:{uuid:6001,lv:1,cd:AtkSpeedSet[AtkSpeedLv.Slow3].cd,ccd:0}},
    //     atked:[
    //         {s_uuid:6301,t_num:3,overrides:{TGroup:TGroup.Self,ap:3}},
    //         {s_uuid:6401,t_num:5,overrides:{TGroup:TGroup.Self,ap:15}}
    //     ],
    //     info:"每受击3次加3层护盾，每受击5次永久+15攻击力"},
-    // 5016:{uuid:5016,name:"狂血战士",path:"hc1", fac:FacSet.HERO,pool_lv:5,lv:1,type:HType.Melee,hp:1500,ap:142,
+    // 5016:{uuid:5016,name:"狂血战士",path:"hc1", fac:FacSet.HERO,card_lv:5,lv:1,type:HType.Melee,hp:1500,ap:142,
    //     skills:{6001:{uuid:6001,lv:1,cd:AtkSpeedSet[AtkSpeedLv.Slow3].cd,ccd:0}},
    //     atked:[
    //         {s_uuid:6401,t_num:3,overrides:{TGroup:TGroup.Self,ap:10}},
@@ -307,7 +307,7 @@ export const HeroInfo: Record<number, heroInfo> = {

    // ========== atking 类 — 刺客（自身强化） ==========
    5021: {
-        uuid: 5021, name: "小刺客", path: "hc1", fac: FacSet.HERO, pool_lv: 1, lv: 1, type: HType.Melee, hp: 300, ap: 28,
+        uuid: 5021, name: "小刺客", path: "hc1", fac: FacSet.HERO, card_lv: 1, lv: 1, type: HType.Melee, hp: 300, ap: 28,
        skills: { 6001: { uuid: 6001, lv: 1, cd: AtkSpeedSet[AtkSpeedLv.Fast2].cd, ccd: 0 } },
        atking: [{ s_uuid: 6401, t_num: 5, overrides: { TGroup: TGroup.Self, ap: 8 } }],
        // 成长主线：滚雪球（AP增量8→10→12，5级阈值5→4刀）；6级追加暴伤强化（永久叠加无100%上限，与高AP叠乘）
@@ -335,26 +335,32 @@ export const HeroInfo: Record<number, heroInfo> = {
        ]
    },
    5022: {
-        uuid: 5022, name: "嗜血剑客", path: "hc2", fac: FacSet.HERO, pool_lv: 3, lv: 1, type: HType.Melee, hp: 900, ap: 85,
+        uuid: 5022, name: "嗜血剑客", path: "hc2", fac: FacSet.HERO, card_lv: 3, lv: 1, type: HType.Melee, hp: 900, ap: 85,
        skills: { 6001: { uuid: 6001, lv: 1, cd: AtkSpeedSet[AtkSpeedLv.Fast2].cd, ccd: 0 } },
        atking: [
            { s_uuid: 6403, t_num: 5, overrides: { TGroup: TGroup.Self, hit_count: 1, timed_buff_id: 7012, buff_value: 15, buff_duration: 5 } },
            { s_uuid: 6401, t_num: 7, overrides: { TGroup: TGroup.Self, ap: 12 } }
        ],
        evolve: {
-            2: { atking: [
-                { s_uuid: 6403, t_num: 5, overrides: { TGroup: TGroup.Self, hit_count: 1, timed_buff_id: 7012, buff_value: 20, buff_duration: 5 } },
-                { s_uuid: 6401, t_num: 7, overrides: { TGroup: TGroup.Self, ap: 12 } }
-            ]},
+            2: {
+                atking: [
+                    { s_uuid: 6403, t_num: 5, overrides: { TGroup: TGroup.Self, hit_count: 1, timed_buff_id: 7012, buff_value: 20, buff_duration: 5 } },
+                    { s_uuid: 6401, t_num: 7, overrides: { TGroup: TGroup.Self, ap: 12 } }
+                ]
+            },
            3: { ap_bonus: 20, hp_bonus: 80 },
-            4: { atking: [
-                { s_uuid: 6403, t_num: 5, overrides: { TGroup: TGroup.Self, hit_count: 1, timed_buff_id: 7012, buff_value: 20, buff_duration: 6 } },
-                { s_uuid: 6401, t_num: 7, overrides: { TGroup: TGroup.Self, ap: 15 } }
-            ]},
-            5: { atking: [
-                { s_uuid: 6403, t_num: 4, overrides: { TGroup: TGroup.Self, hit_count: 1, timed_buff_id: 7012, buff_value: 20, buff_duration: 6 } },
-                { s_uuid: 6401, t_num: 7, overrides: { TGroup: TGroup.Self, ap: 15 } }
-            ]},
+            4: {
+                atking: [
+                    { s_uuid: 6403, t_num: 5, overrides: { TGroup: TGroup.Self, hit_count: 1, timed_buff_id: 7012, buff_value: 20, buff_duration: 6 } },
+                    { s_uuid: 6401, t_num: 7, overrides: { TGroup: TGroup.Self, ap: 15 } }
+                ]
+            },
+            5: {
+                atking: [
+                    { s_uuid: 6403, t_num: 4, overrides: { TGroup: TGroup.Self, hit_count: 1, timed_buff_id: 7012, buff_value: 20, buff_duration: 6 } },
+                    { s_uuid: 6401, t_num: 7, overrides: { TGroup: TGroup.Self, ap: 15 } }
+                ]
+            },
            6: {
                atking: [
                    { s_uuid: 6403, t_num: 4, overrides: { TGroup: TGroup.Self, hit_count: 1, timed_buff_id: 7012, buff_value: 20, buff_duration: 6 } },
@@ -374,7 +380,7 @@ export const HeroInfo: Record<number, heroInfo> = {
        ]
    },
    // 5022: {
-    //     uuid: 5022, name: "嗜血剑客", path: "hc2", fac: FacSet.HERO, pool_lv: 3, lv: 1, type: HType.Melee, hp: 900, ap: 85,
+    //     uuid: 5022, name: "嗜血剑客", path: "hc2", fac: FacSet.HERO, card_lv: 3, lv: 1, type: HType.Melee, hp: 900, ap: 85,
    //     skills: { 6001: { uuid: 6001, lv: 1, cd: AtkSpeedSet[AtkSpeedLv.Fast2].cd, ccd: 0 } },
    //     atking: [
    //         { s_uuid: 6403, t_num: 5, overrides: { TGroup: TGroup.Self, ap: 10 } },
@@ -383,7 +389,7 @@ export const HeroInfo: Record<number, heroInfo> = {
    //     info: "每攻击5次永久+10%暴击率，每攻击7次永久+12攻击力"
    // },
    // 5023: {
-    //     uuid: 5023, name: "暗影杀手", path: "hc3", fac: FacSet.HERO, pool_lv: 5, lv: 1, type: HType.Melee, hp: 1500, ap: 142,
+    //     uuid: 5023, name: "暗影杀手", path: "hc3", fac: FacSet.HERO, card_lv: 5, lv: 1, type: HType.Melee, hp: 1500, ap: 142,
    //     skills: { 6001: { uuid: 6001, lv: 1, cd: AtkSpeedSet[AtkSpeedLv.Fast1].cd, ccd: 0 } },
    //     atking: [
    //         { s_uuid: 6403, t_num: 5, overrides: { TGroup: TGroup.Self, ap: 10 } },
@@ -394,7 +400,7 @@ export const HeroInfo: Record<number, heroInfo> = {

    // ========== atking 类 — 射手（队友强化，hit_count 控制目标数） ==========
    5031: {
-        uuid: 5031, name: "援护弓手", path: "ha1", fac: FacSet.HERO, pool_lv: 1, lv: 1, type: HType.Long, hp: 143, ap: 40,
+        uuid: 5031, name: "援护弓手", path: "ha1", fac: FacSet.HERO, card_lv: 1, lv: 1, type: HType.Long, hp: 143, ap: 40,
        skills: { 6001: { uuid: 6001, lv: 1, cd: AtkSpeedSet[AtkSpeedLv.Normal2].cd, ccd: 0 } },
        atking: [{ s_uuid: 6401, t_num: 5, overrides: { TGroup: TGroup.Team, hit_count: 1, ap: 8 } }],
        // 成长主线：AP增益 8→10→12，5级 hit_count 1→2（2英雄环境=全队）；6级追加全队攻速光环
@@ -417,7 +423,7 @@ export const HeroInfo: Record<number, heroInfo> = {
        ]
    },
    5032: {
-        uuid: 5032, name: "战术弓手", path: "ha2", fac: FacSet.HERO, pool_lv: 3, lv: 1, type: HType.Long, hp: 430, ap: 120,
+        uuid: 5032, name: "战术弓手", path: "ha2", fac: FacSet.HERO, card_lv: 3, lv: 1, type: HType.Long, hp: 430, ap: 120,
        skills: { 6008: { uuid: 6008, lv: 1, cd: AtkSpeedSet[AtkSpeedLv.Normal1].cd, ccd: 0 } },
        atking: [{ s_uuid: 6403, t_num: 5, overrides: { TGroup: TGroup.Team, hit_count: 3, timed_buff_id: 7012, buff_value: 10, buff_duration: 5 } }],
        evolve: {
@@ -443,13 +449,13 @@ export const HeroInfo: Record<number, heroInfo> = {
        ]
    },
    // 5032: {
-    //     uuid: 5032, name: "战术弓手", path: "ha2", fac: FacSet.HERO, pool_lv: 3, lv: 1, type: HType.Long, hp: 430, ap: 120,
+    //     uuid: 5032, name: "战术弓手", path: "ha2", fac: FacSet.HERO, card_lv: 3, lv: 1, type: HType.Long, hp: 430, ap: 120,
    //     skills: { 6001: { uuid: 6001, lv: 1, cd: AtkSpeedSet[AtkSpeedLv.Normal1].cd, ccd: 0 } },
    //     atking: [{ s_uuid: 6403, t_num: 5, overrides: { TGroup: TGroup.Team, hit_count: 3, ap: 10 } }],
    //     info: "每攻击5次为随机3名队友永久提升暴击率10%"
    // },
    // 5033: {
-    //     uuid: 5033, name: "鹰眼弓将", path: "ha3", fac: FacSet.HERO, pool_lv: 5, lv: 1, type: HType.Long, hp: 717, ap: 200,
+    //     uuid: 5033, name: "鹰眼弓将", path: "ha3", fac: FacSet.HERO, card_lv: 5, lv: 1, type: HType.Long, hp: 717, ap: 200,
    //     skills: { 6001: { uuid: 6001, lv: 1, cd: AtkSpeedSet[AtkSpeedLv.Fast3].cd, ccd: 0 } },
    //     atking: [
    //         { s_uuid: 6401, t_num: 5, overrides: { TGroup: TGroup.Team, hit_count: 6, ap: 8 } },
@@ -460,13 +466,13 @@ export const HeroInfo: Record<number, heroInfo> = {

    // ========== dead 类（战士+刺客 · 死亡遗产） ==========
    // 5041: {
-    //     uuid: 5041, name: "殉道卫士", path: "hk1", fac: FacSet.HERO, pool_lv: 1, lv: 1, type: HType.Melee, hp: 300, ap: 28,
+    //     uuid: 5041, name: "殉道卫士", path: "hk1", fac: FacSet.HERO, card_lv: 1, lv: 1, type: HType.Melee, hp: 300, ap: 28,
    //     skills: { 6001: { uuid: 6001, lv: 1, cd: AtkSpeedSet[AtkSpeedLv.Slow3].cd, ccd: 0 } },
    //     dead: [{ s_uuid: 6301, t_num: 1, overrides: { TGroup: TGroup.Team, ap: 3 } }],
    //     info: "死亡时为全队添加3层护盾"
    // },
    // 5042: {
-    //     uuid: 5042, name: "遗志将军", path: "hk2", fac: FacSet.HERO, pool_lv: 2, lv: 1, type: HType.Melee, hp: 600, ap: 57,
+    //     uuid: 5042, name: "遗志将军", path: "hk2", fac: FacSet.HERO, card_lv: 2, lv: 1, type: HType.Melee, hp: 600, ap: 57,
    //     skills: { 6001: { uuid: 6001, lv: 1, cd: AtkSpeedSet[AtkSpeedLv.Slow3].cd, ccd: 0 } },
    //     dead: [
    //         { s_uuid: 6401, t_num: 1, overrides: { TGroup: TGroup.Team, ap: 20 } },
@@ -476,13 +482,13 @@ export const HeroInfo: Record<number, heroInfo> = {
    //     info: "死亡时全队永久+20攻击力、+80最大生命值，死后复活一次"
    // },
    // 5043: {
-    //     uuid: 5043, name: "亡魂刺客", path: "hc1", fac: FacSet.HERO, pool_lv: 3, lv: 1, type: HType.Melee, hp: 900, ap: 85,
+    //     uuid: 5043, name: "亡魂刺客", path: "hc1", fac: FacSet.HERO, card_lv: 3, lv: 1, type: HType.Melee, hp: 900, ap: 85,
    //     skills: { 6001: { uuid: 6001, lv: 1, cd: AtkSpeedSet[AtkSpeedLv.Normal1].cd, ccd: 0 } },
    //     dead: [{ s_uuid: 6405, t_num: 1, overrides: { TGroup: TGroup.Team, ap: 15 } }],
    //     info: "死亡时全队永久提升击晕概率15%"
    // },
    // 5044: {
-    //     uuid: 5044, name: "血誓剑客", path: "hc2", fac: FacSet.HERO, pool_lv: 4, lv: 1, type: HType.Melee, hp: 1200, ap: 113,
+    //     uuid: 5044, name: "血誓剑客", path: "hc2", fac: FacSet.HERO, card_lv: 4, lv: 1, type: HType.Melee, hp: 1200, ap: 113,
    //     skills: { 6001: { uuid: 6001, lv: 1, cd: AtkSpeedSet[AtkSpeedLv.Fast3].cd, ccd: 0 } },
    //     dead: [
    //         { s_uuid: 6403, t_num: 1, overrides: { TGroup: TGroup.Team, ap: 15 } },
@@ -491,7 +497,7 @@ export const HeroInfo: Record<number, heroInfo> = {
    //     info: "死亡时全队永久+15%暴击率、+20%暴伤"
    // },
    // 5045: {
-    //     uuid: 5045, name: "不灭战魂", path: "hk3", fac: FacSet.HERO, pool_lv: 5, lv: 1, type: HType.Melee, hp: 1500, ap: 142,
+    //     uuid: 5045, name: "不灭战魂", path: "hk3", fac: FacSet.HERO, card_lv: 5, lv: 1, type: HType.Melee, hp: 1500, ap: 142,
    //     skills: { 6001: { uuid: 6001, lv: 1, cd: AtkSpeedSet[AtkSpeedLv.Slow3].cd, ccd: 0 } },
    //     dead: [
    //         { s_uuid: 6301, t_num: 1, overrides: { TGroup: TGroup.Team, ap: 5 } },
@@ -505,7 +511,7 @@ export const HeroInfo: Record<number, heroInfo> = {
    // 遗志双核心：死亡一次释放【盾+HP】双遗产；6级追加【AP】，并解锁第2次复活
    // 数值节奏：盾 5→6→7→8，HP 80→100→120→150，6级终极追加 AP+30 且复活次数 1→2
    5045: {
-        uuid: 5045, name: "不灭战魂", path: "hk3", fac: FacSet.HERO, pool_lv: 5, lv: 1, type: HType.Melee, hp: 1500, ap: 60,
+        uuid: 5045, name: "不灭战魂", path: "hk3", fac: FacSet.HERO, card_lv: 5, lv: 1, type: HType.Melee, hp: 1500, ap: 60,
        skills: { 6001: { uuid: 6001, lv: 1, cd: AtkSpeedSet[AtkSpeedLv.Slow3].cd, ccd: 0 } },
        // 死亡释放：5 层护盾 + 全队 +80 HP；复活 1 次血量 50%
        dead: [{ s_uuid: 6301, t_num: 1, overrides: { TGroup: TGroup.Team, ap: 5 } }, { s_uuid: 6402, t_num: 1, overrides: { TGroup: TGroup.Team, ap: 80 } }],
@@ -531,7 +537,7 @@ export const HeroInfo: Record<number, heroInfo> = {

    // ========== fstart 类（法师 · 战前增益） ==========
    5051: {
-        uuid: 5051, name: "占卜师", path: "hm1", fac: FacSet.HERO, pool_lv: 1, lv: 1, type: HType.Long, hp: 143, ap: 40,
+        uuid: 5051, name: "占卜师", path: "hm1", fac: FacSet.HERO, card_lv: 1, lv: 1, type: HType.Long, hp: 143, ap: 40,
        skills: { 6001: { uuid: 6001, lv: 1, cd: AtkSpeedSet[AtkSpeedLv.Mid3].cd, ccd: 0 } },
        // 战前计时 buff：每波开始全队 AP 限时提升（+30/5s → +60/7s → +90/10s），6级追加暴击驻场光环
        // 统一复用 7111 基础配置，通过 buff_value/buff_duration 覆写实现三档成长
@@ -554,7 +560,7 @@ export const HeroInfo: Record<number, heroInfo> = {
        ]
    },
    5052: {
-        uuid: 5052, name: "护盾牧师", path: "hm2", fac: FacSet.HERO, pool_lv: 2, lv: 1, type: HType.Long, hp: 287, ap: 80,
+        uuid: 5052, name: "护盾牧师", path: "hm2", fac: FacSet.HERO, card_lv: 2, lv: 1, type: HType.Long, hp: 287, ap: 80,
        skills: { 6001: { uuid: 6001, lv: 1, cd: AtkSpeedSet[AtkSpeedLv.Slow1].cd, ccd: 0 } },
        fstart: [{ s_uuid: 6301, t_num: 1, overrides: { TGroup: TGroup.Team, ap: 3 } }],
        evolve: {
@@ -575,25 +581,25 @@ export const HeroInfo: Record<number, heroInfo> = {
        ]
    },
    // 5052: {
-    //     uuid: 5052, name: "护盾牧师", path: "hm2", fac: FacSet.HERO, pool_lv: 2, lv: 1, type: HType.Long, hp: 287, ap: 80,
+    //     uuid: 5052, name: "护盾牧师", path: "hm2", fac: FacSet.HERO, card_lv: 2, lv: 1, type: HType.Long, hp: 287, ap: 80,
    //     skills: { 6001: { uuid: 6001, lv: 1, cd: AtkSpeedSet[AtkSpeedLv.Slow1].cd, ccd: 0 } },
    //     fstart: [{ s_uuid: 6301, t_num: 1, overrides: { TGroup: TGroup.Team, ap: 2 } }],
    //     info: "战斗开始时为全队添加2层护盾"
    // },
    // 5053: {
-    //     uuid: 5053, name: "血盟法师", path: "hm3", fac: FacSet.HERO, pool_lv: 2, lv: 1, type: HType.Long, hp: 287, ap: 80,
+    //     uuid: 5053, name: "血盟法师", path: "hm3", fac: FacSet.HERO, card_lv: 2, lv: 1, type: HType.Long, hp: 287, ap: 80,
    //     skills: { 6001: { uuid: 6001, lv: 1, cd: AtkSpeedSet[AtkSpeedLv.Mid2].cd, ccd: 0 } },
    //     fstart: [{ s_uuid: 6402, t_num: 1, overrides: { TGroup: TGroup.Team, ap: 100 } }],
    //     info: "战斗开始时为全队永久提升最大生命值100点"
    // },
    // 5054: {
-    //     uuid: 5054, name: "暴击法师", path: "hm4", fac: FacSet.HERO, pool_lv: 3, lv: 1, type: HType.Long, hp: 430, ap: 120,
+    //     uuid: 5054, name: "暴击法师", path: "hm4", fac: FacSet.HERO, card_lv: 3, lv: 1, type: HType.Long, hp: 430, ap: 120,
    //     skills: { 6001: { uuid: 6001, lv: 1, cd: AtkSpeedSet[AtkSpeedLv.Mid3].cd, ccd: 0 } },
    //     fstart: [{ s_uuid: 6403, t_num: 1, overrides: { TGroup: TGroup.Team, ap: 20 } }],
    //     info: "战斗开始时为全队永久提升暴击率20%"
    // },
    // 5055: {
-    //     uuid: 5055, name: "毁灭法师", path: "hm5", fac: FacSet.HERO, pool_lv: 4, lv: 1, type: HType.Long, hp: 573, ap: 160,
+    //     uuid: 5055, name: "毁灭法师", path: "hm5", fac: FacSet.HERO, card_lv: 4, lv: 1, type: HType.Long, hp: 573, ap: 160,
    //     skills: { 6001: { uuid: 6001, lv: 1, cd: AtkSpeedSet[AtkSpeedLv.Mid1].cd, ccd: 0 } },
    //     fstart: [
    //         { s_uuid: 6404, t_num: 1, overrides: { TGroup: TGroup.Team, ap: 25 } },
@@ -602,7 +608,7 @@ export const HeroInfo: Record<number, heroInfo> = {
    //     info: "战斗开始时为全队永久+25%暴伤、+20攻击力"
    // },
    // 5056: {
-    //     uuid: 5056, name: "预言法师", path: "hm6", fac: FacSet.HERO, pool_lv: 5, lv: 1, type: HType.Long, hp: 717, ap: 200,
+    //     uuid: 5056, name: "预言法师", path: "hm6", fac: FacSet.HERO, card_lv: 5, lv: 1, type: HType.Long, hp: 717, ap: 200,
    //     skills: { 6001: { uuid: 6001, lv: 1, cd: AtkSpeedSet[AtkSpeedLv.Normal3].cd, ccd: 0 } },
    //     fstart: [
    //         { s_uuid: 6405, t_num: 1, overrides: { TGroup: TGroup.Team, ap: 20 } },
@@ -614,13 +620,13 @@ export const HeroInfo: Record<number, heroInfo> = {

    // ========== field 类（法师 · 驻场光环） ==========
    // 5061: {
-    //     uuid: 5061, name: "亡语法师", path: "hm1", fac: FacSet.HERO, pool_lv: 3, lv: 1, type: HType.Long, hp: 430, ap: 120,
+    //     uuid: 5061, name: "亡语法师", path: "hm1", fac: FacSet.HERO, card_lv: 3, lv: 1, type: HType.Long, hp: 430, ap: 120,
    //     skills: { 6001: { uuid: 6001, lv: 1, cd: AtkSpeedSet[AtkSpeedLv.Mid2].cd, ccd: 0 } },
    //     field: [7015],
    //     info: "驻场期间全队死亡触发技能次数+1，死亡后光环消失"
    // },
    5061: {
-        uuid: 5061, name: "战歌法师", path: "hm3", fac: FacSet.HERO, pool_lv: 3, lv: 1, type: HType.Long, hp: 430, ap: 120,
+        uuid: 5061, name: "战歌法师", path: "hm3", fac: FacSet.HERO, card_lv: 3, lv: 1, type: HType.Long, hp: 430, ap: 120,
        skills: { 6001: { uuid: 6001, lv: 1, cd: AtkSpeedSet[AtkSpeedLv.Mid2].cd, ccd: 0 } },
        field: [7002],
        evolve: {
@@ -643,7 +649,7 @@ export const HeroInfo: Record<number, heroInfo> = {

    // ========== fend + atking 类（辅助 · 治疗续航 + 波次增益） ==========
    5071: {
-        uuid: 5071, name: "治愈牧师", path: "hh1", fac: FacSet.HERO, pool_lv: 1, lv: 1, type: HType.Long, hp: 143, ap: 40,
+        uuid: 5071, name: "治愈牧师", path: "hh1", fac: FacSet.HERO, card_lv: 1, lv: 1, type: HType.Long, hp: 143, ap: 40,
        skills: { 6001: { uuid: 6001, lv: 1, cd: AtkSpeedSet[AtkSpeedLv.Normal3].cd, ccd: 0 } },
        atking: [{ s_uuid: 6302, t_num: 5, overrides: { TGroup: TGroup.Team, ap: 200 } }],
        // 成长主线：治疗量 200→250→300%，5级 hit_count 1→2（全队）；6级追加护盾 atking，攻防一体
@@ -671,28 +677,28 @@ export const HeroInfo: Record<number, heroInfo> = {
        ]
    },
    // 5072: {
-    //     uuid: 5072, name: "小金库", path: "hh2", fac: FacSet.HERO, pool_lv: 2, lv: 1, type: HType.Long, hp: 287, ap: 80,
+    //     uuid: 5072, name: "小金库", path: "hh2", fac: FacSet.HERO, card_lv: 2, lv: 1, type: HType.Long, hp: 287, ap: 80,
    //     skills: { 6001: { uuid: 6001, lv: 1, cd: AtkSpeedSet[AtkSpeedLv.Mid1].cd, ccd: 0 } },
    //     atking: [{ s_uuid: 6302, t_num: 5, overrides: { TGroup: TGroup.Team, ap: 200 } }],
    //     fend: [{ s_uuid: 6303, t_num: 1, overrides: { gold: 1 } }],
    //     info: "每攻击5次治疗全队，每波结束获得1金币"
    // },
    // 5073: {
-    //     uuid: 5073, name: "强化牧师", path: "hh3", fac: FacSet.HERO, pool_lv: 3, lv: 1, type: HType.Long, hp: 430, ap: 120,
+    //     uuid: 5073, name: "强化牧师", path: "hh3", fac: FacSet.HERO, card_lv: 3, lv: 1, type: HType.Long, hp: 430, ap: 120,
    //     skills: { 6001: { uuid: 6001, lv: 1, cd: AtkSpeedSet[AtkSpeedLv.Normal3].cd, ccd: 0 } },
    //     atking: [{ s_uuid: 6302, t_num: 5, overrides: { TGroup: TGroup.Team, ap: 250 } }],
    //     fend: [{ s_uuid: 6401, t_num: 1, overrides: { TGroup: TGroup.Team, ap: 10 } }],
    //     info: "每攻击5次治疗全队，每波结束全队永久+10攻击力"
    // },
    // 5074: {
-    //     uuid: 5074, name: "生命牧师", path: "hh4", fac: FacSet.HERO, pool_lv: 4, lv: 1, type: HType.Long, hp: 573, ap: 160,
+    //     uuid: 5074, name: "生命牧师", path: "hh4", fac: FacSet.HERO, card_lv: 4, lv: 1, type: HType.Long, hp: 573, ap: 160,
    //     skills: { 6001: { uuid: 6001, lv: 1, cd: AtkSpeedSet[AtkSpeedLv.Normal3].cd, ccd: 0 } },
    //     atking: [{ s_uuid: 6302, t_num: 5, overrides: { TGroup: TGroup.Team, ap: 250 } }],
    //     fend: [{ s_uuid: 6402, t_num: 1, overrides: { TGroup: TGroup.Team, ap: 80 } }],
    //     info: "每攻击5次治疗全队，每波结束全队永久+80最大生命值"
    // },
    // 5075: {
-    //     uuid: 5075, name: "全能牧师", path: "hh5", fac: FacSet.HERO, pool_lv: 5, lv: 1, type: HType.Long, hp: 717, ap: 200,
+    //     uuid: 5075, name: "全能牧师", path: "hh5", fac: FacSet.HERO, card_lv: 5, lv: 1, type: HType.Long, hp: 717, ap: 200,
    //     skills: { 6001: { uuid: 6001, lv: 1, cd: AtkSpeedSet[AtkSpeedLv.Normal2].cd, ccd: 0 } },
    //     atking: [{ s_uuid: 6302, t_num: 5, overrides: { TGroup: TGroup.Team, ap: 300 } }],
    //     fend: [