merge: 同步 master e92a18e1（卡片落位 reports/＋dev→engineering 改名批）——四处版本历史节冲突取本批删除侧，reports 卡片重放禁写变更记录清理，06b 闸扫描面扩 reports/
This commit is contained in:
DKChan committed
commit
8a68c9ea11
116 files changed
+253
-2660
No files matched your search
@@ -33,7 +33,8 @@ r"""数值验证工具（判定端）——自动化评判 + 元进度爬升测
|
||||
python tools/balance_verifier.py --na 60 --k 60 --seed0 9000 --spend atk_first
|
||||
python tools/balance_verifier.py --only adventure --inject max_hp:3 --na 100
|
||||
python tools/balance_verifier.py --from-raw <raw.jsonl> # 免重跑，对既有采集重新判定/出报告
|
||||
输出：控制台判定结论 + design/qa/balance-verifier-<时间戳>.md（报告）+ 同名 .raw.jsonl（原始逐局数据）。
|
||||
输出：控制台判定结论 + sim-data/balance-verifier-<时间戳>.md（报告）+ 同名 .raw.jsonl（原始逐局数据）。
|
||||
两件均落 sim-data/（整目录不入 git，读数以最新一份为准）。
|
||||
兼容注：旧 raw.jsonl 含 level 段（直入口单关）行——判定自动忽略，
|
||||
逐关读数一律由冒险行派生。
|
||||
"""
|
||||
@@ -51,7 +52,7 @@ ROOT = Path(__file__).resolve().parent.parent
|
||||
SLICE = ROOT / "game"
|
||||
GODOT = r"D:\code\godot\Godot_v4.7.2-stable_win64_console.exe"
|
||||
SCRIPT = "res://smoke/verifier_batch.gd"
|
||||
QA_DIR = ROOT / "design" / "qa"
|
||||
READINGS_DIR = ROOT / "sim-data"
|
||||
VJSON_PREFIX = "VJSON "
|
||||
ERROR_MARKERS = ("SCRIPT ERROR", "Parse Error")
|
||||
|
||||
@@ -728,8 +729,8 @@ def main():
|
||||
print(f"[数值验证] 已载入既有采集 {len(rows)} 局：{raw_path}")
|
||||
else:
|
||||
rows, _ = collect(args)
|
||||
QA_DIR.mkdir(parents=True, exist_ok=True)
|
||||
raw_path = QA_DIR / f"balance-verifier-{ts}.raw.jsonl"
|
||||
READINGS_DIR.mkdir(parents=True, exist_ok=True)
|
||||
raw_path = READINGS_DIR / f"balance-verifier-{ts}.raw.jsonl"
|
||||
with open(raw_path, "w", encoding="utf-8") as f:
|
||||
for r in rows:
|
||||
f.write(json.dumps(r, ensure_ascii=False) + "\n")
|
||||
@@ -747,7 +748,7 @@ def main():
|
||||
if args.from_raw:
|
||||
md_path = raw_path.with_suffix(".md")
|
||||
else:
|
||||
md_path = QA_DIR / f"balance-verifier-{ts}.md"
|
||||
md_path = READINGS_DIR / f"balance-verifier-{ts}.md"
|
||||
md_path.write_text(md, encoding="utf-8")
|
||||
print(f"[数值验证] 报告：{md_path}")
|
||||
print(f"[数值验证] 原始逐局数据：{raw_path}（--from-raw 可免重跑重判）")
|
||||
|
||||
@@ -25,7 +25,7 @@ from pathlib import Path
|
||||
|
||||
# 退役词表：(正则词, 退役日期, 继任词/口径, 备注)。新增退役批时在此追加一行。
|
||||
RETIRED_TERMS = [
|
||||
(r"registry|entities\.yaml|architecture\.yaml", "2026-10-19", "术语规范名→design/gdd/术语表.md；现行值→data/tables/*.tres；取值域与字段契约→data/schemas/*.gd；架构立场→design/dev/architecture/architecture.md", "跨系统事实登记处注销批（2026-10-19 用户裁）"),
|
||||
(r"registry|entities\.yaml|architecture\.yaml", "2026-10-19", "术语规范名→design/gdd/术语表.md；现行值→data/tables/*.tres；取值域与字段契约→data/schemas/*.gd；架构立场→design/engineering/architecture/architecture.md", "跨系统事实登记处注销批（2026-10-19 用户裁）"),
|
||||
("伏击", "2026-09-20", "警觉（blast 负向）", "伏击机制整体退役"),
|
||||
("ambush_double|ambush_layers|flat_attach", "2026-09-20", "enemy_alert / effects 投影", "伏击数据键退役"),
|
||||
("advantage_per_round_cap", "2026-09-20", "（已删字段——行动点天然封顶）", "单轮授予上限删除批"),
|
||||
|
||||
+2
-2
@@ -7,7 +7,7 @@ r"""gdd_lint.py — GDD lean 格式门禁
|
||||
python tools/gdd_lint.py <file.md> ... # 检查指定文件
|
||||
python tools/gdd_lint.py --json # 机器可读输出（供 gate/CI 使用）
|
||||
|
||||
规则（口径权威 = design/dev/doc-conventions.md 第 5–6 节文档骨架与结构纪律）:
|
||||
规则（口径权威 = design/engineering/doc-conventions.md 第 5–6 节文档骨架与结构纪律）:
|
||||
R1 散文段落 ≤ 240 字（代码块/表格/列表/引用不计）
|
||||
R2 表格字符占比（词条表分域豁免，见 R2_EXEMPT 注）
|
||||
R3 正文禁止修订注记：~~删除线~~、"作废"、括号内"日期+评审/修订/拍板/裁决/核销"
|
||||
@@ -320,7 +320,7 @@ def main():
|
||||
|
||||
if args.changelog_only:
|
||||
targets = sorted(
|
||||
p for p in list(Path("design").rglob("*.md")) + [Path("roadmap.md")]
|
||||
p for p in list(Path("design").rglob("*.md")) + list(Path("reports").glob("*.md")) + [Path("roadmap.md")]
|
||||
if p.is_file()
|
||||
)
|
||||
elif args.files:
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#!/usr/bin/env python3
|
||||
# -*- coding: utf-8 -*-
|
||||
"""parity_anchor.py — 「逐位一致对拍」锚工具（架构重构前后逐位一致验收）
|
||||
"""parity_anchor.py — 「逐位一致对拍」锚工具（架构重构前后逐位一致验收；原需求卡已按「吸收即死」退役，凭据见 git 提交史）
|
||||
|
||||
载体 = adventure_monte_carlo.gd 同种子批量完整局（SceneTree headless，自持 ConfigDB，零渲染）。
|
||||
三变体钉死（种子面错开，覆盖 base / 同调账 / 商店-GP 账三类 T2/T3 重构面）：
|
||||
|
||||
@@ -40,17 +40,17 @@ RESERVED_RETIRED = "已退役（git 历史可考）"
|
||||
|
||||
# ---- 卡片机检（2026-10-18 卡片冲突修订批补）----
|
||||
CARD_GLOB = "需求卡片-*.md"
|
||||
CARD_DIR = "design/research"
|
||||
CARD_DIR = "reports"
|
||||
SYNC_RULE_DATE = (2026, 10, 17) # req-card §6：实现批禁写 design/ 与根规则文件，义务一律列反哺点
|
||||
SOURCE_RULE_DATE = (2026, 10, 18) # req-card §2：设计事实源必填
|
||||
SOURCE_MARKS = ("设计事实源", "唯一事实源") # 两种合格写法，与库内既有卡片实际形态对齐
|
||||
SYNC_HEADING_RE = re.compile(r"^#{2,3}\s*\d*\.?\s*关联文档同步面")
|
||||
BANNED_DOC_MARKS = ("design/", "../gdd/", "../registry/", "../research/", "../qa/",
|
||||
"../dev/", "../ux/", "../art/", "roadmap.md", "AGENTS.md")
|
||||
"../engineering/", "../ux/", "../art/", "roadmap.md", "AGENTS.md")
|
||||
|
||||
DATE_RE = re.compile(r"\d{4}-\d{2}-\d{2}")
|
||||
VER_RE = re.compile(r"[vV]\d+(?:\.\d+)*")
|
||||
RESEARCH_RE = re.compile(r"design/research/[^\s（）()，,]+")
|
||||
RESEARCH_RE = re.compile(r"reports/需求卡片-[^\s（）()，,]+")
|
||||
ITER_RE = re.compile(r"迭代\s*(\d+)")
|
||||
APPROVAL_RE = re.compile(r"〔用户特批([^〕]*)〕")
|
||||
CRED_RE = re.compile(r"[（(]([^（）()]*)[）)]")
|
||||
@@ -147,7 +147,7 @@ def check_segment(word, creds, line, issues, where, root):
|
||||
rp = m.group(0)
|
||||
break
|
||||
if rp is None:
|
||||
red("凭据缺失", "「已写卡」括号内须为 design/research/ 下的卡片路径")
|
||||
red("凭据缺失", "「已写卡」括号内须为 reports/ 下的需求卡片路径")
|
||||
elif not (root / rp).is_file():
|
||||
red("卡片路径不存在", "已写卡路径 %s 相对仓库根不存在" % rp)
|
||||
return base, rp, None
|
||||
|
||||
@@ -5,11 +5,13 @@
|
||||
收口第四闸（与 doc_link_audit / doc_term_audit / gdd_lint 同列）：
|
||||
把目录三层裁定变成机器检查——任何会话乱放文件，收口时此处直接 FAIL。
|
||||
|
||||
四查：
|
||||
六查：
|
||||
1. 顶层目录白名单（新增顶层目录 = FAIL，须同批改 AGENTS.md + 本脚本白名单）
|
||||
2. 根目录文件白名单（根上只许运行文件与规则文件）
|
||||
3. 图像白名单（图只许在 artwork/ game/assets/ design/art/references/ design/dev/architecture/）
|
||||
4. 退役路径守卫（production/ docs/ tests/ qa-data/ candidates/mockups 旧路径再现 = FAIL）
|
||||
3. 图像白名单（图只许在 artwork/ game/assets/ design/art/references/ design/engineering/architecture/ game/tests/golden/）
|
||||
4. 退役路径守卫（production/ docs/ tests/ qa-data/ design/registry/ design/qa/ 旧路径再现 = FAIL）
|
||||
5. design/ 一级子目录白名单（防临时新目录）
|
||||
6. design/art/ 内容白名单（只许 .md 与 references/；审计报告属中间文档归 design/research/）
|
||||
|
||||
用法: python tools/repo_structure_audit.py # 全查，FAIL 时 exit 1
|
||||
python tools/repo_structure_audit.py --json # 机器读输出
|
||||
@@ -25,21 +27,23 @@ ROOT = Path(__file__).resolve().parent.parent
|
||||
# 清单的家——迭代批禁写 design/，只准往这里写，design/ 全目录对它只读。只放 .md，不放图（图像白名单不含此目录）。
|
||||
TOP_DIRS = {"archive", "artwork", "design", "game", "sim-data", "tools", "reports"}
|
||||
# 2) 根目录文件白名单
|
||||
ROOT_FILES = {"AGENTS.md", "roadmap.md", "stage.txt", "review-mode.txt",
|
||||
ROOT_FILES = {"AGENTS.md", "README.md", "roadmap.md", "stage.txt", "review-mode.txt",
|
||||
".gitignore", ".zcodeignore"}
|
||||
# 3) 图像允许目录（相对路径前缀；archive/ 为归档 zip 不扫）
|
||||
# design/qa/（U2 目检预览图/QA 呈现产物归位）
|
||||
# game/tests/golden/（棋盘 golden 基线=机检测试资产非美术素材，
|
||||
# 素材齐盘态生成入库【基线换代权限 Q6】）
|
||||
# game/tests/golden/（棋盘 golden 基线=机检测试资产非美术素材，素材齐盘态生成入库【基线换代权限 Q6】）
|
||||
IMAGE_EXTS = {".png", ".jpg", ".jpeg", ".webp", ".gif", ".svg", ".pxo", ".psd", ".bmp"}
|
||||
IMAGE_PREFIXES = ("artwork/", "game/assets/", "design/art/references/", "design/dev/architecture/",
|
||||
"design/qa/", "game/tests/golden/")
|
||||
IMAGE_PREFIXES = ("artwork/", "game/assets/", "design/art/references/", "design/engineering/architecture/",
|
||||
"game/tests/golden/")
|
||||
# 4) 退役路径（目录或文件任一再现即 FAIL）
|
||||
RETIRED = ["production", "docs", "tests", "qa-data", "design/registry",
|
||||
"design/art/candidates", "production/mockups",
|
||||
"design/ux", "game/tools"]
|
||||
# design/ 一级子目录白名单（防 ad-hoc 新目录）
|
||||
DESIGN_SUBDIRS = {"art", "dev", "gdd", "qa", "research"}
|
||||
"design/ux", "game/tools", "design/qa"]
|
||||
# 5) design/ 一级子目录白名单（防 ad-hoc 新目录）
|
||||
DESIGN_SUBDIRS = {"art", "engineering", "gdd", "research"}
|
||||
# 6) design/art/ 内容白名单——美术只放 .md 文档与 references/ 参考图；
|
||||
# 审计报告属中间文档，按 doc-conventions §11 落 design/research/，禁驻 art/
|
||||
ART_EXTS = {".md"}
|
||||
ART_SUBDIRS = {"references"}
|
||||
|
||||
|
||||
def scan():
|
||||
@@ -81,6 +85,21 @@ def scan():
|
||||
if extra_d:
|
||||
fails.append("design/ 子目录越界: %s（合法: %s；新分类先过用户拍板再改两处白名单）" % (sorted(extra_d), sorted(DESIGN_SUBDIRS)))
|
||||
|
||||
# 6) design/art/ 内容白名单
|
||||
art_dir = ROOT / "design" / "art"
|
||||
art_bad = []
|
||||
if art_dir.is_dir():
|
||||
for p in sorted(art_dir.iterdir()):
|
||||
rel = p.relative_to(ROOT).as_posix()
|
||||
if p.is_dir():
|
||||
if p.name not in ART_SUBDIRS:
|
||||
art_bad.append(rel + "/")
|
||||
elif p.suffix.lower() not in ART_EXTS:
|
||||
art_bad.append(rel)
|
||||
if art_bad:
|
||||
fails.append("design/art/ 越界内容 %d 项（只许 .md 与 %s）: %s" %
|
||||
(len(art_bad), "、".join(ART_SUBDIRS) + "/", art_bad[:8]))
|
||||
|
||||
notes.append("顶层目录 %d 合法 · 根文件 %d 合法 · design/ 子目录 %s · 图像白名单命中 %s" %
|
||||
(len(top_dirs & TOP_DIRS), len(top_files & ROOT_FILES),
|
||||
sorted(design_subs), "、".join(IMAGE_PREFIXES)))
|
||||
@@ -97,7 +116,7 @@ def main():
|
||||
print(" ! " + f)
|
||||
print("\n处理: 文件归位到合法区；确需新类别 = 同批修订 AGENTS.md Project Layout + 本脚本白名单，commit 留痕。")
|
||||
sys.exit(1)
|
||||
print("\n结构审计 PASS（四查全过：顶层目录/根文件/图像白名单/退役路径）")
|
||||
print("\n结构审计 PASS（六查全过：顶层目录/根文件/图像白名单/退役路径/design 子目录/art 内容）")
|
||||
sys.exit(0)
|
||||
|
||||
|
||||
|
||||
Reference in new issue
Block a user