From 21e2387d6c48e2d7e0a9e5aa6c8077c5dca6b1ff Mon Sep 17 00:00:00 2001 From: cakipaul Date: Mon, 16 Jun 2025 16:42:05 +0800 Subject: [PATCH] sfx update --- asset/dialogue/c02.csv | 2 +- asset/dialogue/c02.dialogue | 2 +- asset/dialogue/c02.dialogue.import | 3 ++- scene/ground/scene/c01/s07_书店外.tscn | 2 +- scene/ground/scene/c01/s08_书店.tscn | 4 ++-- scene/ground/scene/c01/s11_黄包车演出.tscn | 2 +- scene/ground/scene/c02/s01_街道.tscn | 2 +- scene/ground/scene/c02/s03_院子.tscn | 6 ------ scene/ground/scene/c02/s04_保卫科.tscn | 2 +- scene/ground/scene/c02/s05_一楼内侧楼道.tscn | 2 +- scene/ground/scene/c02/s06_二楼.tscn | 1 + scene/ground/scene/c02/s08_瞎子卧室.tscn | 4 ++-- scene/ground/scene/c02/s10_空房间.tscn | 1 - 13 files changed, 14 insertions(+), 19 deletions(-) diff --git a/asset/dialogue/c02.csv b/asset/dialogue/c02.csv index 11385adc..7653bbb9 100644 --- a/asset/dialogue/c02.csv +++ b/asset/dialogue/c02.csv @@ -5,7 +5,7 @@ c02_11肉铺敲门_3,不做生意赶紧滚!,???,, 下⾬了、打烊了、⼩脚⼩孩跳舞了 [ID:],下⾬了、打烊了、⼩脚⼩孩跳舞了 [ID:],,, 摔倒了、哭⿐头、⼩脚上面出血了 [ID:],摔倒了、哭⿐头、⼩脚上面出血了 [ID:],,, 哭⿐头、哭⿐头~⼩脚⼩孩哭⿐头... [ID:],哭⿐头、哭⿐头~⼩脚⼩孩哭⿐头... [ID:],,, -c02_纸人互动_离开公寓1,你要离开公寓吗?,,, +c02_纸人互动_离开公寓1,你要离开芦昌公寓吗?,,, c02_纸人互动_离开公寓2,离开,(response),, c02_纸人互动_离开公寓3,留下,(response),, c02_6偷听对话_李氏_1_fx,真的假的?你钻进去啦,你这个体型进得去哒?,李兰,, diff --git a/asset/dialogue/c02.dialogue b/asset/dialogue/c02.dialogue index 24420e69..22395436 100644 --- a/asset/dialogue/c02.dialogue +++ b/asset/dialogue/c02.dialogue @@ -1,5 +1,5 @@ ~ c02_纸人互动_离开公寓 -你要离开公寓吗? [ID:c02_纸人互动_离开公寓1] +你要离开芦昌公寓吗? [ID:c02_纸人互动_离开公寓1] - 离开 [ID:c02_纸人互动_离开公寓2] do SceneManager.checkout_index_page() - 留下 [ID:c02_纸人互动_离开公寓3] diff --git a/asset/dialogue/c02.dialogue.import b/asset/dialogue/c02.dialogue.import index c3970f4d..01b30a69 100644 --- a/asset/dialogue/c02.dialogue.import +++ b/asset/dialogue/c02.dialogue.import @@ -1,6 +1,7 @@ [remap] -importer="dialogue_manager_compiler_14" +importer="dialogue_manager" +importer_version=15 type="Resource" uid="uid://o7gam82qlv3s" path="res://.godot/imported/c02.dialogue-5236d0e6b429422139c083b2994458ed.tres" diff --git a/scene/ground/scene/c01/s07_书店外.tscn b/scene/ground/scene/c01/s07_书店外.tscn index e3bb3abb..6c006821 100644 --- a/scene/ground/scene/c01/s07_书店外.tscn +++ b/scene/ground/scene/c01/s07_书店外.tscn @@ -80,7 +80,7 @@ autoplay = true bus = &"game_sfx" script = ExtResource("4_c7jb6") mode = "场景背景音" -"自动开始" = null +"自动开始" = true "循环播放" = true "感应玩家操作" = false metadata/_custom_type_script = "uid://rq6w1vuhuq1m" diff --git a/scene/ground/scene/c01/s08_书店.tscn b/scene/ground/scene/c01/s08_书店.tscn index 0b7e8c12..d885c27f 100644 --- a/scene/ground/scene/c01/s08_书店.tscn +++ b/scene/ground/scene/c01/s08_书店.tscn @@ -66,7 +66,7 @@ autoplay = true bus = &"game_sfx" script = ExtResource("4_p6k3c") mode = "场景背景音" -"自动开始" = null +"自动开始" = true "循环播放" = true "感应玩家操作" = false metadata/_custom_type_script = "uid://rq6w1vuhuq1m" @@ -76,7 +76,7 @@ stream = ExtResource("5_eerhd") bus = &"game_sfx" script = ExtResource("4_p6k3c") mode = "场景背景音" -"自动开始" = null +"自动开始" = true "循环播放" = true "感应玩家操作" = false metadata/_custom_type_script = "uid://rq6w1vuhuq1m" diff --git a/scene/ground/scene/c01/s11_黄包车演出.tscn b/scene/ground/scene/c01/s11_黄包车演出.tscn index bc0b0787..d3ca7b3b 100644 --- a/scene/ground/scene/c01/s11_黄包车演出.tscn +++ b/scene/ground/scene/c01/s11_黄包车演出.tscn @@ -171,7 +171,7 @@ autoplay = true bus = &"game_sfx" script = ExtResource("3_vx53v") mode = "场景背景音" -"自动开始" = null +"自动开始" = true "循环播放" = true "感应玩家操作" = false metadata/_custom_type_script = "uid://rq6w1vuhuq1m" diff --git a/scene/ground/scene/c02/s01_街道.tscn b/scene/ground/scene/c02/s01_街道.tscn index 94fe4633..5d777bae 100644 --- a/scene/ground/scene/c02/s01_街道.tscn +++ b/scene/ground/scene/c02/s01_街道.tscn @@ -27,7 +27,7 @@ autoplay = true bus = &"game_sfx" script = ExtResource("4_gqpp0") mode = "场景背景音" -"自动开始" = null +"自动开始" = true "循环播放" = true "感应玩家操作" = false metadata/_custom_type_script = "uid://rq6w1vuhuq1m" diff --git a/scene/ground/scene/c02/s03_院子.tscn b/scene/ground/scene/c02/s03_院子.tscn index a837407b..ef2875e3 100644 --- a/scene/ground/scene/c02/s03_院子.tscn +++ b/scene/ground/scene/c02/s03_院子.tscn @@ -507,10 +507,6 @@ texture = ExtResource("7_gd6xp") interacted_texture = ExtResource("9_liq0c") prop_key = "prop_老虎钳" -[node name="SfxInvalid" parent="Ground/DeployLayer/Interactable铁门" index="0"] - -[node name="SfxSuccess" parent="Ground/DeployLayer/Interactable铁门" index="1"] - [node name="CollisionShape2D" parent="Ground/DeployLayer/Interactable铁门/Area2D" index="0"] shape = SubResource("RectangleShape2D_er6ob") @@ -597,8 +593,6 @@ frame_progress = 0.952326 height = 49.11 dialogue_title = "c02_s11_井边疯子对话" -[node name="Sfx" parent="Ground/DeployLayer/Npc井边疯子" index="0"] - [node name="SpeakingSign2D" parent="Ground/DeployLayer/Npc井边疯子" index="4"] position = Vector2(0, -49.11) diff --git a/scene/ground/scene/c02/s04_保卫科.tscn b/scene/ground/scene/c02/s04_保卫科.tscn index 8f724f29..d71a3d8a 100644 --- a/scene/ground/scene/c02/s04_保卫科.tscn +++ b/scene/ground/scene/c02/s04_保卫科.tscn @@ -43,7 +43,7 @@ autoplay = true bus = &"game_sfx" script = ExtResource("4_ffvrp") mode = "场景背景音" -"自动开始" = null +"自动开始" = true "循环播放" = true "感应玩家操作" = false metadata/_custom_type_script = "uid://rq6w1vuhuq1m" diff --git a/scene/ground/scene/c02/s05_一楼内侧楼道.tscn b/scene/ground/scene/c02/s05_一楼内侧楼道.tscn index ef48974a..4238e7a5 100644 --- a/scene/ground/scene/c02/s05_一楼内侧楼道.tscn +++ b/scene/ground/scene/c02/s05_一楼内侧楼道.tscn @@ -74,7 +74,7 @@ autoplay = true bus = &"game_sfx" script = ExtResource("4_20mbg") mode = "场景背景音" -"自动开始" = null +"自动开始" = true "循环播放" = true "感应玩家操作" = false metadata/_custom_type_script = "uid://rq6w1vuhuq1m" diff --git a/scene/ground/scene/c02/s06_二楼.tscn b/scene/ground/scene/c02/s06_二楼.tscn index 55409bca..da9caad4 100644 --- a/scene/ground/scene/c02/s06_二楼.tscn +++ b/scene/ground/scene/c02/s06_二楼.tscn @@ -327,6 +327,7 @@ oneshot_animation = "" [node name="背景音效" type="AudioStreamPlayer" parent="Ground/AnimationPlayer" index="0"] stream = ExtResource("3_yolsv") +autoplay = true bus = &"game_sfx" script = ExtResource("4_2e08x") mode = "场景背景音" diff --git a/scene/ground/scene/c02/s08_瞎子卧室.tscn b/scene/ground/scene/c02/s08_瞎子卧室.tscn index 4f540813..225756d7 100644 --- a/scene/ground/scene/c02/s08_瞎子卧室.tscn +++ b/scene/ground/scene/c02/s08_瞎子卧室.tscn @@ -106,7 +106,7 @@ autoplay = true bus = &"game_sfx" script = ExtResource("3_t3h08") mode = "场景背景音" -"自动开始" = null +"自动开始" = true "循环播放" = true "感应玩家操作" = true metadata/_custom_type_script = "uid://rq6w1vuhuq1m" @@ -117,7 +117,7 @@ autoplay = true bus = &"game_sfx" script = ExtResource("3_t3h08") mode = "场景背景音" -"自动开始" = null +"自动开始" = true "循环播放" = true "感应玩家操作" = false metadata/_custom_type_script = "uid://rq6w1vuhuq1m" diff --git a/scene/ground/scene/c02/s10_空房间.tscn b/scene/ground/scene/c02/s10_空房间.tscn index c33f4293..80cb497b 100644 --- a/scene/ground/scene/c02/s10_空房间.tscn +++ b/scene/ground/scene/c02/s10_空房间.tscn @@ -89,7 +89,6 @@ autoplay = true bus = &"game_sfx" script = ExtResource("4_chbaa") mode = "场景背景音" -audio_dict = Dictionary[String, AudioStream]({}) "自动开始" = true "循环播放" = true "感应玩家操作" = false