diff --git a/scene/ground/scene/c03/s08_囚室.gd b/scene/ground/scene/c03/s08_囚室.gd index c635bff9..66265703 100644 --- a/scene/ground/scene/c03/s08_囚室.gd +++ b/scene/ground/scene/c03/s08_囚室.gd @@ -83,6 +83,7 @@ func _on_body_interacted(success: bool) -> void: SceneManager.lock_player() body_sprite.play() await body_sprite.animation_finished + $"Sfx尸体掉落".play() SceneManager.unlock_player() # SceneManager.enable_prop_item("prop_转轮") # await SceneManager.get_inspector().quit_and_hidden diff --git a/scene/ground/scene/c03/s08_囚室.tscn b/scene/ground/scene/c03/s08_囚室.tscn index b930beab..6dda8047 100644 --- a/scene/ground/scene/c03/s08_囚室.tscn +++ b/scene/ground/scene/c03/s08_囚室.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=35 format=3 uid="uid://bixdbbyhroepi"] +[gd_scene load_steps=37 format=3 uid="uid://bixdbbyhroepi"] [ext_resource type="PackedScene" uid="uid://dayyx4jerj7io" path="res://scene/ground/ground.tscn" id="1_fusj3"] [ext_resource type="Script" uid="uid://ddrlpkqfabx6d" path="res://scene/ground/scene/c03/s08_囚室.gd" id="2_fusj3"] @@ -21,6 +21,8 @@ [ext_resource type="PackedScene" uid="uid://dsa6frlw6e6gg" path="res://scene/entity/pickable.tscn" id="16_7eou8"] [ext_resource type="PackedScene" uid="uid://jyi40p8ylsj1" path="res://scene/ground/script/c03/s08_closeup符纸.tscn" id="17_06t0x"] [ext_resource type="Texture2D" uid="uid://bpjqwfihjol7t" path="res://asset/art/scene/c03/s08_囚室/符纸.png" id="17_7eou8"] +[ext_resource type="AudioStream" uid="uid://ce3p55nnts4v5" path="res://asset/audio/effect/action/cloth2.ogg" id="17_u8vcj"] +[ext_resource type="AudioStream" uid="uid://dph8v3v5mq1xl" path="res://asset/audio/sfx/交互/sfx_交互失败.ogg" id="18_twson"] [ext_resource type="SpriteFrames" uid="uid://cwes55ajc3rd4" path="res://asset/art/gif/c02_空房间/c02_空房间_frames.tres" id="19_cnbie"] [ext_resource type="Texture2D" uid="uid://bp84w8keuelyj" path="res://asset/art/scene/c02/s10_空房间/e_蜡烛-sheet.png" id="20_vu7oc"] [ext_resource type="Texture2D" uid="uid://cylsq5cvhlp18" path="res://asset/art/tool/point_light.png" id="21_cvhc1"] @@ -172,6 +174,12 @@ bus = &"game_sfx" script = ExtResource("4_2jtaw") metadata/_custom_type_script = "uid://rq6w1vuhuq1m" +[node name="Sfx尸体掉落" type="AudioStreamPlayer" parent="Ground/AnimationPlayer" index="2"] +stream = ExtResource("17_u8vcj") +bus = &"game_sfx" +script = ExtResource("4_2jtaw") +metadata/_custom_type_script = "uid://rq6w1vuhuq1m" + [node name="BGSprite2D" parent="Ground" index="2"] light_mask = 5 position = Vector2(8, 0) @@ -239,7 +247,9 @@ unique_name_in_owner = true position = Vector2(205, -13) offset = Vector2(0, -50) first_interact_os_key = "c03_s08_囚室绳子" +mute_when_interacted = true interacted_texture = ExtResource("15_jdv4a") +stream_invalid_replacement = ExtResource("18_twson") prop_key = "prop_菜刀" [node name="尸体动画" type="AnimatedSprite2D" parent="Ground/DeployLayer/Interactable囚室尸体"] diff --git a/scene/ground/scene/c03/s13_院子II.tscn b/scene/ground/scene/c03/s13_院子II.tscn index 7afb804c..4653269e 100644 --- a/scene/ground/scene/c03/s13_院子II.tscn +++ b/scene/ground/scene/c03/s13_院子II.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=85 format=3 uid="uid://b1elo74u56fap"] +[gd_scene load_steps=84 format=3 uid="uid://b1elo74u56fap"] [ext_resource type="PackedScene" uid="uid://dayyx4jerj7io" path="res://scene/ground/ground.tscn" id="1_8fjn8"] [ext_resource type="Script" uid="uid://bgahyojxlgysm" path="res://scene/ground/scene/c03/s13_院子II.gd" id="2_j4frh"] @@ -19,7 +19,6 @@ [ext_resource type="Script" uid="uid://wapo47a1oddf" path="res://scene/entity/audio/sfx2d.gd" id="29_iqhvu"] [ext_resource type="PackedScene" uid="uid://cw3q5pvciumil" path="res://scene/entity/interactable.tscn" id="30_ys0pv"] [ext_resource type="Texture2D" uid="uid://bgpf35bhrkl86" path="res://asset/art/scene/c02/s03_公寓一楼院子/铁门/打开 底层.png" id="32_520fk"] -[ext_resource type="Texture2D" uid="uid://f8yjp5ggr8qw" path="res://asset/art/scene/c02/s03_公寓一楼院子/算卦布.png" id="33_lusp2"] [ext_resource type="Texture2D" uid="uid://1pr32tkx4ttl" path="res://asset/art/scene/c02/s03_公寓一楼院子/e_煤油灯座.png" id="34_awwqy"] [ext_resource type="Texture2D" uid="uid://0x7cl2cmcs6l" path="res://asset/art/scene/c02/s03_公寓一楼院子/光晕/光晕2.png" id="35_1goeu"] [ext_resource type="Texture2D" uid="uid://cj0ie1ahfaam" path="res://asset/art/scene/c02/s03_公寓一楼院子/光晕/光晕5.png" id="36_45ren"] @@ -308,19 +307,7 @@ metadata/_custom_type_script = "uid://0wjaho6qkg6s" position = Vector2(955, 5) texture = ExtResource("21_eoyk5") -[node name="Note血迹" parent="Ground/DeployLayer" index="7" instance=ExtResource("22_bf8pe")] -position = Vector2(523, 78) -title_filter = "c02" -note_key = "c02_s03_干掉的血迹" - -[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="Ground/DeployLayer/Note血迹"] -self_modulate = Color(0.255659, 0.255659, 0.255659, 1) -show_behind_parent = true -position = Vector2(132, 10) -sprite_frames = ExtResource("13_v8hau") -animation = &"肉铺门口血迹" - -[node name="灯笼" type="Node2D" parent="Ground/DeployLayer" index="8"] +[node name="灯笼" type="Node2D" parent="Ground/DeployLayer" index="7"] [node name="灯笼" type="Sprite2D" parent="Ground/DeployLayer/灯笼"] position = Vector2(1644, -86) @@ -370,20 +357,12 @@ energy = 0.7 texture = SubResource("GradientTexture2D_kyfht") texture_scale = 2.2 -[node name="铁门" type="Sprite2D" parent="Ground/DeployLayer" index="9"] +[node name="铁门" type="Sprite2D" parent="Ground/DeployLayer" index="8"] light_mask = 5 position = Vector2(1222, 28) texture = ExtResource("32_520fk") -[node name="Note算命摊位" parent="Ground/DeployLayer" index="10" instance=ExtResource("22_bf8pe")] -position = Vector2(725, 45) -note_key = "c02_院子_算命摊位" - -[node name="算卦布" type="Sprite2D" parent="Ground/DeployLayer/Note算命摊位"] -position = Vector2(0, 18) -texture = ExtResource("33_lusp2") - -[node name="煤油灯" type="Sprite2D" parent="Ground/DeployLayer" index="11"] +[node name="煤油灯" type="Sprite2D" parent="Ground/DeployLayer" index="9"] position = Vector2(293, 13) texture = ExtResource("34_awwqy") @@ -401,7 +380,7 @@ energy = 2.0 blend_mode = 2 texture = ExtResource("35_1goeu") -[node name="煤油灯2" type="Sprite2D" parent="Ground/DeployLayer" index="12"] +[node name="煤油灯2" type="Sprite2D" parent="Ground/DeployLayer" index="10"] position = Vector2(605, 13) texture = ExtResource("34_awwqy") @@ -419,7 +398,7 @@ energy = 2.0 blend_mode = 2 texture = ExtResource("36_45ren") -[node name="煤油灯3" type="Sprite2D" parent="Ground/DeployLayer" index="13"] +[node name="煤油灯3" type="Sprite2D" parent="Ground/DeployLayer" index="11"] position = Vector2(854, 13) texture = ExtResource("34_awwqy") @@ -437,20 +416,20 @@ energy = 2.0 blend_mode = 2 texture = ExtResource("37_eb474") -[node name="井" type="Sprite2D" parent="Ground/DeployLayer" index="14"] +[node name="井" type="Sprite2D" parent="Ground/DeployLayer" index="12"] self_modulate = Color(0.739288, 0.739288, 0.739288, 1) light_mask = 5 z_index = 10 position = Vector2(2062, 60) texture = ExtResource("38_xodct") -[node name="药车" type="Sprite2D" parent="Ground/DeployLayer" index="15"] +[node name="药车" type="Sprite2D" parent="Ground/DeployLayer" index="13"] light_mask = 5 z_index = 11 position = Vector2(1025, 27) texture = ExtResource("39_dr0a1") -[node name="Event2D抓药游戏" type="Node2D" parent="Ground/DeployLayer" index="16"] +[node name="Event2D抓药游戏" type="Node2D" parent="Ground/DeployLayer" index="14"] script = ExtResource("40_y8r2l") event_name = &"c03_drug_game" event_stages = Array[int]([0, 1]) @@ -583,36 +562,32 @@ z_index = 20 position = Vector2(1095, 58) texture = ExtResource("50_4318j") -[node name="Closeup敲门游戏" parent="Ground/DeployLayer" index="17" instance=ExtResource("48_orsrv")] +[node name="Closeup敲门游戏" parent="Ground/DeployLayer" index="15" instance=ExtResource("48_orsrv")] position = Vector2(466, 3) packed_scene = ExtResource("51_1f2bv") on_display_hide_hud = true collision_width_and_x = Vector2(40, 0) -[node name="Ambush惊悚闪电" parent="Ground/DeployLayer" index="18" instance=ExtResource("16_ift4e")] -position = Vector2(1319, 40) -hook_method = "shocking_lighting" - -[node name="Ambush偷听对话" parent="Ground/DeployLayer" index="19" instance=ExtResource("16_ift4e")] +[node name="Ambush偷听对话" parent="Ground/DeployLayer" index="16" instance=ExtResource("16_ift4e")] position = Vector2(1836, 7) trigger_mode = "interact" one_shot = false hook_method = "eavesdrop" -[node name="李氏赖子房间人影" type="AnimatedSprite2D" parent="Ground/DeployLayer" index="20"] +[node name="李氏赖子房间人影" type="AnimatedSprite2D" parent="Ground/DeployLayer" index="17"] position = Vector2(1835, -16) sprite_frames = SubResource("SpriteFrames_0o4rt") autoplay = "default" frame_progress = 0.643855 -[node name="Closeup井" parent="Ground/DeployLayer" index="21" instance=ExtResource("48_orsrv")] +[node name="Closeup井" parent="Ground/DeployLayer" index="18" instance=ExtResource("48_orsrv")] z_index = 6 position = Vector2(2063, 50) packed_scene = ExtResource("54_3w5c0") on_display_hide_hud = true action_key = 3 -[node name="Npc井边疯子" parent="Ground/DeployLayer" index="22" instance=ExtResource("45_g606l")] +[node name="Npc井边疯子" parent="Ground/DeployLayer" index="19" instance=ExtResource("45_g606l")] z_index = 10 position = Vector2(2037, 67) sprite_frames = ExtResource("13_v8hau") @@ -626,7 +601,7 @@ sign_x_offset = -2.0 collision_width_and_x = Vector2(37.08, 0) dialogue_title = "c02_井边疯子对话" -[node name="新背景_奠" type="Node2D" parent="Ground/DeployLayer" index="23"] +[node name="新背景_奠" type="Node2D" parent="Ground/DeployLayer" index="20"] visible = false [node name="地上纸钱" type="Sprite2D" parent="Ground/DeployLayer/新背景_奠"] @@ -663,7 +638,7 @@ position = Vector2(898, -162) z_index = 10 position = Vector2(1964, -209) -[node name="Pickable浆糊" parent="Ground/DeployLayer" index="24" instance=ExtResource("26_kq5mn")] +[node name="Pickable浆糊" parent="Ground/DeployLayer" index="21" instance=ExtResource("26_kq5mn")] position = Vector2(774, 64) texture = ExtResource("73_0mdmm") prop_key = "prop_浆糊" @@ -675,7 +650,7 @@ updater_ease_duration = 0.0 updater_stages = Array[int]([3]) metadata/_custom_type_script = "uid://0wjaho6qkg6s" -[node name="Event2D浆糊" type="Node2D" parent="Ground/DeployLayer" index="25"] +[node name="Event2D浆糊" type="Node2D" parent="Ground/DeployLayer" index="22"] position = Vector2(284, -5) script = ExtResource("74_ys1c0") event_name = &"c03_f1_paste_show" @@ -767,7 +742,7 @@ position = Vector2(-5.26316, 6.31579) enabled = false hook_character_name = "王守义" -[node name="Event2D第二章结束井边演出" type="Node2D" parent="Ground/DeployLayer" index="26"] +[node name="Event2D第二章结束井边演出" type="Node2D" parent="Ground/DeployLayer" index="23"] position = Vector2(2100, 0) script = ExtResource("76_cfx4a") event_name = &"c03_well_show" @@ -794,7 +769,7 @@ bus = &"game_sfx" script = ExtResource("4_6pite") metadata/_custom_type_script = "uid://rq6w1vuhuq1m" -[node name="Event2D第二章_纸人" type="Node2D" parent="Ground/DeployLayer" index="27"] +[node name="Event2D第二章_纸人" type="Node2D" parent="Ground/DeployLayer" index="24"] script = ExtResource("78_5dvv8") event_name = &"c03_well_show" event_stages = Array[int]([0]) @@ -843,7 +818,7 @@ z_index = 21 texture = ExtResource("80_mn1r6") centered = false -[node name="Event2D李氏给药完成" type="Node2D" parent="Ground/DeployLayer" index="28"] +[node name="Event2D李氏给药完成" type="Node2D" parent="Ground/DeployLayer" index="25"] position = Vector2(1858, 24) script = ExtResource("81_b80nw") event_name = &"c03_li_paperwoman" @@ -895,7 +870,7 @@ color = Color(1, 0, 0, 1) energy = 2.62 texture = ExtResource("43_0auoh") -[node name="Note李癞_奠" parent="Ground/DeployLayer" index="29" instance=ExtResource("22_bf8pe")] +[node name="Note李癞_奠" parent="Ground/DeployLayer" index="26" instance=ExtResource("22_bf8pe")] position = Vector2(1937, -26) title_filter = "c03" note_key = "c03_s04_奠" @@ -906,7 +881,7 @@ updater_event = &"c03_li_paperwoman" updater_stages = Array[int]([5]) metadata/_custom_type_script = "uid://0wjaho6qkg6s" -[node name="Event第三章开幕" type="Node2D" parent="Ground/DeployLayer" index="30"] +[node name="Event第三章开幕" type="Node2D" parent="Ground/DeployLayer" index="27"] position = Vector2(1490, 0) script = ExtResource("84_2naha") event_name = &"c03_intro_c04" @@ -1001,7 +976,7 @@ bus = &"game_sfx" script = ExtResource("4_6pite") metadata/_custom_type_script = "uid://rq6w1vuhuq1m" -[node name="Event保卫科灯光闪烁C03" type="Node2D" parent="Ground/DeployLayer" index="31"] +[node name="Event保卫科灯光闪烁C03" type="Node2D" parent="Ground/DeployLayer" index="28"] script = ExtResource("78_5dvv8") event_name = &"current_chapter_stage" event_mode = "hide" diff --git a/scene/ground/scene/c03/s14_二楼II.gd b/scene/ground/scene/c03/s14_二楼II.gd index afe98dc1..1f355d6b 100644 --- a/scene/ground/scene/c03/s14_二楼II.gd +++ b/scene/ground/scene/c03/s14_二楼II.gd @@ -40,9 +40,11 @@ func _toggle_candles(show: bool) -> void: func _on_2013_unlocked() -> void: + var s1 = $"../DeployLayer/煤油灯/灯光" + var s2 = $"../DeployLayer/煤油灯2/灯光" var l1 = $"../DeployLayer/煤油灯/PointLight2D" var l2 = $"../DeployLayer/煤油灯/地面光" - var l3 = $"../DeployLayer/煤油灯2/地面光" + var l3 = $"../DeployLayer/煤油灯2/PointLight2D" var l4 = $"../DeployLayer/煤油灯2/地面光" var tween = create_tween() # 所有灯和蜡烛火光不规律闪烁后熄灭 @@ -52,6 +54,8 @@ func _on_2013_unlocked() -> void: tween.parallel().tween_property(l2, "energy", 0.0, 0.5) tween.parallel().tween_property(l3, "energy", 0.0, 0.5) tween.parallel().tween_property(l4, "energy", 0.0, 0.5) + tween.parallel().tween_property(s1, "modulate:a", 0.0, 0.5) + tween.parallel().tween_property(s2, "modulate:a", 0.0, 0.5) for light in lights: var energy = randf_range(0.2, 0.4) tween.parallel().tween_property(light, "energy", energy, 0.5) diff --git a/scene/ground/scene/c03/s14_二楼II.tscn b/scene/ground/scene/c03/s14_二楼II.tscn index 0041494c..e8aff9f2 100644 --- a/scene/ground/scene/c03/s14_二楼II.tscn +++ b/scene/ground/scene/c03/s14_二楼II.tscn @@ -453,7 +453,6 @@ texture = ExtResource("31_gqgi5") position = Vector2(289, 16) packed_scene = ExtResource("40_h4mu1") on_display_hide_hud = true -first_interact_os_key = "c02_二楼水盆" [node name="Event胖子卧室门口小蝉头套" type="Node2D" parent="Ground/DeployLayer" index="13"] script = ExtResource("50_ibpx8") diff --git a/scene/ground/script/c03/s09_closeup棺材特写.gd b/scene/ground/script/c03/s09_closeup棺材特写.gd index 34c44b8a..c2c19776 100644 --- a/scene/ground/script/c03/s09_closeup棺材特写.gd +++ b/scene/ground/script/c03/s09_closeup棺材特写.gd @@ -79,6 +79,7 @@ func _unhandled_input(event: InputEvent) -> void: knife_state = 2 %"胶水".hide() %"刀有柄".show() + $"Sfx安装刀柄".play() SceneManager.disable_prop_item_temp("prop_刀把") hover_knife.freezing = false else: diff --git a/scene/ground/script/c03/s09_closeup棺材特写.tscn b/scene/ground/script/c03/s09_closeup棺材特写.tscn index 5255a1ef..b497889f 100644 --- a/scene/ground/script/c03/s09_closeup棺材特写.tscn +++ b/scene/ground/script/c03/s09_closeup棺材特写.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=13 format=3 uid="uid://btmen4wc4uhhj"] +[gd_scene load_steps=14 format=3 uid="uid://btmen4wc4uhhj"] [ext_resource type="Script" uid="uid://cj22vg4dn44qk" path="res://scene/ground/script/c03/s09_closeup棺材特写.gd" id="1_6v1ol"] [ext_resource type="Texture2D" uid="uid://d03ja5ujdmyce" path="res://asset/art/scene/c03/s09_棺材房/棺材互动/棺材特写.png" id="2_6xi18"] @@ -6,6 +6,7 @@ [ext_resource type="Texture2D" uid="uid://cbql1i4hblmt1" path="res://asset/art/ui/遮罩/inspect特写通用遮罩.png" id="2_f6kiq"] [ext_resource type="Script" uid="uid://rq6w1vuhuq1m" path="res://scene/entity/audio/sfx.gd" id="3_mobd5"] [ext_resource type="AudioStream" uid="uid://has5y3j2yyp7" path="res://asset/audio/sfx/UI/纸条包裹钥匙.ogg" id="4_7k28m"] +[ext_resource type="AudioStream" uid="uid://dogdhy18r3bf8" path="res://asset/audio/effect/action/creak1.ogg" id="5_ld65o"] [ext_resource type="Texture2D" uid="uid://ush0d2g8uj08" path="res://asset/art/scene/c03/s09_棺材房/棺材互动/带血的纸条.png" id="6_ok7al"] [ext_resource type="PackedScene" uid="uid://bkk1rxx36ghrl" path="res://scene/entity/ux/hover_light_click_area.tscn" id="10_t53mt"] [ext_resource type="Texture2D" uid="uid://bkn0cytl435yw" path="res://asset/art/scene/c03/s09_棺材房/棺材互动/刀.png" id="11_ok7al"] @@ -33,6 +34,12 @@ bus = &"game_sfx" script = ExtResource("3_mobd5") metadata/_custom_type_script = "uid://rq6w1vuhuq1m" +[node name="Sfx安装刀柄" type="AudioStreamPlayer" parent="."] +stream = ExtResource("5_ld65o") +bus = &"game_sfx" +script = ExtResource("3_mobd5") +metadata/_custom_type_script = "uid://rq6w1vuhuq1m" + [node name="BG" type="TextureRect" parent="."] anchors_preset = 15 anchor_right = 1.0