diff --git a/asset/dialogue/item_description.csv b/asset/dialogue/item_description.csv index 9aafe188..90427163 100644 --- a/asset/dialogue/item_description.csv +++ b/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. @@ -326,6 +326,7 @@ 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,洞里有很浓的血腥味...,,,,, diff --git a/asset/dialogue/item_description.dialogue b/asset/dialogue/item_description.dialogue index e6cbc86c..5a103b9c 100644 --- a/asset/dialogue/item_description.dialogue +++ b/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 diff --git a/scene/ground/scene/c02/s03_院子.tscn b/scene/ground/scene/c02/s03_院子.tscn index 71152c23..33967ba6 100644 --- a/scene/ground/scene/c02/s03_院子.tscn +++ b/scene/ground/scene/c02/s03_院子.tscn @@ -1471,6 +1471,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 +1492,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 +1664,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"] diff --git a/scene/ground/scene/c02/s04_保卫科.gd b/scene/ground/scene/c02/s04_保卫科.gd index a0ea51f2..1eb27314 100644 --- a/scene/ground/scene/c02/s04_保卫科.gd +++ b/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) diff --git a/scene/ground/scene/c02/s04_保卫科.tscn b/scene/ground/scene/c02/s04_保卫科.tscn index 98f7470d..3819a7d4 100644 --- a/scene/ground/scene/c02/s04_保卫科.tscn +++ b/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 diff --git a/scene/ground/scene/c02/s06_二楼.tscn b/scene/ground/scene/c02/s06_二楼.tscn index 7cd946fd..592c0a7d 100644 --- a/scene/ground/scene/c02/s06_二楼.tscn +++ b/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) diff --git a/scene/ground/scene/c03/s02_瞎子新卧室.gd b/scene/ground/scene/c03/s02_瞎子新卧室.gd index 12fafea1..616a70e1 100644 --- a/scene/ground/scene/c03/s02_瞎子新卧室.gd +++ b/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 diff --git a/scene/ground/scene/c03/s02_瞎子新卧室.tscn b/scene/ground/scene/c03/s02_瞎子新卧室.tscn index 86ababa5..d345e7e7 100644 --- a/scene/ground/scene/c03/s02_瞎子新卧室.tscn +++ b/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" diff --git a/scene/ground/scene/c03/s03_瞎子理发店.tscn b/scene/ground/scene/c03/s03_瞎子理发店.tscn index 4b9c78a6..4cd7a071 100644 --- a/scene/ground/scene/c03/s03_瞎子理发店.tscn +++ b/scene/ground/scene/c03/s03_瞎子理发店.tscn @@ -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) diff --git a/scene/ground/scene/c03/s04_李癞房间.gd b/scene/ground/scene/c03/s04_李癞房间.gd index e9966dea..1ad3dbfd 100644 --- a/scene/ground/scene/c03/s04_李癞房间.gd +++ b/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) diff --git a/scene/ground/script/c02/event_2d_xchan_run_away.gd b/scene/ground/script/c02/event_2d_xchan_run_away.gd index 18794229..a5f09cf1 100644 --- a/scene/ground/script/c02/event_2d_xchan_run_away.gd +++ b/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") diff --git a/scene/ground/script/c03/s03_刮海报_理发店.tscn b/scene/ground/script/c03/s03_刮海报_理发店.tscn index b6ffb0d9..d6f1cf9d 100644 --- a/scene/ground/script/c03/s03_刮海报_理发店.tscn +++ b/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") diff --git a/scene/ux/prop_hud.gd b/scene/ux/prop_hud.gd index f352f422..b12fe35f 100644 --- a/scene/ux/prop_hud.gd +++ b/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)