feat(mvp): 新增铁血防守 MVP（领队结算/红色榜单/🛡️芯片），原 MVP 更名最佳球员

app.py

@@ -91,6 +91,7 @@ def server(input: Inputs, output: Outputs, session: Session) -> None:
             repo.match_contributions(season),
             repo.mvp_ranking(season),
             repo.settled_mvps(),
+            repo.dmvp_ranking(season),
         )
 
     # ------------------------------------------------------------------ 导出榜单图片
@@ -108,6 +109,7 @@ def server(input: Inputs, output: Outputs, session: Session) -> None:
             key=lambda x: (-x["saves"], -x["attended"]),
         )
         mvp = repo.mvp_ranking(season)
+        dmvp = repo.dmvp_ranking(season)
 
         def rowsify(items, valuefn):
             return [(str(i), it["name"], valuefn(it)) for i, it in enumerate(items, 1)]
@@ -116,7 +118,8 @@ def server(input: Inputs, output: Outputs, session: Session) -> None:
             ("射手榜", rowsify(scorers, lambda x: f'{x["goals"]} 球')),
             ("助攻榜", rowsify(assisters, lambda x: f'{x["assists"]} 助')),
             ("出勤榜", rowsify(attend, lambda x: f'{x["attended"]}/{x["total"]}')),
-            ("MVP 榜", rowsify(mvp, lambda x: f'{x["mvps"]} 次')),
+            ("最佳球员 MVP", rowsify(mvp, lambda x: f'{x["mvps"]} 次')),
+            ("铁血防守 MVP", rowsify(dmvp, lambda x: f'{x["dmvps"]} 次')),
         ]
         if keepers:  # 有门将才加扑救榜
             boards.append(("扑救榜", rowsify(keepers, lambda x: f'{x["saves"]} 救')))
@@ -298,17 +301,18 @@ def server(input: Inputs, output: Outputs, session: Session) -> None:
     def _save_mvp_lock():
         if not input.btn_save_mvp_lock() or not is_admin():
             return
-        def _sel(mid: int, suffix: str = "") -> int | None:
-            raw = input[f"mvpsel{suffix}_{mid}"]()
+        def _sel(mid: int, prefix: str = "mvpsel") -> int | None:
+            raw = input[f"{prefix}_{mid}"]()
             return int(raw) if (raw and raw != "none" and str(raw).isdigit()) else None
         settled = opened = 0
         for m in repo.list_matches():
             mid = m["id"]
-            w1, w2 = _sel(mid), _sel(mid, "2")
-            if (w1, w2) != (m.get("mvp_user_id"), m.get("mvp2_user_id")):
-                repo.settle_mvp(mid, w1, w2)
-                settled += 1 if (w1 or w2) else 0
-                opened += 1 if (w1 is None and w2 is None) else 0
+            w1, w2, wd = _sel(mid), _sel(mid, "mvpsel2"), _sel(mid, "dmvpsel")
+            cur = (m.get("mvp_user_id"), m.get("mvp2_user_id"), m.get("dmvp_user_id"))
+            if (w1, w2, wd) != cur:
+                repo.settle_mvp(mid, w1, w2, wd)
+                settled += 1 if (w1 or w2 or wd) else 0
+                opened += 1 if (w1 is None and w2 is None and wd is None) else 0
         bump()
         ui.notification_show(
             f"已结算 {settled} 场、重新开放 {opened} 场 🏅", type="message"

src/db.py

@@ -59,6 +59,7 @@ def _run_light_migrations() -> None:
         ("matches", "mvp_locked", f"BOOLEAN NOT NULL DEFAULT {bool_false}"),
         ("matches", "mvp_user_id", "INTEGER"),  # 可空:None=未结算
         ("matches", "mvp2_user_id", "INTEGER"),  # 可空:双 MVP 第二人
+        ("matches", "dmvp_user_id", "INTEGER"),  # 可空:铁血防守 MVP
     ]
     for table, col, ddl in wanted:
         if table not in existing:

src/models.py

@@ -64,6 +64,10 @@ class Match(Base):
     mvp2_user_id: Mapped[int | None] = mapped_column(
         ForeignKey("users.id"), nullable=True
     )
