第二章优化：保卫科老鼠精、花名册；院子引导玩家走向保卫科

asset/art/gif/c03_瞎子新卧室/c03_瞎子新卧室_frames.tres

@@ -1,4 +1,4 @@
-[gd_resource type="SpriteFrames" load_steps=73 format=3 uid="uid://div8kcn7gu78r"]
+[gd_resource type="SpriteFrames" load_steps=75 format=3 uid="uid://div8kcn7gu78r"]
 
 [ext_resource type="Texture2D" uid="uid://ci0lh102m7myw" path="res://asset/art/gif/c03_瞎子新卧室/瞎子_坐拿烟_左呼吸/0.png" id="1_5viyw"]
 [ext_resource type="Texture2D" uid="uid://chptmqdm7c4wd" path="res://asset/art/gif/c03_瞎子新卧室/瞎子_咳嗽吐血/0.png" id="1_a0gqt"]
@@ -30,6 +30,8 @@
 [ext_resource type="Texture2D" uid="uid://cqvhc7emob3r2" path="res://asset/art/gif/c03_瞎子新卧室/小猫挠墙/2.png" id="13_omra6"]
 [ext_resource type="Texture2D" uid="uid://r117spkalnsd" path="res://asset/art/gif/c03_瞎子新卧室/瞎子_咳嗽吐血/13.png" id="14_kpr4a"]
 [ext_resource type="Texture2D" uid="uid://dwe8gbny3488v" path="res://asset/art/gif/c03_瞎子新卧室/小猫挠墙/3.png" id="14_mgqqr"]
+[ext_resource type="Texture2D" uid="uid://xw0akfvfh1d" path="res://asset/art/gif/c03_瞎子新卧室/小猫呼吸_left/1.png" id="14_omra6"]
+[ext_resource type="Texture2D" uid="uid://bg754vafpitve" path="res://asset/art/gif/c03_瞎子新卧室/小猫呼吸_left/2.png" id="15_mgqqr"]
 [ext_resource type="Texture2D" uid="uid://ctri0kcjfyacl" path="res://asset/art/gif/c03_瞎子新卧室/瞎子_咳嗽吐血/14.png" id="15_sprph"]
 [ext_resource type="Texture2D" uid="uid://dx84h7qxo543c" path="res://asset/art/gif/c03_瞎子新卧室/小猫挠墙/4.png" id="15_vol74"]
 [ext_resource type="Texture2D" uid="uid://c42p8e1gtnbnq" path="res://asset/art/gif/c03_瞎子新卧室/小猫挠墙/5.png" id="16_euwpl"]
