小蝶惊醒；台词补充

asset/audio/peiyin/c03/c03_绞肉机演出_小小蝶11.ogg.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://bfqyf8wl27817"
+path="res://.godot/imported/c03_绞肉机演出_小小蝶11.ogg-ab8cff889c58376177707b671cf74f28.oggvorbisstr"
+
+[deps]
+
+source_file="res://asset/audio/peiyin/c03/c03_绞肉机演出_小小蝶11.ogg"
+dest_files=["res://.godot/imported/c03_绞肉机演出_小小蝶11.ogg-ab8cff889c58376177707b671cf74f28.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

asset/audio/sfx/交互/sfx_老鼠声.ogg.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://c7l2ktdggihd2"
+path="res://.godot/imported/sfx_老鼠声.ogg-6858989286bf5345cb094c0d79373b0d.oggvorbisstr"
+
+[deps]
+
+source_file="res://asset/audio/sfx/交互/sfx_老鼠声.ogg"
+dest_files=["res://.godot/imported/sfx_老鼠声.ogg-6858989286bf5345cb094c0d79373b0d.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

asset/audio/sfx/交互/角色/小蝶惊醒喘气.ogg.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://wbpxhy1q0pi5"
+path="res://.godot/imported/小蝶惊醒喘气.ogg-f272ad1ccab3ae1827d85afbb36220fc.oggvorbisstr"
+
+[deps]
+
+source_file="res://asset/audio/sfx/交互/角色/小蝶惊醒喘气.ogg"
+dest_files=["res://.godot/imported/小蝶惊醒喘气.ogg-f272ad1ccab3ae1827d85afbb36220fc.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

asset/dialogue/c03.csv

@@ -1,4 +1,5 @@
 keys,zh_CN,zh_SH,_character,_notes,_tags
+c03_绞肉机演出_小蝉10,下次再见啦！,,小小蝶,,[#anonymous]
 c03_三楼窗户人影偷听_陆仁7,咱们的诊金也该涨涨了。,咱们看毛病的铜钱是不是要涨一涨了。,陆仁,,[#anonymous]
 c03_三楼窗户人影偷听_陆仁8,外头的东西今天一个价，明天又是一个价，处处都要花钱，小蝶也到了要上学的年纪...,现在外头的东西一天一个价，哪一样事情覅用铜钱？小蝶也到了要读书的年纪...,陆仁,,[#anonymous]
 c03_三楼窗户人影偷听_陆仁9,我是个俗人，得为将来打算。,我们平头老百姓，总为以后打算的。,陆仁,,[#anonymous]
@@ -15,7 +16,7 @@ c03_瞎子卧室演出_瞎子4,一个活生生的小女孩，就这么找不见
 c03_一楼院子李癞胖_胖子6,真像啊，像活过来了似的...,哪能嘎像的，像活过来了一样...,张文开,,[#anonymous]
 c03_一楼院子李癞胖_李氏7,呸！现在抓药还要多收几个子儿，我看那老板就是掉钱眼里去了！,册那！现在赎药还要多收铜钱啊？老板大概落了铜钱眼里去了！,李兰,,[#anonymous]
 c03_一楼院子李癞胖_癞子5,都忙完了吧？,生活都做好了伐？,王守义,,[#anonymous]
-c03_一楼院子李癞胖_癞子6,走走走，一起搓麻啊张老板，三缺一！,好了么走了，搓麻将去了！张老板，三缺一！,王守义,,[#anonymous]
+c03_一楼院子李癞胖_癞子6,走走走，一起搓麻啊！张老板，三缺一！,好了么走了，搓麻将去了！张老板，三缺一！,王守义,,[#anonymous]
 c03_一楼院子李癞胖_胖子7,一天天的净惦记着我身上这点油水了！,一天天就想刮我身上这点油水了！,张文开,,[#anonymous]
 c03_一楼院子李癞胖_胖子8,唉，走，来两把过过手瘾！,唉，走，过过手念头过过手念头！,张文开,,[#anonymous]
 c03_理发店_癞子_8,我家那个昨天想拿推子给我剃头，差点给我开了瓢！,我家那个昨天想拿推子给我剃头，差点给我开了瓢！,王守义,,
@@ -156,6 +157,7 @@ c03_绞肉机演出_小小蝶10,那个，这是我新认识的好朋友，她叫
 c03_绞肉机演出_小蝉7,我叫方小蝉。,我叫方小蝉。,方小蝉,,
 c03_绞肉机演出_小蝉8,阿姨，你们是不是要回去吃饭啦，我爸爸...一会也要来喊我回家了。,阿姨，你们是伐是要回起吃饭啦，我爸爸...等些阿要叫我回起了。,方小蝉,,
 c03_绞肉机演出_小蝉9,再、再见。,再、再见。,方小蝉,,
+c03_绞肉机演出_小小蝶11,下次再见啦！,,小小蝶,,[#anonymous]
 c03_结尾井边演出_小蝉10,我要是还活着...就能拉你起来了,我要是还活来嘿，就好拉侬起来了,方小蝉,,
 c03_结尾井边演出_小蝶1,方小蝉？我好像...想起你是谁了...,方小蝉？我好像想起侬是啥宁了,吕萍,,
 c03_结尾井边演出_小蝉11,嗯...那你可以...离开这里了吗？,嗯...那侬可以...回去了伐？,方小蝉,,

asset/dialogue/c03.dialogue

@@ -276,6 +276,11 @@
 方小蝉: 再、再见。 [ID:c03_绞肉机演出_小蝉9]
 => END
 
+~ c03_绞肉机回忆小蝶和小婵8
+#（混响效果+重叠播放）（衔接记忆回到现实）
+小小蝶: 下次再见啦！ [#anonymous]  [ID:c03_绞肉机演出_小小蝶11]
+=> END
+
 ~ c03_井边回忆
 方小蝉: 我要是还活着...就能拉你起来了 [ID:c03_结尾井边演出_小蝉10]
 吕萍: 方小蝉？我好像...想起你是谁了... [ID:c03_结尾井边演出_小蝶1]

scene/ground/scene/c02/s03_院子.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=121 format=3 uid="uid://djc2uaefhmu7"]
+[gd_scene load_steps=122 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_院子.gd" id="2_dt5aj"]
@@ -81,6 +81,7 @@
 [ext_resource type="Texture2D" uid="uid://bjdy0o0qngukl" path="res://asset/art/scene/c03/s00_院子与其他/e_运尸车.png" id="74_f5g0l"]
 [ext_resource type="Script" uid="uid://b5to0url3t7h4" path="res://scene/ground/script/c02/s03_event李氏给药完成.gd" id="75_0ek7o"]
 [ext_resource type="SpriteFrames" uid="uid://cmvr3lbwe3h7p" path="res://asset/art/gif/c03_特写与游戏动画/c03_特写与游戏动画_frames.tres" id="75_allmh"]
+[ext_resource type="AudioStream" uid="uid://wbpxhy1q0pi5" path="res://asset/audio/sfx/交互/角色/小蝶惊醒喘气.ogg" id="77_0kbwx"]
 [ext_resource type="Texture2D" uid="uid://rsk3dkai37hu" path="res://asset/art/scene/c02/s03_公寓一楼院子/诡异效果/前侧楼梯_楼梯人群_前景.png" id="77_6y26q"]
 [ext_resource type="Script" uid="uid://3umabu63j1t5" path="res://scene/ground/script/c02/s03_event第三章开幕.gd" id="77_ndc6g"]
 [ext_resource type="Texture2D" uid="uid://by7ibwt45ndlm" path="res://asset/art/scene/c03/s00_第三章开幕/第三章开场.png" id="77_pyl5w"]
@@ -1441,6 +1442,12 @@ bus = &"game_sfx"
 script = ExtResource("4_ygnci")
 metadata/_custom_type_script = "uid://rq6w1vuhuq1m"
 
+[node name="Sfx惊醒喘气" type="AudioStreamPlayer" parent="Ground/DeployLayer/Event2D第二章结束井边演出"]
+stream = ExtResource("77_0kbwx")
+bus = &"game_sfx"
+script = ExtResource("4_ygnci")
+metadata/_custom_type_script = "uid://rq6w1vuhuq1m"
+
 [node name="Event2D第二章_纸人" type="Node2D" parent="Ground/DeployLayer" index="39"]
 script = ExtResource("73_lt8c0")
 event_name = &"c03_well_show"

scene/ground/scene/c03/s12_胖子游戏3.tscn

@@ -1,10 +1,11 @@
-[gd_scene load_steps=24 format=3 uid="uid://cxabqg87g4vxc"]
+[gd_scene load_steps=25 format=3 uid="uid://cxabqg87g4vxc"]
 
 [ext_resource type="PackedScene" uid="uid://dayyx4jerj7io" path="res://scene/ground/ground.tscn" id="1_ly8ge"]
 [ext_resource type="Script" uid="uid://f4uampm47832" path="res://scene/ground/scene/c03/s12_胖子游戏3.gd" id="2_c01lu"]
 [ext_resource type="AudioStream" uid="uid://dvc2emnfcmabx" path="res://asset/audio/sfx/环境音/白噪音/白噪声楼道1.ogg" id="3_h404e"]
 [ext_resource type="Script" uid="uid://rq6w1vuhuq1m" path="res://scene/entity/audio/sfx.gd" id="4_fjio5"]
 [ext_resource type="AudioStream" uid="uid://bhaws2ungqaf5" path="res://asset/audio/sfx/交互/角色/sfx_哼歌.ogg" id="5_47wdn"]
+[ext_resource type="Script" uid="uid://wapo47a1oddf" path="res://scene/entity/audio/sfx2d.gd" id="6_vyyx8"]
 [ext_resource type="Texture2D" uid="uid://jimhy0dgkeoi" path="res://asset/art/gif/c03_胖子游戏/c03_胖子游戏第一段/地面.png" id="9_fjio5"]
 [ext_resource type="Texture2D" uid="uid://b22lmq2qtsmf1" path="res://asset/art/gif/c03_胖子游戏/c03_胖子游戏第一段/最后的背景 循环贴图.png" id="9_mr0pm"]
 [ext_resource type="Script" uid="uid://cphfob11f7atx" path="res://addons/property-inspector/pro_animation_sprite2d/pro_animated_sprite.gd" id="9_vyyx8"]
@@ -139,12 +140,13 @@ bus = &"game_sfx"
 script = ExtResource("4_fjio5")
 metadata/_custom_type_script = "uid://rq6w1vuhuq1m"
 
-[node name="Sfx小蝉哼歌" type="AudioStreamPlayer" parent="Ground/AnimationPlayer" index="2"]
+[node name="Sfx小蝉哼歌" type="AudioStreamPlayer2D" parent="Ground/AnimationPlayer" index="2"]
+position = Vector2(7155, 89)
 stream = ExtResource("5_47wdn")
 volume_db = 20.0
 bus = &"game_sfx"
-script = ExtResource("4_fjio5")
+script = ExtResource("6_vyyx8")
-metadata/_custom_type_script = "uid://rq6w1vuhuq1m"
+metadata/_custom_type_script = "uid://wapo47a1oddf"
 
 [node name="BGSprite2D" parent="Ground" index="2"]
 light_mask = 5

scene/ground/script/c02/s03_event_2d第二章结束井边演出.gd

@@ -34,7 +34,9 @@ func _start_well_show() -> void:
 	# c02_吕萍_背靠呼吸
 	player.player_action(20, false)
 	# 多坐一会
-	await Util.wait(6.5)
+	await Util.wait(5.5)
+	# 惊醒喘气
+	$"Sfx惊醒喘气".play()
 	# c02_吕萍_背靠起身
 	await player.player_action(19, true)
 	await Util.wait(2.0)

scene/ground/script/c02/s03_event第三章开幕.gd

@@ -41,7 +41,7 @@ func intro_c04() -> void:
 	await Util.wait(1.5)
 	var pivot = $"CameraPivot"
 	camera.focus_node(pivot, 3.0)
-	await Util.wait(1.5)
+	await Util.wait(2.7)
 	var animation_player = $"AnimationPlayer" as AnimationPlayer
 	animation_player.play("intro_c04")
 	Util.timer(2.0, $"Pro花盆掉落".hide)

scene/ground/script/c03/s03_closeup癞子纸人.tscn

@@ -2,7 +2,7 @@
 
 [ext_resource type="Script" uid="uid://de2smnt2my047" path="res://scene/ground/script/c03/s03_closeup癞子纸人.gd" id="1_6n6qt"]
 [ext_resource type="AudioStream" uid="uid://b5bbu858rembf" path="res://asset/audio/sfx/交互/第二章/sfx_s03_剪刀声音.ogg" id="2_2kayp"]
-[ext_resource type="AudioStream" uid="uid://dxnsyw7box2w0" path="res://asset/audio/sfx/交互/序章/sfx_鬼影浮现.ogg" id="2_fvunv"]
+[ext_resource type="AudioStream" uid="uid://ko5kibky8hcw" path="res://asset/audio/sfx/交互/第一章/红字特效音.ogg" id="2_epvok"]
 [ext_resource type="Texture2D" uid="uid://cbql1i4hblmt1" path="res://asset/art/ui/遮罩/inspect特写通用遮罩.png" id="2_uenj0"]
 [ext_resource type="Texture2D" uid="uid://e88x3ihvhetd" path="res://asset/art/scene/c03/s03_瞎子理发店/癞子特写/背景.png" id="2_xao0c"]
 [ext_resource type="Script" uid="uid://rq6w1vuhuq1m" path="res://scene/entity/audio/sfx.gd" id="3_6rgy3"]
@@ -287,7 +287,8 @@ libraries = {
 }
 
 [node name="Sfx不要剪刀诡异音效" type="AudioStreamPlayer" parent="."]
-stream = ExtResource("2_fvunv")
+stream = ExtResource("2_epvok")
+volume_db = -8.0
 bus = &"game_sfx"
 script = ExtResource("3_6rgy3")
 metadata/_custom_type_script = "uid://rq6w1vuhuq1m"

scene/ground/script/c03/二章结尾回忆.gd

@@ -68,7 +68,10 @@ func start_show() -> void:
 	xdie.play("小蝶看向灰姑呼吸")
 	DialogueManager.show_dialogue_balloon(GlobalConfig.DIALOG_C03, "c03_绞肉机回忆小蝶和小婵7")
 	await DialogueManager.dialogue_ended
-	await Util.wait(1.5)
+	await Util.wait(0.8)
+	# 下次见，混响转场
+	DialogueManager.show_dialogue_balloon(GlobalConfig.DIALOG_C03, "c03_绞肉机回忆小蝶和小婵8")
+	await Util.wait(0.8)
 	# c03_meat_grinder: 0:初始化 1:已装转盘 2:胖子游戏结束 3:绞肉机演出 4:演出结束
 	EventManager.set_stage("c03_meat_grinder", 4)
 	EventManager.set_stage("c03_well_show", 1)

scene/ux/note/ux_note.tscn

@@ -81,7 +81,6 @@ expand_mode = 5
 stretch_mode = 5
 
 [node name="Event_current_chapter_stage" type="Sprite2D" parent="Bag/Book"]
-visible = false
 position = Vector2(340, 137)
 scale = Vector2(0.2, 0.2)
 script = ExtResource("5_nk0pj")
@@ -261,6 +260,7 @@ scale = Vector2(1.19114, 1.20576)
 texture = ExtResource("11_dohnv")
 
 [node name="Event_current_chapter_stage2" type="Sprite2D" parent="Bag/Book"]
+visible = false
 position = Vector2(340, 137)
 scale = Vector2(0.2, 0.2)
 script = ExtResource("5_nk0pj")