iter41-卡2:呈现层结构收敛批:67清+2豁免+2展平改善——拆私有族+六状态件+ui_kit收敛+束收拢+print删;含u14补做、并master并案与批末九处解析错修复
This commit is contained in:
1 parent
c0190e1336
commit
730c35aa0a
104 files changed
+3419
-5333
No files matched your search
@@ -62,7 +62,7 @@ func _phase_text(p: int) -> String:
|
||||
|
||||
|
||||
func _cost(kind: String) -> int:
|
||||
var ae = db.action_economy
|
||||
var ae = db.run.action_economy
|
||||
match kind:
|
||||
"dig":
|
||||
return ae.dig_ap_cost # 基础挖格成本恒表值(钻头对价挂付费开掘侧)
|
||||
|
||||
@@ -680,7 +680,7 @@ func _roll_round_actions() -> void:
|
||||
# 容器内直读主角行)
|
||||
var facts := {
|
||||
"round_index": round_index,
|
||||
"last_round_end": "none" if (action_economy.last_round_end as Dictionary).is_empty() else String((action_economy.last_round_end as Dictionary).get("path_tag", "none")),
|
||||
"last_round_end": "none" if action_economy.last_round_end().is_empty() else String(action_economy.last_round_end().get("path_tag", "none")),
|
||||
"mines_hit_last": int(_mines_hits["last"]),
|
||||
"mines_hit_total": int(_mines_hits["total"]),
|
||||
}
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
uid://dpy0a6fcggbwe
|
||||
@@ -0,0 +1 @@
|
||||
uid://du0gxv0lnrxnp
|
||||
@@ -0,0 +1 @@
|
||||
uid://jaxlqd8ml3co
|
||||
@@ -101,7 +101,7 @@ func rebuild(feat_ids: Array, item_ids: Array, tree_rules: Array = []) -> void:
|
||||
|
||||
## 特性订阅装载域(feats 表序→按持有集过滤→行内数组序——装载声明序第一段)
|
||||
func _load_feat_triggers(feat_ids: Array) -> void:
|
||||
if db != null and db.feats != null:
|
||||
if db != null and db.crossrun.feats != null:
|
||||
for row in db.crossrun.feats.rows:
|
||||
var fid := String(row.get("feat_id", ""))
|
||||
if not feat_ids.has(fid):
|
||||
|
||||
@@ -145,7 +145,7 @@ func forge_buy_level(route_id: String) -> bool:
|
||||
var row: Dictionary[Variant, Variant] = db.crossrun.forge.route(route_id)
|
||||
if row.is_empty() or not _forge_route_unlocked(route_id):
|
||||
return false
|
||||
var lvl := meta_state.forge_state().levels.get(route_id, 0)
|
||||
var lvl: int = meta_state.forge_state().levels.get(route_id, 0)
|
||||
if lvl >= int(row.get("cap", 0)):
|
||||
return false
|
||||
var price := ForgeTable.level_price(row, lvl)
|
||||
@@ -206,13 +206,13 @@ func forge_shop_status() -> Array:
|
||||
var out: Array[Dictionary] = []
|
||||
for row in db.crossrun.forge.route_rows():
|
||||
var rid := String(row.get("route_id", ""))
|
||||
var lvl := meta_state.forge_state().levels.get(rid, 0)
|
||||
var lvl: int = meta_state.forge_state().levels.get(rid, 0)
|
||||
var cap_v := int(row.get("cap", 0))
|
||||
var unlocked := _forge_route_unlocked(rid)
|
||||
var prereq := String(row.get("prereq_route", ""))
|
||||
var plvl := meta_state.forge_state().levels.get(prereq, 0) if prereq != "" else 0
|
||||
var plvl: int = meta_state.forge_state().levels.get(prereq, 0) if prereq != "" else 0
|
||||
var pcap := int(db.crossrun.forge.route(prereq).get("cap", 0)) if prereq != "" else 0
|
||||
var selected := (String(row.get("kind", "")) == "weapon" and meta_state.forge_state().weapon == rid) \
|
||||
var selected: bool = (String(row.get("kind", "")) == "weapon" and meta_state.forge_state().weapon == rid) \
|
||||
or (String(row.get("kind", "")) == "armor" and meta_state.forge_state().armor == rid)
|
||||
out.append({
|
||||
"route_id": rid,
|
||||
@@ -362,7 +362,7 @@ func tree_buy(node_id: String) -> bool:
|
||||
func tree_toggle_fork(group: String, side: String) -> bool:
|
||||
if not db.crossrun.meta_tree.FORK_GROUPS.has(group) or not (side == "a" or side == "b"):
|
||||
return false
|
||||
var cur := meta_state.tree_state().fork_sides.get(group, "")
|
||||
var cur: String = meta_state.tree_state().fork_sides.get(group, "")
|
||||
if cur == "" or cur == side:
|
||||
return false # 未解锁走购买面;同态零操作
|
||||
meta_state.set_fork_side(group, side)
|
||||
@@ -521,7 +521,7 @@ func attune_camp_status() -> Dictionary:
|
||||
"equipped": equipped.has(iid),
|
||||
"unlocked": meta_state.item_unlocked(iid),
|
||||
})
|
||||
var lvl := meta_state.attune_state().refresh_level
|
||||
var lvl: int = meta_state.attune_state().refresh_level
|
||||
var next_row: Dictionary[Variant, Variant] = db.crossrun.meta.attune_refresh_row(lvl + 1)
|
||||
return {
|
||||
"slots": Attunement.slots(db, save),
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
uid://bc5perm32w2yp
|
||||
@@ -0,0 +1 @@
|
||||
uid://dylsba7whx5ql
|
||||
Reference in new issue
Block a user