game-group/gplan-2
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge master(85dc9af 收窄批)入分支：07清单⑬双登冲突解（收窄⑬保留+秘宝目检改⑭）；smoke_all/roadmap auto-merge

Browse Source
This commit is contained in:
DKChan committed 2026-10-05 08:55:37 +08:00
2 parents d2ab5073d7 85dc9afe7d
commit c7173889c0
32 files changed
+207 -1849
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

game/data/schemas/board_gen_table.gd
+11
View File
@@ -65,6 +65,17 @@ func validate() -> Array:
var bt: String = str(row.get("board_type", ""))
if not BOARD_TYPE_VOCABULARY.has(bt):
errs.append({"category": "cross_field", "message": "(%d,%d) board_type 越词表: %s" % [L, D, bt]})
# 初始展开收窄批两参数（迭代14① T1——加载期校验违例致命；缺省 shave=1 现行投值 / cap=0 闸关防御口径）
var sr: int = int(row.get("shave_ring_radius", 1))
if sr < 0 or sr > 2:
errs.append({"category": "domain", "message": "(%d,%d) shave_ring_radius 越域 [0,2]: %d" % [L, D, sr]})
var r0_cap: int = int(row.get("r0_max_cap", 0))
if r0_cap > 0:
# 护栏（任务书 §二）：cap ≥ 出生格数 9（BoardData.SPAWN_AREA_CELLS）、cap ≤ 板格数一半
if r0_cap < BoardData.SPAWN_AREA_CELLS:
errs.append({"category": "cross_field", "message": "(%d,%d) r0_max_cap 低于出生保障面 %d: %d" % [L, D, BoardData.SPAWN_AREA_CELLS, r0_cap]})
if r0_cap > (w * h) / 2:
errs.append({"category": "cross_field", "message": "(%d,%d) r0_max_cap 超板格数一半 %d: %d" % [L, D, (w * h) / 2, r0_cap]})
anchor_ok[L] = anchor_ok.get(L, false) or D == 0
for L in anchor_ok.keys():
if not anchor_ok[L]:
game/data/tables/board_gen.tres
+57 -19
View File
@@ -14,7 +14,9 @@ rows = [{
"solver_rules": "single_subset",
"min_safe_count": 50,
"max_gen_attempts": 16,
"board_type": "dungeon"
"board_type": "dungeon",
"shave_ring_radius": 1,
"r0_max_cap": 45
}, {
"level_index": 1,
"node_depth": 1,
@@ -25,7 +27,9 @@ rows = [{
"solver_rules": "single_subset",
"min_safe_count": 50,
"max_gen_attempts": 16,
"board_type": "dungeon"
"board_type": "dungeon",
"shave_ring_radius": 1,
"r0_max_cap": 45
}, {
"level_index": 1,
"node_depth": 2,
@@ -36,7 +40,9 @@ rows = [{
"solver_rules": "single_subset",
"min_safe_count": 50,
"max_gen_attempts": 16,
"board_type": "dungeon"
"board_type": "dungeon",
"shave_ring_radius": 1,
"r0_max_cap": 45
}, {
"level_index": 1,
"node_depth": 3,
@@ -47,7 +53,9 @@ rows = [{
"solver_rules": "single_subset",
"min_safe_count": 50,
"max_gen_attempts": 16,
"board_type": "dungeon"
"board_type": "dungeon",
"shave_ring_radius": 1,
"r0_max_cap": 45
}, {
"level_index": 1,
"node_depth": 4,
@@ -58,7 +66,9 @@ rows = [{
"solver_rules": "single_subset",
"min_safe_count": 60,
"max_gen_attempts": 24,
"board_type": "dungeon"
"board_type": "dungeon",
"shave_ring_radius": 1,
"r0_max_cap": 43
}, {
"level_index": 2,
"node_depth": 0,
@@ -69,7 +79,9 @@ rows = [{
"solver_rules": "single_subset",
"min_safe_count": 60,
"max_gen_attempts": 24,
"board_type": "underdark"
"board_type": "underdark",
"shave_ring_radius": 1,
"r0_max_cap": 43
}, {
"level_index": 2,
"node_depth": 1,
@@ -80,7 +92,9 @@ rows = [{
"solver_rules": "single_subset",
"min_safe_count": 60,
"max_gen_attempts": 24,
"board_type": "underdark"
"board_type": "underdark",
"shave_ring_radius": 1,
"r0_max_cap": 43
}, {
"level_index": 2,
"node_depth": 4,
@@ -91,7 +105,9 @@ rows = [{
"solver_rules": "single_subset",
"min_safe_count": 60,
"max_gen_attempts": 24,
"board_type": "underdark"
"board_type": "underdark",
"shave_ring_radius": 1,
"r0_max_cap": 43
}, {
"level_index": 2,
"node_depth": 5,
@@ -102,7 +118,9 @@ rows = [{
"solver_rules": "single_subset",
"min_safe_count": 60,
"max_gen_attempts": 24,
"board_type": "underdark"
"board_type": "underdark",
"shave_ring_radius": 1,
"r0_max_cap": 43
}, {
"level_index": 2,
"node_depth": 6,
@@ -113,7 +131,9 @@ rows = [{
"solver_rules": "single_subset",
"min_safe_count": 60,
"max_gen_attempts": 24,
"board_type": "underdark"
"board_type": "underdark",
"shave_ring_radius": 1,
"r0_max_cap": 43
}, {
"level_index": 2,
"node_depth": 7,
@@ -124,7 +144,9 @@ rows = [{
"solver_rules": "single_subset",
"min_safe_count": 60,
"max_gen_attempts": 24,
"board_type": "underdark"
"board_type": "underdark",
"shave_ring_radius": 1,
"r0_max_cap": 43
}, {
"level_index": 2,
"node_depth": 9,
@@ -135,7 +157,9 @@ rows = [{
"solver_rules": "single_subset",
"min_safe_count": 60,
"max_gen_attempts": 24,
"board_type": "underdark"
"board_type": "underdark",
"shave_ring_radius": 1,
"r0_max_cap": 43
}, {
"level_index": 3,
"node_depth": 0,
@@ -146,7 +170,9 @@ rows = [{
"solver_rules": "single_subset",
"min_safe_count": 70,
"max_gen_attempts": 32,
"board_type": "deep_underdark"
"board_type": "deep_underdark",
"shave_ring_radius": 1,
"r0_max_cap": 51
}, {
"level_index": 3,
"node_depth": 1,
@@ -157,7 +183,9 @@ rows = [{
"solver_rules": "single_subset",
"min_safe_count": 70,
"max_gen_attempts": 32,
"board_type": "deep_underdark"
"board_type": "deep_underdark",
"shave_ring_radius": 1,
"r0_max_cap": 51
}, {
"level_index": 3,
"node_depth": 4,
@@ -168,7 +196,9 @@ rows = [{
"solver_rules": "single_subset",
"min_safe_count": 70,
"max_gen_attempts": 32,
"board_type": "deep_underdark"
"board_type": "deep_underdark",
"shave_ring_radius": 1,
"r0_max_cap": 51
}, {
"level_index": 3,
"node_depth": 5,
@@ -179,7 +209,9 @@ rows = [{
"solver_rules": "single_subset",
"min_safe_count": 70,
"max_gen_attempts": 32,
"board_type": "deep_underdark"
"board_type": "deep_underdark",
"shave_ring_radius": 1,
"r0_max_cap": 51
}, {
"level_index": 3,
"node_depth": 6,
@@ -190,7 +222,9 @@ rows = [{
"solver_rules": "single_subset",
"min_safe_count": 70,
"max_gen_attempts": 32,
"board_type": "deep_underdark"
"board_type": "deep_underdark",
"shave_ring_radius": 1,
"r0_max_cap": 51
}, {
"level_index": 3,
"node_depth": 7,
@@ -201,7 +235,9 @@ rows = [{
"solver_rules": "single_subset",
"min_safe_count": 70,
"max_gen_attempts": 32,
"board_type": "deep_underdark"
"board_type": "deep_underdark",
"shave_ring_radius": 1,
"r0_max_cap": 51
}, {
"level_index": 3,
"node_depth": 9,
@@ -212,7 +248,9 @@ rows = [{
"solver_rules": "single_subset",
"min_safe_count": 82,
"max_gen_attempts": 32,
"board_type": "deep_underdark"
"board_type": "deep_underdark",
"shave_ring_radius": 1,
"r0_max_cap": 59
}]
; 切片调参登记（SLICE-TUNED provisional，调参所有权仍归 C3）：