Merge branch 'master' into terrain-variation-20260919
# Conflicts: # design/registry/entities.yaml # prototypes/dungeon-sweeper-vertical-slice/core/rng_service.gd
This commit is contained in:
DKChan committed
commit
ea11495354
8 files changed
+258
-25
No files matched your search
@@ -3,20 +3,24 @@
|
||||
# Date: 2026-09-10
|
||||
# RngService autoload（数据配置）——封闭命名流单点（Rule 5）。玩法代码禁止 randomize()/自建 RandomNumberGenerator。
|
||||
# 实现 GDD：design/archive/gdd-2026-09-14/d2-data-config.md（系统 ID D2·数据配置——registry 追溯锚，命名规范见 CLAUDE.md）
|
||||
# R2 派生公式（黄金向量已预验证）：derive = (SALT XOR wrap64(master + scope×GOLDEN)) AND 0x7FFF…
|
||||
# R3 派生公式（2026-09-19 掷点测量修复批 B 案改版，黄金向量已重登记）：derive = mix64(SALT XOR wrap64(master + scope×GOLDEN))——splitmix64 finalizer 变体终末混淆，见 _mix64 注记；R2 旧向量随批作废
|
||||
# 取号语义：全新实例首个 open_stream = scope 0（地图战斗资源 预推进术语的登记口径）。
|
||||
extends Node
|
||||
|
||||
const STREAM_NAMES := ["board_gen", "reward_roll", "encounter", "armor_roll", "behavior_roll", "variant_place"] # 2026-09-12 增 encounter（遭遇随机化批）；2026-09-16 增 armor_roll（护甲等级掷点批）+ behavior_roll（敌人技能池批——开轮摇号，每敌派生独立子流，registry rng_service 条目同步）；2026-09-19 增 variant_place（地形变异首批类型定稿批——变异布置流，一板恰一 scope）
|
||||
|
||||
# 分段表达式书写（数据配置 R2 实现级规约——禁 ≥2^63 完整字面量）
|
||||
# 分段表达式书写（数据配置 R3 实现级规约——禁 ≥2^63 完整字面量）
|
||||
const GOLDEN_RATIO := (0x9E3779B9 << 32) | 0x7F4A7C15 # 0x9E3779B97F4A7C15
|
||||
const SALT_BOARD_GEN := (0xA0761D64 << 32) | 0x78BD642F # 0xA0761D6478BD642F
|
||||
const SALT_REWARD_ROLL := (0xE7037ED1 << 32) | 0xA0B428DB # 0xE7037ED1A0B428DB
|
||||
const SALT_ENCOUNTER := (0x8EBC6AF0 << 32) | 0x9C88C6E3 # 0x8EBC6AF09C88C6E3（遭遇骰——registry stream_seed_derivation 权威值；旧值 0x5DEECE66D<<32 超 int64 被截断，黄金向量漂移）
|
||||
const SALT_ARMOR_ROLL := (0xC2B2AE3D << 32) | 0x27D4EB2F # 0xC2B2AE3D27D4EB2F（护甲掷点流——互异奇常数 ≠ 乘数；黄金向量见冒烟/registry 同批登记）
|
||||
const SALT_BEHAVIOR_ROLL := (0x85EBCA77 << 32) | 0x58C24E15 # 0x85EBCA7758C24E15（技能摇号流——互异奇常数 ≠ 乘数；黄金向量见冒烟/registry 同批登记）
|
||||
const SALT_VARIANT_PLACE := (0x9AE16A3F << 32) | 0x2FAD6C39 # 0x9AE16A3F2FAD6C39（变异布置流——互异奇常数 ≠ 乘数；地形变异首批类型定稿批 2026-09-19）
|
||||
# R3 混淆终末函数常量（splitmix64 finalizer 变体——互异奇常数 ≠ 乘数；全程 OUT_MASK 63 位掩码保持
|
||||
# 有符号 int64 移位语义与参考实现逐位一致，见 _mix64 注记）
|
||||
const MIX_MUL_A := (0xBF58476D << 32) | 0x1CE4E5B9 # 0xBF58476D1CE4E5B9
|
||||
const MIX_MUL_B := (0x94D049BB << 32) | 0x133111EB # 0x94D049BB133111EB
|
||||
const SALT_VARIANT_PLACE := (0x9AE16A3F << 32) | 0x2FAD6C39 # 0x9AE16A3F2FAD6C39（变异布置流——互异奇常数 ≠ 乘数；地形变异首批类型定稿批 2026-09-20，黄金向量按 R3 公式登记）
|
||||
# behavior_roll 派生向量（registry 同批登记）：子流 scope = spawn_index × STRIDE + 单敌摇号序（0 起）。
|
||||
# 每敌消费自己的 scope 段 → 单敌出招轨迹可独立复放、敌间互不穿插（proposal 约束二）。
|
||||
const BEHAVIOR_SUBSTREAM_STRIDE := 1000000
|
||||
@@ -55,7 +59,19 @@ func derive_at(stream: String, scope: int) -> int:
|
||||
assert(scope >= 0, "负 scope 与 scope+2^63 经输出掩码别名（禁止）")
|
||||
var t: int = _master_seed + scope * GOLDEN_RATIO # wrap64 自然回绕——禁 float 中间量/禁 %/禁主动修复
|
||||
var seed_val: int = _salt_for(stream) ^ t
|
||||
return seed_val & OUT_MASK
|
||||
return _mix64(seed_val)
|
||||
|
||||
|
||||
# R3 派生终末混淆（splitmix64 finalizer 变体，2026-09-19 掷点测量修复批 B 案）：裸派生种子直接作
|
||||
# PCG 初始状态时，「连续小整数 master × 头部 scope 窗口」的面值彩票会被短局复用放大进聚合统计
|
||||
# （验收重测批实证：30 连续种子 × 头部窗口 × 40 局复用 → 18 点聚合 +57%）；此混淆使任何窄种子窗
|
||||
# 表现如随机抽样。纯函数、逐 scope 复放语义不变；全程 OUT_MASK 63 位掩码——有符号 int64 的 >>
|
||||
# 为算术移位，63 位正值域内与逻辑移位逐位一致，这是与参考实现（Python 无符号模型）对齐的关键。
|
||||
func _mix64(z: int) -> int:
|
||||
z = (z + GOLDEN_RATIO) & OUT_MASK
|
||||
z = (z ^ (z >> 30)) * MIX_MUL_A & OUT_MASK
|
||||
z = (z ^ (z >> 27)) * MIX_MUL_B & OUT_MASK
|
||||
return (z ^ (z >> 31)) & OUT_MASK
|
||||
|
||||
|
||||
func set_master_seed(seed_val: int) -> void:
|
||||
|
||||
@@ -3,10 +3,17 @@
|
||||
# 关卡期望扫描（难度曲线与Boss 调参期关卡侧批量工具的原型——对应 棋盘生成 F4 / 战斗侧 monte_carlo.gd）：
|
||||
# 扫描 atk% × hp% 网格（模拟天赋树数值提升档位），输出每档"通关率 / 整关承伤期望 / 败北节点分布 /
|
||||
# 通关剩余 HP 期望 / 进 Boss HP 期望 / 平均轮数"——把"多少数值能通关、通关要掉多少血"变成可测量数据。
|
||||
# 运行：Godot_console.exe --headless --path . --script res://smoke/level_monte_carlo.gd -- [N] [seed0]
|
||||
# 运行：Godot_console.exe --headless --path . --script res://smoke/level_monte_carlo.gd -- [N] [seed0] [normal|perfect|both] [level_index] [shared|unique]
|
||||
# 种子模式（2026-09-19 掷点测量修复批 A 案）：shared（默认，旧行为）= 同批次全部格子×策略共用种子
|
||||
# seed0+i——同种子历史坐标可比，但同一 (种子, scope) 被反复消费，聚合掷点统计被头部窗口彩票放大
|
||||
# （验收重测批实证）；unique = 逐局独立种子（seed0 + 全局递增序号），每个掷点恰消费一次 → 聚合
|
||||
# 掷点统计回归标准二项分布（±2σ gate 口径重新有效）。验收掷点面用 unique；同种子 A/B 对照用 shared。
|
||||
extends SceneTree
|
||||
|
||||
|
||||
var _run_cursor := 0 # unique 模式全局局序号（seed = seed0 + cursor）
|
||||
|
||||
|
||||
func _initialize() -> void:
|
||||
var args := OS.get_cmdline_user_args()
|
||||
var n := 30
|
||||
@@ -42,9 +49,14 @@ func _initialize() -> void:
|
||||
policies = ["perfect"]
|
||||
elif policy_arg == "both":
|
||||
policies = ["normal", "perfect"]
|
||||
# 种子模式（掷点测量修复批 A 案——见文件头注记）：缺省 shared = 旧行为零变更
|
||||
var seed_mode := "shared"
|
||||
if args.size() >= 5 and args[4] in ["shared", "unique"]:
|
||||
seed_mode = args[4]
|
||||
var atk_axis: Array = [0, 50, 100, 150, 200]
|
||||
var hp_axis: Array = [0, 100]
|
||||
print("=== 关卡期望扫描：level %d · N=%d/格 · 种子 %d+%d · 策略=%s ===" % [level_arg, n, seed0, n, policy_arg])
|
||||
var seed_label := "种子 %d+%d" % [seed0, n] if seed_mode == "shared" else "种子 %d 起逐局独立" % seed0
|
||||
print("=== 关卡期望扫描：level %d · N=%d/格 · %s · 策略=%s · 种子模式=%s ===" % [level_arg, n, seed_label, policy_arg, seed_mode])
|
||||
print("%-6s %-10s %-8s %-14s %-14s %-14s %-10s %-12s %-12s %-10s %-10s %-8s %-8s" % ["策略", "atk%/hp%", "通关率", "整关承伤均/p90", "通关剩余HP均(胜)", "进BossHP均", "平均轮数", "踩雷/战", "普通承伤/场%", "跳战率", "Boss承伤%", "踩雷/局", "刷新/局"])
|
||||
var perfect_mine_total := 0 # 完美档构造保证 = 零踩雷（只挖已证安全格）——扫描末断言
|
||||
for policy in policies:
|
||||
@@ -65,7 +77,9 @@ func _initialize() -> void:
|
||||
var mine_per_run: Array = []
|
||||
var refresh_per_run: Array = []
|
||||
for i in range(n):
|
||||
var st = autoplay.run_level(db, seed0 + i, level_arg, atk_pct, hp_pct, true, logger, policy)
|
||||
var seed_val := seed0 + i if seed_mode == "shared" else seed0 + _run_cursor
|
||||
_run_cursor += 1
|
||||
var st = autoplay.run_level(db, seed_val, level_arg, atk_pct, hp_pct, true, logger, policy)
|
||||
dmg_all.append(st.hero_dmg)
|
||||
rounds_all.append(st.rounds)
|
||||
mine_per_run.append(int(st.mine_hits))
|
||||
|
||||
@@ -31,15 +31,16 @@ func _initialize() -> void:
|
||||
print(" error: [%s] %s" % [d.category, d.message])
|
||||
var rng = load("res://core/rng_service.gd").new()
|
||||
rng.set_master_seed(42)
|
||||
# R2 黄金向量（数据配置 AC-3）
|
||||
check(rng.derive_at("board_gen", 0) == 2339089373825164293, "R2 向量 board_gen m=42 scope=0")
|
||||
check(rng.derive_at("board_gen", 1) == 4485977604321908752, "R2 向量 board_gen m=42 scope=1")
|
||||
check(rng.derive_at("board_gen", 2) == 2024629813010603131, "R2 向量 board_gen m=42 scope=2")
|
||||
check(rng.derive_at("board_gen", 3) == 8849696722413293638, "R2 向量 board_gen m=42 scope=3")
|
||||
check(rng.derive_at("reward_roll", 0) == 7422916049646135537, "R2 向量 reward_roll m=42 scope=0")
|
||||
check(rng.derive_at("encounter", 0) == 1061841193803499209, "R2 向量 encounter m=42 scope=0（registry salt_encounter=0x8EBC6AF09C88C6E3 权威值）")
|
||||
check(rng.derive_at("armor_roll", 0) == 4806095330042243845, "R2 向量 armor_roll m=42 scope=0（护甲等级掷点批 2026-09-16——registry salt_armor_roll=0xC2B2AE3D27D4EB2F 权威值）")
|
||||
check(rng.derive_at("behavior_roll", 0) == 426657203655691839, "R2 向量 behavior_roll m=42 scope=0（敌人技能池批 2026-09-16——registry salt_behavior_roll=0x85EBCA7758C24E15 权威值）")
|
||||
# R3 黄金向量（数据配置 AC-3——2026-09-19 掷点测量修复批 B 案改版：derive 后过 splitmix64 终末混淆，
|
||||
# Python 参考实现逐位交叉验证一致；R2 旧向量随批作废）
|
||||
check(rng.derive_at("board_gen", 0) == 8672514112661456564, "R3 向量 board_gen m=42 scope=0")
|
||||
check(rng.derive_at("board_gen", 1) == 8834291164406037215, "R3 向量 board_gen m=42 scope=1")
|
||||
check(rng.derive_at("board_gen", 2) == 7714373262647006282, "R3 向量 board_gen m=42 scope=2")
|
||||
check(rng.derive_at("board_gen", 3) == 1280102845971471347, "R3 向量 board_gen m=42 scope=3")
|
||||
check(rng.derive_at("reward_roll", 0) == 8363815839763232861, "R3 向量 reward_roll m=42 scope=0")
|
||||
check(rng.derive_at("encounter", 0) == 5906263231575069166, "R3 向量 encounter m=42 scope=0（registry salt_encounter=0x8EBC6AF09C88C6E3 权威值）")
|
||||
check(rng.derive_at("armor_roll", 0) == 1459964581993244806, "R3 向量 armor_roll m=42 scope=0（护甲等级掷点批 2026-09-16——registry salt_armor_roll=0xC2B2AE3D27D4EB2F 权威值）")
|
||||
check(rng.derive_at("behavior_roll", 0) == 1791557311233092846, "R3 向量 behavior_roll m=42 scope=0（敌人技能池批 2026-09-16——registry salt_behavior_roll=0x85EBCA7758C24E15 权威值）")
|
||||
check(rng.derive_at("board_gen", 0) == rng.derive_at("board_gen", 0), "derive_at 纯函数恒等")
|
||||
# scope 取号语义：首个 open_stream = scope 0；计数器单调
|
||||
var s0 = rng.open_stream("board_gen")
|
||||
|
||||
@@ -111,6 +111,7 @@ class RunAcc:
|
||||
self.snapshot_buffs_total = 0
|
||||
self.round_ledger = [] # --rounds 逐轮流水
|
||||
self.roll_rows = [] # 命中掷点候选字段的 step 行
|
||||
self.refresh_count = 0 # 受理的弃图刷新次数（action 行 op=refresh accepted=True）
|
||||
self._prev_hp = None # 上一结算快照的主角 HP（宽口径逐轮差分用）
|
||||
self._last_enemy_present = False
|
||||
|
||||
@@ -164,6 +165,11 @@ class RunAcc:
|
||||
self.result = e.get("result", "")
|
||||
self.end_hp = int(e.get("hp", 0))
|
||||
|
||||
def on_action(self, e):
|
||||
# 刷新经济监控（07 清单⑦）：只计受理成功的弃图刷新——被拒尝试不构成弃图。
|
||||
if e.get("op") == "refresh" and e.get("accepted"):
|
||||
self.refresh_count += 1
|
||||
|
||||
# -- 轮窗口收口（核心口径都在这里）------------------------------------
|
||||
|
||||
def _finalize_round(self, snap, battle, hp, enemy_present):
|
||||
@@ -326,7 +332,9 @@ def _feed(run, res, kind, e):
|
||||
run.on_battle_end(e)
|
||||
elif kind == "level_end":
|
||||
run.on_level_end(e)
|
||||
# action / ux / diagnosis 等其余 kind：本工具当前无消费面，静默跳过
|
||||
elif kind == "action":
|
||||
run.on_action(e)
|
||||
# ux / diagnosis 等其余 kind：本工具当前无消费面，静默跳过
|
||||
|
||||
|
||||
def resolve_inputs(arg):
|
||||
@@ -355,6 +363,8 @@ def aggregate_levels(runs):
|
||||
wins = sum(1 for r in rs if r.result == "victory")
|
||||
boss_rs = [r for r in rs if r.boss_enter_hp() is not None]
|
||||
win_rs = [r for r in rs if r.result == "victory"]
|
||||
total_rounds = sum(r.rounds_total for r in rs)
|
||||
total_refresh = sum(r.refresh_count for r in rs)
|
||||
rows.append({
|
||||
"level": lvl, "policy": policy or "—", "runs": n,
|
||||
"clear_rate": wins / n if n else None,
|
||||
@@ -362,6 +372,8 @@ def aggregate_levels(runs):
|
||||
"avg_boss_hp": (sum(r.boss_enter_hp() for r in boss_rs) / len(boss_rs)) if boss_rs else None,
|
||||
"avg_end_hp": (sum(r.end_hp for r in win_rs) / len(win_rs)) if win_rs else None,
|
||||
"avg_dmg": sum(r.damage_total for r in rs) / n if n else None,
|
||||
"refresh_per_run": total_refresh / n if n else None, # 弃图率（与 MC 刷新/局同口径）
|
||||
"refresh_per_round": total_refresh / total_rounds if total_rounds else None, # 每轮刷新率
|
||||
})
|
||||
return rows
|
||||
|
||||
@@ -502,13 +514,17 @@ def render(res_files, args, out):
|
||||
print("== 关卡级统计 ==", file=out)
|
||||
print(" 口径：局=run 行切分（无 run 行的旧日志整文件一局）；通关=result=victory；", file=out)
|
||||
print(" 进BossHP=Boss首结算快照HP+首轮承伤−首轮治疗（精确反推）；平均轮数=每局settlement数。", file=out)
|
||||
hdr = f" {'关卡':>6} {'档位':>8} {'局数':>5} {'通关率':>7} {'平均轮数':>8} {'进BossHP均':>10} {'通关剩余HP均':>12} {'整局承伤均':>10}"
|
||||
print(" 弃图率=每局受理刷新次数（07⑦ 基线读数，与 MC 刷新/局同口径）；", file=out)
|
||||
print(" 每轮刷新率=刷新次数÷结算轮数（组内加权）。阈值数字归调参批，本表只出基线。", file=out)
|
||||
hdr = (f" {'关卡':>6} {'档位':>8} {'局数':>5} {'通关率':>7} {'平均轮数':>8} {'进BossHP均':>10} "
|
||||
f"{'通关剩余HP均':>12} {'整局承伤均':>10} {'弃图率':>7} {'每轮刷新率':>9}")
|
||||
print(hdr, file=out)
|
||||
for row in aggregate_levels(all_runs):
|
||||
print(f" {str(row['level']):>6} {row['policy']:>8} {row['runs']:>5} "
|
||||
f"{fmt(row['clear_rate'] * 100 if row['clear_rate'] is not None else None):>6}% "
|
||||
f"{fmt(row['avg_rounds']):>8} {fmt(row['avg_boss_hp']):>10} "
|
||||
f"{fmt(row['avg_end_hp']):>12} {fmt(row['avg_dmg']):>10}", file=out)
|
||||
f"{fmt(row['avg_end_hp']):>12} {fmt(row['avg_dmg']):>10} "
|
||||
f"{fmt(row['refresh_per_run'], 2):>7} {fmt(row['refresh_per_round'], 3):>9}", file=out)
|
||||
print(file=out)
|
||||
|
||||
print("== 战斗级统计（按 关卡/节点类型/深度 分组；对照承伤带 普通≤20%、Boss≤50% max_hp）==", file=out)
|
||||
@@ -553,11 +569,11 @@ def render(res_files, args, out):
|
||||
|
||||
if args.per_run:
|
||||
print("== 逐局明细（--per-run）==", file=out)
|
||||
print(f" {'文件':<28} {'种子':>6} {'档位':>8} {'结果':>8} {'轮数':>4} {'承伤':>5} {'零承伤轮':>8} {'进BossHP':>8} {'终局HP':>6}", file=out)
|
||||
print(f" {'文件':<28} {'种子':>6} {'档位':>8} {'结果':>8} {'轮数':>4} {'承伤':>5} {'零承伤轮':>8} {'进BossHP':>8} {'终局HP':>6} {'刷新':>4}", file=out)
|
||||
for run in all_runs:
|
||||
print(f" {run.src_file:<28} {str(run.seed):>6} {run.policy or '—':>8} "
|
||||
f"{run.result or '—':>8} {run.rounds_total:>4} {run.damage_total:>5} "
|
||||
f"{run.zero_narrow:>8} {fmt(run.boss_enter_hp(), 0):>8} {str(run.end_hp):>6}", file=out)
|
||||
f"{run.zero_narrow:>8} {fmt(run.boss_enter_hp(), 0):>8} {str(run.end_hp):>6} {run.refresh_count:>4}", file=out)
|
||||
print(file=out)
|
||||
|
||||
if args.rounds:
|
||||
|
||||
Reference in new issue
Block a user