diff --git a/asset/dialogue/item_description.dialogue b/asset/dialogue/item_description.dialogue
index f15e995a..2f554946 100644
--- a/asset/dialogue/item_description.dialogue
+++ b/asset/dialogue/item_description.dialogue
@@ -68,7 +68,6 @@
院长的信 [#texture=c01/院长的信物品.png][#inspect=c01/院长的信.png] [ID:prop_院长的信]
浦育院院长秦阳
民国21年11月20日
致吕萍：
你现下境况如何？
你虽离开浦育院已久，但我始终没有忘记为你祈祷。
愿上帝保佑你走向真正光明的道路。我相信这也是当年你父亲将你托付给我时的殷切愿景。
你既已成人，无论你的父母出于何种理由选择与你分离，你都应当拥有知晓真相的权利，所以我将公寓地址附在了信后，除此之外，我亦知之甚少。
若有闲暇，欢迎你回浦育院看看。
院长童玉君
民国十九年十月十五日
公寓地址 芦昌路26弄3号 [ID:prop_院长的信_说明]
-
# c02
火柴 [#texture=c02/火柴.png] [ID:prop_火柴]
火柴_说明 [#texture=c02/火柴.png] [ID:prop_火柴_说明]
diff --git a/manager/audio_manager/vibe_group_collection.tres b/manager/audio_manager/vibe_group_collection.tres
index 5fb77d70..8944e8bb 100644
--- a/manager/audio_manager/vibe_group_collection.tres
+++ b/manager/audio_manager/vibe_group_collection.tres
@@ -15,7 +15,7 @@
[sub_resource type="Resource" id="Resource_bjndi"]
script = ExtResource("1_0bbao")
group_name = &"c01_书店外"
-group_db = 0.0
+group_db = -5.0
base_sound = ExtResource("2_uwtc1")
base_sound_db = 0.0
embellishments = Array[ExtResource("3_scrw7")]([])
@@ -24,7 +24,7 @@ metadata/_custom_type_script = "uid://cy1ngx5no67v"
[sub_resource type="Resource" id="Resource_chrc1"]
script = ExtResource("1_0bbao")
group_name = &"c02_房间里1"
-group_db = 0.0
+group_db = -5.0
base_sound = ExtResource("4_f75a1")
base_sound_db = 0.0
embellishments = Array[ExtResource("3_scrw7")]([])
@@ -33,7 +33,7 @@ metadata/_custom_type_script = "uid://cy1ngx5no67v"
[sub_resource type="Resource" id="Resource_7c7wx"]
script = ExtResource("1_0bbao")
group_name = &"c02_房间里2"
-group_db = 0.0
+group_db = -5.0
base_sound = ExtResource("5_pgee5")
base_sound_db = 0.0
embellishments = Array[ExtResource("3_scrw7")]([])
@@ -42,7 +42,7 @@ metadata/_custom_type_script = "uid://cy1ngx5no67v"
[sub_resource type="Resource" id="Resource_an5bn"]
script = ExtResource("1_0bbao")
group_name = &"c02_楼道1"
-group_db = 0.0
+group_db = -5.0
base_sound = ExtResource("6_u0i77")
base_sound_db = 0.0
embellishments = Array[ExtResource("3_scrw7")]([])
@@ -51,7 +51,7 @@ metadata/_custom_type_script = "uid://cy1ngx5no67v"
[sub_resource type="Resource" id="Resource_egnaw"]
script = ExtResource("1_0bbao")
group_name = &"c02_楼道2"
-group_db = 0.0
+group_db = -5.0
base_sound = ExtResource("7_kxpku")
base_sound_db = 0.0
embellishments = Array[ExtResource("3_scrw7")]([])
@@ -60,7 +60,7 @@ metadata/_custom_type_script = "uid://cy1ngx5no67v"
[sub_resource type="Resource" id="Resource_e3r3f"]
script = ExtResource("1_0bbao")
group_name = &"c02_诡异室外"
-group_db = 0.0
+group_db = -5.0
base_sound = ExtResource("8_ehphf")
base_sound_db = 0.0
embellishments = Array[ExtResource("3_scrw7")]([])
@@ -78,7 +78,7 @@ metadata/_custom_type_script = "uid://eydkufjbf7n6"
[sub_resource type="Resource" id="Resource_n45nr"]
script = ExtResource("1_0bbao")
group_name = &"c02_楼道虫鸣"
-group_db = 0.0
+group_db = -5.0
base_sound = ExtResource("6_u0i77")
base_sound_db = 0.0
embellishments = Array[ExtResource("3_scrw7")]([SubResource("Resource_s3jju")])
diff --git a/scene/entity/interactable.gd b/scene/entity/interactable.gd
index b4e028da..9bb0c4bf 100644
--- a/scene/entity/interactable.gd
+++ b/scene/entity/interactable.gd
@@ -75,6 +75,7 @@ func _ready() -> void:
area2d.body_exited.connect(_on_cancel)
if enable_snapper:
sign_snapper.arrived.connect(_pre_interacted)
+ sign_snapper.action_on_arrived = action_key
else:
sign_snapper.enabled = false
sign_mark.interacted.connect(_pre_interacted)
diff --git a/scene/entity/npc.tscn b/scene/entity/npc.tscn
index e14ccd18..7b5dfefe 100644
--- a/scene/entity/npc.tscn
+++ b/scene/entity/npc.tscn
@@ -161,6 +161,7 @@ texture = SubResource("GradientTexture2D_7lwt5")
unique_name_in_owner = true
visible = false
modulate = Color(0.753984, 0.753984, 0.753984, 1)
+z_index = 100
position = Vector2(0, -60)
scale = Vector2(0.07, 0.07)
diff --git a/scene/entity/partical/particals_ash_vertical.tscn b/scene/entity/partical/particals_ash_vertical.tscn
index 51863e58..f45d4808 100644
--- a/scene/entity/partical/particals_ash_vertical.tscn
+++ b/scene/entity/partical/particals_ash_vertical.tscn
@@ -36,7 +36,7 @@ color_ramp = SubResource("GradientTexture1D_5cty7")
[node name="纸钱" type="GPUParticles2D" parent="."]
modulate = Color(1, 1, 1, 0.54902)
position = Vector2(3, 0)
-amount = 300
+amount = 150
texture = ExtResource("1_hsa64")
lifetime = 30.0
preprocess = 20.0
diff --git a/scene/entity/portal.tscn b/scene/entity/portal.tscn
index e819c24d..f8dc18e6 100644
--- a/scene/entity/portal.tscn
+++ b/scene/entity/portal.tscn
@@ -74,7 +74,6 @@ shape = SubResource("RectangleShape2D_munml")
[node name="SignSnapper" type="Marker2D" parent="."]
unique_name_in_owner = true
script = ExtResource("12_bxihn")
-release_player_on_arrived = false
radius = 10.0
delay_arrived = 0.1
delay_after_action = 0.4
diff --git a/scene/ground/scene/c01/s06_孤儿院长廊围墙.tscn b/scene/ground/scene/c01/s06_孤儿院长廊围墙.tscn
index 48519764..57acd841 100644
--- a/scene/ground/scene/c01/s06_孤儿院长廊围墙.tscn
+++ b/scene/ground/scene/c01/s06_孤儿院长廊围墙.tscn
@@ -164,6 +164,7 @@ metadata/_custom_type_script = "uid://wapo47a1oddf"
position = Vector2(490, 36)
stream = ExtResource("5_6mww0")
autoplay = true
+stream_paused = true
bus = &"game_sfx"
script = ExtResource("4_qq2uh")
loop = true
diff --git a/scene/ground/scene/c02/s02_animation.gd b/scene/ground/scene/c02/s02_animation.gd
index 272e5e85..fd82fade 100644
--- a/scene/ground/scene/c02/s02_animation.gd
+++ b/scene/ground/scene/c02/s02_animation.gd
@@ -66,7 +66,7 @@ func _oneshot_wind():
func xiaochan_disappear():
var xc = $"../DeployLayer/Ambush小蝉闪现/小蝉" as AnimatedSprite2D
xc.play()
- create_tween().tween_property(xc, "modulate:a", 0.0, 3.0)
+ create_tween().tween_property(xc, "modulate:a", 0.0, 2.0)
func _on_flyer_exit(arg):
diff --git a/scene/ground/scene/c02/s02_过道.tscn b/scene/ground/scene/c02/s02_过道.tscn
index 30c0098a..08c16825 100644
--- a/scene/ground/scene/c02/s02_过道.tscn
+++ b/scene/ground/scene/c02/s02_过道.tscn
@@ -133,6 +133,7 @@ content_key = "c02_青岛啤酒"
[node name="鼠疫海报" parent="Ground/DeployLayer" index="8" instance=ExtResource("12_0fckv")]
position = Vector2(442, -30)
texture_cover = ExtResource("7_wdwbi")
+content_key = "c02_鼠疫海报"
[node name="Ambush纸人" parent="Ground/DeployLayer" index="9" instance=ExtResource("8_52as8")]
visible = false
@@ -212,8 +213,6 @@ hook_method = "check_if_show_shoes"
position = Vector2(122, -15)
gaslight_energy = 2.0
gaslight_ground_energy = 0.0
-one_shot = false
-disable_prop_after_interacted = true
[node name="Closeup八音盒" parent="Ground/DeployLayer" index="18" instance=ExtResource("19_6wwyd")]
position = Vector2(533, 65)
@@ -227,11 +226,11 @@ position = Vector2(0, 11)
texture = ExtResource("22_jg8g0")
[node name="Ambush小蝉闪现" parent="Ground/DeployLayer" index="19" instance=ExtResource("8_52as8")]
-position = Vector2(301, 52)
+position = Vector2(97, 49)
hook_method = "xiaochan_disappear"
[node name="小蝉" type="AnimatedSprite2D" parent="Ground/DeployLayer/Ambush小蝉闪现"]
-position = Vector2(279, 10)
+position = Vector2(189, 15)
sprite_frames = ExtResource("19_q0axc")
animation = &"头套小蝉呼吸"
autoplay = "头套小蝉呼吸"
diff --git a/scene/ground/scene/c02/s03_院子.tscn b/scene/ground/scene/c02/s03_院子.tscn
index 1adccc61..69dd7002 100644
--- a/scene/ground/scene/c02/s03_院子.tscn
+++ b/scene/ground/scene/c02/s03_院子.tscn
@@ -427,6 +427,7 @@ energy = 0.7
texture = SubResource("GradientTexture2D_kyfht")
[node name="新背景_奠" type="Node2D" parent="Ground/DeployLayer" index="10"]
+visible = false
[node name="地上纸钱" type="Sprite2D" parent="Ground/DeployLayer/新背景_奠"]
z_index = -4
@@ -506,6 +507,8 @@ texture = ExtResource("8_plfv5")
light_mask = 5
position = Vector2(1222, 28)
texture = ExtResource("7_gd6xp")
+enable_snapper = false
+action_key = 3
interacted_texture = ExtResource("9_liq0c")
prop_key = "prop_老虎钳"
@@ -533,7 +536,6 @@ position = Vector2(290, 1)
gaslight_energy = 1.5
gaslight_ground_energy = 0.7
mute_when_interacted = false
-disable_prop_after_interacted = true
[node name="煤油灯2" parent="Ground/DeployLayer" index="17" instance=ExtResource("10_jme4f")]
position = Vector2(610, 1)
@@ -542,7 +544,6 @@ ground_light_texture = ExtResource("12_ni5ro")
gaslight_energy = 1.5
gaslight_ground_energy = 0.7
mute_when_interacted = false
-disable_prop_after_interacted = true
[node name="煤油灯3" parent="Ground/DeployLayer" index="18" instance=ExtResource("10_jme4f")]
position = Vector2(857, 1)
@@ -551,7 +552,6 @@ ground_light_texture = ExtResource("14_7pq5y")
gaslight_energy = 1.5
gaslight_ground_energy = 0.7
mute_when_interacted = false
-disable_prop_after_interacted = true
[node name="井" type="Sprite2D" parent="Ground/DeployLayer" index="19"]
self_modulate = Color(0.739288, 0.739288, 0.739288, 1)
diff --git a/scene/ground/scene/c02/s06_二楼.tscn b/scene/ground/scene/c02/s06_二楼.tscn
index 6fcfaf3f..a1f49792 100644
--- a/scene/ground/scene/c02/s06_二楼.tscn
+++ b/scene/ground/scene/c02/s06_二楼.tscn
@@ -929,7 +929,6 @@ debug_mov_animation = "小小小蝶动画(跑）"
position = Vector2(616, -14)
ground_light_texture = ExtResource("8_7x2h6")
ground_height_offset = 15.0
-disable_prop_after_interacted = true
[node name="CollisionShape2D" parent="Ground/DeployLayer/煤油灯/Area2D" index="0"]
shape = SubResource("RectangleShape2D_lh55k")
@@ -943,7 +942,6 @@ position = Vector2(329, -14)
ground_light_texture = ExtResource("6_vbvbc")
gaslight_energy = 2.0
ground_height_offset = 15.0
-disable_prop_after_interacted = true
[node name="Interactable老鼠洞" parent="Ground/DeployLayer" index="9" instance=ExtResource("7_0d746")]
position = Vector2(610, 50)
diff --git a/scene/ground/scene/c02/s08_瞎子卧室.tscn b/scene/ground/scene/c02/s08_瞎子卧室.tscn
index 0bc5a73d..74872b5f 100644
--- a/scene/ground/scene/c02/s08_瞎子卧室.tscn
+++ b/scene/ground/scene/c02/s08_瞎子卧室.tscn
@@ -368,10 +368,13 @@ texture = SubResource("GradientTexture2D_bp5fr")
[node name="AudioListener2D" type="AudioListener2D" parent="Ground/MainPlayer" index="7"]
current = true
-[node name="FGSprite2D" parent="Ground/ParallaxForeground/FGParallaxLayer" index="0"]
-position = Vector2(11, 148)
+[node name="Sprite2D" type="Sprite2D" parent="Ground/ParallaxForeground/BGParallaxLayer" index="0"]
+position = Vector2(291, 94)
texture = ExtResource("4_gx8oy")
+[node name="FGSprite2D" parent="Ground/ParallaxForeground/FGParallaxLayer" index="0"]
+position = Vector2(1, 147)
+
[node name="PlayerLine2D" parent="Ground/ParallaxForeground" index="2"]
points = PackedVector2Array(580, 150, 690, 150)
diff --git a/scene/ground/scene/c02/s10_空房间.tscn b/scene/ground/scene/c02/s10_空房间.tscn
index 90836a18..9a0d4357 100644
--- a/scene/ground/scene/c02/s10_空房间.tscn
+++ b/scene/ground/scene/c02/s10_空房间.tscn
@@ -183,7 +183,6 @@ gaslight_energy = 2.0
gaslight_ground_energy = 2.0
mute_when_interacted = false
one_shot = false
-disable_prop_after_interacted = true
[node name="拼接小猫玩具" type="AnimatedSprite2D" parent="Ground/DeployLayer" index="12"]
visible = false
diff --git a/scene/ground/script/c02/老鼠精画像.gd b/scene/ground/script/c02/老鼠精画像.gd
new file mode 100644
index 00000000..2cbe2c53
--- /dev/null
+++ b/scene/ground/script/c02/老鼠精画像.gd
@@ -0,0 +1,6 @@
+extends CanvasLayer
+
+
+func _ready() -> void:
+ layer = GlobalConfig.CANVAS_LAYER_LITTLE_GAME
+ %Label.text = tr("c02_保卫科老鼠精").replace("
", "\n")
diff --git a/scene/ground/script/c02/老鼠精画像.gd.uid b/scene/ground/script/c02/老鼠精画像.gd.uid
new file mode 100644
index 00000000..70b24565
--- /dev/null
+++ b/scene/ground/script/c02/老鼠精画像.gd.uid
@@ -0,0 +1 @@
+uid://dyk58stu5enia
diff --git a/scene/ground/script/c02/老鼠精画像.tscn b/scene/ground/script/c02/老鼠精画像.tscn
index 27bfd14e..51a45046 100644
--- a/scene/ground/script/c02/老鼠精画像.tscn
+++ b/scene/ground/script/c02/老鼠精画像.tscn
@@ -1,12 +1,12 @@
[gd_scene load_steps=5 format=3 uid="uid://cdf2qe8l7323i"]
-[ext_resource type="Script" uid="uid://dnrql1t0j6v8i" path="res://scene/ground/script/c02/通用特写脚本.gd" id="1_lpmq3"]
+[ext_resource type="Script" uid="uid://dyk58stu5enia" path="res://scene/ground/script/c02/老鼠精画像.gd" id="1_l77sh"]
[ext_resource type="Texture2D" uid="uid://d1xr7g5huv5or" path="res://asset/art/scene/c02/s04_保卫科/ux_老鼠画像特写.png" id="2_eyynm"]
[ext_resource type="PackedScene" uid="uid://dmysq4sxx8iqh" path="res://scene/entity/ux/content_inspector.tscn" id="3_lpmq3"]
[ext_resource type="Texture2D" uid="uid://f186lvt5y2ql" path="res://asset/art/ui/prop/inspect背景遮罩.png" id="4_l77sh"]
[node name="老鼠精画像" type="CanvasLayer"]
-script = ExtResource("1_lpmq3")
+script = ExtResource("1_l77sh")
[node name="TextureRect" type="TextureRect" parent="."]
anchors_preset = 15
@@ -44,5 +44,6 @@ offset_right = 50.0
offset_bottom = 7.0
grow_horizontal = 2
grow_vertical = 2
+text = "c02_保卫科老鼠精"
horizontal_alignment = 1
autowrap_mode = 3
diff --git a/scene/ground/script/c02/通用特写脚本.gd b/scene/ground/script/c02/通用特写脚本.gd
index 2cbe2c53..5b9c9b50 100644
--- a/scene/ground/script/c02/通用特写脚本.gd
+++ b/scene/ground/script/c02/通用特写脚本.gd
@@ -3,4 +3,3 @@ extends CanvasLayer
func _ready() -> void:
layer = GlobalConfig.CANVAS_LAYER_LITTLE_GAME
- %Label.text = tr("c02_保卫科老鼠精").replace("
", "\n")