Merge remote-tracking branch 'origin/demo'

scene/entity/closeup.gd

@@ -11,6 +11,8 @@ signal exit(arg)
 @export var on_display_hide_hud := false
 @export var on_display_change_volumn := true
 @export var on_display_changed_volumn_db := -7.0
+# 转场效果 1s
+@export var transition_effect := true
 @export_tool_button("新建特写场景") var create_closeup_scene = _create_scene_with_script
 # 在 exit 信号前，禁用 cancel
 var _holding_cancel_before_exit := false
@@ -42,6 +44,10 @@ func display() -> void:
 		SceneManager.lock_player(0, action_key)
 		# 展示时，禁用 sign_mark 的输入
 		sign_mark.pass_unhandled_input = true
+		# 转场效果
+		if transition_effect:
+			SceneManager.black_transition(0.5, 0.1)
+			await Util.wait(0.55)
 		current_child = packed_scene.instantiate()
 		add_child(current_child)
 		if current_child.has_signal("exit"):

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

@@ -225,6 +225,8 @@ texture = ExtResource("8_mrltr")
 
 [node name="Closeup戏台" parent="Ground/DeployLayer" index="8" instance=ExtResource("10_2yvhw")]
 position = Vector2(305, -249)
+[node name="Closeup戏台" parent="Ground/DeployLayer" index="7" instance=ExtResource("10_2yvhw")]
+position = Vector2(314, 30)
 packed_scene = ExtResource("11_2yvhw")
 on_display_hide_hud = true
 first_interact_os_key = "c02_一楼戏台"