20250131场景更改

scene/ground/scene/c01/s05_院长房间.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=33 format=3 uid="uid://dlx5xxbg53rb8"]
+[gd_scene load_steps=34 format=3 uid="uid://dlx5xxbg53rb8"]
 
 [ext_resource type="PackedScene" uid="uid://dayyx4jerj7io" path="res://scene/ground/ground.tscn" id="1_ff4yb"]
 [ext_resource type="Script" path="res://scene/ground/scene/c01/s05_animation.gd" id="2_j5oim"]
@@ -10,6 +10,7 @@
 [ext_resource type="Texture2D" uid="uid://eamkmbyicbkd" path="res://asset/art/scene/c01/s05_院长房间/e_座钟.png" id="7_3tetc"]
 [ext_resource type="Texture2D" uid="uid://qtksfmfvk3c7" path="res://asset/art/scene/c01/s05_院长房间/e_床.png" id="7_xakd0"]
 [ext_resource type="Texture2D" uid="uid://dihrl7mgckinx" path="res://asset/art/scene/c01/s05_院长房间/e_钢琴.png" id="8_mnduo"]
+[ext_resource type="AudioStream" uid="uid://byjcmxy5crce5" path="res://asset/audio/sfx/ui/纸条.mp3" id="9_8debu"]
 [ext_resource type="Texture2D" uid="uid://cmrpf3w0oetem" path="res://asset/art/scene/c01/s05_院长房间/e_桌椅.png" id="9_x837o"]
 [ext_resource type="PackedScene" uid="uid://jr1yd46wm5je" path="res://scene/entity/note.tscn" id="10_18v0g"]
 [ext_resource type="Texture2D" uid="uid://choqjery7hf58" path="res://asset/art/scene/c01/s05_院长房间/e_画框.png" id="11_6gq1s"]
@@ -17,12 +18,12 @@
 [ext_resource type="SpriteFrames" uid="uid://b7fhheih1hbvf" path="res://config/animation/entity_sprite_frames.tres" id="14_e1bmq"]
 [ext_resource type="PackedScene" uid="uid://cw3q5pvciumil" path="res://scene/entity/interactable.tscn" id="14_lq1ou"]
 [ext_resource type="PackedScene" uid="uid://bnf3lkcbpx1ar" path="res://scene/entity/ambush.tscn" id="15_1uixh"]
-[ext_resource type="AudioStream" uid="uid://dky3j8lwcy5sk" path="res://asset/audio/sfx/ui/物品查看.mp3" id="15_2jvyd"]
+[ext_resource type="AudioStream" uid="uid://inmdv5gqqius" path="res://asset/audio/sfx/ui/门锁互动.mp3" id="16_j2w12"]
 [ext_resource type="Texture2D" uid="uid://bloct6cpdt2qi" path="res://asset/art/scene/c01/s05_院长房间/l_墙.png" id="16_qh7fg"]
 [ext_resource type="Texture2D" uid="uid://df30bmtgdoqc3" path="res://asset/art/scene/c01/s05_院长房间/l_窗户光源.png" id="17_qqw2v"]
-[ext_resource type="AudioStream" uid="uid://cvttds81trcoc" path="res://asset/audio/sfx/ui/click.wav" id="19_5i4lj"]
+[ext_resource type="AudioStream" uid="uid://dky3j8lwcy5sk" path="res://asset/audio/sfx/ui/物品查看.mp3" id="17_yfgov"]
+[ext_resource type="AudioStream" uid="uid://cvttds81trcoc" path="res://asset/audio/sfx/ui/click.wav" id="19_6eopl"]
 [ext_resource type="PackedScene" uid="uid://dw0s23v7qmj28" path="res://ui/vertical_label.tscn" id="20_t1dxj"]
-[ext_resource type="AudioStream" uid="uid://inmdv5gqqius" path="res://asset/audio/sfx/ui/门锁互动.mp3" id="22_4c44k"]
 [ext_resource type="Script" path="res://scene/entity/general/sfx.gd" id="23_o1482"]
 
 [sub_resource type="Animation" id="Animation_c6mhi"]
