From 0dac4490341bacc147907e2638e0a862bb54d344 Mon Sep 17 00:00:00 2001 From: cakipaul Date: Mon, 21 Jul 2025 18:19:55 +0800 Subject: [PATCH] =?UTF-8?q?=E9=99=A2=E9=95=BF=E6=88=BF=E9=97=B4=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=88=B4=E5=81=87=E5=8F=91=E8=BF=87=E7=A8=8Bos?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- asset/dialogue/item_description.csv | 1 + asset/dialogue/item_description.dialogue | 1 + manager/archive_manager/debug_panel.gd | 4 ++++ manager/archive_manager/sfx_config_panel.gd | 3 ++- scene/entity/audio/sfx.gd | 1 - scene/ground/scene/c01/s05_院长房间.gd | 14 ++++++++++---- scene/ground/scene/c01/s05_院长房间.tscn | 7 +++++-- 7 files changed, 23 insertions(+), 8 deletions(-) diff --git a/asset/dialogue/item_description.csv b/asset/dialogue/item_description.csv index 64f32b02..2901387a 100644 --- a/asset/dialogue/item_description.csv +++ b/asset/dialogue/item_description.csv @@ -113,6 +113,7 @@ c01_s08_书店工作,老板交代的工作还没做完,不能偷懒。,,,,,I h c01_s08_书店工钱,这个月的工钱还没拿。,,,,,I haven't collected this month's wages yet. mem_偷听对话,偷听对话,,,,,Eavesdropping mem_疯子看井,疯子看井,,,,,Madman Guards Well +c01_小小蝶找假发,我的假发呢?,,,,,Where is my wig? c01_鸡毛掸子,这是鸡毛掸子吗?,,,,,Is this a feather duster? c01_院长书桌,桌上放着一本《圣经》。{br}「凡要救自己生命的,必丧掉生命...」,,,,,"There's a Bible on the table.{br}'Whoever wants to save their life will lose it, but whoever loses their life for me will find it...'" c01_院长床,这本书已经看过了。{br}...那些句子是什么意思呢?,,,,,I've already read this book.{br}...What do those sentences mean? diff --git a/asset/dialogue/item_description.dialogue b/asset/dialogue/item_description.dialogue index 3d9003d2..ddfa4fb6 100644 --- a/asset/dialogue/item_description.dialogue +++ b/asset/dialogue/item_description.dialogue @@ -167,6 +167,7 @@ ~ Notes_c01 # c01-s05 院长房间 +我的假发呢? [ID:c01_小小蝶找假发] 这是鸡毛掸子吗? [ID:c01_鸡毛掸子] 桌上放着一本《圣经》。{br}「凡要救自己生命的,必丧掉生命...」 [ID:c01_院长书桌] 这本书已经看过了。{br}...那些句子是什么意思呢? [ID:c01_院长床] diff --git a/manager/archive_manager/debug_panel.gd b/manager/archive_manager/debug_panel.gd index a0bf282a..49333333 100644 --- a/manager/archive_manager/debug_panel.gd +++ b/manager/archive_manager/debug_panel.gd @@ -24,6 +24,10 @@ func _input(event: InputEvent) -> void: quit() +func _unhandled_input(_event: InputEvent) -> void: + get_viewport().set_input_as_handled() + + func _on_quit_debug_button_pressed() -> void: # 不写入配置 GlobalConfig.DEBUG = false diff --git a/manager/archive_manager/sfx_config_panel.gd b/manager/archive_manager/sfx_config_panel.gd index 83edb200..63db4899 100644 --- a/manager/archive_manager/sfx_config_panel.gd +++ b/manager/archive_manager/sfx_config_panel.gd @@ -32,7 +32,8 @@ func _ready(): # 1. 检测 current_scene 下 Sfx 节点 func refresh_sfx_list(ground: Ground2D, headless := false): sfx_nodes.clear() - current_scene_name = GroundLoader.get_ground_scene_readable_name(ground.scene_name) + current_scene_name = ground.scene_name + current_scene_name += "_" + GroundLoader.get_ground_scene_readable_name(ground.scene_name) find_sfx_nodes(ground) load_config() if not headless: diff --git a/scene/entity/audio/sfx.gd b/scene/entity/audio/sfx.gd index be1ad825..2f466689 100644 --- a/scene/entity/audio/sfx.gd +++ b/scene/entity/audio/sfx.gd @@ -5,7 +5,6 @@ const META_ORIGINAL_STREAM = &"original_stream" @export_enum("交互与效果音", "BGM", "场景背景音") var mode := "交互与效果音": set(value): - _set_up_process_mode_by_mode() mode = value notify_property_list_changed() diff --git a/scene/ground/scene/c01/s05_院长房间.gd b/scene/ground/scene/c01/s05_院长房间.gd index 2d55b982..9f0397e4 100644 --- a/scene/ground/scene/c01/s05_院长房间.gd +++ b/scene/ground/scene/c01/s05_院长房间.gd @@ -94,17 +94,23 @@ func _on_ground_ready() -> void: play("intro") -func cant_read(): - DialogueManager.show_dialogue_balloon(dialogue_c01, "c01_s05_院长房间_看不清了") +func cant_read() -> void: + DialogueManager.show_dialogue_balloon(dialogue_c01, "c01_s05_院长房间_看不清了", [GlobalConfig.DIALOG_IGNORE_INPUT]) -func _on_note_read(): +func os_find_wig() -> void: + # TODO + SceneManager.pop_debug_dialog_info("美术", "小小蝶找假发") + SceneManager.pop_os_with_str("c01_小小蝶找假发") + + +func _on_note_read() -> void: frame.enabled = false # 稍加延时后显示鸡毛掸子 Util.timer(1.0, func(): ambush.enabled = true) -func _on_ambush_triggered(): +func _on_ambush_triggered() -> void: ambush.enabled = false frame.note_key = "c01_摆正的洋相片" Util.timer(5.5, func(): frame.enabled = true) diff --git a/scene/ground/scene/c01/s05_院长房间.tscn b/scene/ground/scene/c01/s05_院长房间.tscn index 709b05ae..5eb98f88 100644 --- a/scene/ground/scene/c01/s05_院长房间.tscn +++ b/scene/ground/scene/c01/s05_院长房间.tscn @@ -357,8 +357,8 @@ tracks/5/path = NodePath("AnimationPlayer") tracks/5/interp = 1 tracks/5/loop_wrap = true tracks/5/keys = { -"times": PackedFloat32Array(0, 3, 20.1667), -"transitions": PackedFloat32Array(1, 1, 1), +"times": PackedFloat32Array(0, 3, 20.1667, 21.7), +"transitions": PackedFloat32Array(1, 1, 1, 1), "values": [{ "args": [], "method": &"intro_start" @@ -368,6 +368,9 @@ tracks/5/keys = { }, { "args": [], "method": &"cant_read" +}, { +"args": [], +"method": &"os_find_wig" }] } tracks/6/type = "method"