feedback7: merge fb7-dobermann — 教鞭 is the official three-choice (PR #353 by @Sukvii, the owner's decision), the Final Assault / Hidden Core pay a 战术特训 card's perfect coins (guarded by b.progress leaksBy), the bots put zero-range heavy guards on the road first (PR #339 by @IceCodeNew, placement only)
- Conflicts (the branch started atae22335c): spec.js / protocol.js b.progress (resolved from fb7-ui-backlog + leaksBy), gameLogic.js / game.js exports (device tips + normalizePersonalChoice), docs/PLAYING.md / design/network.md lines merged against the base, META.md (画卷 note + 教鞭), test/docs-consistency.test.js pin (both fields). - Grok review: MERGE AFTER FIXES — the HIGH (a forged boss result paid the cards) fixed on the branch (66a228c6), the META wording (1ab12763). - Golden: matches 10 (the 杜宾 bot picks and the guard placement); union: coop3-ABYSS-5 differs from HEAD only in ai_2's dmgDealt (1238011 → 1186269), no outcome change — HEAD's side had moved it, the new placement applies on that path. - Broad node --test 5623 (5621 pass, 0 fail, 2 skipped); lint 0 errors; typecheck; i18n strict clean.
This commit is contained in:
commit
2de2feee3c
57 files changed
+1339
-276
No files matched your search
@@ -386,6 +386,12 @@
|
||||
"CONTINGENCY // 机变阶段": "CONTINGENCY // Improv Phase",
|
||||
"选择一项": "Choose one",
|
||||
"倒计时结束后仍未选定将自动分配": "If no choice is made before the countdown ends, one will be assigned automatically",
|
||||
"教鞭选择": "Pointing Stick Choice",
|
||||
"教鞭 · 战术特训": "Pointing Stick · Tactical Training",
|
||||
"请选择一项战术特训": "Choose a Tactical Training bounty",
|
||||
"请先完成教鞭选择": "Complete the Pointing Stick choice first",
|
||||
"休整期结束时未选择将自动选定": "An unselected bounty will be picked automatically when the Rest Phase ends",
|
||||
"从候选中选择一项战术特训": "Choose one Tactical Training bounty from the offered cards",
|
||||
"选择一项(无时间限制)": "Choose one (no time limit)",
|
||||
" · 点击卡牌选中,再次点击确认": " · Tap a card to select, tap again to confirm",
|
||||
"已完成选择": "Choice made",
|
||||
|
||||
Reference in new issue
Block a user