@@ -463,10 +464,10 @@ tracks/8/path = NodePath("CameraFocusMarker:zoom_ratio")
 tracks/8/interp = 1
 tracks/8/loop_wrap = true
 tracks/8/keys = {
-"times": PackedFloat32Array(0, 0.56, 3.52, 4.1),
+"times": PackedFloat32Array(0, 0.84, 3.18, 4.1),
 "transitions": PackedFloat32Array(1, 1, 1, 1),
 "update": 0,
-"values": [1.0, 1.5, 1.5, 1.0]
+"values": [1.0, 1.3, 1.3, 1.0]
 }
 tracks/9/type = "value"
 tracks/9/imported = false
@@ -475,10 +476,10 @@ tracks/9/path = NodePath("CameraFocusMarker:force_offset")
 tracks/9/interp = 1
 tracks/9/loop_wrap = true
 tracks/9/keys = {
-"times": PackedFloat32Array(0, 0.5, 1.46, 2.28, 3.58, 4.08),
+"times": PackedFloat32Array(0, 4.08),
-"transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1),
+"transitions": PackedFloat32Array(1, 1),
 "update": 0,
-"values": [Vector2(0, 0), Vector2(0, -50), Vector2(0, -50), Vector2(0, -90), Vector2(0, -90), Vector2(0, 0)]
+"values": [Vector2(0, -20), Vector2(0, -20)]
 }
 
 [sub_resource type="Animation" id="Animation_ocf0o"]
@@ -567,7 +568,6 @@ resource_local_to_scene = true
 
 [node name="S05院长房间" type="Node2D"]
 metadata/_edit_vertical_guides_ = [-45.0]
-metadata/_edit_horizontal_guides_ = [88.0, 122.0]
 
 [node name="Ground" parent="." instance=ExtResource("1_ff4yb")]
 position = Vector2(1, 0)
@@ -614,6 +614,9 @@ texture = ExtResource("9_x837o")
 title_filter = "c01"
 note_key = "c01_院长书桌"
 
+[node name="Sfx" parent="Ground/DeployLayer/桌椅" index="0"]
+stream = ExtResource("9_8debu")
+
 [node name="Sign" parent="Ground/DeployLayer/桌椅" index="1"]
 offset_top = -21.0
 offset_bottom = 59.0
@@ -629,6 +632,9 @@ texture = ExtResource("11_6gq1s")
 title_filter = "c01"
 note_key = "c01_倾斜的洋相片"
 
+[node name="Sfx" parent="Ground/DeployLayer/画框" index="0"]
+stream = ExtResource("9_8debu")
+
 [node name="Sign" parent="Ground/DeployLayer/画框" index="1"]
 offset_left = 3.0
 offset_top = -7.0
@@ -669,8 +675,11 @@ frame = 10
 [node name="oneshot纸片" parent="Ground/DeployLayer" index="9" instance=ExtResource("14_lq1ou")]
 position = Vector2(231, 77)
 
+[node name="SfxInvalid" parent="Ground/DeployLayer/oneshot纸片" index="0"]
+stream = ExtResource("16_j2w12")
+
 [node name="SfxSuccess" parent="Ground/DeployLayer/oneshot纸片" index="1"]
-stream = ExtResource("15_2jvyd")
+stream = ExtResource("17_yfgov")
 file = "物品查看.mp3"
 
 [node name="Sign" parent="Ground/DeployLayer/oneshot纸片" index="2"]
@@ -695,11 +704,11 @@ texture = ExtResource("8_mnduo")
 one_shot = false
 
 [node name="SfxInvalid" parent="Ground/DeployLayer/钢琴" index="0"]
-stream = ExtResource("19_5i4lj")
+stream = ExtResource("19_6eopl")
 file = "click.wav"
 
 [node name="SfxSuccess" parent="Ground/DeployLayer/钢琴" index="1"]
-stream = ExtResource("19_5i4lj")
+stream = ExtResource("19_6eopl")
 file = "click.wav"
 
 [node name="Sign" parent="Ground/DeployLayer/钢琴" index="2"]
@@ -851,7 +860,7 @@ text_key = "ui_夜行船1"
 
 [node name="sfx_door_open" type="AudioStreamPlayer" parent="Ground"]
 unique_name_in_owner = true
-stream = ExtResource("22_4c44k")
+stream = ExtResource("16_j2w12")
 bus = &"game_sfx"
 script = ExtResource("23_o1482")
 file = "门锁互动.mp3"

