From 30e69234b79e67b4276b00e8e18eb6445fdfa517 Mon Sep 17 00:00:00 2001
From: panFD <panfudan0209@qq.com>
Date: Sun, 6 Sep 2026 17:43:16 +0800
Subject: [PATCH] =?UTF-8?q?feat(hero):=20=E6=96=B0=E5=A2=9E=E5=9B=9E?=
 =?UTF-8?q?=E8=A1=80=E5=9D=A6=E5=85=8B5009=E4=B8=8E=E7=81=AB=E7=AE=AD?=
 =?UTF-8?q?=E5=93=A55010=E8=8B=B1=E9=9B=84=EF=BC=8C=E4=BC=98=E5=8C=96UI?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E4=B8=8E=E6=8A=80=E8=83=BD=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1.  新增5009回血坦克、5010火箭哥英雄配置
2.  重构英雄列表UI布局，新增职业标签配色区分
3.  优化技能详情展示，支持完整覆写参数显示
4.  调整技能默认配置，移除固定summon_count注入
5.  优化触发技能展示逻辑，新增参数详情显示
---
 assets/script/game/common/config/heroSet.ts |  23 +++
 put/server/data/heroes.json                 | 200 +++++++++++++++++++-
 put/web/src/App.vue                         |  69 ++++++-
 put/web/src/style.css                       |  26 ++-
 4 files changed, 296 insertions(+), 22 deletions(-)

diff --git a/assets/script/game/common/config/heroSet.ts b/assets/script/game/common/config/heroSet.ts
index 89dec165..540f13d7 100644
--- a/assets/script/game/common/config/heroSet.ts
+++ b/assets/script/game/common/config/heroSet.ts
@@ -718,6 +718,29 @@ export const HeroInfo: Record<number, heroInfo> = {
         },
         info: "",
     },
