第二章整体优化

asset/audio/sfx/交互/第二章/sfx_刀落下.ogg.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://cwivh1kekjm02"
+path="res://.godot/imported/sfx_刀落下.ogg-b1992787cc95a84fcb5462522ec241ba.oggvorbisstr"
+
+[deps]
+
+source_file="res://asset/audio/sfx/交互/第二章/sfx_刀落下.ogg"
+dest_files=["res://.godot/imported/sfx_刀落下.ogg-b1992787cc95a84fcb5462522ec241ba.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://df2ep7ae3gutx"
+path="res://.godot/imported/sfx_肉掉下来.ogg-2dd1aab9b3c429e86b64fe88a80e35e4.oggvorbisstr"
+
+[deps]
+
+source_file="res://asset/audio/sfx/交互/第二章/sfx_肉掉下来.ogg"
+dest_files=["res://.godot/imported/sfx_肉掉下来.ogg-2dd1aab9b3c429e86b64fe88a80e35e4.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

asset/audio/sfx/交互/第二章/sfx_胖子被砸死.ogg.import

@@ -1,19 +0,0 @@
-[remap]
-
-importer="oggvorbisstr"
-type="AudioStreamOggVorbis"
-uid="uid://7ifxbe8eaxpj"
-path="res://.godot/imported/sfx_胖子被砸死.ogg-8a687892d56f2aee17768ba62e070b86.oggvorbisstr"
-
-[deps]
-
-source_file="res://asset/audio/sfx/交互/第二章/sfx_胖子被砸死.ogg"
-dest_files=["res://.godot/imported/sfx_胖子被砸死.ogg-8a687892d56f2aee17768ba62e070b86.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://7ifxbe8eaxpj"
+path="res://.godot/imported/sfx_胖子被肉砸死.ogg-ababf536eb1fa249e0f04f3088215c4f.oggvorbisstr"
+
+[deps]
+
+source_file="res://asset/audio/sfx/交互/第二章/sfx_胖子被肉砸死.ogg"
+dest_files=["res://.godot/imported/sfx_胖子被肉砸死.ogg-ababf536eb1fa249e0f04f3088215c4f.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

asset/dialogue/item_description.csv

@@ -173,7 +173,7 @@ prop_符纸_说明,切记将符纸布于墙面和棺体，等候七日，在水
 prop_沾血的纸条,沾血的纸条,,,[#texture=c03/沾血的纸条.png][#inspect=c03/ux_沾血的纸条.png],,
 prop_沾血的纸条_说明,文开，近日几条丘八又上门，娘仍未告诉他们你在何处，如今世道乱，苟活不耻，保命为上，盼望与儿早日重逢。,,,,,
 prop_沾血的老虎钳,沾血的老虎钳,,,[#texture=c02/老虎钳物品.png][#inspect=c02/老虎钳.png],,
-prop_沾血的老虎钳_说明,沾血的老虎钳,,,,,
+prop_沾血的老虎钳_说明,金属齿口微微张开，像是在沉默地等待下一次合拢。{br}上面覆着一层已干涸多年的深褐色痕迹，颜色深得几乎吞没了光。{br}手柄的包皮处有一道被汗水与力道反复磨出的暗凹，握在手中时，那种冰冷与沉重仿佛会从掌心渗入记忆深处，唤起某个不该想起的夜晚。{br}它似乎曾夺走过什么——一种声音，或一段无法再被诉说的真相。,,,,,
 c01_s05_检查院长房间,好像忘记了什么事情，再回去检查一遍吧。,,,,,I feel like I've forgotten something. Let me go back and check again.
 c01_s07_需要报纸,书店还没开门。,,,,,The bookstore isn't open yet.
 c01_s08_书店工作,老板交代的工作还没做完，不能偷懒。,,,,,I haven't finished the work the boss assigned. I can't slack off.
@@ -322,10 +322,11 @@ c03_s07_绞肉机,看着像台碎肉机,,,,,
 c03_s07_胖子游戏结束,张文开...文开...{br}方...小蝉...{br}绞肉机...,,,,,
 c03_s08_囚室绳子,？！{br}这绳子绑的太结实了{br}我得找个东西割断它,,,,,
 c03_s08_囚室醒过来,我这是到哪儿来了？,,,,,
-c03_s08_囚室看到脚印,？又是脚印,,,,,
+c03_s08_囚室看到脚印,小蝉的脚印...更接近那里了...,,,,,
 c03_s08_囚室桶,黏糊糊的半成品浆糊，里面还裹着一只死老鼠,,,,,
 c03_s08_囚室符纸,妖物者，本自造化而生，具灵识，知求生，与万类本无别。人言有异，是以别之。,,,,,
 c03_s08_囚室偷听后,他们说的药方...是我父母写的那张...{br}当年到底...算了，先想办法出去吧,,,,,
+c03_s09_棺材上刻的文字,上面刻着长命百岁。,,,,,
 c03_s09_胖子干尸,不知道是谁的干尸...,,,,,
 c03_s10_label1,[wave]当兵去，当兵饿不死[/wave],,,,,
 c03_s10_label2,[wave]活[/wave],,,,,
@@ -339,7 +340,7 @@ c03_s12_label5,[wave]已经...回不了头了。[/wave],,,,,
 c03_s12_label6,[wave]将她交给我，方能保你平安[/wave],,,,,
 c03_s12_label7,[wave]反正...都一样吧[/wave],,,,,
 c03_s12_label8,[wave]又嫩又甜[/wave],,,,,
-c03_李癞胖演出结束,怎么突然出现这么多人？{br}要不跟过去看看？,,,,,
+c03_李癞胖演出结束,怎么突然出现这么多人？,,,,,
 c03_冷飕飕风吹过,...{br}这股风...,,,,,
 c03_保卫科_李癞拜老鼠精,？！{br}他们这是...在拜那幅像？,,,,,
 c03_小手洞1,洞里有很浓的血腥味...,,,,,

asset/dialogue/item_description.dialogue

@@ -212,7 +212,7 @@
 沾血的纸条 [#texture=c03/沾血的纸条.png] [#inspect=c03/ux_沾血的纸条.png] [ID:prop_沾血的纸条]
 文开，近日几条丘八又上门，娘仍未告诉他们你在何处，如今世道乱，苟活不耻，保命为上，盼望与儿早日重逢。[ID:prop_沾血的纸条_说明]
 沾血的老虎钳 [#texture=c02/老虎钳物品.png][#inspect=c02/老虎钳.png]  [ID:prop_沾血的老虎钳]
-沾血的老虎钳 [ID:prop_沾血的老虎钳_说明]
+金属齿口微微张开，像是在沉默地等待下一次合拢。{br}上面覆着一层已干涸多年的深褐色痕迹，颜色深得几乎吞没了光。{br}手柄的包皮处有一道被汗水与力道反复磨出的暗凹，握在手中时，那种冰冷与沉重仿佛会从掌心渗入记忆深处，唤起某个不该想起的夜晚。{br}它似乎曾夺走过什么——一种声音，或一段无法再被诉说的真相。 [ID:prop_沾血的老虎钳_说明]
 => END
 
 
@@ -406,7 +406,7 @@
 # s08 囚室
 ？！{br}这绳子绑的太结实了{br}我得找个东西割断它 [ID:c03_s08_囚室绳子]
 我这是到哪儿来了？ [ID:c03_s08_囚室醒过来]
-？又是脚印 [ID:c03_s08_囚室看到脚印]
+小蝉的脚印...更接近那里了... [ID:c03_s08_囚室看到脚印]
 黏糊糊的半成品浆糊，里面还裹着一只死老鼠 [ID:c03_s08_囚室桶]
 妖物者，本自造化而生，具灵识，知求生，与万类本无别。人言有异，是以别之。 [ID:c03_s08_囚室符纸]
 他们说的药方...是我父母写的那张...{br}当年到底...算了，先想办法出去吧 [ID:c03_s08_囚室偷听后]

manager/scene/global_functor.gd

@@ -127,8 +127,10 @@ func c03_final_choose_exit() -> void:
 	# 如果出公寓做过选择，此处就不出现选择
 	SceneManager.lock_player()
 	SceneManager.black_transition(0.7, 14.0)
-	await Util.wait(2.0)
+	await Util.wait(2.5)
 	AudioManager.play_sfx(stream_exit_by_choice)
 	await Util.wait(10.5)
 	SceneManager.unlock_player()
 	SceneManager.checkout_index_page()
+	# 防止继续执行下去
+	await Util.wait(2.0)

scene/dialog/balloon.tscn

@@ -74,8 +74,8 @@ theme_override_constants/shadow_offset_y = 1
 theme_override_constants/shadow_offset_x = 1
 text = "Dialogue..."
 autowrap_mode = 0
-seconds_per_step = 0.005
+seconds_per_step = 0.0
-seconds_per_pause_step = 0.1
+seconds_per_pause_step = 0.0
 
 [node name="Responses" type="MarginContainer" parent="Balloon/VBoxContainer"]
 layout_mode = 2

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

@@ -900,11 +900,12 @@ metadata/_custom_type_script = "uid://cphfob11f7atx"
 [node name="Interactable抓药道具" parent="Ground/DeployLayer/Event2D抓药游戏/药车_老板" instance=ExtResource("8_xt8j0")]
 position = Vector2(1058, 30)
 action_key = 3
-one_shot_max_times = 3
+one_shot_max_times = 4
 disable_prop_after_interacted = true
 prop_key = "prop_3个纸铜钱"
 prop_key2 = "prop_药方"
 prop_key3 = "prop_辫子"
+prop_key4 = "prop_药纸"
 
 [node name="Closeup抓药游戏" parent="Ground/DeployLayer/Event2D抓药游戏/药车_老板" instance=ExtResource("23_81juy")]
 position = Vector2(1058, 30)
@@ -1388,6 +1389,11 @@ move_configs = Array[Dictionary]([{
 debug_mov_animation = "胖子_走路"
 metadata/_custom_type_script = "uid://cphfob11f7atx"
 
+[node name="Npc张文开" parent="Ground/DeployLayer/Event2D浆糊/Pro胖子" instance=ExtResource("35_plfv5")]
+position = Vector2(-5.26316, 9.47369)
+enabled = false
+hook_character_name = "张文开"
+
 [node name="Pro李氏" type="AnimatedSprite2D" parent="Ground/DeployLayer/Event2D浆糊"]
 position = Vector2(460, 32)
 scale = Vector2(0.95, 0.95)
@@ -1405,6 +1411,11 @@ move_configs = Array[Dictionary]([{
 debug_mov_animation = "李氏_走路_右"
 metadata/_custom_type_script = "uid://cphfob11f7atx"
 
+[node name="Npc李兰" parent="Ground/DeployLayer/Event2D浆糊/Pro李氏" instance=ExtResource("35_plfv5")]
+position = Vector2(3.15785, 13.6842)
+enabled = false
+hook_character_name = "李兰"
+
 [node name="Pro癞子" type="AnimatedSprite2D" parent="Ground/DeployLayer/Event2D浆糊"]
 position = Vector2(592, 32)
 scale = Vector2(0.95, 0.95)
@@ -1422,6 +1433,11 @@ move_configs = Array[Dictionary]([{
 debug_mov_animation = "辫子癞子_走路_右"
 metadata/_custom_type_script = "uid://cphfob11f7atx"
 
+[node name="Npc王守义" parent="Ground/DeployLayer/Event2D浆糊/Pro癞子" instance=ExtResource("35_plfv5")]
+position = Vector2(-5.26316, 6.31579)
+enabled = false
+hook_character_name = "王守义"
+
 [node name="Event2D第二章结束井边演出" type="Node2D" parent="Ground/DeployLayer" index="38"]
 position = Vector2(2100, 0)
 script = ExtResource("72_18q2p")
@@ -1471,6 +1487,7 @@ updater_stages = Array[int]([0])
 metadata/_custom_type_script = "uid://0wjaho6qkg6s"
 
 [node name="前景" type="Sprite2D" parent="Ground/DeployLayer/Event2D第二章_纸人/排队常人"]
+light_mask = 0
 z_index = 21
 texture = ExtResource("77_6y26q")
 centered = false
@@ -1491,6 +1508,7 @@ updater_stages = Array[int]([0])
 metadata/_custom_type_script = "uid://0wjaho6qkg6s"
 
 [node name="前景" type="Sprite2D" parent="Ground/DeployLayer/Event2D第二章_纸人/排队纸人"]
+light_mask = 0
 z_index = 21
 texture = ExtResource("78_5mk2s")
 centered = false
@@ -1662,14 +1680,17 @@ metadata/_custom_type_script = "uid://bkkiyk5jkdw4d"
 
 [node name="Ambush保卫科灯光闪烁0" parent="Ground/DeployLayer/Event保卫科灯光闪烁C03" instance=ExtResource("25_iyaiw")]
 position = Vector2(979, 34)
+enter_affected_by_visibility = true
 hook_method = "c03_light_flip0"
 
 [node name="Ambush保卫科灯光闪烁1" parent="Ground/DeployLayer/Event保卫科灯光闪烁C03" instance=ExtResource("25_iyaiw")]
 position = Vector2(658, 33)
+enter_affected_by_visibility = true
 hook_method = "c03_light_flip1"
 
 [node name="Ambush保卫科灯光闪烁2" parent="Ground/DeployLayer/Event保卫科灯光闪烁C03" instance=ExtResource("25_iyaiw")]
 position = Vector2(342, 35)
+enter_affected_by_visibility = true
 hook_method = "c03_light_flip2"
 
 [node name="PointLight2D" type="PointLight2D" parent="Ground/AmbientLayer" index="0"]

scene/ground/scene/c02/s04_保卫科.gd

@@ -41,6 +41,8 @@ func _on_ground_ready() -> void:
 
 	# 第二章之后关闭 closeup折锡纸 
 	if EventManager.get_chapter_stage() >= 3:
+		# 第二章不说花名册的事
+		closeup花名册.first_interact_os_key = ""
 		closeup折锡纸.enabled = false 
 
 
@@ -54,10 +56,10 @@ func _on_closeup_tin_coin_exited(arg = null):
 
 func _on_first_read(_arg) -> void:
 	await SceneManager.pop_os_with_str("c02_保卫科花名册首次互动结束")
-	EventManager.set_stage(&"handnote_c02_list_namesAndGoal", 1)
 
 
 func _on_name_book_exited(_arg) -> void:
+	EventManager.set_stage_if_greater(&"handnote_c02_list_namesAndGoal", 1)
 	if EventManager.get_chapter_stage() >= 3:
 		# 在 Event 节点脚本中执行演出
 		EventManager.set_stage_if_greater("c03_lilai_worship_mouse", 1)

scene/ground/scene/c02/s04_保卫科.tscn

@@ -192,7 +192,7 @@ metadata/_custom_type_script = "uid://0wjaho6qkg6s"
 
 [node name="背景图" type="Sprite2D" parent="Ground/DeployLayer/老鼠精_第二章"]
 z_index = -1
-position = Vector2(-160.5, -77.5)
+position = Vector2(-159.5, -76.5)
 texture = ExtResource("26_6bni3")
 centered = false
 

scene/ground/scene/c02/s05_一楼内侧楼道.gd

@@ -14,11 +14,13 @@ func _ready() -> void:
 
 
 func _on_ground_ready() -> void:
+	var pickable_meat = $"../DeployLayer/Pickable掉落的肉"
+	pickable_meat.triggered.connect(_on_pick_meat)
 	# 粘鼠游戏
 	if ArchiveManager.get_global_value(&"c02_meat_dropping"):
 		# 肉掉落，检查粘鼠板是否启用
 		if $"../DeployLayer/Interactable粘鼠板".interacted_times > 0:
-			if not $"../DeployLayer/Pickable掉落的肉".picked:
+			if not pickable_meat.picked:
 				var sprite = $"../DeployLayer/Interactable粘鼠板/粘鼠挣扎"
 				sprite.visible = true
 				sprite.play()
@@ -30,7 +32,7 @@ func _on_ground_ready() -> void:
 			$"../DeployLayer/Ambush老鼠叼肉".enabled = true
 			$"../DeployLayer/老鼠叼肉".visible = true
 	if ArchiveManager.get_global_value(&"c02_meat_given"):
-		$"../DeployLayer/Pickable掉落的肉".enabled = true
+		pickable_meat.enabled = true
 
 	var xiaochan = $"../DeployLayer/Ambush小蝉消失" as Ambush2D
 	var madman = $"../DeployLayer/Npc疯子" as Npc2D
@@ -96,8 +98,7 @@ func wood_puppet() -> void:
 	$"Sfx背景音".reset_volumn_to_default()
 
 
-func bucket_meat() -> void:
+func _on_pick_meat() -> void:
-	SceneManager.enable_prop_item("prop_新鲜的肉")
 	EventManager.set_stage_if_greater(&"handnote_c02_meat_stopMouse", 2)
 	EventManager.set_stage_if_greater(&"handnote_c02_meat_knockDoor", 2)
 

scene/ground/scene/c02/s06_二楼.gd

@@ -193,6 +193,9 @@ func _c02_final_show():
 		var closeup = $"../DeployLayer/Closeup谢幕演出" as Closeup2D
 		closeup.display()
 		closeup.exit.connect(_on_exit_final_show, CONNECT_ONE_SHOT)
+		await Util.wait(1.5)
+		# 结尾演出时直接解锁地图
+		EventManager.set_stage_if_greater(&"handnote_c02_map_2", 1)
 		play("RESET")
 
 

scene/ground/scene/c02/s06_二楼.tscn

@@ -1421,7 +1421,7 @@ metadata/_custom_type_script = "uid://bkkiyk5jkdw4d"
 
 [node name="Ambush走到尽头后小蝉跑" parent="Ground/DeployLayer/Event2D_xchan_run_away" instance=ExtResource("14_k01ve")]
 position = Vector2(365, 55)
-enabled = false
+enter_affected_by_visibility = true
 
 [node name="AutoplayAnimatedSprite" parent="Ground/DeployLayer/Event2D_xchan_run_away" instance=ExtResource("10_p6da7")]
 position = Vector2(269, 57)

scene/ground/scene/c03/s02_瞎子新卧室.gd

@@ -46,8 +46,6 @@ func _on_ground_ready() -> void:
 	else:
 		closeup洋糕点.enabled = true
 	if ambush小猫挠墙.played:
-		pickable李癞钥匙.visible = true
-		# ambush小猫挠墙.visible = false
 		ambush小猫挠墙.get_node("小猫挠墙").play("小猫呼吸_left")
 	else:
 		#TODO

scene/ground/scene/c03/s02_瞎子新卧室.tscn

@@ -178,6 +178,7 @@ metadata/_custom_type_script = "uid://rq6w1vuhuq1m"
 
 [node name="Sfx猫打呼噜" type="AudioStreamPlayer" parent="Ground/AnimationPlayer" index="1"]
 stream = ExtResource("5_bjrfa")
+volume_db = 12.0
 bus = &"game_sfx"
 script = ExtResource("23_qq2pn")
 metadata/_custom_type_script = "uid://rq6w1vuhuq1m"
@@ -407,7 +408,6 @@ texture = ExtResource("24_ac6iq")
 [node name="EventBinder" type="Node" parent="Ground/DeployLayer/Pickable李癞钥匙"]
 script = ExtResource("12_es0xo")
 updater_event = &"c03_invite_xchan_supper"
-updater_mode = "shower"
 updater_ease_duration = 0.0
 updater_stages = Array[int]([3])
 trigger_event = &"c03_invite_xchan_supper"

scene/ground/scene/c03/s03_瞎子理发店.tscn

@@ -133,7 +133,7 @@ metadata/_custom_type_script = "uid://cphfob11f7atx"
 [node name="Npc癞子" parent="Ground/DeployLayer/Event2D癞子剪辫子/Pro癞子" instance=ExtResource("15_pkhgt")]
 position = Vector2(0, 28)
 enabled = false
-hook_character_name = "癞子"
+hook_character_name = "王守义"
 
 [node name="Pro瞎子" type="AnimatedSprite2D" parent="Ground/DeployLayer/Event2D癞子剪辫子"]
 position = Vector2(349, 44)
@@ -154,7 +154,7 @@ metadata/_custom_type_script = "uid://cphfob11f7atx"
 [node name="Npc瞎子" parent="Ground/DeployLayer/Event2D癞子剪辫子/Pro瞎子" instance=ExtResource("15_pkhgt")]
 position = Vector2(5, 0)
 enabled = false
-hook_character_name = "瞎子"
+hook_character_name = "方启钊"
 
 [node name="Pro陆仁" type="AnimatedSprite2D" parent="Ground/DeployLayer/Event2D癞子剪辫子"]
 position = Vector2(297, 37)
@@ -219,6 +219,7 @@ player_movement_rect = Rect2(35, -158, 506, 316)
 facing_direction = Vector2(1, 0)
 
 [node name="AudioListener2D" type="AudioListener2D" parent="Ground/MainPlayer" index="6"]
+current = true
 
 [node name="FGSprite2D" parent="Ground/ParallaxForeground/FGParallaxLayer" index="0"]
 position = Vector2(9, 0)

scene/ground/scene/c03/s04_李癞房间.gd

@@ -60,7 +60,7 @@ func _on_exit_sort_mahjong_game(arg) -> void:
 func _on_exit_cheat_mahjong_game(arg) -> void:
 	if arg:
 		# 咳嗽声暂时消失
-		$"../DeployLayer/Event李氏纸人相关/Sfx2d咳嗽声".ease_kill()
+		$"../DeployLayer/Event李氏纸人相关/Sfx2d咳嗽声".easing_kill()
 		
 		EventManager.set_stage_if_greater("c03_mahjong_game", 3)
 		EventManager.set_stage_if_greater("c03_li_paperwoman", 1)		

scene/ground/scene/c03/s06_胖子卧室.gd

@@ -46,6 +46,9 @@ func _on_ground_ready() -> void:
 	counter.global_position.x = counter_x
 	after_counter_moved()
 
+	if ArchiveManager.get_global_value("c03_s06_hit_show_ready_to_play"):
+		$"../DeployLayer/Closeup柜子后的洞".display()
+
 
 var pushing_counter = false:
 	set(value):

scene/ground/scene/c03/s08_囚室.gd

@@ -57,7 +57,11 @@ func _check_first_enter() -> void:
 		player.set_facing_direction(Vector2.LEFT)
 		# c02_吕萍_背靠呼吸
 		player.player_action(20, false)
-		await Util.wait(3.0)
+		# 刚被打则多等，否则少等
+		if ArchiveManager.runtime_get("c03_s06_hit_show"):
+			await Util.wait(8.0)
+		else:
+			await Util.wait(4.0)
 		# c02_吕萍_背靠起身
 		await player.player_action(19, true)
 		await SceneManager.pop_os_with_str("c03_s08_囚室醒过来")

scene/ground/scene/c03/s09_棺材房.tscn

@@ -541,7 +541,7 @@ texture = ExtResource("15_rcrkk")
 position = Vector2(39, 9)
 stream = SubResource("AudioStreamInteractive_qkb2a")
 volume_db = -5.0
-max_distance = 700.0
+max_distance = 800.0
 attenuation = 3.0
 bus = &"game_sfx"
 script = ExtResource("10_htuhx")

scene/ground/scene/c03/s10_胖子游戏1.tscn

@@ -5,7 +5,7 @@
 [ext_resource type="AudioStream" uid="uid://dvc2emnfcmabx" path="res://asset/audio/sfx/环境音/白噪音/白噪声楼道1.ogg" id="3_7f2bb"]
 [ext_resource type="Script" uid="uid://rq6w1vuhuq1m" path="res://scene/entity/audio/sfx.gd" id="4_60xwi"]
 [ext_resource type="Texture2D" uid="uid://b22lmq2qtsmf1" path="res://asset/art/gif/c03_胖子游戏/c03_胖子游戏第一段/最后的背景 循环贴图.png" id="5_a608f"]
-[ext_resource type="AudioStream" uid="uid://7ifxbe8eaxpj" path="res://asset/audio/sfx/交互/第二章/sfx_胖子被砸死.ogg" id="5_v1flc"]
+[ext_resource type="AudioStream" uid="uid://df2ep7ae3gutx" path="res://asset/audio/sfx/交互/第二章/sfx_肉掉下来.ogg" id="5_v1flc"]
 [ext_resource type="Texture2D" uid="uid://c3bmukyjja1id" path="res://asset/art/gif/c03_胖子游戏/c03_胖子游戏第一段/前景.png" id="6_hno1l"]
 [ext_resource type="Texture2D" uid="uid://dd8vkws24b5vy" path="res://asset/art/gif/c03_胖子游戏/c03_胖子游戏第一段/肉山后 可以和背景移动速度不一样 循环贴图.png" id="6_x0t6p"]
 [ext_resource type="Texture2D" uid="uid://dpt0s2ujvcjs5" path="res://asset/art/gif/c03_胖子游戏/c03_胖子游戏第一段/肉山前 可以和背景移动速度不一样 循环贴图.png" id="7_8s7iq"]
@@ -32,7 +32,7 @@
 [ext_resource type="SpriteFrames" uid="uid://dy8b8dmgv3mdd" path="res://asset/art/gif/c03_胖子游戏/c03_胖子游戏第二段/c03_胖子游戏第二段_frames.tres" id="21_4bvrv"]
 [ext_resource type="Texture2D" uid="uid://b7gyapghy3tsy" path="res://asset/art/neutral_point_light.png" id="22_v1flc"]
 [ext_resource type="AudioStream" uid="uid://s1ogxxkfscc6" path="res://asset/audio/sfx/交互/第二章/棺材怪脚步.ogg" id="28_v1flc"]
-[ext_resource type="AudioStream" uid="uid://b5cjl0a4iw1kd" path="res://asset/audio/sfx/交互/第二章/剁肉_诡异.ogg" id="30_v1flc"]
+[ext_resource type="AudioStream" uid="uid://cwivh1kekjm02" path="res://asset/audio/sfx/交互/第二章/sfx_刀落下.ogg" id="30_v1flc"]
 
 [sub_resource type="Animation" id="Animation_v1flc"]
 length = 0.001
@@ -812,6 +812,7 @@ metadata/_custom_type_script = "uid://wapo47a1oddf"
 
 [node name="Sfx2D棺材怪切刀" type="AudioStreamPlayer" parent="Ground/CanvasLayer/胖子游戏棺材怪"]
 stream = ExtResource("30_v1flc")
+volume_db = 5.0
 bus = &"game_sfx"
 script = ExtResource("4_60xwi")
 metadata/_custom_type_script = "uid://rq6w1vuhuq1m"

scene/ground/scene/c03/s11_胖子游戏2.tscn

@@ -4,7 +4,7 @@
 [ext_resource type="Script" uid="uid://fejtkano6pn7" path="res://scene/ground/scene/c03/s11_胖子游戏2.gd" id="2_lfcjf"]
 [ext_resource type="AudioStream" uid="uid://dvc2emnfcmabx" path="res://asset/audio/sfx/环境音/白噪音/白噪声楼道1.ogg" id="3_hx2uj"]
 [ext_resource type="Script" uid="uid://rq6w1vuhuq1m" path="res://scene/entity/audio/sfx.gd" id="4_0w5fd"]
-[ext_resource type="AudioStream" uid="uid://7ifxbe8eaxpj" path="res://asset/audio/sfx/交互/第二章/sfx_胖子被砸死.ogg" id="5_novpu"]
+[ext_resource type="AudioStream" uid="uid://7ifxbe8eaxpj" path="res://asset/audio/sfx/交互/第二章/sfx_胖子被肉砸死.ogg" id="5_novpu"]
 [ext_resource type="Texture2D" uid="uid://b1t0o8vqwjirh" path="res://asset/art/gif/c03_胖子游戏/c03_胖子游戏第三段/山顶.png" id="5_wqrgj"]
 [ext_resource type="SpriteFrames" uid="uid://ca8u6yx6rv0xm" path="res://asset/art/gif/c03_胖子游戏/c03_胖子游戏第三段/c03_胖子游戏第三段_frames.tres" id="6_c73iv"]
 [ext_resource type="Texture2D" uid="uid://w4ep0mqmkfo0" path="res://asset/art/gif/c03_胖子游戏/c03_胖子游戏第三段/山顶洞口.png" id="6_hx2uj"]

scene/ground/script/c02/event_2d_xchan_run_away.gd

@@ -24,7 +24,6 @@ func _on_stage_updated():
 	# 0初始隐藏 1准备播放 2播放结束隐藏
 	if stage == 1:
 		var ambush = $"Ambush走到尽头后小蝉跑" as Ambush2D
-		ambush.enabled = true
 		var sprite = $"AutoplayAnimatedSprite"
 		ambush.triggered.connect(func():
 			sprite.play("c00_头套小婵_run")

scene/ground/script/c02/event_2d叼纸小猫.gd

@@ -17,7 +17,7 @@ func _on_global_stage_updated(e: StringName, s: int):
 
 func _on_ground_ready(_ground: Ground2D):
 	if $"Inspectable小猫纸条".icount > 0:
-		EventManager.set_stage_if_greater(pre_event_name, 4)
+		EventManager.set_stage_if_greater(event_name, 4)
 	# else:
 	# 	$"Pickable小猫纸条".triggered.connect(EventManager.set_stage.bind(event_name, 4))
 

scene/ground/script/c02/s03_event_2d抓药游戏.gd

@@ -22,14 +22,14 @@ func _on_global_stage_updated(e: StringName, s: int):
 func _on_ground_ready(_ground: Ground2D):
 	interactable.interacted.connect(_boss_interacted)
 	interactable.interact_mismatch_failed.connect(_boss_interacted.bind(false))
-	if interactable.interacted_times >= 3:
+	if interactable.interacted_times >= 4:
 		closeup.enabled = true
 		boss_sprite.hide()
 
 
 func _boss_interacted(valid := true) -> void:
 	if valid:
-		if interactable.interacted_times >= 3:
+		if interactable.interacted_times >= 4:
 			SceneManager.lock_player()
 			boss_sprite.play("抓药游戏_老板做药")
 			var camera = SceneManager.get_camera_marker()

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

@@ -110,9 +110,7 @@ func _braid_cutting_show() -> void:
 	$AnimationPlayer.play("light_and_canvas_flipping")
 	await Util.wait(1.5)
 	DialogueManager.show_dialogue_balloon(GlobalConfig.DIALOG_C03, "c03_s03_理发店演出1")
-	var tween = create_tween()
+	create_tween().tween_property(glass_mask, "modulate:a", 1.0, 0.5)
-	tween.tween_interval(1.0)
-	tween.tween_property(glass_mask, "modulate:a", 1.0, 1.0)
 	await DialogueManager.dialogue_ended
 	SceneManager.black_transition(0.7, 0.5)
 	await Util.wait(1.0)

scene/ground/script/c03/s03_刮海报_理发店.tscn

@@ -177,6 +177,7 @@ scale = Vector2(0.7, 0.3)
 polygon = PackedVector2Array(43, -26.5, -19, -44.7, -19, -42.1, -69, -5, -69, -1.6, -46.3, 6, -41.6, 6, -8.5, 24, -5.7, 24, 10.3, 36, 12.1, 36, 20, 44.7, 20, 46.4, 22.6, 47.4, 67.9, -4, 69.4, -4, 70, -5.6, 70, -7, 61, -14.9, 61, -16.2, 43, -25.3)
 
 [node name="Sprite2D" type="Sprite2D" parent="鬼母子游戏/倒塌/Props/药纸"]
+self_modulate = Color(0.374139, 0.374139, 0.374139, 1)
 light_mask = 2
 scale = Vector2(0.7, 0.3)
 texture = ExtResource("16_5s8gu")
@@ -184,7 +185,6 @@ texture = ExtResource("16_5s8gu")
 [node name="PointLight2D" type="PointLight2D" parent="鬼母子游戏/倒塌/Props/药纸"]
 light_mask = 0
 position = Vector2(1, 5)
-energy = 0.6
 range_layer_max = 10
 range_item_cull_mask = 2
 texture = SubResource("GradientTexture2D_b7rxv")

scene/ground/script/c03/s04_closeup李氏纸人.gd

@@ -39,8 +39,7 @@ func _display_label(id: int) -> void:
 		label = $"求舌头/RichTextLabel"
 	elif id == 1:
 		label = $"求药/RichTextLabel"
-		EventManager.set_stage_if_greater("handnote_c03_prop_drug", 1)
+	$"Sfx诡异的哑巴音效".play(4.0)
-	$"Sfx诡异的哑巴音效".play()
 	label.show()
 	label.modulate.a = 0.0
 	var tween = create_tween()

scene/ground/script/c03/s04_closeup李氏纸人.tscn

@@ -163,6 +163,7 @@ stretch_mode = 5
 
 [node name="Sfx诡异的哑巴音效" type="AudioStreamPlayer" parent="."]
 stream = ExtResource("4_f8b80")
+volume_db = -5.0
 bus = &"game_sfx"
 script = ExtResource("4_vcv6g")
 metadata/_custom_type_script = "uid://rq6w1vuhuq1m"

scene/ground/script/c03/s04_closeup柜子.gd

@@ -22,6 +22,8 @@ func _on_drug_spec_interacted() -> void:
 	# 拿药方后，启动 drug game
 	EventManager.set_stage("c03_drug_game", 1)
 	SceneManager.enable_prop_item("prop_药方", true)
+	EventManager.set_stage_if_greater("handnote_c03_prop_drug", 1)
+
 
 func _on_pic_interacted() -> void:
 	if pic.freezing:

scene/ground/script/c03/s06_closeup柜子后的洞.gd

@@ -26,6 +26,8 @@ func _ready() -> void:
 	hover_handle.interacted.connect(func():
 		_on_prop_picked("prop_刀把")
 	)
+	if ArchiveManager.get_global_value("c03_s06_hit_show_ready_to_play"):
+		_show()
 
 
 func _on_prop_picked(prop_key: String) -> void:
@@ -35,20 +37,24 @@ func _on_prop_picked(prop_key: String) -> void:
 		(prop_key == "prop_3012钥匙" and EventManager.get_stage(&"c03_s06_hole_knife_handle") > 0)
 		or (prop_key == "prop_刀把" and EventManager.get_stage(&"c03_s06_hole_key") > 0)
 	):
+		ArchiveManager.set_global_entry("c03_s06_hit_show_ready_to_play", true)
 		await SceneManager.get_inspector().quit_and_hidden
-		# TODO
+		_show()
-		SceneManager.pop_debug_dialog_info("美术&音效", "背后响起画外音「偷东西？」; 被胖子打晕演出")
+
-		await Util.wait(0.5)
+
-		Util.shake_layer(self, 2.0, 0.5, 4.0)
+func _show() -> void:
-		await Util.wait(2.0)
+	await Util.wait(1.0)
-		$"Sfx胖子靠近".play()
+	Util.shake_layer(self, 2.0, 0.5, 4.0)
-		# 画面抖动变红，玩家被打晕，画面变黑
+	$"Sfx胖子靠近".play()
-		$AnimationPlayer.play("bleeding_red")
+	DialogueManager.show_dialogue_balloon(GlobalConfig.DIALOG_C03, "c03_s06_被胖子打晕", [GlobalConfig.DIALOG_IGNORE_INPUT])
-		Util.shake_layer(self, 1.0)
+	await Util.wait(3.0)
-		# 拉长黑幕时长
+	$"Sfx被击中耳鸣".global_play()
-		SceneManager.black_transition(2.0, 3.0)
+	# 画面抖动变红，玩家被打晕，画面变黑
-		await Util.wait(2.0)
+	$AnimationPlayer.play("bleeding_red")
-		DialogueManager.show_dialogue_balloon(GlobalConfig.DIALOG_C03, "c03_s06_被胖子打晕")
+	Util.shake_layer(self, 2.5)
-		await Util.wait(3.0)
+	# 拉长黑幕时长
-		$"Sfx被击中耳鸣".global_play()
+	SceneManager.black_transition(2.0, 6.0)
-		SceneManager.get_ground_loader().transition_to_scene("c03_s08", "1")
+	await Util.wait(2.5)
+	ArchiveManager.set_global_entry("c03_s06_hit_show_ready_to_play", false)
+	ArchiveManager.runtime_set("c03_s06_hit_show", true)
+	SceneManager.get_ground_loader().transition_to_scene("c03_s08", "1")

scene/ground/script/c03/s07_event胖子游戏结束演出.gd

@@ -33,6 +33,8 @@ func _fatty_game_finished_show() -> void:
 	monster.show()
 	monster.play("砍桌子")
 	var sfx_monster = $"../棺材怪切肉/Sfx棺材怪切肉" as Sfx2D
+	# 剁肉_诡异
+	sfx_monster.stream = preload("uid://b5cjl0a4iw1kd")
 	# 小孩笑声
 	var sfx_laugh = $"Sfx2D小蝉笑声"
 	var tween = create_tween()

scene/ground/script/c03/s09_closeup棺材特写.gd

@@ -77,6 +77,7 @@ func _unhandled_input(event: InputEvent) -> void:
 			get_viewport().set_input_as_handled()
 			if prop == "prop_刀把":
 				knife_state = 2
+				%"胶水".hide()
 				%"刀有柄".show()
 				SceneManager.disable_prop_item_temp("prop_刀把")
 				hover_knife.freezing = false

scene/ground/script/c03/s09_closeup棺材特写.tscn

@@ -89,14 +89,14 @@ texture = ExtResource("11_ok7al")
 unique_name_in_owner = true
 visible = false
 light_mask = 4
-position = Vector2(33, -18)
+position = Vector2(30, -17)
 texture = ExtResource("13_i378g")
 
 [node name="刀有柄" type="Sprite2D" parent="Hover刀"]
 unique_name_in_owner = true
 visible = false
 light_mask = 4
-position = Vector2(32, -23)
+position = Vector2(31, -21)
 texture = ExtResource("13_ld65o")
 
 [node name="PointLight2D" type="PointLight2D" parent="Hover刀"]
@@ -117,6 +117,8 @@ modulate = Color(1, 1, 1, 0)
 anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
+offset_top = 1.0
+offset_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
 mouse_filter = 1

scene/ux/prop_hud.gd

@@ -594,7 +594,7 @@ func inspect_item(prop_key: String, display_obtained := true, inspect_content :=
 	if inspect_content:
 		var content = get_item_description(prop_key)
 		var wide = len(content) > 150
-		inspector.pop_standard_inspection(texture, null, content, not wide, wide)
+		inspector.pop_standard_inspection(texture, null, content, false, wide)
 	else:
 		inspector.pop_prop_inspection(prop_key, texture, display_obtained)