scene/ground/scene/c01/s06_animation.gd

@@ -103,7 +103,7 @@ func _game_counting_down(_res = null):
 	get_tree().create_timer(2.5).timeout.connect(_kids_start_run)
 	cat.visible = true
 	cat.play("【墙上黑猫】跑步")
-	SceneManager.get_shading_layer().show_default_fog(2.0)
+	SceneManager.get_shading_layer().show_default_fog(10.0)
 
 
 func _kids_start_run():

scene/ground/scene/c01/s06_孤儿院长廊围墙.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=23 format=3 uid="uid://bx16c8nn32f40"]
+[gd_scene load_steps=25 format=3 uid="uid://bx16c8nn32f40"]
 
 [ext_resource type="PackedScene" uid="uid://dayyx4jerj7io" path="res://scene/ground/ground.tscn" id="1_bitx7"]
 [ext_resource type="Script" path="res://scene/ground/scene/c01/s06_animation.gd" id="2_fkfhi"]
@@ -15,6 +15,8 @@
 [ext_resource type="PackedScene" uid="uid://bnf3lkcbpx1ar" path="res://scene/entity/ambush.tscn" id="11_tudob"]
 [ext_resource type="PackedScene" uid="uid://jr1yd46wm5je" path="res://scene/entity/note.tscn" id="12_28t76"]
 [ext_resource type="PackedScene" uid="uid://cw3q5pvciumil" path="res://scene/entity/interactable.tscn" id="12_idjp0"]
+[ext_resource type="AudioStream" uid="uid://inmdv5gqqius" path="res://asset/audio/sfx/ui/门锁互动.mp3" id="13_5s1q8"]
+[ext_resource type="AudioStream" uid="uid://ccng5y2fip6mc" path="res://asset/audio/sfx/ui/开锁声.mp3" id="14_4tl6s"]
 
 [sub_resource type="Animation" id="Animation_723yg"]
 length = 0.001
@@ -91,11 +93,6 @@ position = Vector2(0, -3)
 texture = ExtResource("2_ow3ya")
 offset = Vector2(0, -155)
 
-[node name="院长凳子" type="Sprite2D" parent="Ground/BGSprite2D" index="0"]
-position = Vector2(30, -6)
-texture = ExtResource("3_su6aw")
-centered = false
-
 [node name="portal_left" parent="Ground/DeployLayer" index="0"]
 position = Vector2(144, 20)
 immediately = false
@@ -123,7 +120,8 @@ freeze_time = 3.0
 hook_animation = "门口_观望"
 
 [node name="踢球男孩" parent="Ground/DeployLayer" index="5" instance=ExtResource("5_erliv")]
-position = Vector2(535, -3)
+position = Vector2(535, 8)
+scale = Vector2(0.9, 0.9)
 range_x = 450.0
 speed = 90.0
 
