iter42-卡2: level_runner委托壳19枚拆除+shop公开化直连键7=33+残留零真残留+基线记账03/04/05(用户裁)

game/presentation/camp_shop_presenter.gd

@@ -170,37 +170,37 @@ func on_shop_buy(product_id: String) -> void:
 	var runner = _runner_get.call()
 	if runner == null:
 		return
-	if runner.is_shop_pool():
+	if runner.shop.is_shop_pool():
 		# pool 面：买 1 → 核心全重抽——货架整架重投喂（重抽反馈；余额不足核心拒绝零副作用）
-		if not runner.buy_pool_item(product_id):
+		if not runner.shop.buy_pool_item(product_id):
 			logger.log_ux("ux_reject", {"source": "wallet", "sub_reason": "insufficient_gp"})
 			toast.show_toast("GP不足——买不起这件商品", "warn")
 			return
-		shop_overlay.open_shelf(runner.shop_shelf(), int(runner.gp))
-		shop_overlay.set_visit_info(int(runner.shop_bp_visit_buys()), float(db.run.shop.price_a))   # T6 爬价规则行
-		shop_overlay.set_refresh_display(runner.shop_refresh_free_left(), runner.shop_refresh_cost(), int(runner.gp) >= runner.shop_refresh_cost())
+		shop_overlay.open_shelf(runner.shop.shop_shelf(), int(runner.gp))
+		shop_overlay.set_visit_info(int(runner.shop.shop_bp_visit_buys()), float(db.run.shop.price_a))   # T6 爬价规则行
+		shop_overlay.set_refresh_display(runner.shop.shop_refresh_free_left(), runner.shop.shop_refresh_cost(), int(runner.gp) >= runner.shop.shop_refresh_cost())
 		_refresh_presentations.call()
 		return
-	if not runner.buy_product(product_id):
+	if not runner.shop.buy_product(product_id):
 		# 余额不足（按钮禁用为常态防线——兜底拒绝可见，pattern 1）
 		logger.log_ux("ux_reject", {"source": "wallet", "sub_reason": "insufficient_gp"})
 		toast.show_toast("GP不足——买不起这件商品", "warn")
 		return
-	shop_overlay.refresh_state(runner.shop_products(), int(runner.gp))
+	shop_overlay.refresh_state(runner.shop.shop_products(), int(runner.gp))
 	_refresh_presentations.call()
 
 
 # MC-1：刷新意图（shop_overlay.refresh_requested——核心 shop_refresh 受理后整架重投喂=重抽反馈）
 func on_shop_refresh() -> void:
 	var runner = _runner_get.call()
-	if runner == null or not runner.is_shop_pool():
+	if runner == null or not runner.shop.is_shop_pool():
 		return
-	if not runner.shop_refresh():
+	if not runner.shop.shop_refresh():
 		toast.show_toast("GP不足——刷新失败", "warn")
 		return
-	shop_overlay.open_shelf(runner.shop_shelf(), int(runner.gp))
-	shop_overlay.set_visit_info(int(runner.shop_bp_visit_buys()), float(db.run.shop.price_a))   # T6 爬价规则行
-	shop_overlay.set_refresh_display(runner.shop_refresh_free_left(), runner.shop_refresh_cost(), int(runner.gp) >= runner.shop_refresh_cost())
+	shop_overlay.open_shelf(runner.shop.shop_shelf(), int(runner.gp))
+	shop_overlay.set_visit_info(int(runner.shop.shop_bp_visit_buys()), float(db.run.shop.price_a))   # T6 爬价规则行
+	shop_overlay.set_refresh_display(runner.shop.shop_refresh_free_left(), runner.shop.shop_refresh_cost(), int(runner.gp) >= runner.shop.shop_refresh_cost())
 	_refresh_presentations.call()
 
 

game/presentation/curio_interact_controller.gd

@@ -160,7 +160,7 @@ func on_refresh() -> void:
 	if not refreshed:
 		# 免费位（X/Y）已穷——GP 付费档（先扣钱包后重抽，余额不足拒绝零副作用）
 		var cost: int = adventure.refresh_bank().gp_cost()
-		if runner == null or not runner.spend_gp(cost):
+		if runner == null or not runner.shop.spend_gp(cost):
 			ctx.views.toast.show_toast("GP不足——刷新失败", "warn")
 			return
 		refreshed = adventure.stop().refresh_curio_paid()

game/presentation/main.gd

@@ -770,7 +770,7 @@ func _on_refresh_confirmed() -> void:
 		return
 	var ok: bool = false
 	if run_scope.level_active and run_scope.runner != null:
-		ok = run_scope.runner.player_request_refresh()
+		ok = run_scope.runner.shop.player_request_refresh()
 	elif run_scope.settlement != null:
 		ok = run_scope.settlement.player_request_refresh()
 	logger.log_action("refresh", Vector2i(-1, -1), ok)

