Merge remote-tracking branch 'origin/demo'

manager/archive_manager/debug_panel.gd

@@ -17,12 +17,14 @@ func _ready() -> void:
 func _input(event: InputEvent) -> void:
 	if (
 		event.is_action_pressed("debugging")
-		or event.is_action_pressed("cancel")
 		or event.is_action_pressed("escape")
 	):
-		get_viewport().set_input_as_handled()
 		quit()
 
+func _unhandled_key_input(_event: InputEvent) -> void:
+	# 调试界面接受所有输入事件
+	get_viewport().set_input_as_handled()
+
 
 func _unhandled_input(_event: InputEvent) -> void:
 	get_viewport().set_input_as_handled()

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

@@ -77,6 +77,7 @@ func wood_puppet() -> void:
 	await SceneManager.get_inspector().quit_and_hidden
 	SceneManager.lock_player(0, 17, true)
 	$"../DeployLayer/DizzyShader".dizzy()
+	$"Sfx背景音".change_volumn_db(-10.0)
 	$"Sfx记忆闪回音效".play()
 	# SceneManager.get_camera_marker().shake_camera()
 	await Util.wait(2.5)
@@ -92,6 +93,7 @@ func wood_puppet() -> void:
 	SceneManager.unlock_player()
 	EventManager.set_stage_if_greater(&"handnote_c02_xchan_sheKnowsMe", 1)
 	$"Sfx记忆闪回音效".easing_kill()
+	$"Sfx背景音".reset_volumn_to_default()
 
 
 func bucket_meat() -> void:

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

@@ -185,7 +185,7 @@ hook_method = "wood_puppet"
 position = Vector2(-108, -168)
 packed_scene = ExtResource("10_7mq0m")
 quit_closeup_on_cancel = false
-on_display_changed_volumn_db = -50.0
+on_display_changed_volumn_db = 0.0
 action_key = 3
 first_interact_os_key = "c02_一楼戏台"
 

scene/ux/bag/prop_bag.gd

@@ -34,6 +34,10 @@ func _load_item_buttons() -> void:
 	# prop keys
 	var inventory = hud.inventory
 	for prop_key in inventory.important_items:
+		if not hud.items_dict.has(prop_key):
+			printerr("Important item not found in items_dict: ", prop_key)
+			continue
+		hud.items_description_dict.has(prop_key)
 		var button = preload("uid://wxd25ec3cqyy").instantiate()
 		button.text = tr(prop_key)
 		button.pressed.connect(_display_item.bind(prop_key, button))

scene/ux/inspector_balloon.gd

@@ -0,0 +1,89 @@
+class_name InspectorBalloon
+extends MarginContainer
+
+signal quitted(is_manually: bool)
+
+@export var prop_title_to_content_wait_time := 3.0
+@export var auto_quit_time := 5.0
+
+@onready var character_label = %CharacterLabel as RichTextLabel
+@onready var content_label = %ContentLabel as RichTextLabel
+
+enum { DISPLAYING_NONE, DISPLAYING_TITLE, DISPLAYING_CONTENT }
+
+var _display_mutex := Mutex.new()
+var _displaying_status := DISPLAYING_NONE
+var _pending_content := ""
+var _balloon_tween: Tween
+
+
+func _ready() -> void:
+	character_label.text = ""
+	content_label.text = ""
+
+
+func show_prop_balloon(obtain_str: String, prop_title: String, content: String) -> void:
+	_display_mutex.lock()
+	if _balloon_tween and _balloon_tween.is_running():
+		_balloon_tween.kill()
+	_balloon_tween = create_tween()
+	show()
+	_pending_content = content
+	# 如果有获得的物品名称，则显示标题，否则直接显示内容
+	if not obtain_str.is_empty():
+		obtain_str = "[color=orange]" + obtain_str + "[/color]"
+		_displaying_status = DISPLAYING_TITLE
+	else:
+		_display_content()
+		_display_mutex.unlock()
+		return
+	character_label.show()
+	character_label.text = obtain_str
+	content_label.text = prop_title
+	if not _pending_content.is_empty():
+		_balloon_tween.tween_interval(prop_title_to_content_wait_time)
+		_balloon_tween.tween_callback(_display_content)
+	else:
+		_balloon_tween.tween_interval(auto_quit_time)
+		_balloon_tween.tween_callback(_finished.bind(false))
+	_display_mutex.unlock()
+
+
+func _display_content() -> void:
+	_display_mutex.lock()
+	if _balloon_tween and _balloon_tween.is_running():
+		_balloon_tween.kill()
+	_balloon_tween = create_tween()
+	_displaying_status = DISPLAYING_CONTENT
+	character_label.hide()
+	content_label.text = _pending_content
+	_pending_content = ""
+	_balloon_tween.tween_interval(auto_quit_time)
+	_balloon_tween.tween_callback(_finished.bind(false))
+	_display_mutex.unlock()
+
+
+func _finished(manually: bool) -> void:
+	_display_mutex.lock()
+	character_label.text = ""
+	content_label.text = ""
+	_displaying_status = DISPLAYING_NONE
+	hide()
+	quitted.emit(manually)
+	_display_mutex.unlock()
+
+
+func _input(event: InputEvent) -> void:
+	_display_mutex.lock()
+	if _displaying_status == DISPLAYING_NONE:
+		_display_mutex.unlock()
+		return
+	if event.is_action_pressed("interact") or event.is_action_pressed("cancel"):
+		get_viewport().set_input_as_handled()
+		if _balloon_tween and _balloon_tween.is_running():
+			_balloon_tween.kill()
+		if not _pending_content.is_empty() and _displaying_status == DISPLAYING_TITLE:
+			_display_content()
+		else:
+			_finished(true)
+	_display_mutex.unlock()