+    # 铁血防守 MVP（同样由管理员结算指定；独立于最佳球员 MVP，可同场同人）
+    dmvp_user_id: Mapped[int | None] = mapped_column(
+        ForeignKey("users.id"), nullable=True
+    )
     created_at: Mapped[datetime] = mapped_column(DateTime, default=datetime.now)
 
 

src/repo.py

@@ -344,12 +344,16 @@ def player_rank(user_id: int) -> Optional[dict[str, Any]]:
     my_mvps = next(
         (r["mvps"] for r in mvp_ranking() if r["user_id"] == user_id), 0
     )
+    my_dmvps = next(
+        (r["dmvps"] for r in dmvp_ranking() if r["user_id"] == user_id), 0
+    )
     return {
         **me,
         "goal_rank": goal_rank,
         "assist_rank": assist_rank,
         "n_players": len(agg),
         "mvps": my_mvps,
+        "dmvps": my_dmvps,
     }
 
 
@@ -411,12 +415,37 @@ def mvp_ranking(season: Optional[int] = None) -> list[dict[str, Any]]:
     return sorted(tally.values(), key=lambda x: (-x["mvps"], x["name"]))
 
 
+def dmvp_ranking(season: Optional[int] = None) -> list[dict[str, Any]]:
+    """当季铁血防守 MVP 榜：按获得次数降序（每场由领队结算指定一人）。"""
+    with get_session() as s:
+        match_ids = _season_match_ids(s, season)
+        if not match_ids:
+            return []
+        rows = (
+            s.query(Match.dmvp_user_id, User.display_name, User.jersey_number)
+            .join(User, Match.dmvp_user_id == User.id)
+            .filter(Match.id.in_(match_ids), Match.dmvp_user_id.isnot(None))
+            .all()
+        )
+    tally: dict[int, dict[str, Any]] = {}
+    for uid, name, jersey in rows:
+        t = tally.setdefault(
+            uid, {"user_id": uid, "name": name, "jersey": jersey, "dmvps": 0}
+        )
+        t["dmvps"] += 1
+    return sorted(tally.values(), key=lambda x: (-x["dmvps"], x["name"]))
+
+
 def settle_mvp(
-    match_id: int, mvp_user_id: Optional[int], mvp2_user_id: Optional[int] = None
+    match_id: int,
+    mvp_user_id: Optional[int],
+    mvp2_user_id: Optional[int] = None,
+    dmvp_user_id: Optional[int] = None,
 ) -> None:
-    """管理员结算某场 MVP：指定一或两名获得者并锁定投票；全传 None=取消结算重开。
+    """管理员结算某场：最佳球员 MVP（可双）+ 铁血防守 MVP；全传 None=取消结算重开。
 
-    数据不变式：至少一人=已结算锁定；两栏同一人自动去重；第一栏空则第二栏顶上。
+    数据不变式：任一奖项有人=已结算锁票；最佳球员两栏同一人自动去重、第一栏空则
+    第二栏顶上；防守 MVP 独立评选，可与最佳球员同场同人。
     """
     if mvp_user_id is None and mvp2_user_id is not None:
         mvp_user_id, mvp2_user_id = mvp2_user_id, None
@@ -428,25 +457,30 @@ def settle_mvp(
             return
         m.mvp_user_id = mvp_user_id
         m.mvp2_user_id = mvp2_user_id
-        m.mvp_locked = mvp_user_id is not None
+        m.dmvp_user_id = dmvp_user_id
+        m.mvp_locked = mvp_user_id is not None or dmvp_user_id is not None
 
 
 def settled_mvps() -> dict[int, dict[str, Any]]:
-    """已结算场次的 MVP：{match_id: {"user_ids": [...], "names": [显示名,...]}}。
+    """已结算场次的奖项：{match_id: {"user_ids": [...], "names": [...], "dmvp_name": str|None}}。
 
-    单 MVP 一个名字，双 MVP 两个；顺序与结算时一致。
+    names 为最佳球员 MVP（单/双）；dmvp_name 为铁血防守 MVP（可空）。
     """
     with get_session() as s:
         rows = (
-            s.query(Match.id, Match.mvp_user_id, Match.mvp2_user_id)
-            .filter(Match.mvp_user_id.isnot(None))
+            s.query(Match.id, Match.mvp_user_id, Match.mvp2_user_id, Match.dmvp_user_id)
+            .filter((Match.mvp_user_id.isnot(None)) | (Match.dmvp_user_id.isnot(None)))
             .all()
         )
         names = {u.id: u.display_name for u in s.query(User).all()}
     out: dict[int, dict[str, Any]] = {}
