From 8f1a0bd8d674569f88fe7a10d501366cedadec60 Mon Sep 17 00:00:00 2001
From: cakipaul <cakipaul@gmail.com>
Date: Mon, 16 Jun 2025 13:58:24 +0800
Subject: [PATCH] sfx update

---
 scene/entity/general/sfx.gd                  |  2 +-
 scene/ground/scene/c02/s02_过道.tscn         |  6 ------
 scene/ground/scene/c02/s03_院子.tscn         | 15 +--------------
 scene/ground/scene/c02/s06_二楼.tscn         |  3 ---
 scene/ground/scene/c02/s07_二楼内侧楼道.tscn |  3 +--
 scene/ground/scene/c02/s09_裂缝.tscn         |  1 +
 6 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/scene/entity/general/sfx.gd b/scene/entity/general/sfx.gd
index 31bc2f6d..1b684bb8 100644
--- a/scene/entity/general/sfx.gd
+++ b/scene/entity/general/sfx.gd
@@ -6,7 +6,7 @@ class_name Sfx extends AudioStreamPlayer
 		mode = value
 		notify_property_list_changed()
 # 默认 stream 会变成 default 值
-@export var audio_dict = {} as Dictionary[String, AudioStream]
+@export var audio_dict: Dictionary[String, AudioStream]
 
 # 当前播放状态注册；节点销毁前卸载
 # TODO BGM 过程抑制场景音效；场景音效随玩家运动呼吸 (结合 Sfx2D)
diff --git a/scene/ground/scene/c02/s02_过道.tscn b/scene/ground/scene/c02/s02_过道.tscn
index fd55a105..d40bd29a 100644
--- a/scene/ground/scene/c02/s02_过道.tscn
+++ b/scene/ground/scene/c02/s02_过道.tscn
@@ -73,9 +73,6 @@ stream = ExtResource("6_36l5t")
 bus = &"game_sfx"
 script = ExtResource("14_jg8g0")
 mode = "场景背景音"
-audio_dict = Dictionary[String, AudioStream]({
-"default": ExtResource("6_36l5t")
-})
 "自动开始" = true
 "循环播放" = true
 "感应玩家操作" = false
@@ -163,9 +160,6 @@ disabled = true
 stream = ExtResource("11_u68d7")
 bus = &"game_sfx"
 script = ExtResource("14_jg8g0")
-audio_dict = Dictionary[String, AudioStream]({
-"default": ExtResource("11_u68d7")
-})
 
 [node name="Ambush杂物堆" parent="Ground/DeployLayer" index="9" instance=ExtResource("8_52as8")]
 position = Vector2(387, 66)
diff --git a/scene/ground/scene/c02/s03_院子.tscn b/scene/ground/scene/c02/s03_院子.tscn
index 090d1963..a837407b 100644
--- a/scene/ground/scene/c02/s03_院子.tscn
+++ b/scene/ground/scene/c02/s03_院子.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=74 format=3 uid="uid://djc2uaefhmu7"]
+[gd_scene load_steps=71 format=3 uid="uid://djc2uaefhmu7"]
 
 [ext_resource type="PackedScene" uid="uid://dayyx4jerj7io" path="res://scene/ground/ground.tscn" id="1_0dylx"]
 [ext_resource type="Script" uid="uid://dsp5plrdkrsd7" path="res://scene/ground/scene/c02/s03_animation.gd" id="2_dt5aj"]
@@ -30,8 +30,6 @@
 [ext_resource type="Texture2D" uid="uid://b78jbthcfkod7" path="res://asset/art/scene/c02/s03_公寓一楼院子/地面物品反光/地反光3.png" id="14_7pq5y"]
 [ext_resource type="Texture2D" uid="uid://dy55syw4my0qo" path="res://asset/art/scene/c02/s03_公寓一楼院子/e_水井.png" id="21_4n8vm"]
 [ext_resource type="Texture2D" uid="uid://d0mrgm6ot3vee" path="res://asset/art/scene/c02/s03_公寓一楼院子/e_药车.png" id="22_3y5s5"]
-[ext_resource type="AudioStream" uid="uid://inmdv5gqqius" path="res://asset/audio/sfx/ui/门锁互动.mp3" id="22_vddfx"]
-[ext_resource type="AudioStream" uid="uid://ccng5y2fip6mc" path="res://asset/audio/sfx/ui/开锁声.mp3" id="23_3nako"]
 [ext_resource type="PackedScene" uid="uid://dqkxiqbq83cmq" path="res://scene/entity/closeup.tscn" id="23_81juy"]
 [ext_resource type="PackedScene" uid="uid://bxpexbk7f3rax" path="res://scene/ground/script/c02/敲门游戏.tscn" id="24_0o4rt"]
 [ext_resource type="PackedScene" uid="uid://bnf3lkcbpx1ar" path="res://scene/entity/ambush.tscn" id="25_iyaiw"]
