From 72199eaff5a9a4def8873e9bf379d8c15b2b8736 Mon Sep 17 00:00:00 2001 From: cakipaul Date: Wed, 2 Jul 2025 01:46:58 +0800 Subject: [PATCH] =?UTF-8?q?sfx=20=E8=BF=90=E8=A1=8C=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E4=B8=BA=20Inherit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manager/config_manager/global_config.gd | 2 +- scene/effect/dizzy.gdshader | 2 +- scene/entity/closeup.tscn | 2 - scene/entity/inspectable.tscn | 1 - scene/entity/interactable.tscn | 2 - scene/entity/note.tscn | 1 - scene/entity/pickable.tscn | 1 - scene/entity/portal.tscn | 4 -- scene/entity/ux/player_os.gd | 62 +++++++++---------- scene/ground/scene/c01/s05_院长房间.tscn | 20 ++++-- .../ground/scene/c01/s06_孤儿院长廊围墙.tscn | 1 - scene/ground/scene/c01/s07_书店外.tscn | 6 -- scene/ground/scene/c01/s08_书店.tscn | 5 -- scene/ground/scene/c01/s09_公寓楼外.tscn | 10 --- scene/ground/scene/c01/s12_书店外_诡异版.tscn | 2 - scene/ground/scene/c02/s03_院子.tscn | 9 --- scene/ground/scene/c02/s05_一楼内侧楼道.tscn | 1 - scene/ground/scene/c02/s06_二楼.tscn | 2 - scene/ground/scene/c02/s08_瞎子卧室.tscn | 1 - scene/ground/scene/c02/s09_裂缝.tscn | 2 - scene/ground/scene/c02/s12_盒子猫.tscn | 10 ++- scene/ground/scene/c02/s13_盒子猫二楼.tscn | 6 +- scene/ground/script/c01/s10_鬼差探头.tscn | 2 - scene/ground/script/c02/s00_煤油灯.tscn | 2 - scene/ground/script/c02/s00_跟随的老鼠.tscn | 1 - scene/ground/script/c02/小手讨东西.tscn | 4 -- scene/ground/script/c02/折锡纸.tscn | 2 - scene/ground/script/c02/谢幕演出.tscn | 3 - scene/index_page.tscn | 1 - scene/little_game/拼凑信件.tscn | 2 - scene/ux/panel/ux_panel.tscn | 2 - scene/ux/tabs.tscn | 2 - 32 files changed, 59 insertions(+), 114 deletions(-) diff --git a/manager/config_manager/global_config.gd b/manager/config_manager/global_config.gd index dd754f0c..019c12fe 100644 --- a/manager/config_manager/global_config.gd +++ b/manager/config_manager/global_config.gd @@ -84,5 +84,5 @@ signal auto_save_seconds_changed # zh: 0 _SH, 1 _CN; en: [null]; @export var caption := 0 # 最大范围为 10 秒,精度 0.1 -@export var os_wait_time := 2.0 +@export var os_wait_time := 3.0 @export var os_auto_end := true \ No newline at end of file diff --git a/scene/effect/dizzy.gdshader b/scene/effect/dizzy.gdshader index 589d6e72..aaf3b0f4 100644 --- a/scene/effect/dizzy.gdshader +++ b/scene/effect/dizzy.gdshader @@ -16,7 +16,7 @@ void fragment() { vec4 col = vec4(0.0); // 动态参数 float t = TIME * speed; - + // 多次采样叠加 for (int i = 0; i < samples; i++) { // 每层一个角度偏移 + 时间抖动 diff --git a/scene/entity/closeup.tscn b/scene/entity/closeup.tscn index 062565df..83c3df32 100644 --- a/scene/entity/closeup.tscn +++ b/scene/entity/closeup.tscn @@ -24,12 +24,10 @@ prop_key2 = "" prop_key3 = "" [node name="SfxInvalid" type="AudioStreamPlayer" parent="."] -process_mode = 1 bus = &"game_sfx" script = ExtResource("5_dnubm") [node name="SfxSuccess" type="AudioStreamPlayer" parent="."] -process_mode = 1 bus = &"game_sfx" script = ExtResource("5_dnubm") diff --git a/scene/entity/inspectable.tscn b/scene/entity/inspectable.tscn index 5a787925..a84fa2f8 100644 --- a/scene/entity/inspectable.tscn +++ b/scene/entity/inspectable.tscn @@ -22,7 +22,6 @@ content_key = "" [node name="Sfx" type="AudioStreamPlayer" parent="."] unique_name_in_owner = true -process_mode = 1 stream = ExtResource("3_3ldx7") bus = &"game_sfx" script = ExtResource("3_q18ff") diff --git a/scene/entity/interactable.tscn b/scene/entity/interactable.tscn index 6a1f5bd0..a5804275 100644 --- a/scene/entity/interactable.tscn +++ b/scene/entity/interactable.tscn @@ -24,14 +24,12 @@ prop_key2 = "" prop_key3 = "" [node name="SfxInvalid" type="AudioStreamPlayer" parent="."] -process_mode = 1 stream = ExtResource("4_n1rbo") bus = &"game_sfx" script = ExtResource("6_l2kr5") metadata/_custom_type_script = "uid://rq6w1vuhuq1m" [node name="SfxSuccess" type="AudioStreamPlayer" parent="."] -process_mode = 1 stream = ExtResource("5_exp6m") bus = &"game_sfx" script = ExtResource("6_l2kr5") diff --git a/scene/entity/note.tscn b/scene/entity/note.tscn index 6eaaf7e1..e10fe14e 100644 --- a/scene/entity/note.tscn +++ b/scene/entity/note.tscn @@ -18,7 +18,6 @@ note_key = "" [node name="Sfx" type="AudioStreamPlayer" parent="."] unique_name_in_owner = true -process_mode = 1 stream = ExtResource("3_y3pwa") bus = &"game_sfx" script = ExtResource("4_ycvi5") diff --git a/scene/entity/pickable.tscn b/scene/entity/pickable.tscn index b85ea54c..30d8be46 100644 --- a/scene/entity/pickable.tscn +++ b/scene/entity/pickable.tscn @@ -17,7 +17,6 @@ prop_key = "" [node name="Sfx" type="AudioStreamPlayer" parent="."] unique_name_in_owner = true -process_mode = 1 stream = ExtResource("3_dxdbj") bus = &"game_sfx" script = ExtResource("3_1h8r3") diff --git a/scene/entity/portal.tscn b/scene/entity/portal.tscn index c6c206d1..4572a63c 100644 --- a/scene/entity/portal.tscn +++ b/scene/entity/portal.tscn @@ -30,28 +30,24 @@ prop_key = "" [node name="SfxDefault" type="AudioStreamPlayer" parent="."] unique_name_in_owner = true -process_mode = 1 stream = ExtResource("6_1sj6c") bus = &"game_sfx" script = ExtResource("6_bxihn") [node name="SfxOpen" type="AudioStreamPlayer" parent="."] unique_name_in_owner = true -process_mode = 1 stream = ExtResource("5_l48hy") bus = &"game_sfx" script = ExtResource("6_bxihn") [node name="SfxEnter" type="AudioStreamPlayer" parent="."] unique_name_in_owner = true -process_mode = 1 stream = ExtResource("6_p48ld") bus = &"game_sfx" script = ExtResource("6_bxihn") [node name="SfxLocked" type="AudioStreamPlayer" parent="."] unique_name_in_owner = true -process_mode = 1 stream = ExtResource("7_bjcty") bus = &"game_sfx" script = ExtResource("6_bxihn") diff --git a/scene/entity/ux/player_os.gd b/scene/entity/ux/player_os.gd index c76eff28..7c45f537 100644 --- a/scene/entity/ux/player_os.gd +++ b/scene/entity/ux/player_os.gd @@ -7,9 +7,7 @@ signal os_finished @onready var os_contaner = %PanelContainer as PanelContainer var os_tween: Tween -# 保证每次 pop_os 后都会有一次 os_finished 信号 -var os_finish_emit_lock := Mutex.new() -var os_finished_not_emitted := false + func _ready() -> void: if Engine.is_editor_hint(): @@ -19,23 +17,25 @@ func _ready() -> void: return os_contaner.modulate.a = 0.0 os_label.text = "" - os_pausing_timer.timeout.connect(_on_os_line_timeout) + os_pausing_timer.timeout.connect(_on_os_pausing_timeout) + os_finished.connect(func(): locking = false) + + +var locking := false: + set(val): + if val != locking: + locking = val + if val: + SceneManager.lock_player() + else: + SceneManager.unlock_player() func pop_os(lines := []) -> void: - if os_tween: + if os_tween and os_tween.is_valid(): os_tween.kill() - os_finish_emit_lock.lock() - if os_finished_not_emitted: os_finished.emit() - os_finished_not_emitted = true - os_finish_emit_lock.unlock() - SceneManager.lock_player() - # os_finished 必然发送,防止 tween 被 kill,保证一定 unlock - if os_finished.is_connected(SceneManager.unlock_player): - SceneManager.unlock_player() - else: - os_finished.connect(SceneManager.unlock_player, CONNECT_ONE_SHOT) + locking = true os_tween = create_tween() os_label.text = "" os_tween.tween_property(os_contaner, "modulate:a", 1.0, 0.2) @@ -44,13 +44,7 @@ func pop_os(lines := []) -> void: var duration = max(GlobalConfigManager.config.os_wait_time, 0.01) os_tween.tween_callback(_os_load_line.bind(line, duration)) os_tween.tween_property(os_contaner, "modulate:a", 0.0, 0.2) - os_tween.tween_callback(func(): - os_finish_emit_lock.lock() - if os_finished_not_emitted: - os_finished_not_emitted = false - os_finished.emit() - os_finish_emit_lock.unlock() - ) + os_tween.tween_callback(os_finished.emit) # os 结束 await os_finished @@ -58,23 +52,27 @@ func pop_os(lines := []) -> void: func _os_load_line(line: DialogueLine, duration: float): os_label.dialogue_line = line os_label.type_out() - if os_label.finished_typing.is_connected(os_pausing_timer.start): - os_label.finished_typing.disconnect(os_pausing_timer.start) - os_label.finished_typing.connect(os_pausing_timer.start.bind(duration), CONNECT_ONE_SHOT) + if GlobalConfigManager.config.os_auto_end: + if os_label.finished_typing.is_connected(os_pausing_timer.start): + os_label.finished_typing.disconnect(os_pausing_timer.start) + os_label.finished_typing.connect(os_pausing_timer.start.bind(duration), CONNECT_ONE_SHOT) os_tween.pause() -func _on_os_line_timeout(naturally := true): - if not naturally: - if os_label.is_typing: - os_label.skip_typing() - return +func _on_os_pausing_timeout(): if os_tween and os_tween.is_valid(): os_tween.play() func _unhandled_input(event: InputEvent) -> void: if event.is_action_pressed("interact"): - if os_pausing_timer and os_pausing_timer.time_left > 0: + if os_label.is_typing: get_viewport().set_input_as_handled() - _on_os_line_timeout(false) + os_label.skip_typing() + elif ( + not os_pausing_timer.is_stopped() + or (not GlobalConfigManager.config.os_auto_end and os_tween and os_tween.is_valid()) + ): + get_viewport().set_input_as_handled() + os_pausing_timer.stop() + _on_os_pausing_timeout() diff --git a/scene/ground/scene/c01/s05_院长房间.tscn b/scene/ground/scene/c01/s05_院长房间.tscn index 81488023..4a7cfe9c 100644 --- a/scene/ground/scene/c01/s05_院长房间.tscn +++ b/scene/ground/scene/c01/s05_院长房间.tscn @@ -646,10 +646,24 @@ data = { "frame_relocated": false, "oneshot_animation_played": false } +debug_ground_data = Dictionary[String, Variant]({ +"AnimationPlayer": { +"frame_relocated": false, +"oneshot_animation_played": true +}, +"ambush鸡毛掸子": { +"played": false +}, +"oneshot纸片": { +"interacted_times": 0 +}, +"钢琴": { +"interacted_times": 0 +} +}) oneshot_animation = "intro" [node name="intro_audio_player" type="AudioStreamPlayer" parent="Ground/AnimationPlayer" index="0"] -process_mode = 1 stream = ExtResource("3_sluu3") volume_db = -10.0 bus = &"game_sfx" @@ -657,13 +671,11 @@ script = ExtResource("4_1jor4") metadata/_custom_type_script = "uid://rq6w1vuhuq1m" [node name="piano_player" type="AudioStreamPlayer" parent="Ground/AnimationPlayer" index="1"] -process_mode = 1 bus = &"game_sfx" script = ExtResource("4_1jor4") metadata/_custom_type_script = "uid://rq6w1vuhuq1m" [node name="扶正相框" type="AudioStreamPlayer" parent="Ground/AnimationPlayer" index="2"] -process_mode = 1 stream = ExtResource("3_jk3np") volume_db = -6.933 bus = &"game_sfx" @@ -671,7 +683,6 @@ script = ExtResource("4_1jor4") metadata/_custom_type_script = "uid://rq6w1vuhuq1m" [node name="捡起纸片后开门声" type="AudioStreamPlayer" parent="Ground/AnimationPlayer" index="3"] -process_mode = 1 stream = ExtResource("5_1jor4") volume_db = -2.0 bus = &"game_sfx" @@ -679,7 +690,6 @@ script = ExtResource("4_1jor4") metadata/_custom_type_script = "uid://rq6w1vuhuq1m" [node name="下床与铃声音效" type="AudioStreamPlayer" parent="Ground/AnimationPlayer" index="4"] -process_mode = 1 stream = SubResource("AudioStreamSynchronized_sluu3") bus = &"game_sfx" script = ExtResource("4_1jor4") diff --git a/scene/ground/scene/c01/s06_孤儿院长廊围墙.tscn b/scene/ground/scene/c01/s06_孤儿院长廊围墙.tscn index fdaf917e..b07a3d33 100644 --- a/scene/ground/scene/c01/s06_孤儿院长廊围墙.tscn +++ b/scene/ground/scene/c01/s06_孤儿院长廊围墙.tscn @@ -171,7 +171,6 @@ script = ExtResource("4_qq2uh") loop = true [node name="Sfx猫鼠游戏" type="AudioStreamPlayer" parent="Ground/AnimationPlayer" index="2"] -process_mode = 1 stream = SubResource("AudioStreamInteractive_af0pm") volume_db = -17.0 bus = &"game_sfx" diff --git a/scene/ground/scene/c01/s07_书店外.tscn b/scene/ground/scene/c01/s07_书店外.tscn index 5f54b645..5a0e31df 100644 --- a/scene/ground/scene/c01/s07_书店外.tscn +++ b/scene/ground/scene/c01/s07_书店外.tscn @@ -75,7 +75,6 @@ data = { oneshot_animation = "" [node name="环境音" type="AudioStreamPlayer" parent="Ground/AnimationPlayer" index="0"] -process_mode = 1 stream = ExtResource("3_na2nu") volume_db = -4.0 autoplay = true @@ -88,7 +87,6 @@ mode = "场景背景音" metadata/_custom_type_script = "uid://rq6w1vuhuq1m" [node name="chapter_sfx" type="AudioStreamPlayer" parent="Ground/AnimationPlayer" index="1"] -process_mode = 1 stream = ExtResource("3_c7jb6") volume_db = -5.0 bus = &"game_sfx" @@ -96,7 +94,6 @@ script = ExtResource("4_c7jb6") metadata/_custom_type_script = "uid://rq6w1vuhuq1m" [node name="报童音效" type="AudioStreamPlayer" parent="Ground/AnimationPlayer" index="2"] -process_mode = 1 stream = ExtResource("5_7sdrt") volume_db = -5.0 bus = &"game_sfx" @@ -104,7 +101,6 @@ script = ExtResource("4_c7jb6") metadata/_custom_type_script = "uid://rq6w1vuhuq1m" [node name="敲门音效" type="AudioStreamPlayer" parent="Ground/AnimationPlayer" index="3"] -process_mode = 1 stream = ExtResource("6_hwht7") volume_db = -2.0 bus = &"game_sfx" @@ -112,7 +108,6 @@ script = ExtResource("4_c7jb6") metadata/_custom_type_script = "uid://rq6w1vuhuq1m" [node name="开门音效" type="AudioStreamPlayer" parent="Ground/AnimationPlayer" index="4"] -process_mode = 1 stream = ExtResource("8_sqlmr") volume_db = -4.0 bus = &"game_sfx" @@ -199,7 +194,6 @@ action_configs = Array[Dictionary]([{ }]) [node name="Sfx2D" type="AudioStreamPlayer2D" parent="Ground/DeployLayer/陆仁舞刀"] -process_mode = 1 stream = ExtResource("14_c7jb6") volume_db = -2.0 autoplay = true diff --git a/scene/ground/scene/c01/s08_书店.tscn b/scene/ground/scene/c01/s08_书店.tscn index 8737dae7..aaca14a1 100644 --- a/scene/ground/scene/c01/s08_书店.tscn +++ b/scene/ground/scene/c01/s08_书店.tscn @@ -61,7 +61,6 @@ script = ExtResource("2_0lque") oneshot_animation = "one_shot" [node name="环境音" type="AudioStreamPlayer" parent="Ground/AnimationPlayer" index="0"] -process_mode = 1 stream = ExtResource("3_0x288") volume_db = -8.0 autoplay = true @@ -74,7 +73,6 @@ mode = "场景背景音" metadata/_custom_type_script = "uid://rq6w1vuhuq1m" [node name="诡异环境音" type="AudioStreamPlayer" parent="Ground/AnimationPlayer" index="1"] -process_mode = 1 stream = ExtResource("5_eerhd") volume_db = -7.0 bus = &"game_sfx" @@ -86,14 +84,12 @@ mode = "场景背景音" metadata/_custom_type_script = "uid://rq6w1vuhuq1m" [node name="写字声[未启用]" type="AudioStreamPlayer" parent="Ground/AnimationPlayer" index="2"] -process_mode = 1 stream = ExtResource("4_5j1ov") bus = &"game_sfx" script = ExtResource("4_p6k3c") metadata/_custom_type_script = "uid://rq6w1vuhuq1m" [node name="放报纸音效" type="AudioStreamPlayer" parent="Ground/AnimationPlayer" index="3"] -process_mode = 1 stream = ExtResource("9_lfr41") volume_db = -5.0 bus = &"game_sfx" @@ -101,7 +97,6 @@ script = ExtResource("4_p6k3c") metadata/_custom_type_script = "uid://rq6w1vuhuq1m" [node name="摔倒音效" type="AudioStreamPlayer" parent="Ground/AnimationPlayer" index="4"] -process_mode = 1 stream = ExtResource("8_p6k3c") bus = &"game_sfx" script = ExtResource("4_p6k3c") diff --git a/scene/ground/scene/c01/s09_公寓楼外.tscn b/scene/ground/scene/c01/s09_公寓楼外.tscn index 4df16414..98cdbe27 100644 --- a/scene/ground/scene/c01/s09_公寓楼外.tscn +++ b/scene/ground/scene/c01/s09_公寓楼外.tscn @@ -117,19 +117,9 @@ portal_name = "2" target_scene = "c01_s10" target_portal = "left" -[node name="SfxDefault" parent="Ground/DeployLayer/portal_2" index="0"] -process_mode = 0 - -[node name="SfxOpen" parent="Ground/DeployLayer/portal_2" index="1"] -process_mode = 0 - [node name="SfxEnter" parent="Ground/DeployLayer/portal_2" index="2"] -process_mode = 0 stream = null -[node name="SfxLocked" parent="Ground/DeployLayer/portal_2" index="3"] -process_mode = 0 - [node name="Sign" parent="Ground/DeployLayer/portal_2" index="4"] enabled = true diff --git a/scene/ground/scene/c01/s12_书店外_诡异版.tscn b/scene/ground/scene/c01/s12_书店外_诡异版.tscn index 32ec3369..979ab7a4 100644 --- a/scene/ground/scene/c01/s12_书店外_诡异版.tscn +++ b/scene/ground/scene/c01/s12_书店外_诡异版.tscn @@ -100,7 +100,6 @@ bgm_stream = ExtResource("4_mxf8g") metadata/_custom_type_script = "uid://bbg4vopj4apl6" [node name="Sfx鬼差出场" type="AudioStreamPlayer2D" parent="Ground/AnimationPlayer" index="1"] -process_mode = 1 position = Vector2(1443, 41) stream = ExtResource("5_5qtdl") bus = &"game_sfx" @@ -108,7 +107,6 @@ script = ExtResource("6_mxf8g") metadata/_custom_type_script = "uid://wapo47a1oddf" [node name="Sfx鬼差擦肩而过" type="AudioStreamPlayer" parent="Ground/AnimationPlayer" index="2"] -process_mode = 1 stream = ExtResource("7_denrd") bus = &"game_sfx" script = ExtResource("6_p7n7n") diff --git a/scene/ground/scene/c02/s03_院子.tscn b/scene/ground/scene/c02/s03_院子.tscn index fc7d254e..b08a7420 100644 --- a/scene/ground/scene/c02/s03_院子.tscn +++ b/scene/ground/scene/c02/s03_院子.tscn @@ -588,7 +588,6 @@ event = "c02_madman_interacted" metadata/_custom_type_script = "uid://bkkiyk5jkdw4d" [node name="Sfx2D小蝉哼歌" type="AudioStreamPlayer2D" parent="Ground/DeployLayer/Event2D小蝉哼歌"] -process_mode = 1 position = Vector2(-2, -1) stream = ExtResource("6_jhod7") volume_db = 20.0 @@ -606,12 +605,6 @@ action_key = 3 interacted_texture = ExtResource("9_liq0c") prop_key = "prop_老虎钳" -[node name="SfxInvalid" parent="Ground/DeployLayer/Interactable铁门" index="0"] -process_mode = 0 - -[node name="SfxSuccess" parent="Ground/DeployLayer/Interactable铁门" index="1"] -process_mode = 0 - [node name="CollisionShape2D" parent="Ground/DeployLayer/Interactable铁门/Area2D" index="0"] shape = SubResource("RectangleShape2D_er6ob") @@ -733,7 +726,6 @@ animation = &"霸凌1" autoplay = "霸凌1" [node name="Sfx2D霸凌童谣" type="AudioStreamPlayer2D" parent="Ground/DeployLayer/霸凌/f1"] -process_mode = 1 stream = ExtResource("46_qqdxs") volume_db = -5.0 attenuation = 2.0 @@ -1006,7 +998,6 @@ animation = &"吕萍牵手动作" shape = SubResource("RectangleShape2D_vddfx") [node name="Sfx2D跑步" type="AudioStreamPlayer2D" parent="Ground/DeployLayer/火灾/牵手跑"] -process_mode = 1 stream = SubResource("AudioStreamRandomizer_fxne6") volume_db = 3.0 bus = &"game_sfx" diff --git a/scene/ground/scene/c02/s05_一楼内侧楼道.tscn b/scene/ground/scene/c02/s05_一楼内侧楼道.tscn index c9147e8a..ec438a74 100644 --- a/scene/ground/scene/c02/s05_一楼内侧楼道.tscn +++ b/scene/ground/scene/c02/s05_一楼内侧楼道.tscn @@ -355,7 +355,6 @@ event = "c02_madman_interacted" metadata/_custom_type_script = "uid://bkkiyk5jkdw4d" [node name="Sfx2D小蝉哼歌" type="AudioStreamPlayer2D" parent="Ground/DeployLayer/Event2D小蝉哼歌"] -process_mode = 1 position = Vector2(-103, -11) stream = ExtResource("24_7mq0m") volume_db = 20.0 diff --git a/scene/ground/scene/c02/s06_二楼.tscn b/scene/ground/scene/c02/s06_二楼.tscn index c4b15342..abeee5a0 100644 --- a/scene/ground/scene/c02/s06_二楼.tscn +++ b/scene/ground/scene/c02/s06_二楼.tscn @@ -1035,7 +1035,6 @@ action_configs = Array[Dictionary]([{ }]) [node name="疯子撞墙Sfx2D" type="AudioStreamPlayer2D" parent="Ground/DeployLayer/疯子撞墙"] -process_mode = 1 position = Vector2(5, 28) stream = SubResource("AudioStreamRandomizer_wywax") volume_db = 10.0 @@ -1161,7 +1160,6 @@ move_configs = Array[Dictionary]([{ debug_mov_animation = "方瞎子走路-左" [node name="Sfx2D脚步声" type="AudioStreamPlayer2D" parent="Ground/DeployLayer/c02_final/瞎子"] -process_mode = 1 position = Vector2(-39, -20) stream = SubResource("AudioStreamRandomizer_4ndyv") bus = &"game_sfx" diff --git a/scene/ground/scene/c02/s08_瞎子卧室.tscn b/scene/ground/scene/c02/s08_瞎子卧室.tscn index 2664574d..5f73c19a 100644 --- a/scene/ground/scene/c02/s08_瞎子卧室.tscn +++ b/scene/ground/scene/c02/s08_瞎子卧室.tscn @@ -296,7 +296,6 @@ animation = &"c02_王癞子_蹲着呼吸" autoplay = "c02_王癞子_蹲着呼吸" [node name="Sfx2D癞子呼吸" type="AudioStreamPlayer2D" parent="Ground/DeployLayer/癞子偷窥"] -process_mode = 1 stream = ExtResource("20_ujhuc") volume_db = -5.0 max_distance = 700.0 diff --git a/scene/ground/scene/c02/s09_裂缝.tscn b/scene/ground/scene/c02/s09_裂缝.tscn index c9ec9589..d3dbcd9e 100644 --- a/scene/ground/scene/c02/s09_裂缝.tscn +++ b/scene/ground/scene/c02/s09_裂缝.tscn @@ -183,7 +183,6 @@ script = ExtResource("2_34a6f") oneshot_animation = "" [node name="背景音效_通道" type="AudioStreamPlayer" parent="Ground/AnimationPlayer" index="0"] -process_mode = 1 stream = ExtResource("3_qjenp") autoplay = true bus = &"game_sfx" @@ -195,7 +194,6 @@ mode = "场景背景音" metadata/_custom_type_script = "uid://rq6w1vuhuq1m" [node name="背景音效_红色" type="AudioStreamPlayer" parent="Ground/AnimationPlayer" index="1"] -process_mode = 1 stream = ExtResource("5_husb8") bus = &"game_sfx" script = ExtResource("4_qjenp") diff --git a/scene/ground/scene/c02/s12_盒子猫.tscn b/scene/ground/scene/c02/s12_盒子猫.tscn index 03e3cbe7..94e9210c 100644 --- a/scene/ground/scene/c02/s12_盒子猫.tscn +++ b/scene/ground/scene/c02/s12_盒子猫.tscn @@ -20,7 +20,14 @@ footstep_type = "盒子猫" [node name="AnimationPlayer" parent="Ground" index="0"] script = ExtResource("2_7ah3n") debug_global_data = Dictionary[String, Variant]({ -"enabled_items": ["prop_火柴", "prop_院长的信", "prop_银元"] +"c02_boxcat_skip_intro": 0, +"enabled_items": ["prop_火柴", "prop_院长的信", "prop_银元"], +"player_x": 30.0 +}) +debug_ground_data = Dictionary[String, Variant]({ +"AnimationPlayer": { +"oneshot_animation_played": false +} }) oneshot_animation = "" @@ -49,7 +56,6 @@ status = "opened" position = Vector2(465, 21) [node name="小猫初始动画" type="AnimatedSprite2D" parent="Ground/DeployLayer" index="2"] -process_mode = 1 position = Vector2(212, 3) sprite_frames = ExtResource("5_ycgng") animation = &"猫钻进盒子" diff --git a/scene/ground/scene/c02/s13_盒子猫二楼.tscn b/scene/ground/scene/c02/s13_盒子猫二楼.tscn index 5d782d84..45a50888 100644 --- a/scene/ground/scene/c02/s13_盒子猫二楼.tscn +++ b/scene/ground/scene/c02/s13_盒子猫二楼.tscn @@ -26,14 +26,12 @@ script = ExtResource("2_w5nqu") oneshot_animation = "" [node name="Sfx结尾演出" type="AudioStreamPlayer" parent="Ground/AnimationPlayer" index="0"] -process_mode = 1 stream = ExtResource("3_yywsi") bus = &"game_sfx" script = ExtResource("4_yywsi") metadata/_custom_type_script = "uid://rq6w1vuhuq1m" [node name="Sfx脚印" type="AudioStreamPlayer" parent="Ground/AnimationPlayer" index="1"] -process_mode = 1 stream = ExtResource("5_yywsi") bus = &"game_sfx" script = ExtResource("4_yywsi") @@ -72,6 +70,7 @@ texture = ExtResource("6_gge8e") position = Vector2(214, 11) trigger_mode = "interact" one_shot = false +lock_player_on_playing_dialogue = null hook_method = "knock_light_door" [node name="Ambush猫咪敲门互动" parent="Ground/DeployLayer" index="5" instance=ExtResource("9_yywsi")] @@ -79,6 +78,7 @@ position = Vector2(103, 6) trigger_mode = "interact" one_shot = false cooldown_time = 1.5 +lock_player_on_playing_dialogue = null global_method = "c02_cat_play_with_door" [node name="Ambush猫咪敲门互动2" parent="Ground/DeployLayer" index="6" instance=ExtResource("9_yywsi")] @@ -86,6 +86,7 @@ position = Vector2(539, 6) trigger_mode = "interact" one_shot = false cooldown_time = 1.5 +lock_player_on_playing_dialogue = null global_method = "c02_cat_play_with_door" [node name="Ambush猫咪敲门互动3" parent="Ground/DeployLayer" index="7" instance=ExtResource("9_yywsi")] @@ -93,6 +94,7 @@ position = Vector2(663, 5) trigger_mode = "interact" one_shot = false cooldown_time = 1.5 +lock_player_on_playing_dialogue = null global_method = "c02_cat_play_with_door" [node name="追猫猪头怪_左侧" parent="Ground/DeployLayer" index="8" instance=ExtResource("10_kmk38")] diff --git a/scene/ground/script/c01/s10_鬼差探头.tscn b/scene/ground/script/c01/s10_鬼差探头.tscn index 414e8a79..c9c34b92 100644 --- a/scene/ground/script/c01/s10_鬼差探头.tscn +++ b/scene/ground/script/c01/s10_鬼差探头.tscn @@ -121,7 +121,6 @@ texture = ExtResource("4_beln2") centered = false [node name="Sfx" type="AudioStreamPlayer" parent="."] -process_mode = 1 stream = ExtResource("5_c13qq") volume_db = -40.0 bus = &"game_sfx" @@ -129,7 +128,6 @@ script = ExtResource("5_ug335") metadata/_custom_type_script = "uid://rq6w1vuhuq1m" [node name="背景音" type="AudioStreamPlayer" parent="."] -process_mode = 1 stream = SubResource("AudioStreamSynchronized_k54st") bus = &"game_sfx" script = ExtResource("5_ug335") diff --git a/scene/ground/script/c02/s00_煤油灯.tscn b/scene/ground/script/c02/s00_煤油灯.tscn index db02f644..cbfcb67b 100644 --- a/scene/ground/script/c02/s00_煤油灯.tscn +++ b/scene/ground/script/c02/s00_煤油灯.tscn @@ -43,13 +43,11 @@ prop_key2 = "" prop_key3 = "" [node name="SfxInvalid" type="AudioStreamPlayer" parent="."] -process_mode = 1 stream = ExtResource("9_l338h") bus = &"game_sfx" script = ExtResource("8_abb1f") [node name="SfxSuccess" type="AudioStreamPlayer" parent="."] -process_mode = 1 stream = ExtResource("9_abb1f") bus = &"game_sfx" script = ExtResource("8_abb1f") diff --git a/scene/ground/script/c02/s00_跟随的老鼠.tscn b/scene/ground/script/c02/s00_跟随的老鼠.tscn index 21da0a63..4a6ef12e 100644 --- a/scene/ground/script/c02/s00_跟随的老鼠.tscn +++ b/scene/ground/script/c02/s00_跟随的老鼠.tscn @@ -29,7 +29,6 @@ scale = Vector2(0.86, 0.86) texture = SubResource("AtlasTexture_5gnxj") [node name="Sfx2D老鼠叫" type="AudioStreamPlayer2D" parent="mouse1"] -process_mode = 1 position = Vector2(-141.302, -5.86671) scale = Vector2(1.16279, 1.16279) stream = ExtResource("3_otpwt") diff --git a/scene/ground/script/c02/小手讨东西.tscn b/scene/ground/script/c02/小手讨东西.tscn index f6528861..91f2dd34 100644 --- a/scene/ground/script/c02/小手讨东西.tscn +++ b/scene/ground/script/c02/小手讨东西.tscn @@ -29,28 +29,24 @@ unmatched_sign_texture = ExtResource("4_0tuif") matched_sign_texture = ExtResource("5_n2hq3") [node name="SfxInvalid" type="AudioStreamPlayer" parent="."] -process_mode = 1 stream = ExtResource("6_lr23o") bus = &"game_sfx" script = ExtResource("7_7dftu") metadata/_custom_type_script = "uid://rq6w1vuhuq1m" [node name="SfxSuccess" type="AudioStreamPlayer" parent="."] -process_mode = 1 stream = ExtResource("8_7dftu") bus = &"game_sfx" script = ExtResource("7_7dftu") metadata/_custom_type_script = "uid://rq6w1vuhuq1m" [node name="SfxBgm" type="AudioStreamPlayer" parent="."] -process_mode = 1 stream = ExtResource("9_7dftu") bus = &"game_sfx" script = ExtResource("7_7dftu") metadata/_custom_type_script = "uid://rq6w1vuhuq1m" [node name="Sfx摔倒" type="AudioStreamPlayer" parent="."] -process_mode = 1 stream = ExtResource("10_0tuif") bus = &"game_sfx" script = ExtResource("7_7dftu") diff --git a/scene/ground/script/c02/折锡纸.tscn b/scene/ground/script/c02/折锡纸.tscn index d90040cb..442e591e 100644 --- a/scene/ground/script/c02/折锡纸.tscn +++ b/scene/ground/script/c02/折锡纸.tscn @@ -15,14 +15,12 @@ script = ExtResource("1_7tphw") [node name="Sfx抽纸" type="AudioStreamPlayer" parent="."] -process_mode = 1 stream = ExtResource("2_0pjjb") bus = &"game_sfx" script = ExtResource("3_ftr7c") metadata/_custom_type_script = "uid://rq6w1vuhuq1m" [node name="Sfx折纸" type="AudioStreamPlayer" parent="."] -process_mode = 1 stream = ExtResource("4_g2p6p") bus = &"game_sfx" script = ExtResource("3_ftr7c") diff --git a/scene/ground/script/c02/谢幕演出.tscn b/scene/ground/script/c02/谢幕演出.tscn index 8af2851e..8956b1ce 100644 --- a/scene/ground/script/c02/谢幕演出.tscn +++ b/scene/ground/script/c02/谢幕演出.tscn @@ -396,21 +396,18 @@ script = ExtResource("1_s8k21") [node name="Root" type="Node2D" parent="."] [node name="Sfx擦火柴" type="AudioStreamPlayer" parent="Root"] -process_mode = 1 stream = ExtResource("2_yo1xc") bus = &"game_sfx" script = ExtResource("3_r7yca") metadata/_custom_type_script = "uid://rq6w1vuhuq1m" [node name="Sfx小蝉捂眼后笑声" type="AudioStreamPlayer" parent="Root"] -process_mode = 1 stream = ExtResource("4_8edqb") bus = &"game_sfx" script = ExtResource("3_r7yca") metadata/_custom_type_script = "uid://rq6w1vuhuq1m" [node name="Sfx小蝉蒙眼" type="AudioStreamPlayer" parent="Root"] -process_mode = 1 stream = ExtResource("5_kfwxg") bus = &"game_sfx" script = ExtResource("3_r7yca") diff --git a/scene/index_page.tscn b/scene/index_page.tscn index a51a775c..2760d6cd 100644 --- a/scene/index_page.tscn +++ b/scene/index_page.tscn @@ -55,7 +55,6 @@ mouse_filter = 2 [node name="SfxClick" type="AudioStreamPlayer" parent="."] unique_name_in_owner = true -process_mode = 1 stream = ExtResource("2_te6ya") volume_db = -8.285 bus = &"game_sfx" diff --git a/scene/little_game/拼凑信件.tscn b/scene/little_game/拼凑信件.tscn index 04ee2bd7..97052210 100644 --- a/scene/little_game/拼凑信件.tscn +++ b/scene/little_game/拼凑信件.tscn @@ -30,13 +30,11 @@ layer = 5 script = ExtResource("1_cifku") [node name="SfxMove" type="AudioStreamPlayer" parent="."] -process_mode = 1 stream = ExtResource("3_eph5y") bus = &"game_sfx" script = ExtResource("3_ifhby") [node name="Sfx展开信" type="AudioStreamPlayer" parent="."] -process_mode = 1 stream = ExtResource("4_ifhby") volume_db = -5.0 bus = &"game_sfx" diff --git a/scene/ux/panel/ux_panel.tscn b/scene/ux/panel/ux_panel.tscn index 14a543ba..696fd082 100644 --- a/scene/ux/panel/ux_panel.tscn +++ b/scene/ux/panel/ux_panel.tscn @@ -21,14 +21,12 @@ process_mode = 3 script = ExtResource("1_8dnsb") [node name="SfxOpen" type="AudioStreamPlayer" parent="."] -process_mode = 1 stream = ExtResource("2_v1oku") bus = &"game_sfx" script = ExtResource("3_a3uyd") metadata/_custom_type_script = "uid://rq6w1vuhuq1m" [node name="SfxClose" type="AudioStreamPlayer" parent="."] -process_mode = 1 stream = ExtResource("4_ombcf") bus = &"game_sfx" script = ExtResource("3_a3uyd") diff --git a/scene/ux/tabs.tscn b/scene/ux/tabs.tscn index c5b5763b..85660f9a 100644 --- a/scene/ux/tabs.tscn +++ b/scene/ux/tabs.tscn @@ -31,14 +31,12 @@ mouse_filter = 2 script = ExtResource("1_2ekqi") [node name="SfxOpen" type="AudioStreamPlayer" parent="."] -process_mode = 1 stream = ExtResource("2_6kwyk") bus = &"game_sfx" script = ExtResource("2_q0myv") metadata/_custom_type_script = "uid://rq6w1vuhuq1m" [node name="SfxClose" type="AudioStreamPlayer" parent="."] -process_mode = 1 stream = ExtResource("4_4g76p") bus = &"game_sfx" script = ExtResource("2_q0myv")