game/presentation/main_adventure_flow.gd

@@ -78,12 +78,12 @@ static func _on_runner_node(root: Variant, node: Dictionary, info: Dictionary) -
 		# 购买/离开归玩家意图（buy_requested/leave_pressed 接线），零自动推进。
 		# pool 面 = 共享池货架三选一同构卡；legacy 面 = 固定三件（off 对照承载）
 		root._open_modal(root.shop_overlay)
-		if root.run_scope.runner.is_shop_pool():
-			root.shop_overlay.open_shelf(root.run_scope.runner.shop_shelf(), int(root.run_scope.runner.gp))
-			root.shop_overlay.set_visit_info(int(root.run_scope.runner.shop_bp_visit_buys()), float(root.db.run.shop.price_a))   # 爬价规则行
-			root.shop_overlay.set_refresh_display(root.run_scope.runner.shop_refresh_free_left(), root.run_scope.runner.shop_refresh_cost(), int(root.run_scope.runner.gp) >= root.run_scope.runner.shop_refresh_cost())   # MC-1
+		if root.run_scope.runner.shop.is_shop_pool():
+			root.shop_overlay.open_shelf(root.run_scope.runner.shop.shop_shelf(), int(root.run_scope.runner.gp))
+			root.shop_overlay.set_visit_info(int(root.run_scope.runner.shop.shop_bp_visit_buys()), float(root.db.run.shop.price_a))   # 爬价规则行
+			root.shop_overlay.set_refresh_display(root.run_scope.runner.shop.shop_refresh_free_left(), root.run_scope.runner.shop.shop_refresh_cost(), int(root.run_scope.runner.gp) >= root.run_scope.runner.shop.shop_refresh_cost())   # MC-1
 		else:
-			root.shop_overlay.open_shop(root.run_scope.runner.shop_products(), int(root.run_scope.runner.gp))
+			root.shop_overlay.open_shop(root.run_scope.runner.shop.shop_products(), int(root.run_scope.runner.gp))
 			root.shop_overlay.set_visit_info(-1, 1.0)   # legacy 面无爬价行（off 对照承载）
 		root.log_view.append_bb(root.Narrator.shop_line(int(root.run_scope.runner.gp)))
 	root.logger.log_node(node, info, root.run_scope.runner.node_index)

game/presentation/main_overlay_flow.gd

@@ -132,10 +132,10 @@ static func _on_wallet_changed(root: Variant, event: String, gp: int, extra: Dic
 	if String(event) == "gain":
 		root.run_scope.last_gain_amount = int(extra.get("amount", 0))   # GP 增量取数（每战恰一笔 gain）
 	if root.shop_overlay.visible and root.run_scope.runner != null:
-		if root.run_scope.runner.is_shop_pool():
+		if root.run_scope.runner.shop.is_shop_pool():
 			root.shop_overlay.refresh_shelf_state(int(root.run_scope.runner.gp))   # pool 面余额联动（货架内容仅买后重抽变）
 		else:
-			root.shop_overlay.refresh_state(root.run_scope.runner.shop_products(), int(root.run_scope.runner.gp))
+			root.shop_overlay.refresh_state(root.run_scope.runner.shop.shop_products(), int(root.run_scope.runner.gp))
 	root._refresh_presentations()
 
 

game/presentation/views/shop_overlay_view.gd

@@ -85,7 +85,7 @@ func _xnum(v: float) -> String:
 	return "×%d" % int(round(v)) if absf(v - roundf(v)) < 0.005 else "×%.2f" % v
 
 
-# 打开商店（products = runner.shop_products() 投影——[{product_id, display_name, attr, flat_value, price, purchased}]）
+# 打开商店（products = runner.shop.shop_products() 投影——[{product_id, display_name, attr, flat_value, price, purchased}]）
 func open_shop(products: Array, gp: int) -> void:
 	for child in _cards_box.get_children():
 		child.queue_free()
@@ -149,7 +149,7 @@ func _emit_buy_requested(p: Dictionary) -> void:
 
 # ---- 共享池货架面（M-4 迭代 11 第②批 T4——P3 甲程序占位，三选一同构卡；UiKit 既有件）----
 
-# 打开/重刷货架（cards = runner.shop_shelf() 投影——[{kind_id, display_name, value, price, stock_left}]）。
+# 打开/重刷货架（cards = runner.shop.shop_shelf() 投影——[{kind_id, display_name, value, price, stock_left}]）。
 # 买后组合根重投喂新货架 = 整架重建呈现（三件全重抽反馈——未买不保留）；空架 = 池空硬闸合法态。
 func open_shelf(cards: Array, gp: int) -> void:
 	for child in _cards_box.get_children():