-    for mid, u1, u2 in rows:
+    for mid, u1, u2, ud in rows:
         ids = [u for u in (u1, u2) if u is not None]
-        out[mid] = {"user_ids": ids, "names": [names.get(u, "?") for u in ids]}
+        out[mid] = {
+            "user_ids": ids,
+            "names": [names.get(u, "?") for u in ids],
+            "dmvp_name": names.get(ud) if ud is not None else None,
+        }
     return out
 
 

src/repo_base.py

@@ -33,6 +33,7 @@ def _match_dict(m: Match) -> dict[str, Any]:
         "mvp_locked": bool(getattr(m, "mvp_locked", False)),
         "mvp_user_id": getattr(m, "mvp_user_id", None),
         "mvp2_user_id": getattr(m, "mvp2_user_id", None),
+        "dmvp_user_id": getattr(m, "dmvp_user_id", None),
     }
 
 

src/theme.py

@@ -230,6 +230,17 @@ body{
   box-shadow:0 14px 34px -18px rgba(31,169,113,.45), inset 0 1px 0 rgba(255,255,255,.08)}
 .sde-hero.c-green .big .n{background:linear-gradient(180deg,#c9f5e2,var(--green));-webkit-background-clip:text;background-clip:text}
 .sde-hero.c-green .title{color:var(--green)}
+.sde-hero.c-red{border-color:rgba(226,56,75,.55);
+  background:radial-gradient(120% 150% at 100% 0%, rgba(200,16,46,.30), transparent 55%),
+    linear-gradient(135deg, rgba(200,16,46,.17), rgba(17,37,74,.9) 58%);
+  box-shadow:0 14px 34px -18px rgba(200,16,46,.5), inset 0 1px 0 rgba(255,255,255,.08)}
+.sde-hero.c-red .big .n{background:linear-gradient(180deg,#ffd2d8,var(--red-2));-webkit-background-clip:text;background-clip:text;
+  filter:drop-shadow(0 4px 14px rgba(200,16,46,.5))}
+.sde-hero.c-red .title{color:var(--red-2)}
+.sde-hero.c-red .crown{filter:drop-shadow(0 3px 8px rgba(200,16,46,.6))}
+.sde-brow.c-red .bar{background:linear-gradient(90deg,var(--red-2),rgba(200,16,46,.15))}
+.sde-brow.c-red .val{color:#ff9fab}
+.sde-brow.c-red.r2,.sde-brow.c-red.r3{border-color:rgba(226,56,75,.30)}
 .sde-board .sde-empty{padding:18px}
 
 /* ================= 每场比分 · 战报记分牌 ================= */
@@ -278,6 +289,8 @@ body{
 .sde-chip.assist{border-color:rgba(61,165,217,.4);background:rgba(61,165,217,.10)}
 .sde-chip.mvp{border-color:rgba(212,175,55,.65);background:linear-gradient(90deg,rgba(212,175,55,.22),rgba(212,175,55,.08));
   color:#ffe9a8;font-weight:800;box-shadow:0 0 14px -4px rgba(212,175,55,.7)}
+.sde-chip.dmvp{border-color:rgba(226,56,75,.6);background:linear-gradient(90deg,rgba(200,16,46,.24),rgba(200,16,46,.08));
+  color:#ffc3cb;font-weight:800;box-shadow:0 0 14px -4px rgba(200,16,46,.7)}
 @media(max-width:560px){
   .sde-sc-score .n{font-size:30px}
   .sde-hero .big .n{font-size:34px}

src/view_admin.py

@@ -39,8 +39,9 @@ def _admin_panel(user_choices: dict[str, str]) -> ui.Tag:
     mvp_settle = theme.card(
         "结算本场 MVP",
         ui.div(
-            "由领队为每场选定 MVP（队员投票数仅作参考），支持双 MVP：选一人即单 MVP，"
-            "再选第二人即双 MVP（两人各计一次）。全部改回「— 未结算 —」并保存可重新开放投票。",
+            "由领队为每场选定「最佳球员 MVP」（可双：两人各计一次）与「铁血防守 MVP」"
+            "（队员投票数仅作参考）。任一奖项有人即结算锁票；全部改回「— 未结算 —」"
+            "并保存可重新开放投票。",
             class_="sde-sub",
         ),
         ui.output_ui("admin_mvp_settle"),
@@ -143,38 +144,40 @@ def admin_mvp_settle_view(
     vote_summary: dict[int, dict[str, Any]],
     player_choices: dict[str, str],
 ) -> ui.Tag:
-    """每场 MVP 结算表：投票参考 + 双 MVP 下拉（id 为 mvpsel_{mid} / mvpsel2_{mid}）。
+    """每场结算表：投票参考 + 最佳球员双下拉 + 铁血防守下拉。
 
-    两个下拉都含「— 未结算 —」(none)；至少选一人=结算锁定，全 none=重新开放。
+    id：mvpsel_{mid} / mvpsel2_{mid} / dmvpsel_{mid}；任一有人=结算锁定，全 none=重开。
     """
     if not matches:
         return ui.div("还没有比赛，请先在上方添加。", class_="sde-empty")
     choices = {"none": "— 未结算 —", **player_choices}
     head = ui.tags.tr(
-        *[ui.tags.th(h) for h in ["日期", "对手", "投票参考（票数最高）", "MVP ①", "MVP ②（可选）"]]
+        *[ui.tags.th(h) for h in
+          ["日期", "对手", "投票参考", "最佳球员 ①", "最佳球员 ②（可选）", "🛡️ 铁血防守"]]
     )
     body = []
     for m in matches:
         mid = m["id"]
         win = vote_summary.get(mid)
         leader = f'{"、".join(win["names"])}（{win["votes"]} 票）' if win else "暂无投票"
-        sel1 = str(m.get("mvp_user_id") or "none")
-        sel2 = str(m.get("mvp2_user_id") or "none")
-        if sel1 not in choices:
-            sel1 = "none"
-        if sel2 not in choices:
-            sel2 = "none"
+        sels = []
+        for key, field in (
+            (f"mvpsel_{mid}", "mvp_user_id"),
+            (f"mvpsel2_{mid}", "mvp2_user_id"),
+            (f"dmvpsel_{mid}", "dmvp_user_id"),
+        ):
+            sel = str(m.get(field) or "none")
+            if sel not in choices:
+                sel = "none"
+            sels.append(
+                ui.tags.td(ui.input_select(key, "", choices, selected=sel, width="150px"))
+            )
         body.append(
             ui.tags.tr(
                 ui.tags.td(m["date"]),
                 ui.tags.td(m["opponent"]),
                 ui.tags.td(leader),
-                ui.tags.td(
-                    ui.input_select(f"mvpsel_{mid}", "", choices, selected=sel1, width="170px")
-                ),
-                ui.tags.td(
-                    ui.input_select(f"mvpsel2_{mid}", "", choices, selected=sel2, width="170px")
-                ),
+                *sels,
             )
         )
     return ui.div(

src/view_home.py

@@ -17,6 +17,7 @@ def home_view(
     contributions: dict[int, dict[str, list[str]]],
     mvp: list[dict[str, Any]],
     mvp_summary: Optional[dict[int, dict[str, Any]]] = None,
+    dmvp: Optional[list[dict[str, Any]]] = None,
 ) -> ui.Tag:
     stats = ui.div(
         theme.stat(summary["played"], "场次", accent="cream"),
@@ -51,12 +52,16 @@ def home_view(
             attend, "全勤铁人", lambda r: r["attended"], "场", "c-green",
             lambda r: f'共 {r["total"]} 场 · 进球+助攻 {r["ga"]}', me_id,
         ), icon="📋"),
-        theme.card("MVP 榜", _impact_board(
-            mvp, "MVP 之王", lambda r: r["mvps"], "次", "",
+        theme.card("最佳球员 MVP", _impact_board(
+            mvp, "最佳球员", lambda r: r["mvps"], "次", "",
             None, me_id,
         ), icon="🏅", sub="每场由领队结算 · 计获得次数"),
+        theme.card("铁血防守 MVP", _impact_board(
+            dmvp or [], "铁血防守", lambda r: r["dmvps"], "次", "c-red",
+            None, me_id,
+        ), icon="🛡️", sub="每场由领队结算 · 计获得次数"),
     ]
-    widths = [6, 6, 6, 6]
+    widths = [6, 6, 6, 6, 6]
     if keepers:  # 有门将才显示扑救榜
         board_cards.append(
             theme.card("扑救榜", _impact_board(
@@ -64,7 +69,7 @@ def home_view(
                 lambda r: f'出场 {r["attended"]}/{r["total"]}', me_id,
             ), icon="🧤", sub="仅门将")
         )
-        widths = [6, 6, 6, 6, 6]
+        widths = [6, 6, 6, 6, 6, 6]
     boards = ui.layout_columns(*board_cards, col_widths=widths, fill=False)
     return ui.div(
         theme.card("球队战绩", stats, icon="🏆"),
@@ -97,11 +102,17 @@ def _scorecard(
     """一场比赛的战报卡：结果色边+光晕、居中大比分、结果大徽章、明细芯片。"""
     res = m["result"]
     chips: list[Any] = []
-    if m.get("mvp_locked") and mvp and mvp.get("names"):
-        chips.append(
-            ui.span(ui.span("🏅", class_="ic"), "MVP " + "、".join(mvp["names"]),
-                    class_="sde-chip mvp")
-        )
+    if m.get("mvp_locked") and mvp:
+        if mvp.get("names"):
+            chips.append(
+                ui.span(ui.span("🏅", class_="ic"), "最佳球员 " + "、".join(mvp["names"]),
+                        class_="sde-chip mvp")
+            )
+        if mvp.get("dmvp_name"):
+            chips.append(
+                ui.span(ui.span("🛡️", class_="ic"), f'铁血防守 {mvp["dmvp_name"]}',
+                        class_="sde-chip dmvp")
+            )
     for who in c.get("goals", []):
         chips.append(ui.span(ui.span("⚽", class_="ic"), who, class_="sde-chip goal"))
     for who in c.get("assists", []):

src/view_me.py

@@ -61,7 +61,8 @@ def my_totals_view(rank: Optional[dict[str, Any]]) -> ui.Tag:
         ),
         theme.stat(rank["ga"], "进球+助攻", accent="cream"),
         theme.stat(f'{rank["attended"]}/{rank["total"]}', "出场", accent="green"),
-        theme.stat(rank.get("mvps", 0), "MVP", "领队结算", accent="gold"),
+        theme.stat(rank.get("mvps", 0), "最佳球员 MVP", "领队结算", accent="gold"),
+        theme.stat(rank.get("dmvps", 0), "铁血防守 MVP", "领队结算", accent="red"),
     ]
     if rank.get("is_goalkeeper"):
         items.append(theme.stat(rank.get("saves", 0), "我的扑救", "门将", accent="blue"))
@@ -197,11 +198,12 @@ def my_mvp_form_view(
         mid = m["id"]
         if m.get("mvp_locked"):
             win = settled.get(mid)
-            text = (
-                f'🏅 本场 MVP：{"、".join(win["names"])}（领队已结算）'
-                if win and win.get("names")
-                else "本场 MVP 待定（投票已锁定）"
-            )
+            parts = []
+            if win and win.get("names"):
+                parts.append(f'🏅 最佳球员：{"、".join(win["names"])}')
+            if win and win.get("dmvp_name"):
+                parts.append(f'🛡️ 铁血防守：{win["dmvp_name"]}')
+            text = (" · ".join(parts) + "（领队已结算）") if parts else "本场 MVP 待定（投票已锁定）"
             ctl = ui.div(ui.span(text, class_="sde-mvp-settled"), class_="sde-ctl-row")
         else:
             sel = str(my_votes_map.get(mid, "none"))