scene/ux/inspector_balloon.gd.uid

@@ -0,0 +1 @@
+uid://dhjjskfl8r5nk

scene/ux/inspector_balloon.tscn

@@ -0,0 +1,76 @@
+[gd_scene load_steps=4 format=3 uid="uid://dufshurokh0ws"]
+
+[ext_resource type="Theme" uid="uid://dlrwa60futc45" path="res://config/balloon_theme.tres" id="1_wqjpu"]
+[ext_resource type="Script" uid="uid://dhjjskfl8r5nk" path="res://scene/ux/inspector_balloon.gd" id="2_d4kw8"]
+[ext_resource type="PackedScene" uid="uid://ckvgyvclnwggo" path="res://addons/dialogue_manager/dialogue_label.tscn" id="2_kla48"]
+
+[node name="InspectorBalloon" type="MarginContainer"]
+anchors_preset = 7
+anchor_left = 0.5
+anchor_top = 1.0
+anchor_right = 0.5
+anchor_bottom = 1.0
+offset_left = -35.5
+offset_top = -69.0
+offset_right = 35.5
+grow_horizontal = 2
+grow_vertical = 0
+focus_mode = 2
+mouse_filter = 2
+theme = ExtResource("1_wqjpu")
+theme_override_constants/margin_bottom = 38
+script = ExtResource("2_d4kw8")
+
+[node name="VBoxContainer" type="VBoxContainer" parent="."]
+layout_mode = 2
+size_flags_horizontal = 4
+size_flags_vertical = 4
+mouse_filter = 2
+
+[node name="Panel" type="MarginContainer" parent="VBoxContainer"]
+clip_children = 2
+layout_mode = 2
+size_flags_horizontal = 4
+size_flags_vertical = 8
+mouse_filter = 2
+theme_override_constants/margin_left = 0
+theme_override_constants/margin_top = 0
+theme_override_constants/margin_right = 0
+theme_override_constants/margin_bottom = 5
+
+[node name="Container" type="HBoxContainer" parent="VBoxContainer/Panel"]
+layout_direction = 1
+layout_mode = 2
+mouse_filter = 2
+alignment = 1
+
+[node name="CharacterLabel" type="RichTextLabel" parent="VBoxContainer/Panel/Container"]
+unique_name_in_owner = true
+clip_contents = false
+layout_mode = 2
+size_flags_horizontal = 4
+size_flags_vertical = 0
+mouse_filter = 2
+theme_override_colors/font_shadow_color = Color(0.305882, 0.305882, 0.305882, 0.388235)
+theme_override_constants/shadow_offset_y = 1
+theme_override_constants/shadow_offset_x = 1
+bbcode_enabled = true
+text = "c"
+fit_content = true
+scroll_active = false
+autowrap_mode = 0
+
+[node name="ContentLabel" parent="VBoxContainer/Panel/Container" instance=ExtResource("2_kla48")]
+unique_name_in_owner = true
+clip_contents = false
+layout_mode = 2
+size_flags_horizontal = 4
+size_flags_vertical = 0
+mouse_filter = 2
+theme_override_colors/font_shadow_color = Color(0.306923, 0.306923, 0.306923, 0.388235)
+theme_override_constants/shadow_offset_y = 1
+theme_override_constants/shadow_offset_x = 1
+text = "l"
+autowrap_mode = 0
+seconds_per_step = 0.005
+seconds_per_pause_step = 0.1

