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

Merge branch 'master' into m3-iter10-20261001

Browse Source 
# Conflicts:
#	game/smoke/level_autoplay.gd
#	game/smoke/smoke_all.gd
This commit is contained in:
DKChan committed 2026-10-01 18:18:03 +08:00
2 parents 7f5caa386d 8a28e0bf6e
commit bc737fb0cb
24 files changed
+1471 -112
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

game/smoke/smoke_all.gd
+18 -16
View File
@@ -331,8 +331,8 @@ func _smoke_adventure() -> void:
var resolve_ok := level_resolves.size() == 2
var max_flat := int(_db.adventure.bonus_max_hp_flat)
var heal_pct := int(_db.adventure.clear_heal_pct)
var hp_acc := 0 # max_hp 件累加（回血封顶断言的生效上限推导）
var ks_prefix := 0
hp_acc := 0 # max_hp 件累加（回血封顶断言的生效上限推导）
ks_prefix := 0
for i in picks.size():
var p: Dictionary = picks[i]
var cands: Array = p.get("candidates", []) as Array
@@ -346,37 +346,39 @@ func _smoke_adventure() -> void:
var heal: int = int(p.get("heal_gained", -1))
var hp_before: int = int(p.get("hp_before", -1))
var hp_after: int = int(p.get("hp_after", -1))
var max_eff := int(_db.hero.max_hp) + hp_acc # 回血口径 = 表值+加算区（无 TunePanel 百分比）
if heal != mini(int(floor(float(max_eff) * float(heal_pct) / 100.0)), max_eff - hp_before) \
or hp_after != hp_before + heal or hp_after > max_eff:
# 模拟档 v3.4 商店贪心购血合法抬升（L2/L3 店在 Boss 前）——回血口径窗口 = 加算区件 + 购血余量 0..15
var heal_ok_i := false
for extra in 16:
var m := int(_db.hero.max_hp) + hp_acc + extra
if heal == mini(int(floor(float(m) * float(heal_pct) / 100.0)), m - hp_before):
heal_ok_i = true
break
if not heal_ok_i or hp_after != hp_before + heal or hp_after > int(_db.hero.max_hp) + hp_acc + 15:
heal_ok = false
ks_prefix += int(_db.meta_boss_keystone_row(int(p.get("level_index", -1))).get("first_kill", 0))
if int(p.get("keystone_gained", -1)) != int(_db.meta_boss_keystone_row(int(p.get("level_index", -1))).get("first_kill", 0)) \
or int(p.get("keystone_total", -1)) != ks_prefix:
if int(p.get("keystone_gained", -1)) != int(_db.meta_boss_keystone_row(int(p.get("level_index", -1))).get("first_kill", 0)) or int(p.get("keystone_total", -1)) != ks_prefix:
ks_gain_ok = false
if resolve_ok:
var r: Dictionary = level_resolves[i]
if not (p.get("candidates", []) as Array).has(String(r.get("picked", ""))) \
or int(r.get("value", -1)) != int(_db.adventure.bonus_value(String(r.get("picked", "")))):
if not (p.get("candidates", []) as Array).has(String(r.get("picked", ""))) or int(r.get("value", -1)) != int(_db.adventure.bonus_value(String(r.get("picked", "")))):
resolve_ok = false
if String(r.get("picked", "")) == "max_hp":
hp_acc += max_flat
check(cand_ok, "三选一候选 2–3 件且零重复（加权洗牌不放回）")
check(heal_ok, "通关部分回血封顶（floor(上限×比例) 封顶缺口——血回满退役）")
check(heal_ok, "通关部分回血封顶（floor(上限×比例) 封顶缺口——血回满退役；购血容差窗口）")
check(ks_gain_ok, "钥石逐杀入账（首杀档位 + 累计逐位）")
check(resolve_ok, "点选恰兑付选中一件（值=表值；未选项零生效）")
var seq: Array = st["encounter_max_hp_seq"]
var k := 5.0 # hp+400 ⇒ TunePanel 百分比后乘 ×5（加算先加、百分比后乘——生效次序口径）
var exp_base := maxi(1, int(round(float(int(_db.hero.max_hp)) * k)))
var valid_hp := {}
for acc in 4:
valid_hp[maxi(1, int(round(float(int(_db.hero.max_hp) + acc * max_flat) * k)))] = true
# 模拟档 v3.4 商店贪心购血（数值修复批）合法抬升——上限窗口 = 基础 + 加算区 3 件 + 购血余量（hp_up flat 3×5 次宽松界）
var hp_ceiling := maxi(1, int(round(float(int(_db.hero.max_hp) + 3 * max_flat + 15) * k)))
var seq_ok := seq.size() > 0 and int(seq[0]) == exp_base
for v in (seq as Array):
if not valid_hp.has(int(v)):
if int(v) < exp_base or int(v) > hp_ceiling:
seq_ok = false
check(seq_ok,
"各战上限入参 ∈ {基础..基础+3×件值}（覆盖值通道——通关+奖励节点双渠道共享上限 3；首战=基础 %d）" % exp_base)
"各战上限入参 ∈ [基础, 基础+3×件值+购血余量]（覆盖值通道——双渠道共享上限 3；模拟档贪心购血合法叠加〔数值修复批 v3.4〕；首战=基础 %d）" % exp_base)
# ③ 种子域可复现（同种子两局：summary + 上限序列 + 行进序列 + 三选一停点载荷逐位一致）
var st2: Dictionary = autoplay.run_adventure(_db, 42, 900, 400)
check(st2["summary"] == sum and st2["encounter_max_hp_seq"] == seq
@@ -3391,7 +3393,7 @@ func _smoke_nine_types_gp_stream() -> void:
gp_neg = int(row.weight)
check(cell_rows == 22, "奖励字典 22 行（九型×正负 18 格 + aux 正三投放/负一占位——魔法道具内容批 2026-09-29；清图槽独立批尾不计）")
# 雷格负向直伤当量（迭代 8 卡⑧——真人反馈「三雷 3/4 血无后果感」投值：三行各抬 +3 档，负向≈正向 2 倍定价）
var mine_power := {"heal_backlash": 4, "pierce_snare": 5, "magic_recoil": 5}
var mine_power := {"heal_backlash": 6, "pierce_snare": 8, "magic_recoil": 8} # 数值修复批 2026-10-01 再抬档（旧 4/5/5，见 numfix 报告）
for row in _db.reward.rows:
var rid := String(row.get("reward_id", ""))
if mine_power.has(rid):