From a1881632ac712e1d6db28e9eb5c719a3e2f5dab7 Mon Sep 17 00:00:00 2001 From: cakipaul Date: Thu, 10 Jul 2025 12:56:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83=E7=BB=86=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scene/ground/scene/c02/s06_二楼.gd | 4 +-- scene/ground/scene/c02/s06_二楼.tscn | 48 +++++++++++++++----------- scene/ground/scene/c02/s10_空房间.tscn | 2 -- scene/ux/note/ux_note.tscn | 2 +- 4 files changed, 31 insertions(+), 25 deletions(-) diff --git a/scene/ground/scene/c02/s06_二楼.gd b/scene/ground/scene/c02/s06_二楼.gd index ce03d9fe..2438e5ae 100644 --- a/scene/ground/scene/c02/s06_二楼.gd +++ b/scene/ground/scene/c02/s06_二楼.gd @@ -79,11 +79,11 @@ func _on_ground_ready() -> void: ball_game_boys_ambush.visible = true if $"../DeployLayer/Ambush小蝉偷看".played: - $"../DeployLayer/Ambush小蝉偷看".visible = false + $"../DeployLayer/Ambush小蝉偷看".queue_free() # 小蝉偷看 func glimpse_hide_out(): - $"../DeployLayer/Ambush小蝉偷看".visible = false + $"../DeployLayer/Ambush小蝉偷看".queue_free() $"Sfx偷看关门".play() diff --git a/scene/ground/scene/c02/s06_二楼.tscn b/scene/ground/scene/c02/s06_二楼.tscn index 1407c85f..de636bb7 100644 --- a/scene/ground/scene/c02/s06_二楼.tscn +++ b/scene/ground/scene/c02/s06_二楼.tscn @@ -45,7 +45,7 @@ [ext_resource type="Texture2D" uid="uid://b5kolhax7pf4u" path="res://asset/art/scene/c02/s06_二楼楼道/小猫纸条.png" id="37_rjlld"] [ext_resource type="Script" uid="uid://bnm8wuspfx303" path="res://scene/ground/script/c02/event_2d_xchan_run_away.gd" id="39_t5e0j"] [ext_resource type="SpriteFrames" uid="uid://di43shn22n5ph" path="res://asset/art/gif/c00_通用动作/c00_通用动作_frames.tres" id="40_7i4w0"] -[ext_resource type="Script" path="res://scene/ground/script/c03/s02_event_2d偷听陆仁小蝶对话后.gd" id="46_sqio2"] +[ext_resource type="Script" uid="uid://n56a07gyjq1u" path="res://scene/ground/script/c03/s02_event_2d偷听陆仁小蝶对话后.gd" id="46_sqio2"] [sub_resource type="Animation" id="Animation_k01ve"] length = 0.001 @@ -960,7 +960,15 @@ portal_name = "3" target_scene = "c03_s01" target_portal = "right" -[node name="楼梯蜡烛" type="Node2D" parent="Ground/DeployLayer" index="5"] +[node name="portal_4" parent="Ground/DeployLayer" index="5" instance=ExtResource("4_haidv")] +position = Vector2(554, 7) +debug_note = "胖子房间" +enabled = false +portal_name = "4" +target_scene = "c03_s01" +target_portal = "right" + +[node name="楼梯蜡烛" type="Node2D" parent="Ground/DeployLayer" index="6"] [node name="小蜡烛PointLight2D" type="PointLight2D" parent="Ground/DeployLayer/楼梯蜡烛"] position = Vector2(777.8, -48.2) @@ -1018,7 +1026,7 @@ position = Vector2(0, 12.8172) sprite_frames = SubResource("SpriteFrames_lipxo") autoplay = "default" -[node name="Pro小小蝶上楼" parent="Ground/DeployLayer" index="6" instance=ExtResource("10_p6da7")] +[node name="Pro小小蝶上楼" parent="Ground/DeployLayer" index="7" instance=ExtResource("10_p6da7")] position = Vector2(953, 30) sprite_frames = ExtResource("13_6iuix") animation = &"小小小蝶动画(跑）" @@ -1042,7 +1050,7 @@ bus = &"game_sfx" script = ExtResource("14_7x2h6") metadata/_custom_type_script = "uid://wapo47a1oddf" -[node name="Note楼梯杂物堆" parent="Ground/DeployLayer" index="7" instance=ExtResource("10_h3h1a")] +[node name="Note楼梯杂物堆" parent="Ground/DeployLayer" index="8" instance=ExtResource("10_h3h1a")] position = Vector2(801, -77) texture = ExtResource("7_v3hjg") sign_mark_offset = Vector2(0, 1.47) @@ -1055,7 +1063,7 @@ sign_mark_offset = Vector2(0, 1.47) [node name="CollisionShape2D" parent="Ground/DeployLayer/Note楼梯杂物堆/Area2D" index="0"] shape = SubResource("RectangleShape2D_2rktm") -[node name="煤油灯" parent="Ground/DeployLayer" index="8" instance=ExtResource("5_3p5ta")] +[node name="煤油灯" parent="Ground/DeployLayer" index="9" instance=ExtResource("5_3p5ta")] position = Vector2(616, -14) ground_light_texture = ExtResource("8_7x2h6") ground_height_offset = 15.0 @@ -1067,7 +1075,7 @@ shape = SubResource("RectangleShape2D_lh55k") position = Vector2(0, 15) texture = ExtResource("8_7x2h6") -[node name="煤油灯2" type="Sprite2D" parent="Ground/DeployLayer" index="9"] +[node name="煤油灯2" type="Sprite2D" parent="Ground/DeployLayer" index="10"] position = Vector2(321, 1) texture = ExtResource("16_osg51") @@ -1092,7 +1100,7 @@ blend_mode = 2 range_item_cull_mask = 4 texture = ExtResource("21_2rktm") -[node name="Interactable老鼠洞" parent="Ground/DeployLayer" index="10" instance=ExtResource("7_0d746")] +[node name="Interactable老鼠洞" parent="Ground/DeployLayer" index="11" instance=ExtResource("7_0d746")] position = Vector2(618, 50) enabled = false collision_width_and_x = Vector2(60, 0) @@ -1108,19 +1116,19 @@ shape = SubResource("RectangleShape2D_7kxvk") radius = 20.0 walk_to_edge = true -[node name="小老鼠拖鞋子" type="AnimatedSprite2D" parent="Ground/DeployLayer" index="11"] +[node name="小老鼠拖鞋子" type="AnimatedSprite2D" parent="Ground/DeployLayer" index="12"] visible = false position = Vector2(608, -15) sprite_frames = ExtResource("8_nh8we") animation = &"老鼠托小鞋子" speed_scale = -1.0 -[node name="自动跟随的老鼠" parent="Ground/DeployLayer" index="12" instance=ExtResource("9_58d45")] +[node name="自动跟随的老鼠" parent="Ground/DeployLayer" index="13" instance=ExtResource("9_58d45")] position = Vector2(4, 73) action_area = Vector2(920, 40) distance_to_player_range = Vector2(20, 150) -[node name="疯子撞墙" parent="Ground/DeployLayer" index="13" instance=ExtResource("10_p6da7")] +[node name="疯子撞墙" parent="Ground/DeployLayer" index="14" instance=ExtResource("10_p6da7")] visible = false position = Vector2(221, 4) sprite_frames = ExtResource("10_och2w") @@ -1145,7 +1153,7 @@ loop = true loop_round_time = 0.8 metadata/_custom_type_script = "uid://wapo47a1oddf" -[node name="Ambush三男孩" parent="Ground/DeployLayer" index="14" instance=ExtResource("14_k01ve")] +[node name="Ambush三男孩" parent="Ground/DeployLayer" index="15" instance=ExtResource("14_k01ve")] visible = false position = Vector2(167, 38) enabled = false @@ -1162,23 +1170,23 @@ autoplay = "f3" frame = 6 frame_progress = 0.121203 -[node name="Closeup弹珠游戏" parent="Ground/DeployLayer" index="15" instance=ExtResource("11_owxx3")] +[node name="Closeup弹珠游戏" parent="Ground/DeployLayer" index="16" instance=ExtResource("11_owxx3")] position = Vector2(322, -269) packed_scene = ExtResource("12_intre") quit_closeup_on_cancel = false -[node name="Closeup水盆" parent="Ground/DeployLayer" index="16" instance=ExtResource("11_owxx3")] +[node name="Closeup水盆" parent="Ground/DeployLayer" index="17" instance=ExtResource("11_owxx3")] position = Vector2(289, 16) packed_scene = ExtResource("16_p6da7") first_interact_os_key = "c02_二楼水盆" -[node name="Closeup谢幕演出" parent="Ground/DeployLayer" index="17" instance=ExtResource("11_owxx3")] +[node name="Closeup谢幕演出" parent="Ground/DeployLayer" index="18" instance=ExtResource("11_owxx3")] position = Vector2(518, -272) packed_scene = ExtResource("25_m28ab") quit_closeup_on_cancel = false action_key = 3 -[node name="c02_final" type="Node2D" parent="Ground/DeployLayer" index="18"] +[node name="c02_final" type="Node2D" parent="Ground/DeployLayer" index="19"] visible = false [node name="胖子" parent="Ground/DeployLayer/c02_final" instance=ExtResource("10_p6da7")] @@ -1280,13 +1288,13 @@ color = Color(0.895506, 0.638359, 0.208885, 1) energy = 0.0 texture = SubResource("GradientTexture2D_0k27j") -[node name="Ambush小蝉偷看" parent="Ground/DeployLayer" index="19" instance=ExtResource("14_k01ve")] +[node name="Ambush小蝉偷看" parent="Ground/DeployLayer" index="20" instance=ExtResource("14_k01ve")] position = Vector2(553, -5) texture = ExtResource("37_osg51") collision_width_and_x = Vector2(150, 0) hook_method = "glimpse_hide_out" -[node name="Event_小猫纸条" type="Node2D" parent="Ground/DeployLayer" index="20"] +[node name="Event_小猫纸条" type="Node2D" parent="Ground/DeployLayer" index="21"] position = Vector2(164, 42) script = ExtResource("35_h3h1a") pre_event_name = &"c02_ball_game_stage" @@ -1307,11 +1315,11 @@ content_centered = true texture_cover = ExtResource("37_rjlld") content_key = "c02_小猫纸条" -[node name="Ambush解锁二楼地图" parent="Ground/DeployLayer" index="21" instance=ExtResource("14_k01ve")] +[node name="Ambush解锁二楼地图" parent="Ground/DeployLayer" index="22" instance=ExtResource("14_k01ve")] position = Vector2(748, 47) hook_method = "unlock_2floor_map" -[node name="Event2D_xchan_run_away" type="Node2D" parent="Ground/DeployLayer" index="22"] +[node name="Event2D_xchan_run_away" type="Node2D" parent="Ground/DeployLayer" index="23"] position = Vector2(9, -4) script = ExtResource("39_t5e0j") event_name = &"c02_2f_xchan_run_away" @@ -1338,7 +1346,7 @@ move_configs = Array[Dictionary]([{ }]) debug_mov_animation = "c00_头套小婵_run" -[node name="Event2D偷听陆仁对话后" type="Node2D" parent="Ground/DeployLayer" index="23"] +[node name="Event2D偷听陆仁对话后" type="Node2D" parent="Ground/DeployLayer" index="24"] script = ExtResource("46_sqio2") event_name = &"c03_invite_xchan_supper" event_stages = Array[int]([2]) diff --git a/scene/ground/scene/c02/s10_空房间.tscn b/scene/ground/scene/c02/s10_空房间.tscn index 1799ba43..a89b87b0 100644 --- a/scene/ground/scene/c02/s10_空房间.tscn +++ b/scene/ground/scene/c02/s10_空房间.tscn @@ -136,7 +136,6 @@ enabled = false mode = "ballon" dialogue = "c02" note_sign_texture = ExtResource("8_to1d1") -note_key_coverer = null note_key = "c02_钻入隧道询问" [node name="小蜡烛" type="AnimatedSprite2D" parent="Ground/DeployLayer" index="3"] @@ -218,7 +217,6 @@ texture = ExtResource("12_27dvh") [node name="煤油灯" parent="Ground/DeployLayer" index="12" instance=ExtResource("13_27dvh")] position = Vector2(373, -13.8031) -sprite_scale = null gaslight_energy = 2.0 gaslight_ground_energy = 2.0 mute_when_interacted = false diff --git a/scene/ux/note/ux_note.tscn b/scene/ux/note/ux_note.tscn index 0114f04a..71e9dd67 100644 --- a/scene/ux/note/ux_note.tscn +++ b/scene/ux/note/ux_note.tscn @@ -236,7 +236,7 @@ event = &"handnote_c02_hand_requireCoin" hide_if_on_stage = Array[int]([0, 3]) [node name="BlotOut" type="Sprite2D" parent="Bag/Book/Event_current_chapter_stage/Event_handnote_c02_hand_requireCoin"] -position = Vector2(-0.953043, 10.2386) +position = Vector2(-2.20537e-05, -7.14285) rotation = -0.448216 scale = Vector2(1.03957, 1.62217) texture = ExtResource("11_dohnv")