scene/ux/prop_inspector.gd

@@ -21,6 +21,8 @@ signal quit_and_hidden
 @onready var scroll_container = %ScrollContainer as ScrollContainer
 @onready var content_label = %ContentLabel as Label
 @onready var tip_label = %TipLabel as Label
+@onready var inspector_balloon = %InspectorBalloon as InspectorBalloon
+
 
 var tip_cover = "Q: " + tr("ui_退出") + "     " + "E: " + tr("ui_阅读")
 var tip_notes = "Q: " + tr("ui_退出") + "     " + "E: " + tr("ui_收起")
@@ -43,6 +45,11 @@ func _ready() -> void:
 	full_texture.modulate.a = 0.0
 	content_label.modulate.a = 0.0
 	tip_label.modulate.a = 0.0
+	inspector_balloon.quitted.connect(_on_inspector_balloon_quitted)
+
+
+func _on_inspector_balloon_quitted(_is_manually: bool):
+	_hide()
 
 
 func _hide():
@@ -131,8 +138,6 @@ var locking = false:
 				SceneManager.unlock_player()
 		_lock_mutex.unlock()
 
-var balloon
-
 
 func pop_prop_inspection(
 	prop_key: String, cover_texture: Texture2D, display_obtained: bool, as_important_item: bool
@@ -159,31 +164,16 @@ func pop_prop_inspection(
 	# 显示道具获得提示
 	if prop_key:
 		var prop_title = tr(prop_key)
-		var text = "~ title\n"
+		var obtain_str = ""
 		if display_obtained:
-			var obtain_str = tr("ui_获得道具")
+			obtain_str = tr("ui_获得道具")
 			if as_important_item:
 				obtain_str = tr("ui_获得重要物品")
-			text += obtain_str + ": " + prop_title + "[#item]\n"
 		# 道具的一句话说明
 		var original_word_lines = tr(prop_key + "_说明").replace("{br}", "\n").split("\n")
 		# 缩略只要第一行
-		text += original_word_lines[0] + ("..." if len(original_word_lines) > 1 else "")
+		var content = original_word_lines[0] + ("..." if len(original_word_lines) > 1 else "")
-		text += "\n=> END"
+		inspector_balloon.show_prop_balloon(obtain_str, prop_title, content)
-		var current_prop_res = DialogueManager.create_resource_from_text(text)
-		# 手动跳过的同时显示下一句
-		if is_instance_valid(balloon):
-			balloon.queue_free()
-		else:
-			DialogueManager.dialogue_ended.connect(
-				_on_inspecting_prop_words_ended, CONNECT_ONE_SHOT
-			)
-		balloon = preload("res://scene/dialog/balloon.tscn").instantiate()
-		DialogueManager.show_dialogue_balloon_scene(balloon, current_prop_res, "title")
-
-
-func _on_inspecting_prop_words_ended(_res):
-	_hide()
 
 
 func _show_prop_words(line_id: String):

scene/ux/prop_inspector.tscn

@@ -1,9 +1,10 @@
-[gd_scene load_steps=5 format=3 uid="uid://cekhj65axie0p"]
+[gd_scene load_steps=6 format=3 uid="uid://cekhj65axie0p"]
 
 [ext_resource type="Script" uid="uid://1xdb7s1nigv8" path="res://scene/ux/prop_inspector.gd" id="1_2wpwe"]
 [ext_resource type="Texture2D" uid="uid://f186lvt5y2ql" path="res://asset/art/ui/遮罩/inspect背景遮罩.png" id="2_j83lq"]
 [ext_resource type="Texture2D" uid="uid://cvgw2mxrlr6io" path="res://asset/art/scene/c02/旧版/s02_走道/ux_进门鼠疫海报yz.png" id="2_wr575"]
 [ext_resource type="FontVariation" uid="uid://1ryw42kej6lv" path="res://config/font_ui.tres" id="4_opug5"]
+[ext_resource type="PackedScene" uid="uid://dufshurokh0ws" path="res://scene/ux/inspector_balloon.tscn" id="5_p8nxc"]
 
 [node name="PropInspector" type="CanvasLayer"]
 process_mode = 3
@@ -145,3 +146,6 @@ theme_override_fonts/font = ExtResource("4_opug5")
 text = "Q: Exit     E: Read"
 horizontal_alignment = 1
 vertical_alignment = 1
+
+[node name="InspectorBalloon" parent="." instance=ExtResource("5_p8nxc")]
+unique_name_in_owner = true