瞎子井与偷听李癞可在第二章开始后进行

scene/ground/scene/c02/s03_院子.gd

@@ -33,11 +33,6 @@ func _on_ground_ready() -> void:
 		gate.interact_mismatch_failed.connect(_on_gate_failed)
 		gate.interacted.connect(_on_gate_interacted)
 
-	eavesdrop_window = $"../DeployLayer/李氏赖子房间人影"
-	if ArchiveManager.get_global_value(&"c02_eavesdrop_finished"):
-		$"../DeployLayer/Ambush偷听对话".enabled = false
-		eavesdrop_window.visible = false
-
 	$"../DeployLayer/Closeup敲门游戏".exit.connect(_on_knock_exit)
 
 	counter = $"../DeployLayer/Interactable柜子" as Interactable2D
@@ -64,23 +59,31 @@ func _on_ground_ready() -> void:
 		$VibeSfx氛围.switch_to("c02_火灾")
 		$"../DirectionalLight2D".energy = 0
 
+	eavesdrop_window = $"../DeployLayer/李氏赖子房间人影"
 	madman_npc = $"../DeployLayer/Npc井边疯子"
 	madman_npc.visible = false
-	# c02_madman_hitwall 之后， c02_ball_game_stage==3（游戏结束） 之前；同时 eavesdrop_finished
-	if EventManager.get_stage(&"c02_ball_game_stage") < 3:
-		# and ArchiveManager.get_global_value(&"c02_eavesdrop_finished")
+	bully_layer = $"../DeployLayer/霸凌"
+	burning_layer = $"../DeployLayer/火灾"
+	var closeup_well = $"../DeployLayer/Closeup井"
+	# 第一章霸凌阶段（弹珠游戏结束为开始）隐藏疯子与李癞偷听，第二章开始后显示
+	if EventManager.get_stage(&"c02_ball_game_stage") == 3 and EventManager.get_chapter_stage() <= 2:
+		_setup_bully_or_burning(true)
+		# 弹珠游戏结束后就开始霸凌，此时禁止偷听。第一章结束后（火灾结束），第二章再偷听
+		$"../DeployLayer/Ambush偷听对话".enabled = false
+		eavesdrop_window.visible = false
+		closeup_well.enabled = false
+	else:
 		if not ArchiveManager.get_global_value("c02_watched_the_well"):
-			$"../DeployLayer/Closeup井".exit.connect(func(_arg): madman_npc.visible = true)
-		else:
-			madman_npc.visible = true
-	(
-		madman_npc
-		. talk_finished
-		. connect(
-			func(): ArchiveManager.unlock_memory(2)
-			# 2 号为井边记忆
-		)
-	)
+			closeup_well.exit.connect(func(_arg): 
+				madman_npc.visible = true
+				# 2 号为井边记忆
+				ArchiveManager.unlock_memory(2)
+			)
+		# madman_npc.talk_finished.connect(ArchiveManager.unlock_memory.bind(2))
+
+	if ArchiveManager.get_global_value(&"c02_eavesdrop_finished"):
+		$"../DeployLayer/Ambush偷听对话".enabled = false
+		eavesdrop_window.visible = false
 
 	if ArchiveManager.get_global_value(&"c02_show_grounded_coins"):
 		# 奠字 + 纸钱
@@ -116,10 +119,6 @@ func _on_ground_ready() -> void:
 	elif EventManager.get_stage("c02_madman_interacted_stage") == 2:
 		small_shoe.enabled = true
 
-	bully_layer = $"../DeployLayer/霸凌"
-	burning_layer = $"../DeployLayer/火灾"
-	if EventManager.get_stage(&"c02_ball_game_stage") >= 3 and EventManager.get_chapter_stage() < 3:
-		_setup_bully_or_burning(true)
 
 
 func drop_shoe(progress: float, y1: float, y2: float):
@@ -203,9 +202,6 @@ func eavesdrop() -> void:
 
 
 func _setup_bully_or_burning(reenter_scene := false):
-	# 弹珠游戏结束后就开始霸凌，此时禁止偷听。第一章结束后（火灾结束），第二章再偷听
-	$"../DeployLayer/Ambush偷听对话".enabled = false
-	eavesdrop_window.visible = false
 	if EventManager.get_stage(&"c02_burning_end_stage") == 2:
 		# 火灾演出完全结束
 		burning_layer.visible = false

scene/ground/script/c02/井特写.gd

@@ -1,10 +1,13 @@
 extends CanvasLayer
 
+signal  exit()
 
 func _ready() -> void:
 	layer = GlobalConfig.CANVAS_LAYER_LITTLE_GAME
 	if not ArchiveManager.get_global_value("c02_watched_the_well"):
+		ArchiveManager.set_global_entry("c02_watched_the_well", true)
 		DialogueManager.show_dialogue_balloon(
 			preload("res://asset/dialogue/npc.dialogue"), "c02_看井对话"
 		)
-		ArchiveManager.set_global_entry("c02_watched_the_well", true)
+		await DialogueManager.dialogue_ended
+		exit.emit()