@@ -193,7 +191,9 @@ action_configs = Array[Dictionary]([{
 [node name="游戏中途桌椅" parent="Ground/DeployLayer" index="9" instance=ExtResource("8_ouldg")]
 position = Vector2(2233, -1)
 sprite_frames = ExtResource("7_dsj2r")
-animation = &"桌椅正常"
+animation = &"桌椅翻倒"
+frame = 5
+frame_progress = 1.0
 action_configs = Array[Dictionary]([{
 "animation_intro": &"桌椅颤抖-正常",
 "animation_next": "桌椅正常"
@@ -205,6 +205,15 @@ action_configs = Array[Dictionary]([{
 [node name="Interactable桌椅" parent="Ground/DeployLayer" index="10" instance=ExtResource("12_idjp0")]
 position = Vector2(2135, 49)
 
+[node name="SfxInvalid" parent="Ground/DeployLayer/Interactable桌椅" index="0"]
+stream = ExtResource("13_5s1q8")
+
+[node name="SfxSuccess" parent="Ground/DeployLayer/Interactable桌椅" index="1"]
+stream = ExtResource("14_4tl6s")
+
+[node name="TextureContainer" parent="Ground/DeployLayer/Interactable桌椅/Sign" index="0"]
+metadata/_edit_use_anchors_ = true
+
 [node name="CollisionShape2D" parent="Ground/DeployLayer/Interactable桌椅/Area2D" index="0"]
 shape = SubResource("RectangleShape2D_73xsu")
 
@@ -324,7 +333,7 @@ z_index = 6
 z_as_relative = false
 position = Vector2(-23, 1)
 sprite_frames = ExtResource("7_dsj2r")
-animation = &"【单残疾小孩】抓住"
+animation = &"【墙上小孩猫影子】变身"
 autostart = false
 move_configs = Array[Dictionary]([{
 "animation": &"【单残疾小孩】爬行",
@@ -332,21 +341,20 @@ move_configs = Array[Dictionary]([{
 }])
 
 [node name="【墙上小孩猫影子】" parent="Ground/DeployLayer/【胖小孩背着残疾小孩】/【单残疾小孩】" instance=ExtResource("8_ouldg")]
-self_modulate = Color(1, 1, 1, 0.137255)
+self_modulate = Color(0.486275, 0.188235, 0.188235, 0.0235294)
 show_behind_parent = true
 z_index = -1
 z_as_relative = false
 position = Vector2(11, -8)
 sprite_frames = ExtResource("7_dsj2r")
 animation = &"【墙上小孩猫影子】变身"
-frame = 11
-frame_progress = 1.0
 autostart = false
 action_configs = Array[Dictionary]([{
 "animation_intro": &"【墙上小孩猫影子】变身",
-"animation_next": "【墙上小孩猫影子】猫影跑步"
+"animation_next": "【墙上小孩猫影子】猫影跑步",
+"animation_wait_time": 1.0
 }])
-light_energy = -0.7
+light_energy = -0.05
 
 [node name="中途Trigger" type="Area2D" parent="Ground/DeployLayer/【胖小孩背着残疾小孩】/【单残疾小孩】"]
 position = Vector2(29, 12)
@@ -385,49 +393,55 @@ offset = Vector2(601.5, -0.5)
 position = Vector2(1775, 91)
 character = "小小蝶"
 
-[node name="柱子" type="Sprite2D" parent="Ground/ParallaxForeground/BGParallaxLayer" index="0"]
+[node name="院长凳子" type="Sprite2D" parent="Ground/ParallaxForeground/BGParallaxLayer" index="0"]
+position = Vector2(34, 3)
+texture = ExtResource("3_su6aw")
+centered = false
+
+[node name="柱子" type="Sprite2D" parent="Ground/ParallaxForeground/BGParallaxLayer" index="1"]
 position = Vector2(0, 31)
 texture = ExtResource("4_dtycx")
 centered = false
 offset = Vector2(0, -153)
 
-[node name="门口_中蓝衣小孩" parent="Ground/ParallaxForeground/BGParallaxLayer" index="1" instance=ExtResource("8_ouldg")]
+[node name="门口_中蓝衣小孩" parent="Ground/ParallaxForeground/BGParallaxLayer" index="2" instance=ExtResource("8_ouldg")]
-position = Vector2(377, -1)
+position = Vector2(377, 18)
+scale = Vector2(0.9, 0.9)
 sprite_frames = ExtResource("2_l4axy")
 animation = &"中蓝衣小孩呼吸"
 
-[node name="门口_右绿衣男孩" parent="Ground/ParallaxForeground/BGParallaxLayer" index="2" instance=ExtResource("8_ouldg")]
+[node name="门口_右绿衣男孩" parent="Ground/ParallaxForeground/BGParallaxLayer" index="3" instance=ExtResource("8_ouldg")]
-position = Vector2(408, 1)
+position = Vector2(408, 3)
 sprite_frames = ExtResource("2_l4axy")
 animation = &"右绿衣男孩呼吸"
 
-[node name="门口_左2黄衣男" parent="Ground/ParallaxForeground/BGParallaxLayer" index="3" instance=ExtResource("8_ouldg")]
+[node name="门口_红衣姑娘" parent="Ground/ParallaxForeground/BGParallaxLayer" index="4" instance=ExtResource("8_ouldg")]
-position = Vector2(269, 0)
+position = Vector2(333, 9.5)
-sprite_frames = ExtResource("2_l4axy")
-animation = &"左2黄衣男呼吸"
-
-[node name="门口_左一绿衣男" parent="Ground/ParallaxForeground/BGParallaxLayer" index="4" instance=ExtResource("8_ouldg")]
-position = Vector2(230, 37)
-sprite_frames = ExtResource("2_l4axy")
-animation = &"左一绿衣男呼吸"
-flip_h = true
-
-[node name="门口_红衣姑娘" parent="Ground/ParallaxForeground/BGParallaxLayer" index="5" instance=ExtResource("8_ouldg")]
-position = Vector2(333, 0)
 sprite_frames = ExtResource("2_l4axy")
 animation = &"红衣姑娘呼吸"
 
-[node name="门口_院长" parent="Ground/ParallaxForeground/BGParallaxLayer" index="6" instance=ExtResource("8_ouldg")]
+[node name="门口_院长" parent="Ground/ParallaxForeground/BGParallaxLayer" index="5" instance=ExtResource("8_ouldg")]
-position = Vector2(301, -1)
+position = Vector2(301, 8.5)
 sprite_frames = ExtResource("2_l4axy")
-animation = &"院长呼吸"
+animation = &"院长翻书"
+
+[node name="门口_左2黄衣男" parent="Ground/ParallaxForeground/BGParallaxLayer" index="6" instance=ExtResource("8_ouldg")]
+position = Vector2(273, 15)
+sprite_frames = ExtResource("2_l4axy")
+animation = &"左2黄衣男呼吸"
+
+[node name="门口_左一绿衣男" parent="Ground/ParallaxForeground/BGParallaxLayer" index="7" instance=ExtResource("8_ouldg")]
+position = Vector2(242, 46.5)
+sprite_frames = ExtResource("2_l4axy")
+animation = &"左一绿衣男呼吸"
+flip_h = true
 
 [node name="FGSprite2D" parent="Ground/ParallaxForeground/FGParallaxLayer" index="0"]
 visible = false
 texture = null
 
 [node name="动态前景" parent="Ground/ParallaxForeground/FGParallaxLayer" index="1" instance=ExtResource("8_ouldg")]
-position = Vector2(7.10543e-15, 28)
+position = Vector2(7.10543e-15, 23)
 scale = Vector2(0.8, 0.8)
 sprite_frames = ExtResource("2_l4axy")
 animation = &"fg_花圃"

scene/main.tscn

@@ -22,6 +22,7 @@ current_scene = "c01_s05"
 entrance_portal = "right"
 
 [node name="ShadingLayer" parent="." instance=ExtResource("2_d1re1")]
+fog_frame = 15
 
 [node name="PropInspector" parent="." instance=ExtResource("5_ux0rw")]
 unique_name_in_owner = true

scene/shading/shading_layer.gd

@@ -137,7 +137,7 @@ const FOG_COLOR_GRAY = Color(0.5, 0.5, 0.5, 1)
 const FOG_COLOR_DARK_GRAY = Color(0.2, 0.2, 0.2, 1)
 
 const FOG_FRAME_MIN = 0
-const FOG_FRAME_DEFAULT = 15
+const FOG_FRAME_DEFAULT = 23  #原15
 const FOG_FRAME_MAX = 23
 
 const FOG_OFFSET_DEFAULT = Vector2(0, 50)

scene/shading/shading_layer.tscn

@@ -55,7 +55,7 @@ shader_parameter/shake_color_rate = 0.01
 noise_type = 2
 fractal_type = 2
 
-[sub_resource type="NoiseTexture2D" id="NoiseTexture2D_trttd"]
+[sub_resource type="NoiseTexture2D" id="NoiseTexture2D_qmfti"]
 width = 800
 height = 800
 seamless = true
@@ -64,7 +64,7 @@ noise = SubResource("FastNoiseLite_jw18h")
 
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_fv2fx"]
 shader = ExtResource("4_sglhm")
-shader_parameter/noise = SubResource("NoiseTexture2D_trttd")
+shader_parameter/noise = SubResource("NoiseTexture2D_qmfti")
 
 [sub_resource type="SpriteFrames" id="SpriteFrames_xeqgs"]
 animations = [{
@@ -235,6 +235,7 @@ shader_parameter/vignette_rgb = Color(0.247059, 0.14902, 0.192157, 1)
 layer = 10
 script = ExtResource("1_6w7er")
 mode = Array[String]([])
+fog_frame = 15
 
 [node name="Sprite2D" type="Sprite2D" parent="."]
 unique_name_in_owner = true