+    // 5009 回血坦克
+    5009: {
+        uuid: 5009, name: "回血坦克", path: "hk2", fac: FacSet.HERO, rarity: 2, lv: 1, type: HType.Melee, grow_type: HGrowType.Tank, role: HRole.Tank, hp: HERO_ROLE_BASE[HRole.Tank].hp, ap: HERO_ROLE_BASE[HRole.Tank].ap, def: HERO_ROLE_BASE[HRole.Tank].def,
+        skills: {
+            6004: { uuid: 6004, name: "普攻强化", lv: 1, cd: AtkSpeedSet[AtkSpeedLv.Slow].cd, ccd: 0,
+                lv_entries: [
+                    { lv: 2, s_lv: SkillLv.Lv2, overrides: {"proc_skill":{"s_uuid":6502,"chance":10,"overrides":{"ap":10}}} },
+                ],
+            },
+            6102: { uuid: 6102, lv: 1, cd: 8, ccd: 0, overrides: {"ap":250,"bck":30},
+                lv_entries: [
+                    { lv: 8, s_lv: SkillLv.Lv2, overrides: {"ap":300,"bck":50} },
+                    { lv: 16, s_lv: SkillLv.Lv3, overrides: {"ap":350,"bck":70} },
+                ],
+            },
+        },
+        atked: {
+            6302: [
+                { lv: 4, s_lv: SkillLv.Lv1, t_num: 3, overrides: {"ap":10} },
+            ],
+        },
+        info: "",
+    },
 // @hero-setup:heroes-end
 
     /*
diff --git a/put/server/data/heroes.json b/put/server/data/heroes.json
index e6e96e35..65a42726 100644
--- a/put/server/data/heroes.json
+++ b/put/server/data/heroes.json
@@ -613,8 +613,7 @@
           "cdExpr": null,
           "overrides": {
             "ap": 250,
-            "bck": 100,
-            "summon_count": 1
+            "bck": 100
           },
           "desc": "喷出烈焰风暴，对{target}造成攻击力{ap}%伤害，击退{bck}",
           "lv_entries": [
@@ -623,8 +622,7 @@
               "s_lv": 2,
               "overrides": {
                 "ap": 350,
-                "bck": 100,
-                "summon_count": 1
+                "bck": 100
               },
               "desc": ""
             },
@@ -738,8 +736,7 @@
             "name": "圣愈之盾",
             "t_num": 3,
             "overrides": {
-              "ap": 30,
-              "summon_count": 1
+              "ap": 30
             },
             "desc": "{target}获得生命最大值{ap}%的护盾"
           }
@@ -754,6 +751,197 @@
       "hp_bonus": [],
       "def_bonus": [],
       "info": ""
+    },
+    {
+      "uuid": 5009,
+      "name": "甲虫领主",
+      "comment": "",
+      "path": "hk2",
+      "rarity": 2,
+      "roleKey": "Tank",
+      "growKey": "Tank",
+      "typeKey": "Melee",
+      "statBase": {
+        "hp": 0,
+        "ap": 0,
+        "def": 0
+      },
+      "dis": null,
+      "speed": null,
+      "skills": [
+        {
+          "uuid": 6004,
+          "name": "普攻强化",
+          "cd": 1.2,
+          "cdExpr": "AtkSpeedSet[AtkSpeedLv.Slow].cd",
+          "overrides": {},
+          "desc": "",
+          "lv_entries": [
+            {
+              "lv": 2,
+              "s_lv": 2,
+              "overrides": {
+                "proc_skill": {
+                  "s_uuid": 6502,
+                  "chance": 10,
+                  "overrides": {
+                    "ap": 10
+                  }
+                }
+              },
+              "desc": ""
+            }
+          ]
+        },
+        {
+          "uuid": 6102,
+          "name": "",
+          "cd": 8,
+          "cdExpr": null,
+          "overrides": {
+            "ap": 250,
+            "bck": 30
+          },
+          "desc": "",
+          "lv_entries": [
+            {
+              "lv": 8,
+              "s_lv": 2,
+              "overrides": {
+                "ap": 300,
+                "bck": 50
+              },
+              "desc": ""
+            },
+            {
+              "lv": 16,
+              "s_lv": 3,
+              "overrides": {
+                "ap": 350,
+                "bck": 70
+              },
+              "desc": ""
+            }
+          ]
+        }
+      ],
+      "atking": {},
+      "atked": {
+        "6302": [
+          {
+            "lv": 4,
+            "s_lv": 1,
+            "name": "",
+            "t_num": 3,
+            "overrides": {
+              "ap": 10
+            },
+            "desc": ""
+          }
+        ]
+      },
+      "fstart": {},
+      "dead": {},
+      "field": [],
+      "ap_bonus": [],
+      "hp_bonus": [],
+      "def_bonus": [],
+      "info": ""
+    },
+    {
+      "uuid": 5010,
+      "name": "火箭哥",
+      "comment": "",
+      "path": "ha2",
+      "rarity": 3,
+      "roleKey": "Archer",
+      "growKey": "Archer",
+      "typeKey": "Mid",
+      "statBase": {
+        "hp": 0,
+        "ap": 0,
+        "def": 0
+      },
+      "dis": null,
+      "speed": null,
+      "skills": [
+        {
+          "uuid": 6006,
+          "name": "强化普攻",
+          "cd": 0.9,
+          "cdExpr": "AtkSpeedSet[AtkSpeedLv.Fast].cd",
+          "overrides": {},
+          "desc": "",
+          "lv_entries": [
+            {
+              "lv": 2,
+              "s_lv": 2,
+              "overrides": {
+                "ap": 100,
+                "bck_chance": 10
+              },
+              "desc": ""
+            }
+          ]
+        },
+        {
+          "uuid": 6151,
+          "name": "",
+          "cd": 8,
+          "cdExpr": null,
+          "overrides": {
+            "ap": 70,
+            "summon_count": 5,
+            "bck_chance": 100
+          },
+          "desc": "",
+          "lv_entries": [
+            {
+              "lv": 8,
+              "s_lv": 2,
+              "overrides": {
+                "ap": 80,
+                "summon_count": 5,
+                "bck_chance": 100
+              },
+              "desc": ""
+            },
+            {
+              "lv": 16,
+              "s_lv": 3,
+              "overrides": {
+                "bck_chance": 100,
+                "ap": 100,
+                "summon_count": 6
+              },
+              "desc": ""
+            }
+          ]
+        }
+      ],
+      "atking": {
+        "6008": [
+          {
+            "lv": 4,
+            "s_lv": 1,
+            "name": "",
+            "t_num": 3,
+            "overrides": {
+              "ap": 120,
+              "bck_chance": 50
+            },
+            "desc": ""
+          }
+        ]
+      },
+      "atked": {},
+      "fstart": {},
+      "dead": {},
+      "field": [],
+      "ap_bonus": [],
+      "hp_bonus": [],
+      "def_bonus": [],
+      "info": ""
     }
   ]
 }
\ No newline at end of file
diff --git a/put/web/src/App.vue b/put/web/src/App.vue
index a14ea0d8..9dec7702 100644
--- a/put/web/src/App.vue
+++ b/put/web/src/App.vue
@@ -21,7 +21,10 @@
           <div class="row-main">
             <span class="row-uuid">{{ h.uuid }}</span>
             <span class="row-name">{{ h.name || '(未命名)' }}</span>
-            <span class="card-rarity">{{ '★'.repeat(h.rarity) }}</span>
+            <div class="row-sub">
+              <span class="row-role" :class="`role-${h.roleKey?.toLowerCase()}`">{{ roleLabel(h.roleKey) }}</span>
+              <span class="card-rarity">{{ '★'.repeat(h.rarity) }}</span>
+            </div>
           </div>
           <div class="row-meta">
             <template v-if="heroStats(h)">
@@ -33,11 +36,11 @@
           <div class="row-skills">
             <div class="row-skill">
               <span class="tag">普攻</span>{{ skillLabel(h.skills?.[0]) }}
-              <span class="skill-detail">{{ skillDetail(h.skills?.[0]) }}</span>
+              <span class="skill-detail">{{ skillDetailFull(h.skills?.[0]) }}</span>
             </div>
             <div class="row-skill">
               <span class="tag">大招</span>{{ skillLabel(h.skills?.[1]) }}
-              <span class="skill-detail">{{ skillDetail(h.skills?.[1]) }}</span>
+              <span class="skill-detail">{{ skillDetailFull(h.skills?.[1]) }}</span>
             </div>
           </div>
           <div class="row-triggers" v-if="hasTriggers(h) || fieldSummary(h).length">
@@ -45,7 +48,6 @@
             <span v-for="line in triggerSummary(h)" :key="line" class="trigger-chip">{{ line }}</span>
             <span v-if="bonusCount(h)" class="trigger-chip">加成: ×{{ bonusCount(h) }}</span>
           </div>
-          <div class="row-comment" v-if="h.comment || h.info">{{ h.comment || h.info }}</div>
         </div>
       </section>
 
@@ -247,6 +249,40 @@ function skillDetail(sk) {
   if (sk.lv_entries?.length) parts.push(`→lv${Math.max(...sk.lv_entries.map((e) => e.lv))}`)
   return parts.join(' ')
 }
+
+// 覆写对象转简写（如 ap100、crt10、stun20、summon2）
+function overrideParts(ov) {
+  if (!ov) return []
+  const parts = []
+  if (ov.ap != null) parts.push(`ap${ov.ap}`)
+  if (ov.hit_count != null) parts.push(`hit${ov.hit_count}`)
+  if (ov.crt != null) parts.push(`crt${ov.crt}`)
+  if (ov.frz != null) parts.push(`frz${ov.frz}`)
+  if (ov.stun != null) parts.push(`stun${ov.stun}`)
+  if (ov.para != null) parts.push(`para${ov.para}`)
+  if (ov.bck != null) parts.push(`bck${ov.bck}`)
+  if (ov.thorns_dmg != null) parts.push(`thorns${ov.thorns_dmg}`)
+  if (ov.thorns_rate != null) parts.push(`thorns${ov.thorns_rate}%`)
+  if (ov.summon_count != null) parts.push(`数${ov.summon_count}`)
+  if (ov.num != null) parts.push(`num${ov.num}`)
+  if (ov.timed_buff_id != null) parts.push(`buff${ov.timed_buff_id}`)
+  if (ov.buff_value != null) parts.push(`val${ov.buff_value}`)
+  if (ov.buff_chance != null) parts.push(`chance${ov.buff_chance}`)
+  return parts
+}
+
+// 技能完整明细：lv1 + 各 lv_entry 档位参数
+function skillDetailFull(sk) {
+  if (!sk) return ''
+  const parts = []
+  const lv1 = overrideParts(sk.overrides).join(' ')
+  if (lv1) parts.push(lv1)
+  for (const e of sk.lv_entries || []) {
+    const ep = overrideParts(e.overrides).join(' ')
+    parts.push(`lv${e.lv}:${ep || '-'}`)
+  }
+  return parts.join(' | ')
+}
 // lv1 基础三维：HERO_ROLE_BASE + 编辑器偏移（meta 未加载时返回 null 不展示）
 function heroStats(h) {
   const roleEnum = HERO_ROLES.find((r) => r.key === h.roleKey)?.value
@@ -258,7 +294,7 @@ function heroStats(h) {
     def: base.def + (h.statBase?.def || 0),
   }
 }
-// 触发明细行：atking: 6004 奋力一击 lv4 格式，仅输出已启用的组
+// 触发明细行：atking: 6004 奋力一击 lv4 ap300 格式，仅输出已启用的组
 function triggerSummary(h) {
   const lines = []
   for (const tk of ['atking', 'atked', 'fstart', 'dead']) {
@@ -267,7 +303,20 @@ function triggerSummary(h) {
     for (const [sid, entries] of Object.entries(grp)) {
       const minLv = Math.min(...entries.map((e) => e.lv))
       const name = entries[0]?.name || skillMap.value[sid]?.name || ''
-      lines.push(`${tk}: ${sid} ${name} lv${minLv}`)
+      const e = entries[0]
+      const ov = e?.overrides || {}
+      const parts = [`t_num${e?.t_num}`]
+      if (ov.ap != null) parts.push(`ap${ov.ap}`)
+      if (ov.crt != null) parts.push(`crt${ov.crt}`)
+      if (ov.stun != null) parts.push(`stun${ov.stun}`)
+      if (ov.frz != null) parts.push(`frz${ov.frz}`)
+      if (ov.para != null) parts.push(`para${ov.para}`)
+      if (ov.bck != null) parts.push(`bck${ov.bck}`)
+      if (ov.thorns_dmg != null) parts.push(`thorns${ov.thorns_dmg}`)
+      if (ov.thorns_rate != null) parts.push(`thorns${ov.thorns_rate}%`)
+      if (ov.timed_buff_id != null) parts.push(`buff${ov.timed_buff_id}`)
+      if (ov.summon_count != null) parts.push(`数${ov.summon_count}`)
+      lines.push(`${tk}: ${sid} ${name} lv${minLv} ${parts.join(' ')}`)
     }
   }
   return lines
@@ -345,13 +394,13 @@ function addUltSkill() {
   const first = ultSkillOptions.value[0]
   if (!first) return ElMessage.warning('当前职业无可用大招底座')
   const sk = defaultSkill(first.uuid)
-  // 大招默认 summon_count=1，并提供 lv9/lv16 档位
+  // 大招提供 lv8(SkillLv.Lv2)/lv16(SkillLv.Lv3) 档位，不默认注入 summon_count
   sk.cd = 8
   sk.cdExpr = null
-  sk.overrides = { summon_count: 1 }
+  sk.overrides = {}
   sk.lv_entries = [
-    { lv: 9, s_lv: 2, overrides: { summon_count: 1 }, desc: '' },
-    { lv: 16, s_lv: 3, overrides: { summon_count: 2 }, desc: '' },
+    { lv: 8, s_lv: 2, overrides: {}, desc: '' },
+    { lv: 16, s_lv: 3, overrides: {}, desc: '' },
   ]
   current.value.skills[1] = sk
 }
diff --git a/put/web/src/style.css b/put/web/src/style.css
index 794d3b79..c9201530 100644
--- a/put/web/src/style.css
+++ b/put/web/src/style.css
@@ -96,14 +96,28 @@ body {
 }
 .hero-row:hover { box-shadow: 0 3px 12px rgba(46, 91, 160, 0.15); }
 
-/* 行首：uuid + 名称 + 星级 */
-.row-main { display: flex; align-items: center; gap: 8px; min-width: 130px; }
-.row-uuid { font-family: Menlo, Consolas, monospace; color: var(--text-light); }
+/* 行首：uuid / 名称 / 星级+职业，三行竖排 */
+.row-main { display: flex; flex-direction: column; align-items: flex-start; gap: 2px; min-width: 100px; }
+.row-sub { display: flex; align-items: center; gap: 6px; }
+.row-uuid { font-family: Menlo, Consolas, monospace; color: var(--text-light); font-size: 11px; }
 .row-name { font-size: 13px; font-weight: 600; }
 .card-rarity { color: #f5a623; font-size: 11px; }
+.row-role {
+  border-radius: 4px;
+  padding: 0 6px;
+  font-size: 11px;
+  line-height: 18px;
+}
+/* 职业标签颜色区分 */
+.role-tank     { background: #e6f7ff; color: #1890ff; }
+.role-warrior  { background: #fff2e8; color: #fa541c; }
+.role-assassin { background: #f9f0ff; color: #722ed1; }
+.role-archer   { background: #f6ffed; color: #52c41a; }
+.role-mage     { background: #fff0f6; color: #eb2f96; }
+.role-support  { background: #fcffe6; color: #a0d911; }
 
-/* 三维徽章 */
-.row-meta { display: flex; align-items: center; flex-wrap: wrap; gap: 4px 10px; }
+/* 三维徽章：竖排三行显示 */
+.row-meta { display: flex; flex-direction: column; align-items: flex-start; gap: 2px; }
 .stat {
   background: #f0f7ef;
   color: #4a7c3f;
@@ -115,7 +129,7 @@ body {
 
 /* 技能段：普攻/大招两行 */
 .row-skills { display: flex; flex-direction: column; gap: 2px; min-width: 200px; }
-.skill-detail { color: var(--text-light); font-size: 11px; margin-left: 4px; }
+.skill-detail { color: var(--text-light); font-size: 11px; margin-left: 4px; white-space: pre-wrap; word-break: break-all; }
 
 /* 触发/光环/加成：chip 流式排布 */
 .row-triggers { display: flex; flex-wrap: wrap; gap: 4px 6px; flex: 1; min-width: 160px; }