优化 closeup 退出逻辑；quit_closeup_on_cancel

scene/entity/closeup.gd

@@ -7,7 +7,7 @@ class_name Closeup2D
 signal exit(arg)
 
 @export var packed_scene: PackedScene
-@export var quit_closeup_on_escape := true
+@export var quit_closeup_on_cancel := true
 @export_tool_button("新建特写场景") var create_closeup_scene = _create_scene_with_script
 
 var current_child: Node
@@ -52,10 +52,7 @@ func _exit(arg = null):
 func _unhandled_input(event: InputEvent) -> void:
 	if not current_child:
 		return
-	if (
+	if quit_closeup_on_cancel and event.is_action_pressed("cancel"):
-		quit_closeup_on_escape
-		and (event.is_action_pressed("cancel") or event.is_action_pressed("escape"))
-	):
 		_exit()
 		get_viewport().set_input_as_handled()
 	# 在有特写界面时，阻塞 interact 输入
@@ -73,7 +70,9 @@ var script_root_dir = "res://scene/ground/script/"
 
 func _create_scene_with_script():
 	if packed_scene:
-		print_rich("[color=orange][Closeup2D] packed_scene already exists, skip creating new scene and script.")
+		print_rich(
+			"[color=orange][Closeup2D] packed_scene already exists, skip creating new scene and script."
+		)
 		return
 	var script = script_template.duplicate(true) as Script
 	var new_packed_scene = PackedScene.new()

scene/ground/scene/c01/s10_公寓楼道.tscn

@@ -44,7 +44,7 @@ autoplay = "小蝶探头"
 
 [node name="Closeup鬼差探头" parent="Ground/DeployLayer" index="3" instance=ExtResource("8_2jx0x")]
 packed_scene = ExtResource("5_dnd0r")
-quit_closeup_on_escape = false
+quit_closeup_on_cancel = false
 
 [node name="Light" parent="Ground/AmbientLayer" index="0" instance=ExtResource("5_rw4mf")]
 position = Vector2(123, -20)

scene/ground/scene/c02/s05_一楼内侧楼道.tscn

@@ -176,7 +176,7 @@ hook_method = "wood_puppet"
 [node name="Closeup拿人偶后记忆闪回" parent="Ground/DeployLayer" index="5" instance=ExtResource("10_2yvhw")]
 position = Vector2(-108, -168)
 packed_scene = ExtResource("10_7mq0m")
-quit_closeup_on_escape = false
+quit_closeup_on_cancel = false
 action_key = 3
 first_interact_os_key = "c02_一楼戏台"
 

scene/ground/scene/c02/s06_二楼.tscn

@@ -1164,7 +1164,7 @@ frame_progress = 0.121203
 [node name="Closeup弹珠游戏" parent="Ground/DeployLayer" index="15" instance=ExtResource("11_owxx3")]
 position = Vector2(322, -269)
 packed_scene = ExtResource("12_intre")
-quit_closeup_on_escape = false
+quit_closeup_on_cancel = false
 
 [node name="Closeup水盆" parent="Ground/DeployLayer" index="16" instance=ExtResource("11_owxx3")]
 position = Vector2(289, 16)
@@ -1174,7 +1174,7 @@ first_interact_os_key = "c02_二楼水盆"
 [node name="Closeup谢幕演出" parent="Ground/DeployLayer" index="17" instance=ExtResource("11_owxx3")]
 position = Vector2(518, -272)
 packed_scene = ExtResource("25_m28ab")
-quit_closeup_on_escape = false
+quit_closeup_on_cancel = false
 action_key = 3
 
 [node name="c02_final" type="Node2D" parent="Ground/DeployLayer" index="18"]

scene/ground/script/c02/敲门游戏.gd

@@ -70,7 +70,7 @@ var quitting = false
 
 
 func _unhandled_input(event: InputEvent) -> void:
-	if event.is_action_pressed("escape") or event.is_action_pressed("cancel"):
+	if event.is_action_pressed("cancel"):
 		if quitting:
 			# 禁止手动退出，需要 exit.emit(true)
 			get_viewport().set_input_as_handled()

scene/little_game/八音盒/八音盒.gd

@@ -324,7 +324,7 @@ func _unhandled_input(event: InputEvent) -> void:
 		else:
 			# hud 无效shaking
 			hud.on_toggle_invalid_prop()
-	elif event.is_action_pressed("escape"):
+	elif event.is_action_pressed("cancel"):
 		get_viewport().set_input_as_handled()
 		exit.emit(false)
 

scene/little_game/八音盒/八音盒_old.gd

@@ -166,9 +166,8 @@ func _move_button(delta: int) -> void:
 func _unhandled_input(event: InputEvent) -> void:
 	if not visible:
 		return
-	# 阻止输入事件传递给其他节点
+	if event.is_action_pressed("cancel"):
-	get_viewport().set_input_as_handled()
+		get_viewport().set_input_as_handled()
-	if event.is_action_pressed("cancel") or event.is_action_pressed("escape"):
 		var success = ArchiveManager.archive.bayinhe_mode == "finished"
 		exit.emit(success)
 		visible = false
@@ -178,12 +177,16 @@ func _unhandled_input(event: InputEvent) -> void:
 	if ArchiveManager.archive.bayinhe_mode == "closed":
 		# move button
 		if event.is_action_pressed("up"):
+			get_viewport().set_input_as_handled()
 			_move_button(1)
 		elif event.is_action_pressed("down"):
+			get_viewport().set_input_as_handled()
 			_move_button(-1)
 		elif event.is_action_pressed("left"):
+			get_viewport().set_input_as_handled()
 			current_selected_btn = clampi(current_selected_btn - 1, 0, 8)
 		elif event.is_action_pressed("right"):
+			get_viewport().set_input_as_handled()
 			current_selected_btn = clampi(current_selected_btn + 1, 0, 8)
 
 
@@ -224,7 +227,7 @@ func _on_wheel_rotated(radiant: float) -> void:
 				audio_player.play()
 			else:
 				audio_player.stream_paused = false
-			Util.timer(playing_step_sec,  _on_playing_step_finished)
+			Util.timer(playing_step_sec, _on_playing_step_finished)
 
 
 func _on_playing_step_finished():
@@ -235,7 +238,7 @@ func _on_playing_step_finished():
 		return
 	if continue_playing:
 		continue_playing = false
-		Util.timer(playing_step_sec,  _on_playing_step_finished)
+		Util.timer(playing_step_sec, _on_playing_step_finished)
 	else:
 		playing = false
 		audio_player.stream_paused = true
@@ -250,7 +253,7 @@ func _checkout_auto_play():
 	# var audio_len = audio_auto.get_length()
 	# 音效 9.5 秒时关闭盒子
 	var audio_len = 9.5
-	Util.timer(audio_len,  _on_auto_play_finished)
+	Util.timer(audio_len, _on_auto_play_finished)
 
 
 func _on_auto_play_finished():

scene/little_game/拼凑信件.gd

@@ -156,11 +156,8 @@ func _post_success():
 
 
 func _unhandled_input(event: InputEvent) -> void:
-	if event.is_action_pressed("escape") or event.is_action_pressed("bag"):
-		return
-	# block all input except "escape" or "bag"
-	get_viewport().set_input_as_handled()
 	if event.is_action_pressed("cancel"):
+		get_viewport().set_input_as_handled()
 		if game_finished:
 			success.emit()
 		else:
@@ -194,6 +191,7 @@ func _unhandled_input(event: InputEvent) -> void:
 		_rotate_part()
 		handled = true
 	if handled:
+		get_viewport().set_input_as_handled()
 		$SfxMove.play()
 		_display_selected()
 		_check_answer()