@@ -133,6 +135,17 @@ animations = [{
 "speed": 5.0
 }, {
 "frames": [{
+"duration": 2.0,
+"texture": ExtResource("14_omra6")
+}, {
+"duration": 2.0,
+"texture": ExtResource("15_mgqqr")
+}],
+"loop": true,
+"name": &"小猫呼吸_left",
+"speed": 3.0
+}, {
+"frames": [{
 "duration": 6.0,
 "texture": ExtResource("14_mgqqr")
 }, {
@@ -197,6 +210,26 @@ animations = [{
 "speed": 30.0
 }, {
 "frames": [{
+"duration": 3.0,
+"texture": ExtResource("17_t2v0v")
+}, {
+"duration": 3.0,
+"texture": ExtResource("18_5eyh2")
+}, {
+"duration": 3.0,
+"texture": ExtResource("19_ht57b")
+}, {
+"duration": 3.0,
+"texture": ExtResource("20_qoe5p")
+}, {
+"duration": 15.0,
+"texture": ExtResource("23_gvvdv")
+}],
+"loop": false,
+"name": &"小猫结束挠墙",
+"speed": 30.0
+}, {
+"frames": [{
 "duration": 9.0,
 "texture": ExtResource("1_a0gqt")
 }, {

asset/art/gif/c03_瞎子新卧室/小猫呼吸_left/1.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://xw0akfvfh1d"
+path="res://.godot/imported/1.png-3827522f9eabd2cc4e1ba6c1a701890f.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://asset/art/gif/c03_瞎子新卧室/小猫呼吸_left/1.png"
+dest_files=["res://.godot/imported/1.png-3827522f9eabd2cc4e1ba6c1a701890f.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1

asset/art/gif/c03_瞎子新卧室/小猫呼吸_left/2.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://bg754vafpitve"
+path="res://.godot/imported/2.png-7b99f34955caf582f8c5e76c1007f604.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://asset/art/gif/c03_瞎子新卧室/小猫呼吸_left/2.png"
+dest_files=["res://.godot/imported/2.png-7b99f34955caf582f8c5e76c1007f604.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1

asset/art/scene/c02/s04_保卫科/ux_老鼠精画像_第二章.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://bsl1w7a5cfw1f"
+path="res://.godot/imported/ux_老鼠精画像_第二章.png-bd0c9c146c5122f84c9025496f20ead3.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://asset/art/scene/c02/s04_保卫科/ux_老鼠精画像_第二章.png"
+dest_files=["res://.godot/imported/ux_老鼠精画像_第二章.png-bd0c9c146c5122f84c9025496f20ead3.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1

asset/art/scene/c02/s04_保卫科/花名册/翻开页_第二章.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://c04b18dx2o8k4"
+path="res://.godot/imported/翻开页_第二章.png-8f1a8f2429e16972571b2ba403dd1dfc.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://asset/art/scene/c02/s04_保卫科/花名册/翻开页_第二章.png"
+dest_files=["res://.godot/imported/翻开页_第二章.png-8f1a8f2429e16972571b2ba403dd1dfc.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1

asset/audio/sfx/交互/角色/sfx_瞎子咳嗽.ogg.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://o5a70tl5445e"
+path="res://.godot/imported/sfx_瞎子咳嗽.ogg-2e9fbd90a5a121ed6d5b93d9ee736c74.oggvorbisstr"
+
+[deps]
+
+source_file="res://asset/audio/sfx/交互/角色/sfx_瞎子咳嗽.ogg"
+dest_files=["res://.godot/imported/sfx_瞎子咳嗽.ogg-2e9fbd90a5a121ed6d5b93d9ee736c74.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

asset/dialogue/c03.dialogue

@@ -10,11 +10,14 @@
 
 ~ c03_s02_邀请小蝉与瞎子对话1
 小小蝶: 那个...阿叔，小蝉在吗 [#anonymous]  [ID:c03_瞎子卧室演出_小小蝶1]
+=> END
+
+~ c03_s02_邀请小蝉与瞎子对话2
 方启钊: 咳咳，她，咳咳，不在。 [#anonymous]  [ID:c03_瞎子卧室演出_瞎子1]
 小小蝶: 她是不是生病了，好几天没看到她了。 [#anonymous]  [ID:c03_瞎子卧室演出_小小蝶2]
 => END
 
-~ c03_s02_邀请小蝉与瞎子对话2
+~ c03_s02_邀请小蝉与瞎子对话3
 方启钊: 她... [#anonymous]  [ID:c03_瞎子卧室演出_瞎子2]
 方启钊: 我一家一家问过来，都讲没看见她。 [#anonymous]  [ID:c03_瞎子卧室演出_瞎子3]
 方启钊: 一个活生生的小女孩，就这么找不见了... [#anonymous]  [ID:c03_瞎子卧室演出_瞎子4]

asset/dialogue/inspect_content.csv

@@ -27,6 +27,13 @@ c02_保卫科花名册5,三〇一二 吕萍,,,,3012 Lu Ping
 c02_保卫科花名册6,三〇一三 （看不清）,,,,3013 (Illegible)
 c02_保卫科花名册7,把我的鞋子拿给老鼠，老鼠会引开那个疯男人,,,,"Give my shoes to the rats, the rats will lure away that crazy man"
 c02_保卫科花名册8,不要相信墙里的东西！,,,,Don't trust what's in the wall!
+c03_保卫科花名册1,一〇一四 空,,,,
+c03_保卫科花名册2,一〇一五 *** **,,,,
+c03_保卫科花名册3,二〇一三 张文开,,,,
+c03_保卫科花名册4,二〇一五 *** 方小蝉,,,,
+c03_保卫科花名册5,三〇一二 **,,,,
+c03_保卫科花名册6,三** ***,,,,
+c03_保卫科花名册7,多言数穷，不如守中,,,,
 c02_小猫纸条,大哥！今晚老地方见 /井\,,,,Big brother! Meet at the usual place tonight /well\
 c02_议论文字1,你说的是真的啊？,,,,Is what you're saying really true?
 c02_议论文字2,你听谁说的？,,,,Who did you hear that from?

asset/dialogue/inspect_content.dialogue

@@ -43,6 +43,17 @@
 不要相信墙里的东西！ [ID:c02_保卫科花名册8]
 => END
 
+~ c03_保卫科花名册
+一〇一四 空 [ID:c03_保卫科花名册1]
+一〇一五 *** ** [ID:c03_保卫科花名册2]
+二〇一三 张文开 [ID:c03_保卫科花名册3]
+二〇一五 *** 方小蝉 [ID:c03_保卫科花名册4]
+
+三〇一二 ** [ID:c03_保卫科花名册5]
+三** *** [ID:c03_保卫科花名册6]
+多言数穷，不如守中 [ID:c03_保卫科花名册7]
+=> END
+
 ~ c02_小猫纸条
 大哥！今晚老地方见 /井\[ID:c02_小猫纸条]
 => END

asset/dialogue/item_description.csv

@@ -134,6 +134,8 @@ prop_3个纸铜钱,三个纸铜钱,,,[#texture=c03/3个纸铜钱.png],,
 prop_3个纸铜钱_说明,三枚纸制铜钱整齐排列，数量似乎有特殊含义,,,,,
 prop_剪刀,剪刀,,,[#texture=c03/缠着符咒的剪刀.png][#inspect=c03/ux_缠着符咒的剪刀.png],,
 prop_剪刀_说明,普通的裁缝剪刀，刀身上缠绕着黄色的符纸,,,,,
+prop_药纸,药纸,,,[#texture=c03/药纸.png],,
+prop_药纸_说明,用牛皮做的药纸，上面沾着些粉尘,,,,,
 prop_药包,药包,,,[#texture=c03/药包.png][#inspect=c03/ux_药包.png],,
 prop_药包_说明,用牛皮纸包裹的药粉，竟散发着淡淡的香味,,,,,
 prop_菜刀,菜刀,,,[#texture=c03/菜刀.png][#inspect=c03/ux_菜刀.png],,
@@ -279,13 +281,14 @@ c03_s02_获得1015钥匙后,嘶...这是哪户人家的钥匙来着？,,,,,
 c03_s03_纸娃娃,这些是...用来展示发型的吗？,,,,,
 c03_s03_假头套,现在已经不时兴这些了。,,,,,
 c03_s03_镜子,镜子上都是灰尘,,,,,
+c03_s03_获得纸舌头后,要命...搞不懂这种东西干嘛要藏起来...,,,,,
 c03_s03_照完镜子,...{br}是小蝉吧...见怪不怪了。,,,,,
 c03_s03_癞子呼吸声开始,！？{br}又是这个呼吸声？,,,,,
 c03_s03_癞子纸人首次结束,这个假人的造型...有点像在墙缝里看到的那个男人。,,,,,
 c03_s03_桌子,理发店常见的置物架,,,,,
 c03_s03_洗头盆,和楼道里一样的洗头盆,,,,,
 c03_s03_演出结束,又是幻觉吗...{br}刚才灰衣服的男人在八音盒和照片里出现过{br}还有那个红色衣服的女孩...{br}难道说...,,,,,
-c03_药车须知,抓药需足数三文，另需药方与药引,,,,,
+c03_药车须知,抓药需足数三文，另需药方、药纸与药引,,,,,
 c03_抓药铜钱不足,钱还没准备够...牌子上讲需要三文,,,,,
 c03_老板被吸走,...{br}铃铛声...{br}是我梦里那个铃铛声...,,,,,
 c03_s04_首次进入,1015...是刚才那对夫妻的房间吧。,,,,,
@@ -300,12 +303,16 @@ c03_s04_麻将游戏结束,刚才的幻觉...{br}不像是我的记忆。,,,,,
 c03_s04_李氏纸人首次互动,这假人什么时候摆在这的？,,,,,
 c03_s04_李氏纸人求舌头,舌...头...,,,,,
 c03_s04_李氏纸人求药,药...,,,,,
+c03_s04_获得剪刀后,理发店的假人好像提到过剪刀...,,,,,
+c03_s04_获得钥匙后,2013...{br}这是那个肉铺老板家的钥匙。,,,,,
+c03_s04_给药后,病终究还是没治好。,,,,,
+c03_s04_奠,奠,,,,,
 c03_招魂幡鬼差,...{br}还是别乱碰了,,,,,
 c03_s05_长桌,这桌上的肉竟然没有腐烂,,,,,
 c03_s05_首次读完账本,...还是不要多想了,,,,,
 c03_s05_偷听结束,这小女孩提到的玩具...{br}不会就是我手上这个吧？,,,,,
 c03_s06_没贴的寻人启事,肉铺老板居然把一大摞寻人启事藏在家里{br}嗯...还有几张像是从墙上撕下来的。,,,,,
-c03_s06_暗门,暗门被锁起来了,,,,,
+c03_s06_暗门,锁上的活板门...{br}是通到哪里去的？,,,,,
 c03_s06_柜子,这柜子后面好像还有东西,,,,,
 c03_s07_肉袋,一股腐臭的味道,,,,,
 c03_s07_绞肉机,看着像台碎肉机,,,,,
@@ -330,3 +337,4 @@ c03_s12_label6,[wave]将她交给我，方能保你平安[/wave],,,,,
 c03_s12_label7,[wave]反正...都一样吧[/wave],,,,,
 c03_s12_label8,[wave]又嫩又甜[/wave],,,,,
 c03_李癞胖演出结束,怎么突然出现这么多人？{br}要不跟过去看看？,,,,,
+c03_小手洞1,洞里有很浓的血腥味...,,,,,

asset/dialogue/item_description.dialogue

@@ -289,6 +289,7 @@
 3012？上面有我的名字，看来确实是这里... {br}先去三楼看看吧[ID:c02_保卫科花名册首次互动结束]
 祭台是专门供奉这只大老鼠的？ [ID:c02_保卫科祭台os]
 鼠歌  {br}{br}天地小如喉，{br}红轮自吞吐。{br}多少世间人，{br}都被红轮误。 [ID:c02_保卫科老鼠精]
+莫被红轮误莫被红轮误{br}莫被红轮误莫被红轮误{br}莫被红轮误莫被红轮误 [ID:c02_保卫科老鼠精_第二章]
 #小手
 ...还有什么东西能跟它交换呢？ [ID:c02_小手还能换什么]
 ？！ [ID:c02_小手出现摔倒]
@@ -424,6 +425,7 @@
 [wave]又嫩又甜[/wave] [ID:c03_s12_label8]
 # 李癞胖演出结束
 怎么突然出现这么多人？{br}要不跟过去看看？[ID:c03_李癞胖演出结束]
+...{br}这股风...[ID:c03_冷飕飕风吹过]
 # 小手
 洞里有很浓的血腥味...[ID:c03_小手洞1]
 => END

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

@@ -369,3 +369,32 @@ func run_away():
 	camera.force_offset.x = 0.0
 	SceneManager.unlock_player()
 	SceneManager.get_ground_loader().transition_to_scene("c02_s06", "right")
+
+
+# 保卫科灯光闪烁
+func c03_light_flip0() -> void:
+	var light = $"../DeployLayer/煤油灯3/PointLight2D"
+	Util.timer(2.5, _flip_light.bind(light))
+	$"Sfx风吹过".play()
+	await SceneManager.lock_player(0, 22) # 风吹过
+	SceneManager.pop_os_with_str("c03_冷飕飕风吹过")
+	SceneManager.unlock_player()
+
+
+func c03_light_flip1() -> void:
+	var light = $"../DeployLayer/煤油灯2/PointLight2D"
+	_flip_light(light)
+
+
+func c03_light_flip2() -> void:
+	var light = $"../DeployLayer/煤油灯/PointLight2D"
+	_flip_light(light)
+
+
+func _flip_light(light:PointLight2D)->void:
+	var default_energy = light.energy
+	var tween = create_tween()
+	tween.tween_property(light, "energy", default_energy * 0.25, 0.5) 
+	tween.tween_property(light, "energy", default_energy * 0.6, 0.2) 
+	tween.tween_property(light, "energy", default_energy * 0.1, 0.3) 
+	tween.tween_property(light, "energy", default_energy, 0.4) 

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

@@ -1,4 +1,4 @@
-[gd_scene load_steps=119 format=3 uid="uid://djc2uaefhmu7"]
+[gd_scene load_steps=120 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"]
@@ -28,6 +28,7 @@
 [ext_resource type="Texture2D" uid="uid://diuh52qo2o6pa" path="res://asset/art/scene/c02/s03_公寓一楼院子/f_院子内墙上文字与柜子痕迹.png" id="10_3nako"]
 [ext_resource type="PackedScene" uid="uid://dnbutraty2285" path="res://scene/entity/partical/particals_ash_vertical.tscn" id="10_c3f8o"]
 [ext_resource type="Texture2D" uid="uid://dooaferyy44rs" path="res://asset/art/scene/c02/s03_公寓一楼院子/e_前侧楼梯.png" id="10_ud2jg"]
+[ext_resource type="AudioStream" uid="uid://o7fj0r0fbm1h" path="res://asset/audio/sfx/交互/第一章/sfx_冷飕飕.ogg" id="11_8xnjh"]
 [ext_resource type="Texture2D" uid="uid://c0enojekent6s" path="res://asset/art/scene/c02/杂物/e_灯笼.png" id="11_em2ma"]
 [ext_resource type="Texture2D" uid="uid://0x7cl2cmcs6l" path="res://asset/art/scene/c02/s03_公寓一楼院子/光晕/光晕2.png" id="11_g0qhj"]
 [ext_resource type="Script" uid="uid://3p6e8f385kow" path="res://scene/ground/script/c02/event_2d_xchan_run_after_got_pliers.gd" id="11_lq23y"]
@@ -455,6 +456,12 @@ bus = &"game_sfx"
 script = ExtResource("4_ygnci")
 metadata/_custom_type_script = "uid://rq6w1vuhuq1m"
 
+[node name="Sfx风吹过" type="AudioStreamPlayer" parent="Ground/AnimationPlayer" index="7"]
+stream = ExtResource("11_8xnjh")
+bus = &"game_sfx"
+script = ExtResource("4_ygnci")
+metadata/_custom_type_script = "uid://rq6w1vuhuq1m"
+
 [node name="BGSprite2D" parent="Ground" index="2"]
 light_mask = 5
 texture = ExtResource("3_sqv8l")
@@ -1632,6 +1639,25 @@ updater_event = &"c03_li_paperwoman"
 updater_stages = Array[int]([5])
 metadata/_custom_type_script = "uid://0wjaho6qkg6s"
 
+[node name="Event保卫科灯光闪烁C03" type="Node2D" parent="Ground/DeployLayer" index="43"]
+script = ExtResource("73_lt8c0")
+event_name = &"current_chapter_stage"
+event_mode = "hide"
+event_stages = Array[int]([0, 1, 2])
+metadata/_custom_type_script = "uid://bkkiyk5jkdw4d"
+
+[node name="Ambush保卫科灯光闪烁0" parent="Ground/DeployLayer/Event保卫科灯光闪烁C03" instance=ExtResource("25_iyaiw")]
+position = Vector2(979, 34)
+hook_method = "c03_light_flip0"
+
+[node name="Ambush保卫科灯光闪烁1" parent="Ground/DeployLayer/Event保卫科灯光闪烁C03" instance=ExtResource("25_iyaiw")]
+position = Vector2(658, 33)
+hook_method = "c03_light_flip1"
+
+[node name="Ambush保卫科灯光闪烁2" parent="Ground/DeployLayer/Event保卫科灯光闪烁C03" instance=ExtResource("25_iyaiw")]
+position = Vector2(342, 35)
+hook_method = "c03_light_flip2"
+
 [node name="PointLight2D" type="PointLight2D" parent="Ground/AmbientLayer" index="0"]
 light_mask = 4
 position = Vector2(2189, -142)

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

@@ -158,7 +158,7 @@ animation = &"c00_头套小婵_write"
 
 [node name="老鼠精_第二章" type="Sprite2D" parent="Ground/DeployLayer" index="12"]
 self_modulate = Color(0.493545, 0.493546, 0.493546, 1)
-position = Vector2(207.5, -40.5)
+position = Vector2(206.5, -41.5)
 texture = ExtResource("23_vppvs")
 
 [node name="EventBinder" type="Node" parent="Ground/DeployLayer/老鼠精_第二章"]

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

@@ -46,8 +46,13 @@ func _on_ground_ready() -> void:
 	else:
 		closeup洋糕点.enabled = true
 	if ambush小猫挠墙.played:
-		ambush小猫挠墙.visible = false
 		pickable李癞钥匙.visible = true
+		# ambush小猫挠墙.visible = false
+		ambush小猫挠墙.get_node("小猫挠墙").play("小猫呼吸_left")
+	else:
+		#TODO
+		SceneManager.pop_debug_dialog_info("音效", "右侧小猫挠墙")
+		$"Sfx2D猫挠墙".play()
 	pickable李癞钥匙.triggered.connect(func():
 		await SceneManager.get_inspector().quit_and_hidden
 		SceneManager.pop_os_with_str("c03_s02_获得1015钥匙后")
@@ -73,14 +78,19 @@ func _set_notes_coverer(coverer: String) -> void:
 
 
 func scratching_cat_interacted() -> void:
+	$"Sfx2D猫挠墙".stop()
 	# 蹲下 ～ 起立
 	SceneManager.lock_player()
-	$"../DeployLayer/Ambush小猫挠墙/小猫挠墙".play("小猫挠墙")
+	ambush小猫挠墙.get_node("小猫挠墙").play("小猫结束挠墙")
+	SceneManager.pop_debug_dialog_info("音效", "猫打呼噜 & 钥匙掉地上")
+	$"Sfx猫打呼噜".play()
+	# $"Sfx钥匙掉地上".play()
 	# 隐藏床交互，稍后启用
 	var bed = $"../DeployLayer/Note小蝉的床" as Note2D
 	bed.enabled = false
-	await Util.wait(3.5)
-	# 自动隐藏
+	await Util.wait(1.5)
+	# 显示钥匙
 	EventManager.set_stage("c03_invite_xchan_supper", 3)
 	SceneManager.unlock_player()
-	bed.enabled = true
+	await Util.wait(0.5)
+	bed.enabled = true

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

@@ -1,9 +1,10 @@
-[gd_scene load_steps=41 format=3 uid="uid://ctwy1ubhm68la"]
+[gd_scene load_steps=45 format=3 uid="uid://ctwy1ubhm68la"]
 
 [ext_resource type="PackedScene" uid="uid://dayyx4jerj7io" path="res://scene/ground/ground.tscn" id="1_jad6f"]
 [ext_resource type="Script" uid="uid://tk4wg0i4payx" path="res://scene/ground/scene/c03/s02_瞎子新卧室.gd" id="2_y504i"]
 [ext_resource type="AudioStream" uid="uid://b2mudqvq1dmng" path="res://asset/audio/sfx/环境音/白噪音/白噪声房间里1.ogg" id="3_kesv8"]
 [ext_resource type="Texture2D" uid="uid://vc2hn6t5bedg" path="res://asset/art/scene/c03/s02_瞎子新卧室/bg_瞎子新卧室.png" id="4_hehhg"]
+[ext_resource type="AudioStream" uid="uid://l0whtf4cscgx" path="res://asset/audio/sfx/交互/猫咪呼噜.ogg" id="5_bjrfa"]
 [ext_resource type="Texture2D" uid="uid://7ay1ttob8qwm" path="res://asset/art/scene/c02/s08_瞎子卧室/e_床板.png" id="5_xifhb"]
 [ext_resource type="Texture2D" uid="uid://bgtxwxerl2dxh" path="res://asset/art/scene/c02/s08_瞎子卧室/十字架.png" id="6_hehhg"]
 [ext_resource type="PackedScene" uid="uid://61pis75a8fdq" path="res://scene/entity/portal.tscn" id="6_jad6f"]
@@ -22,8 +23,10 @@
 [ext_resource type="PackedScene" uid="uid://jp6ut4wayw7g" path="res://scene/ground/script/c03/s02_closeup洋糕点.tscn" id="13_fl7if"]
 [ext_resource type="PackedScene" uid="uid://dsa6frlw6e6gg" path="res://scene/entity/pickable.tscn" id="13_v3seo"]
 [ext_resource type="Texture2D" uid="uid://c86bfer5qwp2g" path="res://asset/art/scene/c03/s02_瞎子新卧室/桌上放着邀请信.png" id="13_yl4ee"]
+[ext_resource type="Texture2D" uid="uid://b7uo33bdiwpl3" path="res://asset/art/scene/c02/s03_公寓一楼院子/地面物品反光/地反光4.png" id="17_rslrj"]
 [ext_resource type="Texture2D" uid="uid://l7cuvw1k5xc1" path="res://asset/art/scene/c03/s02_瞎子新卧室/洋糕点和符纸.png" id="18_t8u8e"]
 [ext_resource type="Script" uid="uid://wapo47a1oddf" path="res://scene/entity/audio/sfx2d.gd" id="22_jchds"]
+[ext_resource type="AudioStream" uid="uid://o5a70tl5445e" path="res://asset/audio/sfx/交互/角色/sfx_瞎子咳嗽.ogg" id="22_jg7q6"]
 [ext_resource type="PackedScene" uid="uid://bnf3lkcbpx1ar" path="res://scene/entity/ambush.tscn" id="23_6show"]
 [ext_resource type="Script" uid="uid://rq6w1vuhuq1m" path="res://scene/entity/audio/sfx.gd" id="23_qq2pn"]
 [ext_resource type="SpriteFrames" uid="uid://c218xrr85jdc7" path="res://asset/art/gif/c03_小小小蝶上楼道/c03_小小小蝶上楼道_frames.tres" id="24_5cqb4"]
@@ -33,6 +36,7 @@
 [ext_resource type="AudioStream" uid="uid://b08ps5rke143i" path="res://asset/audio/sfx/交互/第二章/amb_灰姑演出.ogg" id="26_kesv8"]
 [ext_resource type="AudioStream" uid="uid://bx2l0xus8u1em" path="res://asset/audio/sfx/交互/第二章/sfx_灰姑出场.ogg" id="27_jchds"]
 [ext_resource type="Script" uid="uid://cnt01hiw52bmn" path="res://scene/entity/ux/sign_snapper.gd" id="32_740dl"]
+[ext_resource type="Script" uid="uid://cphfob11f7atx" path="res://addons/property-inspector/pro_animation_sprite2d/pro_animated_sprite.gd" id="34_w67cj"]
 
 [sub_resource type="AnimationLibrary" id="AnimationLibrary_k01ve"]
 
@@ -172,6 +176,22 @@ mode = "场景背景音"
 "感应玩家操作" = false
 metadata/_custom_type_script = "uid://rq6w1vuhuq1m"
 
+[node name="Sfx猫打呼噜" type="AudioStreamPlayer" parent="Ground/AnimationPlayer" index="1"]
+stream = ExtResource("5_bjrfa")
+bus = &"game_sfx"
+script = ExtResource("23_qq2pn")
+metadata/_custom_type_script = "uid://rq6w1vuhuq1m"
+
+[node name="Sfx2D猫挠墙" type="AudioStreamPlayer2D" parent="Ground/AnimationPlayer" index="2"]
+position = Vector2(532, 54)
+max_distance = 500.0
+attenuation = 2.0
+bus = &"game_sfx"
+script = ExtResource("22_jchds")
+loop = true
+loop_round_time = 3.0
+metadata/_custom_type_script = "uid://wapo47a1oddf"
+
 [node name="BGSprite2D" parent="Ground" index="2"]
 light_mask = 5
 position = Vector2(0, -2)
@@ -263,8 +283,8 @@ position = Vector2(167, 31)
 sprite_scale = 0.33
 animation_low_mode = true
 hide_texture = true
+ground_light_texture = ExtResource("17_rslrj")
 gaslight_energy = 2.0
-gaslight_ground_energy = 2.0
 debug_light_switch = false
 sign_mark_offset = Vector2(0, -18.4)
 
@@ -295,6 +315,7 @@ libraries = {
 }
 
 [node name="Sfx2D瞎子咳嗽" type="AudioStreamPlayer2D" parent="Ground/DeployLayer/Event2D偷听陆仁对话后"]
+stream = ExtResource("22_jg7q6")
 bus = &"game_sfx"
 script = ExtResource("22_jchds")
 metadata/_custom_type_script = "uid://wapo47a1oddf"
@@ -309,13 +330,14 @@ autoplay = "火苗"
 [node name="瞎子抽烟" parent="Ground/DeployLayer/Event2D偷听陆仁对话后" instance=ExtResource("10_jad6f")]
 position = Vector2(229, 39)
 sprite_frames = ExtResource("10_2hv3f")
-animation = &"瞎子_坐拿烟_左呼吸"
+animation = &"瞎子_咳嗽吐血"
 autoplay = "瞎子_坐拿烟_左呼吸"
 action_configs = Array[Dictionary]([{
 &"animation_intro": "瞎子_抽烟",
-&"animation_next": "瞎子_坐拿烟_左呼吸",
-"animation_wait_time": 0.0,
-"intro_loop": 1
+&"animation_next": "瞎子_坐拿烟_左呼吸"
+}, {
+"animation_intro": &"瞎子_咳嗽吐血",
+&"animation_next": "瞎子_坐拿烟_左呼吸"
 }])
 
 [node name="小小小蝶" parent="Ground/DeployLayer/Event2D偷听陆仁对话后" instance=ExtResource("10_jad6f")]
@@ -366,6 +388,7 @@ texture = SubResource("GradientTexture2D_5cqb4")
 
 [node name="Pickable李癞钥匙" parent="Ground/DeployLayer" index="13" instance=ExtResource("13_v3seo")]
 unique_name_in_owner = true
+visible = false
 position = Vector2(499, 78)
 sign_mark_offset = Vector2(0, -2.42)
 collision_width_and_x = Vector2(42.79, 0)
@@ -390,33 +413,39 @@ metadata/_custom_type_script = "uid://0wjaho6qkg6s"
 
 [node name="Ambush小猫挠墙" parent="Ground/DeployLayer" index="14" instance=ExtResource("23_6show")]
 unique_name_in_owner = true
-position = Vector2(507, 49)
+position = Vector2(508, 50)
 trigger_mode = "interact"
 hook_method = "scratching_cat_interacted"
 
+[node name="SignSnapper" type="Marker2D" parent="Ground/DeployLayer/Ambush小猫挠墙"]
+position = Vector2(3, 15)
+script = ExtResource("32_740dl")
+radius = 20.0
+walk_to_edge = true
+face_inside_on_edge = true
+metadata/_custom_type_script = "uid://cnt01hiw52bmn"
+
+[node name="小猫挠墙" type="AnimatedSprite2D" parent="Ground/DeployLayer/Ambush小猫挠墙"]
+position = Vector2(8, 16)
+sprite_frames = ExtResource("10_2hv3f")
+animation = &"小猫循环挠墙"
+autoplay = "小猫循环挠墙"
+script = ExtResource("34_w67cj")
+action_configs = Array[Dictionary]([{
+"animation_intro": &"小猫结束挠墙",
+&"animation_next": "小猫呼吸_left"
+}])
+metadata/_custom_type_script = "uid://cphfob11f7atx"
+
 [node name="EventBinder" type="Node" parent="Ground/DeployLayer/Ambush小猫挠墙"]
 script = ExtResource("12_es0xo")
 updater_event = &"c03_invite_xchan_supper"
 updater_mode = "shower"
 updater_ease_duration = 0.0
-updater_stages = Array[int]([2])
+updater_stage_mode = "exclude"
+updater_stages = Array[int]([0, 1])
 metadata/_custom_type_script = "uid://0wjaho6qkg6s"
 
-[node name="小猫挠墙" type="AnimatedSprite2D" parent="Ground/DeployLayer/Ambush小猫挠墙"]
-position = Vector2(9, 17)
-sprite_frames = ExtResource("10_2hv3f")
-animation = &"小猫循环挠墙"
-autoplay = "小猫循环挠墙"
-frame_progress = 0.270454
-
-[node name="SignSnapper" type="Marker2D" parent="Ground/DeployLayer/Ambush小猫挠墙"]
-position = Vector2(8, 11)
-script = ExtResource("32_740dl")
-radius = 20.0
-walk_to_edge = true
-face_inside_on_edge = true
-metadata/_custom_type_script = "uid://cnt01hiw52bmn"
-
 [node name="MainPlayer" parent="Ground" index="5"]
 position = Vector2(63, 95)
 catty_light_energy = 0.5

scene/ground/script/c02/老鼠精画像.gd

@@ -3,4 +3,8 @@ extends CanvasLayer
 
 func _ready() -> void:
 	layer = GlobalConfig.CANVAS_LAYER_LITTLE_GAME
-	%Label.text = tr("c02_保卫科老鼠精").replace("{br}", "\n")
+	if EventManager.get_chapter_stage() <= 2:
+		%Label.text = tr("c02_保卫科老鼠精").replace("{br}", "\n")
+	else:
+		%Label.text = tr("c02_保卫科老鼠精_第二章").replace("{br}", "\n")
+

scene/ground/script/c02/花名册.gd

@@ -3,10 +3,15 @@ extends CanvasLayer
 
 @onready var button = $TextureButton as TextureButton
 
-var texture_dict = {
+var texture_dict_c02 = {
 	"0": preload("res://asset/art/scene/c02/s04_保卫科/花名册/花名册封皮.png"),
 	"1": preload("res://asset/art/scene/c02/s04_保卫科/花名册/翻开页.png"),
 }
+var texture_dict_c03 = {
+	"0": preload("res://asset/art/scene/c02/s04_保卫科/花名册/花名册封皮.png"),
+	"1": preload("res://asset/art/scene/c02/s04_保卫科/花名册/翻开页_第二章.png"),
+}
+
 
 var click_count = 0
 
@@ -20,7 +25,11 @@ func _on_button_pressed() -> void:
 	$"Sfx翻页".play()
 	click_count += 1
 	if click_count == 1:
-		button.texture_normal = texture_dict["1"]
+		if EventManager.get_chapter_stage() <= 2:
+			button.texture_normal = texture_dict_c02["1"]
+			$ContentInspector.visible = true
+		else:
+			button.texture_normal = texture_dict_c03["1"]
+			$ContentInspectorC03.visible = true
 		button.set_anchors_preset(Control.PRESET_CENTER)
-		$ContentInspector.visible = true
 		button.disabled = true

scene/ground/script/c02/花名册.tscn

@@ -41,7 +41,6 @@ texture_normal = ExtResource("3_myeas")
 
 [node name="ContentInspector" parent="." instance=ExtResource("4_1s4sv")]
 visible = false
-mouse_filter = 2
 
 [node name="HBoxContainer" type="TextureRect" parent="ContentInspector"]
 custom_minimum_size = Vector2(200, 0)
@@ -106,3 +105,66 @@ text = "c02_保卫科花名册7"
 [node name="Label8" type="Label" parent="ContentInspector/HBoxContainer/VBoxContainer"]
 layout_mode = 2
 text = "c02_保卫科花名册8"
+
+[node name="ContentInspectorC03" parent="." instance=ExtResource("4_1s4sv")]
+visible = false
+
+[node name="HBoxContainer" type="TextureRect" parent="ContentInspectorC03"]
+custom_minimum_size = Vector2(200, 0)
+layout_mode = 1
+anchors_preset = 8
+anchor_left = 0.5
+anchor_top = 0.5
+anchor_right = 0.5
+anchor_bottom = 0.5
+offset_left = -282.0
+offset_top = -120.0
+offset_right = 282.0
+offset_bottom = 120.0
+grow_horizontal = 2
+grow_vertical = 2
+mouse_filter = 2
+texture = ExtResource("4_myeas")
+
+[node name="VBoxContainer" type="VBoxContainer" parent="ContentInspectorC03/HBoxContainer"]
+layout_mode = 1
+anchors_preset = 8
+anchor_left = 0.5
+anchor_top = 0.5
+anchor_right = 0.5
+anchor_bottom = 0.5
+offset_left = -42.0
+offset_top = -66.0
+offset_right = 42.0
+offset_bottom = 66.0
+grow_horizontal = 2
+grow_vertical = 2
+mouse_filter = 2
+
+[node name="Label1" type="Label" parent="ContentInspectorC03/HBoxContainer/VBoxContainer"]
+layout_mode = 2
+text = "c03_保卫科花名册1"
+
+[node name="Label2" type="Label" parent="ContentInspectorC03/HBoxContainer/VBoxContainer"]
+layout_mode = 2
+text = "c03_保卫科花名册2"
+
+[node name="Label3" type="Label" parent="ContentInspectorC03/HBoxContainer/VBoxContainer"]
+layout_mode = 2
+text = "c03_保卫科花名册3"
+
+[node name="Label4" type="Label" parent="ContentInspectorC03/HBoxContainer/VBoxContainer"]
+layout_mode = 2
+text = "c03_保卫科花名册4"
+
+[node name="Label5" type="Label" parent="ContentInspectorC03/HBoxContainer/VBoxContainer"]
+layout_mode = 2
+text = "c03_保卫科花名册5"
+
+[node name="Label6" type="Label" parent="ContentInspectorC03/HBoxContainer/VBoxContainer"]
+layout_mode = 2
+text = "c03_保卫科花名册6"
+
+[node name="Label7" type="Label" parent="ContentInspectorC03/HBoxContainer/VBoxContainer"]
+layout_mode = 2
+text = "c03_保卫科花名册7"

scene/ground/script/c03/s02_event_2d偷听陆仁小蝶对话后.gd

@@ -40,7 +40,6 @@ func _on_ground_ready(_ground: Ground2D):
 
 		# Part1: 上半段对话1&抽烟
 		DialogueManager.show_dialogue_balloon(c03_dialogue, "c03_s02_邀请小蝉与瞎子对话1")
-		# TODO 此处播放咳嗽动画
 		the_blind.play("瞎子_抽烟")
 		await DialogueManager.dialogue_ended
 		if the_blind.animation == "瞎子_抽烟":
@@ -48,24 +47,21 @@ func _on_ground_ready(_ground: Ground2D):
 		# Part2: 下半段对话2&灯忽闪
 		animation_player.play("light_flipping")
 		SceneManager.pop_debug_dialog_info("音效", "老鼠叫声+悉悉索索老鼠走路钻洞声")
+		the_blind.play("瞎子_咳嗽吐血")
 		DialogueManager.show_dialogue_balloon(c03_dialogue, "c03_s02_邀请小蝉与瞎子对话2")
 		await DialogueManager.dialogue_ended
-		# TODO
-		# Part3: 瞎子咳嗽
-		SceneManager.pop_debug_dialog_info("音效(或配音老师做)", "瞎子咳嗽&吐血")
-
+		DialogueManager.show_dialogue_balloon(c03_dialogue, "c03_s02_邀请小蝉与瞎子对话3")
+		await DialogueManager.dialogue_ended
 		the_blind.play("瞎子_咳嗽吐血")
 		Util.timer(1.0, $"Sfx2D瞎子咳嗽".play)
-		the_blind.frame_changed.connect(
-			# 共 28 帧，第 20 帧开始
+		Util.timer(6.0, 
 			func ():
-				if the_blind.frame == 20:
-					animation_player.pause()
-					# Part4: 过度到快速闪烁
-					var tween = create_tween()
-					tween.tween_property(light_adder, "energy", 0.8, 0.2)
-					await tween.finished
-					animation_player.play("light_fast_flipping")
+				animation_player.pause()
+				# Part4: 过度到快速闪烁
+				var tween = create_tween()
+				tween.tween_property(light_adder, "energy", 0.8, 0.2)
+				await tween.finished
+				animation_player.play("light_fast_flipping")
 		)
 
 

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

@@ -160,18 +160,22 @@ range_item_cull_mask = 128
 texture = SubResource("GradientTexture2D_go12c")
 
 [node name="倒塌" type="AnimatedSprite2D" parent="鬼母子游戏"]
+visible = false
 sprite_frames = ExtResource("14_s7g11")
 animation = &"鬼母子神"
-frame = 2
-frame_progress = 1.0
 centered = false
 
 [node name="Props" type="Node2D" parent="鬼母子游戏/倒塌"]
+visible = false
 
 [node name="药纸" parent="鬼母子游戏/倒塌/Props" instance=ExtResource("15_3uuyc")]
 unique_name_in_owner = true
 position = Vector2(255, 248)
 
+[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="鬼母子游戏/倒塌/Props/药纸"]
+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/药纸"]
 light_mask = 2
 scale = Vector2(0.7, 0.3)

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

@@ -301,7 +301,7 @@ theme_override_colors/font_outline_color = Color(0, 0, 0, 1)
 theme_override_fonts/normal_font = ExtResource("18_3m4i6")
 theme_override_font_sizes/normal_font_size = 40
 bbcode_enabled = true
-text = "[wave amp=10.0 freq=5.0][shake rate=4.0 level=3]"
+text = "[wave amp=10.0 freq=5.0][shake rate=4.0 level=3]舌...头..."
 fit_content = true
 autowrap_mode = 1
 horizontal_alignment = 1
@@ -335,7 +335,7 @@ theme_override_colors/font_outline_color = Color(0, 0, 0, 1)
 theme_override_fonts/normal_font = ExtResource("18_3m4i6")
 theme_override_font_sizes/normal_font_size = 40
 bbcode_enabled = true
-text = "[wave amp=10.0 freq=5.0][shake rate=4.0 level=3]"
+text = "[wave amp=10.0 freq=5.0][shake rate=4.0 level=3]药..."
 fit_content = true
 autowrap_mode = 1
 horizontal_alignment = 1