diff --git a/scene/entity/partical/particals_ash_vertical.gd b/scene/entity/partical/particals_ash_vertical.gd new file mode 100644 index 00000000..49258983 --- /dev/null +++ b/scene/entity/partical/particals_ash_vertical.gd @@ -0,0 +1,15 @@ +extends Node2D + +@onready var particals = %"纸钱" as GPUParticles2D + +func _ready() -> void: + _on_visibility_changed() + visibility_changed.connect(_on_visibility_changed) + + +func _on_visibility_changed() -> void: + var display = is_visible_in_tree() + particals.emitting = display + if display: + particals.request_particles_process(10.0) + diff --git a/scene/entity/partical/particals_ash_vertical.gd.uid b/scene/entity/partical/particals_ash_vertical.gd.uid new file mode 100644 index 00000000..c02a2045 --- /dev/null +++ b/scene/entity/partical/particals_ash_vertical.gd.uid @@ -0,0 +1 @@ +uid://5y8v4ir43q3j diff --git a/scene/entity/partical/particals_ash_vertical.tscn b/scene/entity/partical/particals_ash_vertical.tscn index f45d4808..0e43037f 100644 --- a/scene/entity/partical/particals_ash_vertical.tscn +++ b/scene/entity/partical/particals_ash_vertical.tscn @@ -1,5 +1,6 @@ -[gd_scene load_steps=7 format=3 uid="uid://dnbutraty2285"] +[gd_scene load_steps=8 format=3 uid="uid://dnbutraty2285"] +[ext_resource type="Script" uid="uid://5y8v4ir43q3j" path="res://scene/entity/partical/particals_ash_vertical.gd" id="1_1ybs0"] [ext_resource type="Texture2D" uid="uid://6vh5m2p3v0t3" path="res://asset/art/scene/c01/s07_书店外/e_纸钱.png" id="1_hsa64"] [sub_resource type="Gradient" id="Gradient_rwi0m"] @@ -32,14 +33,17 @@ scale_curve = SubResource("CurveTexture_jq14j") color_ramp = SubResource("GradientTexture1D_5cty7") [node name="ParticalsAsh" type="Node2D"] +script = ExtResource("1_1ybs0") [node name="纸钱" type="GPUParticles2D" parent="."] +unique_name_in_owner = true modulate = Color(1, 1, 1, 0.54902) position = Vector2(3, 0) amount = 150 texture = ExtResource("1_hsa64") lifetime = 30.0 -preprocess = 20.0 +preprocess = 10.0 +fixed_fps = 10 visibility_rect = Rect2(-750, 0, 1500, 600) process_material = SubResource("ParticleProcessMaterial_wa8gc") metadata/_edit_vertical_guides_ = [-721.0] diff --git a/scene/ground/scene/c02/s03_院子.tscn b/scene/ground/scene/c02/s03_院子.tscn index 938df4c7..167439d5 100644 --- a/scene/ground/scene/c02/s03_院子.tscn +++ b/scene/ground/scene/c02/s03_院子.tscn @@ -380,15 +380,6 @@ target_scene = "c03_s04" target_portal = "1" status = "locked" -[node name="EventBinder" type="Node" parent="Ground/DeployLayer/portal_5"] -script = ExtResource("12_2b6vx") -memo = "c03_before_mahjong_game=[1:粘舌头和刀把|2:给药|3:3|4:准备好进入游戏] 时,打开: [_5] -" -updater_event = &"c03_before_mahjong_game" -updater_mode = "opener" -updater_stages = Array[int]([1, 2, 3, 4]) -metadata/_custom_type_script = "uid://0wjaho6qkg6s" - [node name="Ambush保卫科旁边os" parent="Ground/DeployLayer" index="7" instance=ExtResource("25_iyaiw")] position = Vector2(138, 47) hook_os_key = "c02_院子_保卫科旁" @@ -398,7 +389,6 @@ position = Vector2(0, -1) script = ExtResource("11_lq23y") event_name = &"c02_got_pliers" event_stages = Array[int]([1]) -event_memo = "当事件[c02_got_pliers=1]时显示该节点" metadata/_custom_type_script = "uid://bkkiyk5jkdw4d" [node name="Ambush老虎钳后小蝉跑" parent="Ground/DeployLayer/Event2D_xchan_run_after_got_pliers" instance=ExtResource("25_iyaiw")] @@ -491,42 +481,7 @@ energy = 0.7 texture = SubResource("GradientTexture2D_kyfht") texture_scale = 2.2 -[node name="新背景_奠" type="Node2D" parent="Ground/DeployLayer" index="13"] -visible = false - -[node name="地上纸钱" type="Sprite2D" parent="Ground/DeployLayer/新背景_奠"] -z_index = -4 -position = Vector2(0, -120) -texture = ExtResource("14_qqdxs") -centered = false - -[node name="奠1" type="Sprite2D" parent="Ground/DeployLayer/新背景_奠"] -position = Vector2(199.5, -3) -texture = ExtResource("6_ygnci") - -[node name="奠2" type="Sprite2D" parent="Ground/DeployLayer/新背景_奠"] -position = Vector2(655, -1) -texture = ExtResource("7_c3f8o") - -[node name="奠3" type="Sprite2D" parent="Ground/DeployLayer/新背景_奠"] -position = Vector2(799.5, -3) -texture = ExtResource("8_crgo6") - -[node name="奠4" type="Sprite2D" parent="Ground/DeployLayer/新背景_奠"] -position = Vector2(1936.5, -3) -texture = ExtResource("9_vddfx") - -[node name="ParticalsAsh" parent="Ground/DeployLayer/新背景_奠" instance=ExtResource("10_c3f8o")] -position = Vector2(343, -175) - -[node name="ParticalsAsh2" parent="Ground/DeployLayer/新背景_奠" instance=ExtResource("10_c3f8o")] -position = Vector2(898, -162) - -[node name="ParticalsAsh_z_15" parent="Ground/DeployLayer/新背景_奠" instance=ExtResource("10_c3f8o")] -z_index = 15 -position = Vector2(1964, -209) - -[node name="闷雷_纸人闪现" type="Node2D" parent="Ground/DeployLayer" index="14"] +[node name="闷雷_纸人闪现" type="Node2D" parent="Ground/DeployLayer" index="13"] visible = false [node name="Ambush闷雷纸人" parent="Ground/DeployLayer/闷雷_纸人闪现" instance=ExtResource("25_iyaiw")] @@ -553,11 +508,11 @@ range_layer_max = 2 range_item_cull_mask = 4 texture = SubResource("GradientTexture2D_3nako") -[node name="Ambush要下雨了" parent="Ground/DeployLayer" index="15" instance=ExtResource("25_iyaiw")] +[node name="Ambush要下雨了" parent="Ground/DeployLayer" index="14" instance=ExtResource("25_iyaiw")] position = Vector2(1611, 46) hook_os_key = "c02_院子_要下雨" -[node name="Pickable小鞋子" parent="Ground/DeployLayer" index="16" instance=ExtResource("7_em2ma")] +[node name="Pickable小鞋子" parent="Ground/DeployLayer" index="15" instance=ExtResource("7_em2ma")] position = Vector2(809, 75) sign_mark_offset = Vector2(0, -16.88) enabled = false @@ -568,11 +523,10 @@ position = Vector2(0, -7) scale = Vector2(0.15, 0.15) texture = ExtResource("8_plfv5") -[node name="Event2D小蝉哼歌" type="Node2D" parent="Ground/DeployLayer" index="17"] +[node name="Event2D小蝉哼歌" type="Node2D" parent="Ground/DeployLayer" index="16"] position = Vector2(800, -173) script = ExtResource("26_o1qbs") event_name = &"c02_madman_interacted_stage" -event_memo = "当事件[c02_madman_interacted_stage=]时显示该节点" metadata/_custom_type_script = "uid://bkkiyk5jkdw4d" [node name="Sfx2D小蝉哼歌" type="AudioStreamPlayer2D" parent="Ground/DeployLayer/Event2D小蝉哼歌"] @@ -584,7 +538,7 @@ bus = &"game_sfx" script = ExtResource("54_o1qbs") metadata/_custom_type_script = "uid://wapo47a1oddf" -[node name="Interactable铁门" parent="Ground/DeployLayer" index="18" instance=ExtResource("8_xt8j0")] +[node name="Interactable铁门" parent="Ground/DeployLayer" index="17" instance=ExtResource("8_xt8j0")] light_mask = 5 position = Vector2(1222, 28) texture = ExtResource("7_gd6xp") @@ -604,7 +558,7 @@ collision_mask = 0 [node name="CollisionShape2D" type="CollisionShape2D" parent="Ground/DeployLayer/Interactable铁门/Wall"] shape = SubResource("RectangleShape2D_mdix7") -[node name="Note算命摊位" parent="Ground/DeployLayer" index="19" instance=ExtResource("6_t48d1")] +[node name="Note算命摊位" parent="Ground/DeployLayer" index="18" instance=ExtResource("6_t48d1")] position = Vector2(725, 45) note_key = "c02_院子_算命摊位" @@ -612,7 +566,7 @@ note_key = "c02_院子_算命摊位" position = Vector2(0, 18) texture = ExtResource("6_1tart") -[node name="煤油灯" type="Sprite2D" parent="Ground/DeployLayer" index="20"] +[node name="煤油灯" type="Sprite2D" parent="Ground/DeployLayer" index="19"] position = Vector2(293, 13) texture = ExtResource("32_df1yo") @@ -630,7 +584,7 @@ energy = 2.0 blend_mode = 2 texture = ExtResource("11_g0qhj") -[node name="煤油灯2" type="Sprite2D" parent="Ground/DeployLayer" index="21"] +[node name="煤油灯2" type="Sprite2D" parent="Ground/DeployLayer" index="20"] position = Vector2(605, 13) texture = ExtResource("32_df1yo") @@ -648,7 +602,7 @@ energy = 2.0 blend_mode = 2 texture = ExtResource("34_jhod7") -[node name="煤油灯3" type="Sprite2D" parent="Ground/DeployLayer" index="22"] +[node name="煤油灯3" type="Sprite2D" parent="Ground/DeployLayer" index="21"] position = Vector2(854, 13) texture = ExtResource("32_df1yo") @@ -666,61 +620,60 @@ energy = 2.0 blend_mode = 2 texture = ExtResource("35_o1qbs") -[node name="井" type="Sprite2D" parent="Ground/DeployLayer" index="23"] +[node name="井" type="Sprite2D" parent="Ground/DeployLayer" index="22"] self_modulate = Color(0.739288, 0.739288, 0.739288, 1) light_mask = 5 z_index = 10 position = Vector2(2062, 60) texture = ExtResource("21_4n8vm") -[node name="Closeup敲门游戏" parent="Ground/DeployLayer" index="24" instance=ExtResource("23_81juy")] -position = Vector2(466, 3) -packed_scene = ExtResource("24_0o4rt") -collision_width_and_x = Vector2(40, 0) - -[node name="药车" type="Sprite2D" parent="Ground/DeployLayer" index="25"] +[node name="药车" type="Sprite2D" parent="Ground/DeployLayer" index="23"] light_mask = 5 -z_index = 10 +z_index = 11 position = Vector2(1025, 27) texture = ExtResource("22_3y5s5") -[node name="Closeup抓药游戏" parent="Ground/DeployLayer" index="26" instance=ExtResource("23_81juy")] -position = Vector2(1058, 33) +[node name="Closeup抓药游戏" parent="Ground/DeployLayer" index="24" instance=ExtResource("23_81juy")] +position = Vector2(1058, 24) packed_scene = ExtResource("45_fxne6") quit_closeup_on_cancel = false collision_width_and_x = Vector2(40, 0) [node name="EventBinder" type="Node" parent="Ground/DeployLayer/Closeup抓药游戏"] script = ExtResource("12_2b6vx") -memo = "current_chapter_stage=[3:第二章|4:第三章|5:第四章|6:尾声] 时,启用: [抓药游戏] -" updater_event = &"current_chapter_stage" -updater_stages = Array[int]([3, 4, 5, 6]) +updater_stage_mode = "exclude" +updater_stages = Array[int]([0, 1]) metadata/_custom_type_script = "uid://0wjaho6qkg6s" -[node name="Ambush惊悚闪电" parent="Ground/DeployLayer" index="27" instance=ExtResource("25_iyaiw")] +[node name="Closeup敲门游戏" parent="Ground/DeployLayer" index="25" instance=ExtResource("23_81juy")] +position = Vector2(466, 3) +packed_scene = ExtResource("24_0o4rt") +collision_width_and_x = Vector2(40, 0) + +[node name="Ambush惊悚闪电" parent="Ground/DeployLayer" index="26" instance=ExtResource("25_iyaiw")] position = Vector2(1319, 40) hook_method = "shocking_lighting" -[node name="Ambush偷听对话" parent="Ground/DeployLayer" index="28" instance=ExtResource("25_iyaiw")] +[node name="Ambush偷听对话" parent="Ground/DeployLayer" index="27" instance=ExtResource("25_iyaiw")] position = Vector2(1836, 7) trigger_mode = "interact" one_shot = false hook_method = "eavesdrop" -[node name="李氏赖子房间人影" type="AnimatedSprite2D" parent="Ground/DeployLayer" index="29"] +[node name="李氏赖子房间人影" type="AnimatedSprite2D" parent="Ground/DeployLayer" index="28"] position = Vector2(1835, -16) sprite_frames = SubResource("SpriteFrames_0o4rt") autoplay = "default" frame_progress = 0.643855 -[node name="Closeup井" parent="Ground/DeployLayer" index="30" instance=ExtResource("23_81juy")] +[node name="Closeup井" parent="Ground/DeployLayer" index="29" instance=ExtResource("23_81juy")] z_index = 6 position = Vector2(2063, 50) packed_scene = ExtResource("26_yy4fp") action_key = 3 -[node name="Npc井边疯子" parent="Ground/DeployLayer" index="31" instance=ExtResource("35_plfv5")] +[node name="Npc井边疯子" parent="Ground/DeployLayer" index="30" instance=ExtResource("35_plfv5")] z_index = 10 position = Vector2(2037, 67) sprite_frames = ExtResource("4_gd6xp") @@ -734,7 +687,7 @@ sign_x_offset = -2.0 collision_width_and_x = Vector2(37.08, 0) dialogue_title = "c02_井边疯子对话" -[node name="霸凌" type="Node2D" parent="Ground/DeployLayer" index="32"] +[node name="霸凌" type="Node2D" parent="Ground/DeployLayer" index="31"] visible = false position = Vector2(2154, 60) @@ -797,7 +750,7 @@ collision_mask = 0 shape = SubResource("RectangleShape2D_d7h4s") disabled = true -[node name="火灾" type="Node2D" parent="Ground/DeployLayer" index="33"] +[node name="火灾" type="Node2D" parent="Ground/DeployLayer" index="32"] visible = false [node name="右窗" type="AnimatedSprite2D" parent="Ground/DeployLayer/火灾"] @@ -1039,7 +992,7 @@ script = ExtResource("54_o1qbs") loop = true metadata/_custom_type_script = "uid://wapo47a1oddf" -[node name="Interactable柜子" parent="Ground/DeployLayer" index="34" instance=ExtResource("8_xt8j0")] +[node name="Interactable柜子" parent="Ground/DeployLayer" index="33" instance=ExtResource("8_xt8j0")] visible = false position = Vector2(1772, 48) texture = ExtResource("32_cpifc") @@ -1055,11 +1008,48 @@ animation = &"箱子着火" autoplay = "箱子着火" frame_progress = 0.453645 -[node name="Note柜子可放置区域" parent="Ground/DeployLayer" index="35" instance=ExtResource("6_t48d1")] +[node name="Note柜子可放置区域" parent="Ground/DeployLayer" index="34" instance=ExtResource("6_t48d1")] position = Vector2(1771, 39) title_filter = "c02" note_key = "c02_柜子可放置区域" +[node name="新背景_奠" type="Node2D" parent="Ground/DeployLayer" index="35"] +visible = false + +[node name="地上纸钱" type="Sprite2D" parent="Ground/DeployLayer/新背景_奠"] +z_index = -4 +position = Vector2(0, -120) +texture = ExtResource("14_qqdxs") +centered = false + +[node name="奠1" type="Sprite2D" parent="Ground/DeployLayer/新背景_奠"] +position = Vector2(199.5, -3) +texture = ExtResource("6_ygnci") + +[node name="奠2" type="Sprite2D" parent="Ground/DeployLayer/新背景_奠"] +position = Vector2(655, -1) +texture = ExtResource("7_c3f8o") + +[node name="奠3" type="Sprite2D" parent="Ground/DeployLayer/新背景_奠"] +position = Vector2(799.5, -3) +texture = ExtResource("8_crgo6") + +[node name="奠4" type="Sprite2D" parent="Ground/DeployLayer/新背景_奠"] +position = Vector2(1936.5, -3) +texture = ExtResource("9_vddfx") + +[node name="ParticalsAsh" parent="Ground/DeployLayer/新背景_奠" instance=ExtResource("10_c3f8o")] +z_index = 10 +position = Vector2(343, -175) + +[node name="ParticalsAsh2" parent="Ground/DeployLayer/新背景_奠" instance=ExtResource("10_c3f8o")] +z_index = 10 +position = Vector2(898, -162) + +[node name="ParticalsAsh_z_10" parent="Ground/DeployLayer/新背景_奠" instance=ExtResource("10_c3f8o")] +z_index = 10 +position = Vector2(1964, -209) + [node name="PointLight2D" type="PointLight2D" parent="Ground/AmbientLayer" index="0"] light_mask = 4 position = Vector2(2189, -142)