佛堂音效资产

asset/audio/sfx/交互/第三章/敲木鱼.ogg.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://utvnayb8qrl7"
+path="res://.godot/imported/敲木鱼.ogg-984a5dae8fc31d346c97d436fe0161f0.oggvorbisstr"
+
+[deps]
+
+source_file="res://asset/audio/sfx/交互/第三章/敲木鱼.ogg"
+dest_files=["res://.godot/imported/敲木鱼.ogg-984a5dae8fc31d346c97d436fe0161f0.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

asset/audio/sfx/交互/第三章/猫摇啊摇1.ogg.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://ddgpicbqeeirm"
+path="res://.godot/imported/猫摇啊摇1.ogg-6019c2f49eb051b549d1a91f3e904674.oggvorbisstr"
+
+[deps]
+
+source_file="res://asset/audio/sfx/交互/第三章/猫摇啊摇1.ogg"
+dest_files=["res://.godot/imported/猫摇啊摇1.ogg-6019c2f49eb051b549d1a91f3e904674.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

asset/audio/sfx/交互/第三章/猫摇啊摇2.ogg.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://8wwb1lrcwmxq"
+path="res://.godot/imported/猫摇啊摇2.ogg-b187ef91bd3bfa84dfa9f416d03abc19.oggvorbisstr"
+
+[deps]
+
+source_file="res://asset/audio/sfx/交互/第三章/猫摇啊摇2.ogg"
+dest_files=["res://.godot/imported/猫摇啊摇2.ogg-b187ef91bd3bfa84dfa9f416d03abc19.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

asset/audio/sfx/交互/第三章/猫摇啊摇3.ogg.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://8kdsrnahn8d5"
+path="res://.godot/imported/猫摇啊摇3.ogg-f77e594353dd9973b0c5a061d4e08ada.oggvorbisstr"
+
+[deps]
+
+source_file="res://asset/audio/sfx/交互/第三章/猫摇啊摇3.ogg"
+dest_files=["res://.godot/imported/猫摇啊摇3.ogg-f77e594353dd9973b0c5a061d4e08ada.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

asset/audio/sfx/交互/第三章/猫摇啊摇4.ogg.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://0hyoll22dnqd"
+path="res://.godot/imported/猫摇啊摇4.ogg-23eac55a81534d8f60a3f8f93f4aad66.oggvorbisstr"
+
+[deps]
+
+source_file="res://asset/audio/sfx/交互/第三章/猫摇啊摇4.ogg"
+dest_files=["res://.godot/imported/猫摇啊摇4.ogg-23eac55a81534d8f60a3f8f93f4aad66.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://ga6dmch4k63y"
+path="res://.godot/imported/猫摇啊摇_全.ogg-f2aaba14ba03ba84ce1476448e0dc1fc.oggvorbisstr"
+
+[deps]
+
+source_file="res://asset/audio/sfx/交互/第三章/猫摇啊摇_全.ogg"
+dest_files=["res://.godot/imported/猫摇啊摇_全.ogg-f2aaba14ba03ba84ce1476448e0dc1fc.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

asset/dialogue/event_stage.dialogue

@@ -49,7 +49,7 @@ c04_ghost_trapped: 0:初始化 1:第一次开门 2:进入鬼打墙场景 3:鬼
 # 木头人游戏
 c04_puppet_game: 0:初始化 1:开始游戏 2:游戏胜利
 # 除晦游戏
-c04_erase_curse: 0:初始化 1:开始游戏 2:游戏结束
+c04_erase_curse: 0:初始化 1:开始显示 2:结束隐藏
 # 煮肉游戏
 c04_stew_meat: 0:初始化 1:游戏结束
 # 日记游戏

asset/dialogue/item_description.csv

@@ -140,7 +140,7 @@ prop_3个纸铜钱_说明,三枚纸制铜钱整齐排列，数量似乎有特殊
 prop_剪刀,剪刀,,,[#texture=c03/缠着符咒的剪刀.png][#inspect=c03/ux_缠着符咒的剪刀.png],,
 prop_剪刀_说明,普通的裁缝剪刀，刀身上缠绕着黄色的符纸,,,,,
 prop_药纸,药纸,,,[#texture=c03/药纸.png],,
-prop_药纸_说明,用牛皮做的药纸，上面沾着些粉尘,,,,,
+prop_药纸_说明,常用来绘制符文的纸张，也可用来包其他东西,,,,,
 prop_药包,药包,,,[#texture=c03/药包.png][#inspect=c03/ux_药包.png],,
 prop_药包_说明,用牛皮纸包裹的药粉，竟散发着淡淡的香味,,,,,
 prop_菜刀,菜刀,,,[#texture=c03/菜刀.png][#inspect=c03/ux_菜刀.png],,
@@ -155,11 +155,11 @@ prop_药方,药方,,,[#texture=c03/药方.png][#inspect=c03/ux_药方.png],,
 prop_药方_说明,生姜两片{br}竹叶十片去尖{br}经霜三年的甘蔗{br}蟋蟀一对 注：要原配，即本在一窠中者{br}金钱鼠尾辫一副 注：生剪 烧成灰兑水送服,,,,,
 prop_药方_详情,show,,,,,
 prop_转轮,转轮,,,[#texture=c03/转轮.png],,
-prop_转轮_说明,一个厚重的金属转轮，表面布满了奇怪的划痕和难以辨认的符号，似乎是某种机关的核心部件,,,,,
+prop_转轮_说明,一个厚重的金属转轮，表面布满了的划痕，似乎是某种机关的核心部件,,,,,
 prop_新鲜的肉,新鲜的肉,,,[#texture=c03/新鲜的肉.png],,
-prop_新鲜的肉_说明,一块色泽鲜红的肉，看起来很新鲜，但凑近闻却没有任何血腥味，反而有种奇怪的甜香,,,,,
+prop_新鲜的肉_说明,[] 一块色泽鲜红的肉，凑近闻没有任何血腥味，反而有种不寻常的甜香,,,,,
 prop_符纸钥匙,符纸钥匙,,,[#texture=c03/符纸钥匙.png][#inspect=c03/ux_符纸钥匙.png],,
-prop_符纸钥匙_说明,用朱砂绘制着符文的黄纸折叠成的钥匙，与其说是用来开锁，不如说是为了镇压锁住的东西,,,,,
+prop_符纸钥匙_说明,被符纸缠绕的钥匙，符文似乎是用朱砂绘制的，与其说是用来开锁，不如说是为了镇压锁住的东西,,,,,
 prop_煮熟的肉,煮熟的肉,,,[#texture=c04/煮熟的肉.png],,
 prop_煮熟的肉_说明,煮熟的肉,,,,,
 prop_九宫格块,九宫格块,,,[#texture=c04/九宫格块.png],,
@@ -192,7 +192,7 @@ prop_沾血的纸条_说明,文开，近日几条丘八又上门，娘仍未告
 prop_沾血的老虎钳,沾血的老虎钳,,,[#texture=c02/老虎钳物品.png][#inspect=c02/老虎钳.png],,
 prop_沾血的老虎钳_详情,skip,,,,,
 prop_沾血的老虎钳_说明,「虎头牌」钳子，家家户户常备。,,,,,
-prop_沾血的老虎钳_背包说明,金属齿口微微张开，像是在沉默地等待下一次合拢。{br}上面覆着一层已干涸多年的深褐色痕迹，颜色深得几乎吞没了光。{br}手柄的包皮处有一道被汗水与力道反复磨出的暗凹，握在手中时，那种冰冷与沉重仿佛会从掌心渗入记忆深处，唤起某个不该想起的夜晚。{br}它似乎曾夺走过什么——一种声音，或一段无法再被诉说的真相。,,,,,
+prop_沾血的老虎钳_背包说明,上面覆着一层已干涸多年的深褐色痕迹，颜色深得几乎吞没了光。{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.

scene/ground/scene/c04/s01_父母房间.tscn

@@ -71,7 +71,6 @@ script = ExtResource("7_rfsfd")
 updater_event = &"c04_erase_curse"
 updater_mode = "shower"
 updater_ease_duration = 0.0
-updater_stages = Array[int]([0, 1])
 metadata/_custom_type_script = "uid://0wjaho6qkg6s"
 
 [node name="Closeup九宫格游戏" parent="Ground/DeployLayer" index="4" instance=ExtResource("5_173ya")]

scene/ground/scene/c04/s05_客厅.tscn

@@ -62,7 +62,22 @@ target_scene = "c04_s01"
 target_portal = "left"
 status = "opened"
 
-[node name="藤蔓" type="Sprite2D" parent="Ground/DeployLayer" index="2"]
+[node name="Closeup墙上儿童画" parent="Ground/DeployLayer" index="2" instance=ExtResource("10_2a7rr")]
+position = Vector2(338.5, -5)
+texture = ExtResource("11_3cw04")
+packed_scene = ExtResource("11_6pvlg")
+quit_closeup_on_cancel = false
+on_display_hide_hud = true
+
+[node name="EventBinder" type="Node" parent="Ground/DeployLayer/Closeup墙上儿童画"]
+script = ExtResource("6_sprhu")
+updater_event = &"c04_puppet_game"
+updater_mode = "shower"
+updater_ease_duration = 0.0
+updater_stages = Array[int]([0])
+metadata/_custom_type_script = "uid://0wjaho6qkg6s"
+
+[node name="藤蔓" type="Sprite2D" parent="Ground/DeployLayer" index="3"]
 position = Vector2(294, -17)
 texture = ExtResource("5_sprhu")
 
@@ -71,16 +86,8 @@ script = ExtResource("6_sprhu")
 updater_event = &"c04_erase_curse"
 updater_mode = "shower"
 updater_ease_duration = 0.0
-updater_stages = Array[int]([0, 1])
 metadata/_custom_type_script = "uid://0wjaho6qkg6s"
 
-[node name="Closeup墙上儿童画" parent="Ground/DeployLayer" index="3" instance=ExtResource("10_2a7rr")]
-position = Vector2(338.5, -5)
-texture = ExtResource("11_3cw04")
-packed_scene = ExtResource("11_6pvlg")
-quit_closeup_on_cancel = false
-on_display_hide_hud = true
-
 [node name="Closeup烧香游戏" parent="Ground/DeployLayer" index="4" instance=ExtResource("10_2a7rr")]
 position = Vector2(189, 39)
 packed_scene = ExtResource("13_3cw04")
@@ -121,7 +128,7 @@ texture = ExtResource("16_omv2t")
 [node name="Pro木头人3" type="AnimatedSprite2D" parent="Ground/DeployLayer/Event木头人游戏"]
 position = Vector2(507, 38)
 sprite_frames = ExtResource("6_llv1p")
-animation = &"木头人游戏3_查看"
+animation = &"木头人游戏3_进门动作"
 flip_h = true
 script = ExtResource("7_sprhu")
 autostart = false

scene/ground/scene/c04/s07_佛堂.gd

@@ -14,13 +14,40 @@ func _ready() -> void:
 
 
 #region node_reference
+var interactable小猫摇啊摇: Interactable2D
 #endregion
 
 
 # 读取设置变量名
 func _setup_node_reference() -> void:
-	pass
+	interactable小猫摇啊摇 = $"../DeployLayer/Interactable小猫摇啊摇"
+	interactable小猫摇啊摇.interacted.connect(_on_catty_music_interacted)
 
 
 func _on_ground_ready() -> void:
 	pass
+
+
+var _catty_music_note_id := 0
+var _catty_music_notes = [1, 2, 3, 1, 2, 3, 1, 3, 4, 2, 3]
+var _catty_music_note_map = {
+	# res://asset/audio/sfx/交互/第三章/猫摇啊摇1.ogg
+	1: preload("uid://ddgpicbqeeirm"),
+	2: preload("uid://8wwb1lrcwmxq"),
+	3: preload("uid://8kdsrnahn8d5"),
+	4: preload("uid://0hyoll22dnqd"),
+}
+
+
+func _on_catty_music_interacted() -> void:
+	var sfx = $"Sfx小猫摇啊摇"
+	sfx.stream = _catty_music_note_map[_catty_music_notes[_catty_music_note_id]]
+	sfx.play()
+	_catty_music_note_id = _catty_music_note_id + 1
+	if _catty_music_note_id == _catty_music_notes.size():
+		_catty_music_note_id = 0
+		# 交互成功
+		if not ArchiveManager.get_global_value("c04_s07_catty_music_all_done"):
+			ArchiveManager.set_global_entry("c04_s07_catty_music_all_done", true)
+			# 给道具
+			# TODO 【底片2】

scene/ground/scene/c04/s07_佛堂.tscn

@@ -1,12 +1,14 @@
-[gd_scene load_steps=9 format=3 uid="uid://b6cfu5rs88pql"]
+[gd_scene load_steps=11 format=3 uid="uid://b6cfu5rs88pql"]
 
 [ext_resource type="PackedScene" uid="uid://dayyx4jerj7io" path="res://scene/ground/ground.tscn" id="1_54u5c"]
 [ext_resource type="Script" uid="uid://bj0s5kvlf7dnk" path="res://scene/ground/scene/c04/s07_佛堂.gd" id="2_54u5c"]
 [ext_resource type="AudioStream" uid="uid://b2mudqvq1dmng" path="res://asset/audio/sfx/环境音/白噪音/白噪声房间里1.ogg" id="3_36k7s"]
 [ext_resource type="Script" uid="uid://rq6w1vuhuq1m" path="res://scene/entity/audio/sfx.gd" id="4_qgaoq"]
 [ext_resource type="PackedScene" uid="uid://dqkxiqbq83cmq" path="res://scene/entity/closeup.tscn" id="5_36k7s"]
+[ext_resource type="Texture2D" uid="uid://bnajmg64wo1ve" path="res://asset/art/scene/c04/s07_佛堂/bg_佛堂_适应尺寸.png" id="5_wk0w5"]
 [ext_resource type="PackedScene" uid="uid://b03v4u8m55leh" path="res://scene/ground/script/c04/s07_closeup小猫灵牌.tscn" id="6_qgaoq"]
 [ext_resource type="PackedScene" uid="uid://d3als2ou8psp4" path="res://scene/ground/script/c04/s07_closeup幻灯片游戏.tscn" id="7_ipc8i"]
+[ext_resource type="PackedScene" uid="uid://cw3q5pvciumil" path="res://scene/entity/interactable.tscn" id="9_v2bpp"]
 
 [sub_resource type="AnimationLibrary" id="AnimationLibrary_k01ve"]
 
@@ -34,9 +36,14 @@ mode = "场景背景音"
 "感应玩家操作" = false
 metadata/_custom_type_script = "uid://rq6w1vuhuq1m"
 
+[node name="Sfx小猫摇啊摇" type="AudioStreamPlayer" parent="Ground/AnimationPlayer" index="1"]
+bus = &"game_sfx"
+script = ExtResource("4_qgaoq")
+metadata/_custom_type_script = "uid://rq6w1vuhuq1m"
+
 [node name="BGSprite2D" parent="Ground" index="2"]
 light_mask = 5
-position = Vector2(52, 0)
+texture = ExtResource("5_wk0w5")
 offset = Vector2(0, -158)
 
 [node name="portal_left" parent="Ground/DeployLayer" index="0"]
@@ -54,6 +61,13 @@ packed_scene = ExtResource("6_qgaoq")
 [node name="Closeup幻灯片游戏" parent="Ground/DeployLayer" index="3" instance=ExtResource("5_36k7s")]
 packed_scene = ExtResource("7_ipc8i")
 
+[node name="Interactable小猫摇啊摇" parent="Ground/DeployLayer" index="4" instance=ExtResource("9_v2bpp")]
+unique_name_in_owner = true
+position = Vector2(172, 74)
+mute_when_interacted = true
+mute_when_invalid = true
+one_shot = false
+
 [node name="MainPlayer" parent="Ground" index="5"]
 position = Vector2(63, 95)
 catty_light_energy = 0.5

scene/ground/scene/c04/s09_除晦游戏.tscn

@@ -102,7 +102,6 @@ texture = ExtResource("6_qppbt")
 script = ExtResource("7_3a5uu")
 updater_event = &"c04_erase_curse"
 updater_mode = "shower"
-updater_stages = Array[int]([0, 1])
 metadata/_custom_type_script = "uid://0wjaho6qkg6s"
 
 [node name="关着的门" type="Sprite2D" parent="Ground/DeployLayer" index="5"]

scene/ground/script/c04/s05_closeup墙上儿童画.gd

@@ -5,3 +5,5 @@ signal exit(arg)
 
 func _ready() -> void:
 	layer = GlobalConfig.CANVAS_LAYER_LITTLE_GAME
+	# 显示藤蔓
+	EventManager.set_stage_if_greater("c04_erase_curse", 1)

scene/ground/script/c04/s05_event木头人游戏.gd

@@ -28,6 +28,7 @@ func _on_pre_stage_updated() -> void:
 	pass
 
 
+# 当 c04_puppet_game 更新
 func _on_stage_updated() -> void:
 	# c04_puppet_game: 0:初始化 1:开始游戏 2:游戏胜利
 	match stage:
@@ -36,29 +37,29 @@ func _on_stage_updated() -> void:
 			ambush.enabled = true
 			ambush.triggered.connect(_welcome_animation.bind(0, ambush))
 		1:
-			puppet1.animation = "木头人游戏1_进门动作"
-			puppet1.frame = puppet1.sprite_frames.get_frame_count("木头人游戏1_进门动作") - 1
-			puppet2.animation = "木头人游戏2_进门动作"
-			puppet2.frame = puppet2.sprite_frames.get_frame_count("木头人游戏2_进门动作") - 1
-			puppet3.animation = "木头人游戏3_进门动作"
-			puppet3.frame = puppet3.sprite_frames.get_frame_count("木头人游戏3_进门动作") - 1
+			for i in 3:
+				_puppet_play_animation("木头人游戏%s_进门动作", i, true)
 			# 玩家移动时，开启游戏
 			SceneManager.get_player().position_updated.connect(_on_player_position_updated)
 		2:
-			puppet1.animation = "木头人游戏1_胜利"
-			puppet1.frame = puppet1.sprite_frames.get_frame_count("木头人游戏1_胜利") - 1
-			puppet2.animation = "木头人游戏2_胜利"
-			puppet2.frame = puppet2.sprite_frames.get_frame_count("木头人游戏2_胜利") - 1
-			puppet3.animation = "木头人游戏3_胜利"
-			puppet3.frame = puppet3.sprite_frames.get_frame_count("木头人游戏3_胜利") - 1
+			for i in 3:
+				_puppet_play_animation("木头人游戏%s_胜利", i, true)
+
+
+func _puppet_play_animation(animation_regx: String, id: int, last_frame := false) -> void:
+	var pup = puppets[id] as AnimatedSprite2D
+	var animation = animation_regx % (id + 1)
+	pup.play(animation)
+	if last_frame:
+		pup.frame = pup.sprite_frames.get_frame_count(animation) - 1
 
 
 # 邀请动作
-func _welcome_animation(id: int, ambush) -> void:
+func _welcome_animation(id: int, ambush: Ambush2D) -> void:
 	ambush.enabled = false
 	puppets[id].play("木头人游戏%s_进门动作" % (id + 1))
 
-      
+
 # 0:not started yet; 1-3:started; 4:finished.
 var game_stage := 0
 
@@ -77,8 +78,6 @@ func _on_player_position_updated(pos: Vector2) -> void:
 		pass
 
 
-
-
 ######## 控制聚光灯
 
 const SPOT_LIGHT_ENERGY = 0.3