@@ -52,7 +50,6 @@
 [ext_resource type="Texture2D" uid="uid://3hruwr03tox1" path="res://asset/art/gif/c02_一楼火灾/7-最左木箱 烧痕.png" id="36_rnk1v"]
 [ext_resource type="Texture2D" uid="uid://bdisdxc1txm0g" path="res://asset/art/gif/c02_霸凌/小婵_被霸凌/0.png" id="37_dsgmu"]
 [ext_resource type="SpriteFrames" uid="uid://b0icyhxpj16tv" path="res://asset/art/gif/c02_谢幕演出/frames.tres" id="39_rnk1v"]
-[ext_resource type="AudioStream" uid="uid://cvttds81trcoc" path="res://asset/audio/sfx/ui/click.wav" id="41_df1yo"]
 
 [sub_resource type="Animation" id="Animation_rt2lh"]
 length = 0.001
@@ -348,7 +345,6 @@ bus = &"game_sfx"
 script = ExtResource("4_ygnci")
 mode = "场景背景音"
 audio_dict = Dictionary[String, AudioStream]({
-"default": ExtResource("3_2y8cu"),
 "火灾": ExtResource("5_ygnci")
 })
 "自动开始" = true
@@ -512,14 +508,8 @@ interacted_texture = ExtResource("9_liq0c")
 prop_key = "prop_老虎钳"
 
 [node name="SfxInvalid" parent="Ground/DeployLayer/Interactable铁门" index="0"]
-audio_dict = Dictionary[String, AudioStream]({
-"default": ExtResource("22_vddfx")
-})
 
 [node name="SfxSuccess" parent="Ground/DeployLayer/Interactable铁门" index="1"]
-audio_dict = Dictionary[String, AudioStream]({
-"default": ExtResource("23_3nako")
-})
 
 [node name="CollisionShape2D" parent="Ground/DeployLayer/Interactable铁门/Area2D" index="0"]
 shape = SubResource("RectangleShape2D_er6ob")
@@ -608,9 +598,6 @@ height = 49.11
 dialogue_title = "c02_s11_井边疯子对话"
 
 [node name="Sfx" parent="Ground/DeployLayer/Npc井边疯子" index="0"]
-audio_dict = Dictionary[String, AudioStream]({
-"default": ExtResource("41_df1yo")
-})
 
 [node name="SpeakingSign2D" parent="Ground/DeployLayer/Npc井边疯子" index="4"]
 position = Vector2(0, -49.11)
diff --git a/scene/ground/scene/c02/s06_二楼.tscn b/scene/ground/scene/c02/s06_二楼.tscn
index a8c6173f..55409bca 100644
--- a/scene/ground/scene/c02/s06_二楼.tscn
+++ b/scene/ground/scene/c02/s06_二楼.tscn
@@ -330,9 +330,6 @@ stream = ExtResource("3_yolsv")
 bus = &"game_sfx"
 script = ExtResource("4_2e08x")
 mode = "场景背景音"
-audio_dict = Dictionary[String, AudioStream]({
-"default": ExtResource("3_yolsv")
-})
 "自动开始" = true
 "循环播放" = true
 "感应玩家操作" = false
diff --git a/scene/ground/scene/c02/s07_二楼内侧楼道.tscn b/scene/ground/scene/c02/s07_二楼内侧楼道.tscn
index e37abf84..0da2a433 100644
--- a/scene/ground/scene/c02/s07_二楼内侧楼道.tscn
+++ b/scene/ground/scene/c02/s07_二楼内侧楼道.tscn
@@ -31,11 +31,10 @@ oneshot_animation = ""
 [node name="背景音效" type="AudioStreamPlayer" parent="Ground/AnimationPlayer" index="0"]
 stream = ExtResource("3_s75vl")
 autoplay = true
-stream_paused = true
 bus = &"game_sfx"
 script = ExtResource("4_sv27p")
 mode = "场景背景音"
-"自动开始" = null
+"自动开始" = true
 "循环播放" = true
 "感应玩家操作" = false
 metadata/_custom_type_script = "uid://rq6w1vuhuq1m"
diff --git a/scene/ground/scene/c02/s09_裂缝.tscn b/scene/ground/scene/c02/s09_裂缝.tscn
index 2d13ee41..9d49f991 100644
--- a/scene/ground/scene/c02/s09_裂缝.tscn
+++ b/scene/ground/scene/c02/s09_裂缝.tscn
@@ -160,6 +160,7 @@ stream = ExtResource("5_husb8")
 bus = &"game_sfx"
 script = ExtResource("4_qjenp")
 mode = "场景背景音"
+audio_dict = Dictionary[String, AudioStream]({})
 "自动开始" = false
 "循环播放" = true
 "感应玩家操作" = false