diff --git a/asset/art/ui/inspect/inspect特写通用遮罩.png b/asset/art/ui/遮罩/inspect特写通用遮罩.png
similarity index 100%
rename from asset/art/ui/inspect/inspect特写通用遮罩.png
rename to asset/art/ui/遮罩/inspect特写通用遮罩.png
diff --git a/asset/art/ui/inspect/inspect特写通用遮罩.png.import b/asset/art/ui/遮罩/inspect特写通用遮罩.png.import
similarity index 74%
rename from asset/art/ui/inspect/inspect特写通用遮罩.png.import
rename to asset/art/ui/遮罩/inspect特写通用遮罩.png.import
index ece5fc58..7ac10b49 100644
--- a/asset/art/ui/inspect/inspect特写通用遮罩.png.import
+++ b/asset/art/ui/遮罩/inspect特写通用遮罩.png.import
@@ -3,15 +3,15 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://cbql1i4hblmt1"
-path="res://.godot/imported/inspect特写通用遮罩.png-d71efbdf6a70d5f61869c92fccad6650.ctex"
+path="res://.godot/imported/inspect特写通用遮罩.png-1420576b3b1fddbb0ddd4a53371700d3.ctex"
metadata={
"vram_texture": false
}
[deps]
-source_file="res://asset/art/ui/inspect/inspect特写通用遮罩.png"
-dest_files=["res://.godot/imported/inspect特写通用遮罩.png-d71efbdf6a70d5f61869c92fccad6650.ctex"]
+source_file="res://asset/art/ui/遮罩/inspect特写通用遮罩.png"
+dest_files=["res://.godot/imported/inspect特写通用遮罩.png-1420576b3b1fddbb0ddd4a53371700d3.ctex"]
[params]
diff --git a/asset/art/ui/inspect/inspect背景遮罩.png b/asset/art/ui/遮罩/inspect背景遮罩.png
similarity index 100%
rename from asset/art/ui/inspect/inspect背景遮罩.png
rename to asset/art/ui/遮罩/inspect背景遮罩.png
diff --git a/asset/art/ui/inspect/inspect背景遮罩.png.import b/asset/art/ui/遮罩/inspect背景遮罩.png.import
similarity index 68%
rename from asset/art/ui/inspect/inspect背景遮罩.png.import
rename to asset/art/ui/遮罩/inspect背景遮罩.png.import
index a1596d2f..e3e5d07a 100644
--- a/asset/art/ui/inspect/inspect背景遮罩.png.import
+++ b/asset/art/ui/遮罩/inspect背景遮罩.png.import
@@ -3,15 +3,15 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://f186lvt5y2ql"
-path="res://.godot/imported/inspect背景遮罩.png-6487c5cc89abd54d3577e6cfd1f5c07e.ctex"
+path="res://.godot/imported/inspect背景遮罩.png-dabe02be98137494a661aa879cfa166f.ctex"
metadata={
"vram_texture": false
}
[deps]
-source_file="res://asset/art/ui/inspect/inspect背景遮罩.png"
-dest_files=["res://.godot/imported/inspect背景遮罩.png-6487c5cc89abd54d3577e6cfd1f5c07e.ctex"]
+source_file="res://asset/art/ui/遮罩/inspect背景遮罩.png"
+dest_files=["res://.godot/imported/inspect背景遮罩.png-dabe02be98137494a661aa879cfa166f.ctex"]
[params]
diff --git a/asset/art/ui/遮罩/头痛遮罩.png b/asset/art/ui/遮罩/头痛遮罩.png
new file mode 100644
index 00000000..4441e109
Binary files /dev/null and b/asset/art/ui/遮罩/头痛遮罩.png differ
diff --git a/asset/art/ui/遮罩/头痛遮罩.png.import b/asset/art/ui/遮罩/头痛遮罩.png.import
new file mode 100644
index 00000000..091bed2c
--- /dev/null
+++ b/asset/art/ui/遮罩/头痛遮罩.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://bxv83fm0qgvjh"
+path="res://.godot/imported/头痛遮罩.png-b55bb4679808918573eb38f7af366482.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://asset/art/ui/遮罩/头痛遮罩.png"
+dest_files=["res://.godot/imported/头痛遮罩.png-b55bb4679808918573eb38f7af366482.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
diff --git a/asset/dialogue/inspect_content.csv b/asset/dialogue/inspect_content.csv
index 8c413975..0a7644d3 100644
--- a/asset/dialogue/inspect_content.csv
+++ b/asset/dialogue/inspect_content.csv
@@ -23,7 +23,7 @@ c02_保卫科花名册1,一零一四 空,,,
c02_保卫科花名册2,一零一五王守义 李兰,,,
c02_保卫科花名册3,二零一二 张文开,,,
c02_保卫科花名册4,二零一三 方启钊 方小蝉,,,
-c02_保卫科花名册5,三零一二（看不清）,,,
+c02_保卫科花名册5,三零一二 吕萍,,,
c02_保卫科花名册6,三零一三（看不清）,,,
c02_保卫科花名册7,把我的鞋子拿给老鼠，老鼠会引开那个疯男人,,,
c02_保卫科花名册8,不要相信墙里的东西！,,,
diff --git a/asset/dialogue/inspect_content.dialogue b/asset/dialogue/inspect_content.dialogue
index ae347911..1060fc4c 100644
--- a/asset/dialogue/inspect_content.dialogue
+++ b/asset/dialogue/inspect_content.dialogue
@@ -37,7 +37,7 @@
二零一二 张文开 [ID:c02_保卫科花名册3]
二零一三 方启钊 方小蝉 [ID:c02_保卫科花名册4]
-三零一二（看不清） [ID:c02_保卫科花名册5]
+三零一二 吕萍 [ID:c02_保卫科花名册5]
三零一三（看不清） [ID:c02_保卫科花名册6]
把我的鞋子拿给老鼠，老鼠会引开那个疯男人 [ID:c02_保卫科花名册7]
不要相信墙里的东西！ [ID:c02_保卫科花名册8]
diff --git a/asset/dialogue/item_description.csv b/asset/dialogue/item_description.csv
index b6730444..f49ab685 100644
--- a/asset/dialogue/item_description.csv
+++ b/asset/dialogue/item_description.csv
@@ -163,13 +163,16 @@ c02_十几年前的报纸,十几年前的报纸,,,,,
c02_s02_大头娃娃头套,看着唬人，这尺寸只是给孩子们戴着玩的,,,,,
c02_s02_八音盒,自制的八音盒，这么用心的小玩意，怎么会被人扔在这里呢？,,,,,
c02_s02_八音盒缺人偶,别出心裁的小机关，缺了点东西，暂时还不能用,,,,,
+c02_院子_保卫科旁,这地方有些不对劲，最好先找个人问问,,,,,
c02_s03_干掉的血迹,血迹看上去干了很久，血脚印有大有小，咦，还有个特别小的...,,,,,
c02_院子_算命摊位,算命的摊位？,,,,,
c02_院子_要下雨,好像要下雨了？,,,,,
c02_s03_掉鞋子,怎么天上掉了个小鞋子下来？,,,,,
c02_s03_铁门,被铁链锁住了,,,,,
-c02_保卫科花名册os,芦昌公寓居民登记簿，黄国栋记。,,,,,
-c02_保卫科花名册首次互动结束,3012？上面有我的名字，看来确实是这里...,,,,,
+c02_偷听李癞对话后,三快三慢？是和那个肉铺老板交流的暗号吗？,,,,,
+c02_柜子可放置区域,这里之前放着的东西好像被人挪走了？,,,,,
+c02_保卫科花名册os,登记簿？
刚才那个小孩在上面写了些什么,,,,,
+c02_保卫科花名册首次互动结束,3012？上面有我的名字，看来确实是这里...
先去三楼看看吧,,,,,
c02_保卫科祭台os,祭台是专门供奉这只大老鼠的？,,,,,
c02_保卫科老鼠精,鼠歌
天地小如喉，
红轮自吞吐。
多少世间人，
都被红轮误。,,,,,
c02_小手还能换什么,...还有什么东西能跟它交换呢？,,,,,
@@ -182,11 +185,13 @@ c02_描述垃圾通道,桶是空的，飘着一股血气，又酸又腥。,,,,,
c02_一楼疯子互动后,这人有点不正常...最好离他远点。,,,,,
c02_一楼粘鼠板,这里原来放着什么？,,,,,
c02_一楼死老鼠,老鼠被粘住死掉了。,,,,,
-c02_获得小猫玩具,小猫玩具亮起来了，这光...竟有一丝暖意,,,,,
+c02_获得木头人偶,怎么回事...头...好痛,,,,,
+c02_获得小猫玩具,我的头，又开始痛了,,,,,
+c02_小蝉头套文字,吕萍阿姨，我不想死，求你...帮帮我,,,,,
c02_敲门_肉掉落,楼道有东西掉下来了？,,,,,
c02_敲门_老鼠叼肉,刚刚这里有块肉不见了？,,,,,
c02_锡箔换小鞋子,另一只小鞋子。,,,,,
-c02_二楼楼梯杂物堆,堆满了杂物，看样子没办法从这里上去了。,,,,,
+c02_二楼楼梯杂物堆,去三楼的路被堵住了，要不先看看别的地方吧。,,,,,
c02_二楼水盆,盆里的水很清澈，看上去像是刚盛的。,,,,,
c02_二楼老鼠洞,到处都是老鼠洞，怕不是整栋楼都被老鼠打通了。,,,,,
c02_二楼血脚印,又是这种小小尖尖的血脚印...,,,,,
diff --git a/asset/dialogue/item_description.dialogue b/asset/dialogue/item_description.dialogue
index b2ded54e..eff59850 100644
--- a/asset/dialogue/item_description.dialogue
+++ b/asset/dialogue/item_description.dialogue
@@ -191,7 +191,7 @@
自制的八音盒，这么用心的小玩意，怎么会被人扔在这里呢？ [ID:c02_s02_八音盒]
别出心裁的小机关，缺了点东西，暂时还不能用 [ID:c02_s02_八音盒缺人偶]
# c02 院子
-好像要下雨了？ [ID:c02_院子_保卫科旁]
+这地方有些不对劲，最好先找个人问问 [ID:c02_院子_保卫科旁]
血迹看上去干了很久，血脚印有大有小，咦，还有个特别小的... [ID:c02_s03_干掉的血迹]
算命的摊位？ [ID:c02_院子_算命摊位]
好像要下雨了？ [ID:c02_院子_要下雨]
@@ -200,8 +200,8 @@
三快三慢？是和那个肉铺老板交流的暗号吗？ [ID:c02_偷听李癞对话后]
这里之前放着的东西好像被人挪走了？ [ID:c02_柜子可放置区域]
# c02 保卫科
-芦昌公寓居民登记簿，黄国栋记。 [ID:c02_保卫科花名册os]
-3012？上面有我的名字，看来确实是这里... [ID:c02_保卫科花名册首次互动结束]
+登记簿？
刚才那个小孩在上面写了些什么 [ID:c02_保卫科花名册os]
+3012？上面有我的名字，看来确实是这里...
先去三楼看看吧[ID:c02_保卫科花名册首次互动结束]
祭台是专门供奉这只大老鼠的？ [ID:c02_保卫科祭台os]
鼠歌
天地小如喉，
红轮自吞吐。
多少世间人，
都被红轮误。 [ID:c02_保卫科老鼠精]
# c02 小手
@@ -216,14 +216,17 @@
这人有点不正常...最好离他远点。 [ID:c02_一楼疯子互动后]
这里原来放着什么？ [ID:c02_一楼粘鼠板]
老鼠被粘住死掉了。 [ID:c02_一楼死老鼠]
-# c02 小猫玩具
-小猫玩具亮起来了，这光...竟有一丝暖意 [ID:c02_获得小猫玩具]
+怎么回事...头...好痛 [ID:c02_获得木头人偶]
+
+# c02 空房间
+我的头，又开始痛了 [ID:c02_获得小猫玩具]
+吕萍阿姨，我不想死，求你...帮帮我 [ID:c02_小蝉头套文字]
# c02 敲门_老鼠叼肉
楼道有东西掉下来了？ [ID:c02_敲门_肉掉落]
刚刚这里有块肉不见了？ [ID:c02_敲门_老鼠叼肉]
# c02 二楼
另一只小鞋子。 [ID:c02_锡箔换小鞋子]
-堆满了杂物，看样子没办法从这里上去了。 [ID:c02_二楼楼梯杂物堆]
+去三楼的路被堵住了，要不先看看别的地方吧。 [ID:c02_二楼楼梯杂物堆]
盆里的水很清澈，看上去像是刚盛的。 [ID:c02_二楼水盆]
到处都是老鼠洞，怕不是整栋楼都被老鼠打通了。 [ID:c02_二楼老鼠洞]
又是这种小小尖尖的血脚印... [ID:c02_二楼血脚印]
diff --git a/config/animation/entity_sprite_frames.tres b/config/animation/entity_sprite_frames.tres
index 72b1f446..0a45baa7 100644
--- a/config/animation/entity_sprite_frames.tres
+++ b/config/animation/entity_sprite_frames.tres
@@ -2772,13 +2772,28 @@ animations = [{
"duration": 1.0,
"texture": ExtResource("524_5fksx")
}, {
-"duration": 1.0,
+"duration": 3.0,
"texture": ExtResource("525_45h8i")
}, {
-"duration": 1.0,
+"duration": 3.0,
"texture": ExtResource("526_fw42m")
+}, {
+"duration": 3.0,
+"texture": ExtResource("525_45h8i")
+}, {
+"duration": 3.0,
+"texture": ExtResource("526_fw42m")
+}, {
+"duration": 1.0,
+"texture": ExtResource("524_5fksx")
+}, {
+"duration": 1.0,
+"texture": ExtResource("523_xhf7n")
+}, {
+"duration": 1.0,
+"texture": ExtResource("522_1n12f")
}],
-"loop": true,
+"loop": false,
"name": &"c02_吕萍_头痛蹲下",
"speed": 8.0
}, {
diff --git a/manager/scene/scene_manager.gd b/manager/scene/scene_manager.gd
index 630321d5..3794354d 100644
--- a/manager/scene/scene_manager.gd
+++ b/manager/scene/scene_manager.gd
@@ -219,12 +219,12 @@ func disable_prop_item(prop_key: String) -> void:
printerr("disable_prop_item PropHud node not found")
-func pop_os_with_str(translation_key: String, auto_lock := true, auto_unlock := true) -> void:
+func pop_os_with_str(translation_key: String) -> void:
var player = get_player() as MainPlayer
if player:
var msg = tr(translation_key).replace("
", "\n")
var lines = await Util.generate_lines(msg)
- player.pop_os(lines, auto_lock, auto_unlock)
+ player.pop_os(lines)
else:
printerr("Player node not found")
diff --git a/project.godot b/project.godot
index 2265fbdc..881b9efd 100644
--- a/project.godot
+++ b/project.godot
@@ -104,6 +104,7 @@ folder_colors={
"res://asset/art/scene/": "pink",
"res://asset/audio/": "green",
"res://asset/audio/sfx/": "green",
+"res://asset/shader/": "red",
"res://config/": "gray",
"res://manager/": "purple",
"res://scene/": "purple",
diff --git a/scene/character/main_player.gd b/scene/character/main_player.gd
index b5882c61..9f49eae6 100644
--- a/scene/character/main_player.gd
+++ b/scene/character/main_player.gd
@@ -18,7 +18,7 @@ signal animation_finished
enable_light = val
if is_node_ready():
light.enabled = enable_light
-@export var catty_light_energy := 0.7
+@export var catty_light_energy := 0.3
@export var lock_move_left := false
@export var lock_move_right := false
@export var reenter_lock: PlayerReenterLock
@@ -324,8 +324,8 @@ func _reset_os_and_light_position():
# shadow_y = size.y * 0.5
-func pop_os(lines := [], auto_lock := true, auto_unlock := true) -> void:
- await os_pivot.pop_os(lines, auto_lock, auto_unlock)
+func pop_os(lines := []) -> void:
+ await os_pivot.pop_os(lines)
# animation -> offset_y
diff --git a/scene/character/main_player.tscn b/scene/character/main_player.tscn
index 903faa40..16802eca 100644
--- a/scene/character/main_player.tscn
+++ b/scene/character/main_player.tscn
@@ -41,8 +41,6 @@ size = Vector2(15, 180)
z_index = 5
collision_mask = 2
script = ExtResource("1_3a78y")
-catty_light_energy = 0.3
-running_locked = true
metadata/_edit_vertical_guides_ = [-15.0, -3.0]
[node name="PointLight2D" type="PointLight2D" parent="."]
diff --git a/scene/character/player_animation_config.gd b/scene/character/player_animation_config.gd
index 598282d9..37503f51 100644
--- a/scene/character/player_animation_config.gd
+++ b/scene/character/player_animation_config.gd
@@ -49,6 +49,7 @@ var ANIMATION_CONFIG = {
15: [&"c00_吕萍_起立", Vector2.ONE, Vector2(20, -94.0)],
# c00_吕萍_记笔记_right
16: [&"", Vector2.ONE, Vector2(0, -50.0), &"", &"c00_吕萍_记笔记_right"],
+ 17: [&"", Vector2.ONE, Vector2(0, -50.0), &"c02_吕萍_头痛蹲下", &""],
},
"吕萍爬行":
{
diff --git a/scene/effect/dizzy.gdshader b/scene/effect/dizzy.gdshader
new file mode 100644
index 00000000..589d6e72
--- /dev/null
+++ b/scene/effect/dizzy.gdshader
@@ -0,0 +1,31 @@
+shader_type canvas_item;
+render_mode blend_mix; // 直接覆盖，不做额外混合
+
+// 调节参数
+uniform float intensity : hint_range(0.0, 2.0) = 1.0; // 效果强度
+uniform float speed : hint_range(0.0, 10.0) = 1.0; // 动画速度
+uniform int samples : hint_range(1, 8) = 4; // 采样层数
+uniform float angle_spread : hint_range(0.0, 3.14) = 1.0; // 各通道最大偏移角度
+uniform sampler2D SCREEN_TEXTURE: hint_screen_texture, filter_linear_mipmap;
+
+
+void fragment() {
+ // 屏幕 UV
+ vec2 uv = SCREEN_UV;
+ // 总颜色累加器
+ vec4 col = vec4(0.0);
+ // 动态参数
+ float t = TIME * speed;
+
+ // 多次采样叠加
+ for (int i = 0; i < samples; i++) {
+ // 每层一个角度偏移 + 时间抖动
+ float a = float(i) * (2.0 * PI / float(samples)) + sin(t + float(i)) * angle_spread;
+ // 偏移量向量，依据 intensity 控制幅度
+ vec2 offset = vec2(cos(a), sin(a)) * (0.005 * intensity);
+ col += texture(SCREEN_TEXTURE, uv + offset);
+ }
+ // 平均并输出
+ col /= float(samples);
+ COLOR = col;
+}
\ No newline at end of file
diff --git a/scene/effect/dizzy.gdshader.uid b/scene/effect/dizzy.gdshader.uid
new file mode 100644
index 00000000..eca4fc77
--- /dev/null
+++ b/scene/effect/dizzy.gdshader.uid
@@ -0,0 +1 @@
+uid://dmchh10qdaawj
diff --git a/scene/effect/dizzy_shader.gd b/scene/effect/dizzy_shader.gd
new file mode 100644
index 00000000..e28bb3b1
--- /dev/null
+++ b/scene/effect/dizzy_shader.gd
@@ -0,0 +1,20 @@
+extends CanvasLayer
+
+@onready var rect = $ColorRect as ColorRect
+
+var tween
+
+
+func dizzy(duration := 2.0):
+ if tween and tween.is_valid():
+ tween.kill()
+ show()
+ tween = create_tween()
+ tween.tween_property(rect.material, "shader_parameter/intensity", 0.7, 0.2)
+ tween.tween_property(rect.material, "shader_parameter/intensity", 1.3, 0.2)
+ if duration > 0.0:
+ tween.set_loops(max(duration / 0.4, 1))
+ else:
+ # infinite
+ tween.set_loops(10000)
+ tween.tween_callback(hide)
diff --git a/scene/effect/dizzy_shader.gd.uid b/scene/effect/dizzy_shader.gd.uid
new file mode 100644
index 00000000..42084e6c
--- /dev/null
+++ b/scene/effect/dizzy_shader.gd.uid
@@ -0,0 +1 @@
+uid://c1ps7symh0l3o
diff --git a/scene/effect/dizzy_shader.tscn b/scene/effect/dizzy_shader.tscn
new file mode 100644
index 00000000..9e434d2c
--- /dev/null
+++ b/scene/effect/dizzy_shader.tscn
@@ -0,0 +1,36 @@
+[gd_scene load_steps=5 format=3 uid="uid://decfqoe5v0y6n"]
+
+[ext_resource type="Shader" uid="uid://dmchh10qdaawj" path="res://scene/effect/dizzy.gdshader" id="1_qpmt5"]
+[ext_resource type="Script" uid="uid://c1ps7symh0l3o" path="res://scene/effect/dizzy_shader.gd" id="1_t0l4c"]
+[ext_resource type="Texture2D" uid="uid://bxv83fm0qgvjh" path="res://asset/art/ui/遮罩/头痛遮罩.png" id="2_1cuad"]
+
+[sub_resource type="ShaderMaterial" id="ShaderMaterial_iylo4"]
+shader = ExtResource("1_qpmt5")
+shader_parameter/intensity = 1.0
+shader_parameter/speed = 1.0
+shader_parameter/samples = 4
+shader_parameter/angle_spread = 1.0
+
+[node name="DizzyShader" type="CanvasLayer"]
+script = ExtResource("1_t0l4c")
+
+[node name="TextureRect" type="TextureRect" parent="."]
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+mouse_filter = 2
+texture = ExtResource("2_1cuad")
+expand_mode = 1
+stretch_mode = 5
+
+[node name="ColorRect" type="ColorRect" parent="."]
+visible = false
+material = SubResource("ShaderMaterial_iylo4")
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+mouse_filter = 2
diff --git a/scene/effect/fog.tscn b/scene/effect/fog_shader.tscn
similarity index 100%
rename from scene/effect/fog.tscn
rename to scene/effect/fog_shader.tscn
diff --git a/scene/effect/shading_layer.tscn b/scene/effect/shading_layer.tscn
index bd7609b4..206d2e4e 100644
--- a/scene/effect/shading_layer.tscn
+++ b/scene/effect/shading_layer.tscn
@@ -7,7 +7,7 @@
[ext_resource type="Shader" uid="uid://cwuxtdwmhahhp" path="res://asset/shader/palette.gdshader" id="4_n5nu8"]
[ext_resource type="Shader" uid="uid://bcfnbll451i2r" path="res://asset/shader/fog.gdshader" id="4_sglhm"]
[ext_resource type="Texture2D" uid="uid://36k1j0qw66tm" path="res://asset/shader/palette/bloodmoon21-1x.png" id="5_ios50"]
-[ext_resource type="PackedScene" uid="uid://bicuc35kbn8hd" path="res://scene/effect/fog.tscn" id="7_7084x"]
+[ext_resource type="PackedScene" uid="uid://bicuc35kbn8hd" path="res://scene/effect/fog_shader.tscn" id="7_7084x"]
[ext_resource type="Material" uid="uid://7wllwmfkfvsb" path="res://asset/shader/cloud.tres" id="7_cmfij"]
[ext_resource type="Shader" uid="uid://3lssj7jwlhxl" path="res://asset/shader/chromatic_abberation.gdshader" id="8_b0unx"]
[ext_resource type="Texture2D" uid="uid://bmlhwa80lywa3" path="res://asset/art/ui/inverted_point_light_masks/000.png" id="8_v5h2g"]
diff --git a/scene/effect/smoke.tscn b/scene/effect/smoke.tscn
index c05d99d1..7aaa0d5f 100644
--- a/scene/effect/smoke.tscn
+++ b/scene/effect/smoke.tscn
@@ -1,6 +1,6 @@
[gd_scene load_steps=5 format=3 uid="uid://bwce0niymxrou"]
-[ext_resource type="Texture2D" uid="uid://bhl1b5ren8emk" path="res://scene/effect/smoke.png" id="1_705e3"]
+[ext_resource type="Texture2D" uid="uid://bhl1b5ren8emk" path="res://scene/effect/smoke.png" id="1_8lkq7"]
[sub_resource type="Curve" id="Curve_r8ddf"]
_limits = [-2.0, 2.0, -1.0, 1.0]
@@ -20,7 +20,7 @@ colors = PackedColorArray(0, 0, 0, 0.501961, 0.199732, 0.199732, 0.199732, 1, 0.
[node name="CPUParticles2D" type="CPUParticles2D" parent="."]
amount = 200
-texture = ExtResource("1_705e3")
+texture = ExtResource("1_8lkq7")
speed_scale = 0.15
emission_shape = 1
emission_sphere_radius = 12.0
diff --git a/scene/entity/inspectable.tscn b/scene/entity/inspectable.tscn
index a68b5187..5a787925 100644
--- a/scene/entity/inspectable.tscn
+++ b/scene/entity/inspectable.tscn
@@ -7,7 +7,7 @@
[ext_resource type="Script" uid="uid://rq6w1vuhuq1m" path="res://scene/entity/audio/sfx.gd" id="3_q18ff"]
[ext_resource type="PackedScene" uid="uid://c4tipnj1cr1j3" path="res://scene/entity/ux/sign.tscn" id="4_do8tr"]
[ext_resource type="FontVariation" uid="uid://1ryw42kej6lv" path="res://config/font_ui.tres" id="7_ianbs"]
-[ext_resource type="Texture2D" uid="uid://f186lvt5y2ql" path="res://asset/art/ui/inspect/inspect背景遮罩.png" id="7_xawjo"]
+[ext_resource type="Texture2D" uid="uid://f186lvt5y2ql" path="res://asset/art/ui/遮罩/inspect背景遮罩.png" id="7_xawjo"]
[ext_resource type="Script" uid="uid://cnt01hiw52bmn" path="res://scene/entity/ux/sign_snapper.gd" id="10_mtbvd"]
[sub_resource type="RectangleShape2D" id="RectangleShape2D_4fuic"]
diff --git a/scene/entity/ux/player_os.gd b/scene/entity/ux/player_os.gd
index c4638dfe..c76eff28 100644
--- a/scene/entity/ux/player_os.gd
+++ b/scene/entity/ux/player_os.gd
@@ -22,7 +22,7 @@ func _ready() -> void:
os_pausing_timer.timeout.connect(_on_os_line_timeout)
-func pop_os(lines := [], auto_lock := true, auto_unlock := true) -> void:
+func pop_os(lines := []) -> void:
if os_tween:
os_tween.kill()
os_finish_emit_lock.lock()
@@ -30,12 +30,11 @@ func pop_os(lines := [], auto_lock := true, auto_unlock := true) -> void:
os_finished.emit()
os_finished_not_emitted = true
os_finish_emit_lock.unlock()
- if auto_lock:
- SceneManager.lock_player()
- if auto_unlock:
- # os_finished 必然发送，防止 tween 被 kill，保证一定 unlock
- if os_finished.is_connected(SceneManager.unlock_player):
- SceneManager.unlock_player()
+ SceneManager.lock_player()
+ # os_finished 必然发送，防止 tween 被 kill，保证一定 unlock
+ if os_finished.is_connected(SceneManager.unlock_player):
+ SceneManager.unlock_player()
+ else:
os_finished.connect(SceneManager.unlock_player, CONNECT_ONE_SHOT)
os_tween = create_tween()
os_label.text = ""
@@ -70,7 +69,7 @@ func _on_os_line_timeout(naturally := true):
if os_label.is_typing:
os_label.skip_typing()
return
- if os_tween.is_valid():
+ if os_tween and os_tween.is_valid():
os_tween.play()
diff --git a/scene/ground/scene/animation_root.gd b/scene/ground/scene/animation_root.gd
index b8a5dd91..ccde6576 100644
--- a/scene/ground/scene/animation_root.gd
+++ b/scene/ground/scene/animation_root.gd
@@ -16,10 +16,11 @@ var dialogue_c06 := preload("res://asset/dialogue/c06.dialogue") as DialogueReso
# event 也混合其中
@export var debug_global_data: Dictionary[String, Variant] = {
"enabled_items": ["prop_火柴", "prop_院长的信", "prop_银元"],
+ "player_x": 30.0,
}
@export var debug_ground_data: Dictionary[String, Variant] = {}
-@export var auto_reset_on_debug_restarting := true
+@export var auto_reset_on_debug_restarting := false
@export_tool_button("reset 存档") var reset_archive = _reset_archive
var oneshot_animation := ""
@@ -69,6 +70,7 @@ func _reset_archive() -> void:
ResourceLoader.load("user://data/archives/save000.tres", "AssembledArchive")
as AssembledArchive
)
+ archive.player_global_position_x = debug_global_data.get_or_add("player_x", 30.0)
# 重置全局变量
var prop_arr = archive.prop_inventory.default_enabled_items
if get_node("../MainPlayer").character.begins_with("吕萍"):
@@ -128,6 +130,7 @@ func _reset_archive() -> void:
ResourceSaver.save(archive)
notify_property_list_changed()
+
func _setup_ground_data(g_data: Dictionary[String, Variant], node: Node):
if not node:
return
@@ -138,6 +141,8 @@ func _setup_ground_data(g_data: Dictionary[String, Variant], node: Node):
g_data[child.name] = {"interacted_times": 0}
elif child is Pickable2D and not g_data.has(child.name):
g_data[child.name] = {"picked": false}
+ elif child is AnimationRoot and not g_data.has(child.name):
+ g_data[child.name] = child.data
_setup_ground_data(g_data, child)
diff --git a/scene/ground/scene/c01/s06_孤儿院长廊围墙.tscn b/scene/ground/scene/c01/s06_孤儿院长廊围墙.tscn
index 6a715e41..fdaf917e 100644
--- a/scene/ground/scene/c01/s06_孤儿院长廊围墙.tscn
+++ b/scene/ground/scene/c01/s06_孤儿院长廊围墙.tscn
@@ -24,7 +24,7 @@
[ext_resource type="AudioStream" uid="uid://cwq0jaa708tf1" path="res://asset/audio/sfx/环境音/序章/02_孤儿院走廊_秋千声音.wav" id="12_huyl5"]
[ext_resource type="PackedScene" uid="uid://cw3q5pvciumil" path="res://scene/entity/interactable.tscn" id="12_idjp0"]
[ext_resource type="AudioStream" uid="uid://mfu0btujldql" path="res://asset/audio/sfx/环境音/序章/02_孤儿院走廊_跷跷板声音.wav" id="13_phmvd"]
-[ext_resource type="PackedScene" uid="uid://bicuc35kbn8hd" path="res://scene/effect/fog.tscn" id="14_d5def"]
+[ext_resource type="PackedScene" uid="uid://bicuc35kbn8hd" path="res://scene/effect/fog_shader.tscn" id="14_d5def"]
[ext_resource type="Shader" uid="uid://bcfnbll451i2r" path="res://asset/shader/fog.gdshader" id="15_22a7a"]
[ext_resource type="Texture2D" uid="uid://b7gyapghy3tsy" path="res://asset/art/neutral_point_light.png" id="15_q7j0p"]
[ext_resource type="AudioStream" uid="uid://bv7std2s8bb0p" path="res://asset/audio/sfx/环境音/序章/童谣.wav" id="15_qq2uh"]
diff --git a/scene/ground/scene/c01/s07_书店外.tscn b/scene/ground/scene/c01/s07_书店外.tscn
index 9358361b..5f54b645 100644
--- a/scene/ground/scene/c01/s07_书店外.tscn
+++ b/scene/ground/scene/c01/s07_书店外.tscn
@@ -6,7 +6,7 @@
[ext_resource type="Texture2D" uid="uid://bbuskt4kwkwpl" path="res://asset/art/scene/c01/s07_书店外/bg_书店外_黄昏.png" id="3_l7171"]
[ext_resource type="AudioStream" uid="uid://cxwvfeuq4o71o" path="res://asset/audio/sfx/环境音/序章/03_书店外黄昏.wav" id="3_na2nu"]
[ext_resource type="Texture2D" uid="uid://dklacql2hdtwv" path="res://asset/art/scene/c01/s07_书店外/e_装饰 书店外黄昏.png" id="4_8do8y"]
-[ext_resource type="PackedScene" uid="uid://bicuc35kbn8hd" path="res://scene/effect/fog.tscn" id="4_62isb"]
+[ext_resource type="PackedScene" uid="uid://bicuc35kbn8hd" path="res://scene/effect/fog_shader.tscn" id="4_62isb"]
[ext_resource type="Script" uid="uid://rq6w1vuhuq1m" path="res://scene/entity/audio/sfx.gd" id="4_c7jb6"]
[ext_resource type="PackedScene" uid="uid://61pis75a8fdq" path="res://scene/entity/portal.tscn" id="4_ulvsd"]
[ext_resource type="PackedScene" uid="uid://jr1yd46wm5je" path="res://scene/entity/note.tscn" id="5_3pha1"]
diff --git a/scene/ground/scene/c01/s09_公寓楼外.tscn b/scene/ground/scene/c01/s09_公寓楼外.tscn
index b4847fbf..4df16414 100644
--- a/scene/ground/scene/c01/s09_公寓楼外.tscn
+++ b/scene/ground/scene/c01/s09_公寓楼外.tscn
@@ -13,7 +13,7 @@
[ext_resource type="AudioStream" uid="uid://c1orqd7uxh8iu" path="res://asset/audio/sfx/环境音/序章/05_诡异通用_2.wav" id="6_lrqbi"]
[ext_resource type="AudioStream" uid="uid://dxnsyw7box2w0" path="res://asset/audio/sfx/交互/序章/sfx_鬼影浮现.wav" id="7_5sju7"]
[ext_resource type="Texture2D" uid="uid://dol25yn3fixim" path="res://asset/art/fog_mask.png" id="7_828bq"]
-[ext_resource type="PackedScene" uid="uid://bicuc35kbn8hd" path="res://scene/effect/fog.tscn" id="7_wrhtk"]
+[ext_resource type="PackedScene" uid="uid://bicuc35kbn8hd" path="res://scene/effect/fog_shader.tscn" id="7_wrhtk"]
[ext_resource type="Shader" uid="uid://bcfnbll451i2r" path="res://asset/shader/fog.gdshader" id="8_0ohlv"]
[ext_resource type="AudioStream" uid="uid://c5rgfl6ub4chw" path="res://asset/audio/sfx/交互/序章/sfx_鬼差擦肩而过.wav" id="8_sq0x2"]
[ext_resource type="SpriteFrames" uid="uid://c2peyi2l65h47" path="res://asset/art/gif/c01_公寓外街道/c01_公寓外街道_frames.tres" id="10_0ohlv"]
@@ -72,7 +72,6 @@ script = ExtResource("2_u053j")
oneshot_animation = ""
[node name="花枯萎音效" type="AudioStreamPlayer" parent="Ground/AnimationPlayer" index="0"]
-process_mode = 1
stream = ExtResource("3_b5sdk")
volume_db = -8.0
autoplay = true
@@ -118,9 +117,19 @@ portal_name = "2"
target_scene = "c01_s10"
target_portal = "left"
+[node name="SfxDefault" parent="Ground/DeployLayer/portal_2" index="0"]
+process_mode = 0
+
+[node name="SfxOpen" parent="Ground/DeployLayer/portal_2" index="1"]
+process_mode = 0
+
[node name="SfxEnter" parent="Ground/DeployLayer/portal_2" index="2"]
+process_mode = 0
stream = null
+[node name="SfxLocked" parent="Ground/DeployLayer/portal_2" index="3"]
+process_mode = 0
+
[node name="Sign" parent="Ground/DeployLayer/portal_2" index="4"]
enabled = true
diff --git a/scene/ground/scene/c01/s10_公寓楼道.tscn b/scene/ground/scene/c01/s10_公寓楼道.tscn
index 8971f87c..3a292d7b 100644
--- a/scene/ground/scene/c01/s10_公寓楼道.tscn
+++ b/scene/ground/scene/c01/s10_公寓楼道.tscn
@@ -18,6 +18,9 @@ scene_name = "c01_s10"
[node name="AnimationPlayer" parent="Ground" index="0"]
script = ExtResource("2_4kx83")
+debug_global_data = Dictionary[String, Variant]({
+"enabled_items": ["prop_火柴", "prop_院长的信", "prop_银元"]
+})
oneshot_animation = ""
[node name="背景音效" type="AudioStreamPlayer" parent="Ground/AnimationPlayer" index="0"]
diff --git a/scene/ground/scene/c01/s11_黄包车演出.tscn b/scene/ground/scene/c01/s11_黄包车演出.tscn
index a14755a8..53ff55dd 100644
--- a/scene/ground/scene/c01/s11_黄包车演出.tscn
+++ b/scene/ground/scene/c01/s11_黄包车演出.tscn
@@ -155,6 +155,9 @@ libraries = {
&"": SubResource("AnimationLibrary_6ojod")
}
script = ExtResource("2_espm6")
+debug_global_data = Dictionary[String, Variant]({
+"enabled_items": ["prop_火柴", "prop_院长的信", "prop_银元"]
+})
oneshot_animation = ""
[node name="黄包车Sfx" type="AudioStreamPlayer" parent="Ground/AnimationPlayer" index="0"]
diff --git a/scene/ground/scene/c01/s12_书店外_诡异版.tscn b/scene/ground/scene/c01/s12_书店外_诡异版.tscn
index 2fe62f8a..32ec3369 100644
--- a/scene/ground/scene/c01/s12_书店外_诡异版.tscn
+++ b/scene/ground/scene/c01/s12_书店外_诡异版.tscn
@@ -23,7 +23,7 @@
[ext_resource type="SpriteFrames" uid="uid://cvkuw35ulebme" path="res://asset/art/gif/c01_书店外街道/c01_书店外街道_frames.tres" id="13_lucm6"]
[ext_resource type="SpriteFrames" uid="uid://db7m3aks5w65j" path="res://asset/art/gif/c01_书店外街道_夜晚小孩害怕/c01_书店外街道_夜晚小孩害怕_frames.tres" id="14_7jjl5"]
[ext_resource type="PackedScene" uid="uid://b50n0hvs4yh75" path="res://addons/property-inspector/pro_animation_sprite2d/pro_animated_sprite.tscn" id="14_ct084"]
-[ext_resource type="PackedScene" uid="uid://bicuc35kbn8hd" path="res://scene/effect/fog.tscn" id="15_pvvjq"]
+[ext_resource type="PackedScene" uid="uid://bicuc35kbn8hd" path="res://scene/effect/fog_shader.tscn" id="15_pvvjq"]
[ext_resource type="Shader" uid="uid://bcfnbll451i2r" path="res://asset/shader/fog.gdshader" id="16_guu7t"]
[ext_resource type="Texture2D" uid="uid://b7gyapghy3tsy" path="res://asset/art/neutral_point_light.png" id="17_nta2f"]
[ext_resource type="Texture2D" uid="uid://dol25yn3fixim" path="res://asset/art/fog_mask.png" id="19_7jjl5"]
diff --git a/scene/ground/scene/c02/s01_公寓门口.tscn b/scene/ground/scene/c02/s01_公寓门口.tscn
index bdfd964f..14052522 100644
--- a/scene/ground/scene/c02/s01_公寓门口.tscn
+++ b/scene/ground/scene/c02/s01_公寓门口.tscn
@@ -24,6 +24,9 @@ data = {
"oneshot_animation_played": false,
"received_letter": false
}
+debug_global_data = Dictionary[String, Variant]({
+"enabled_items": ["prop_火柴", "prop_院长的信", "prop_银元"]
+})
oneshot_animation = ""
[node name="VibeSfx" type="Node" parent="Ground/AnimationPlayer" index="0"]
diff --git a/scene/ground/scene/c02/s02_过道.tscn b/scene/ground/scene/c02/s02_过道.tscn
index c4fcc8f8..e37d5d0b 100644
--- a/scene/ground/scene/c02/s02_过道.tscn
+++ b/scene/ground/scene/c02/s02_过道.tscn
@@ -62,6 +62,9 @@ data = {
"flyer_shaven": false,
"oneshot_animation_played": false
}
+debug_global_data = Dictionary[String, Variant]({
+"enabled_items": ["prop_火柴", "prop_院长的信", "prop_银元"]
+})
oneshot_animation = ""
[node name="冷飕飕Sfx" parent="Ground/AnimationPlayer" index="0" instance=ExtResource("3_fvldj")]
diff --git a/scene/ground/scene/c02/s03_院子.gd b/scene/ground/scene/c02/s03_院子.gd
index a83073dc..e9f35a31 100644
--- a/scene/ground/scene/c02/s03_院子.gd
+++ b/scene/ground/scene/c02/s03_院子.gd
@@ -65,17 +65,16 @@ func _on_ground_ready() -> void:
$"../DirectionalLight2D".energy = 0
madman_npc = $"../DeployLayer/Npc井边疯子"
+ madman_npc.visible = false
# c02_madman_hitwall 之后， c02_ball_game_stage==3（游戏结束） 之前；同时 eavesdrop_finished
if (
- ArchiveManager.get_global_value(&"c02_madman_hitwall")
- and ArchiveManager.get_global_value(&"c02_ball_game_stage", 0) < 3
- and ArchiveManager.get_global_value(&"c02_eavesdrop_finished")
+ ArchiveManager.get_global_value(&"c02_ball_game_stage", 0) < 3
+ # and ArchiveManager.get_global_value(&"c02_eavesdrop_finished")
):
- madman_npc.visible = true
- madman_npc.get_node("StaticBody2D/CollisionShape2D").disabled = false
- else:
- madman_npc.visible = false
- madman_npc.get_node("StaticBody2D/CollisionShape2D").disabled = true
+ if not ArchiveManager.get_global_value("c02_watched_the_well"):
+ $"../DeployLayer/Closeup井".exit.connect(func(_arg): madman_npc.visible = true)
+ else:
+ madman_npc.visible = true
if ArchiveManager.get_global_value(&"c02_the_blind_room_unlocked"):
# 奠字 + 纸钱
@@ -188,7 +187,6 @@ func eavesdrop() -> void:
await Util.wait(1.5)
SceneManager.pop_os_with_str("c02_偷听李癞对话后")
SceneManager.unlock_player()
-
func _setup_bully_or_burning(reenter_scene := false):
@@ -261,6 +259,7 @@ func bully_end():
func block_right_move():
SceneManager.pop_os_with_str("c02_点火前阻止右移")
+
# var count_down_tween:Tween
# func count_down():
diff --git a/scene/ground/scene/c02/s03_院子.tscn b/scene/ground/scene/c02/s03_院子.tscn
index f88b035a..fc7d254e 100644
--- a/scene/ground/scene/c02/s03_院子.tscn
+++ b/scene/ground/scene/c02/s03_院子.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=80 format=3 uid="uid://djc2uaefhmu7"]
+[gd_scene load_steps=79 format=3 uid="uid://djc2uaefhmu7"]
[ext_resource type="PackedScene" uid="uid://dayyx4jerj7io" path="res://scene/ground/ground.tscn" id="1_0dylx"]
[ext_resource type="Script" uid="uid://dsp5plrdkrsd7" path="res://scene/ground/scene/c02/s03_院子.gd" id="2_dt5aj"]
@@ -226,8 +226,6 @@ animations = [{
"speed": 4.0
}]
-[sub_resource type="RectangleShape2D" id="RectangleShape2D_bbhbr"]
-
[sub_resource type="RectangleShape2D" id="RectangleShape2D_d7h4s"]
size = Vector2(10, 50)
@@ -287,6 +285,76 @@ data = {
"camera_played": false,
"oneshot_animation_played": false
}
+debug_global_data = Dictionary[String, Variant]({
+"c02_ball_game_stage": 1,
+"c02_burning": false,
+"c02_burning_end": 0,
+"c02_counter_pushed_out": false,
+"c02_eavesdrop_finished": false,
+"c02_madman_hitwall": false,
+"c02_madman_interacted": false,
+"c02_open_gate_first_failed": false,
+"c02_ready_to_fire": false,
+"c02_the_blind_room_unlocked": false,
+"c02_watched_the_well": false,
+"enabled_items": ["prop_火柴", "prop_院长的信", "prop_银元"],
+"handnote_stage": 0,
+"player_x": 2030.0
+})
+debug_ground_data = Dictionary[String, Variant]({
+"Ambush保卫科旁边os": {
+"played": false
+},
+"Ambush偷听对话": {
+"played": false
+},
+"Ambush惊悚闪电": {
+"played": false
+},
+"Ambush点火游戏阻挡右移": {
+"played": false
+},
+"Ambush等待的小蝉": {
+"played": false
+},
+"Ambush要下雨了": {
+"played": false
+},
+"Ambush闷雷纸人": {
+"played": false
+},
+"Ambush霸凌": {
+"played": false
+},
+"AnimationPlayer": {
+"camera_played": false,
+"oneshot_animation_played": false
+},
+"Closeup井": {
+"interacted_times": 0
+},
+"Closeup敲门游戏": {
+"interacted_times": 0
+},
+"Interactable柜子": {
+"interacted_times": 0
+},
+"Interactable铁门": {
+"interacted_times": 0
+},
+"Pickable小鞋子": {
+"picked": false
+},
+"煤油灯": {
+"interacted_times": 0
+},
+"煤油灯2": {
+"interacted_times": 0
+},
+"煤油灯3": {
+"interacted_times": 0
+}
+})
oneshot_animation = ""
[node name="Sfx闷雷" type="AudioStreamPlayer" parent="Ground/AnimationPlayer" index="0"]
@@ -603,28 +671,28 @@ position = Vector2(466, 3)
packed_scene = ExtResource("24_0o4rt")
collision_width_and_x = Vector2(40, 0)
-[node name="Closeup井" parent="Ground/DeployLayer" index="24" instance=ExtResource("23_81juy")]
-z_index = 6
-position = Vector2(2063, 50)
-packed_scene = ExtResource("26_yy4fp")
-action_key = 3
-
-[node name="Ambush惊悚闪电" parent="Ground/DeployLayer" index="25" instance=ExtResource("25_iyaiw")]
+[node name="Ambush惊悚闪电" parent="Ground/DeployLayer" index="24" instance=ExtResource("25_iyaiw")]
position = Vector2(1319, 40)
hook_method = "shocking_lighting"
-[node name="Ambush偷听对话" parent="Ground/DeployLayer" index="26" instance=ExtResource("25_iyaiw")]
+[node name="Ambush偷听对话" parent="Ground/DeployLayer" index="25" 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="27"]
+[node name="李氏赖子房间人影" type="AnimatedSprite2D" parent="Ground/DeployLayer" index="26"]
position = Vector2(1835, -16)
sprite_frames = SubResource("SpriteFrames_0o4rt")
autoplay = "default"
frame_progress = 0.643855
+[node name="Closeup井" parent="Ground/DeployLayer" index="27" 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="28" instance=ExtResource("35_plfv5")]
z_index = 10
position = Vector2(2037, 67)
@@ -639,15 +707,6 @@ sign_x_offset = -2.0
collision_width_and_x = Vector2(37.08, 0)
dialogue_title = "c02_井边疯子对话"
-[node name="StaticBody2D" type="StaticBody2D" parent="Ground/DeployLayer/Npc井边疯子"]
-position = Vector2(11, 7)
-collision_layer = 2
-
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Ground/DeployLayer/Npc井边疯子/StaticBody2D"]
-position = Vector2(-11, -3)
-shape = SubResource("RectangleShape2D_bbhbr")
-disabled = true
-
[node name="霸凌" type="Node2D" parent="Ground/DeployLayer" index="29"]
visible = false
position = Vector2(2154, 60)
diff --git a/scene/ground/scene/c02/s04_保卫科.tscn b/scene/ground/scene/c02/s04_保卫科.tscn
index 77a12519..5c2fd132 100644
--- a/scene/ground/scene/c02/s04_保卫科.tscn
+++ b/scene/ground/scene/c02/s04_保卫科.tscn
@@ -38,6 +38,31 @@ data = {
"oneshot_animation_played": false,
"tin_coin_collected": false
}
+debug_global_data = Dictionary[String, Variant]({
+"c02_tin_coin_taken": 0,
+"enabled_items": ["prop_火柴", "prop_院长的信", "prop_银元"]
+})
+debug_ground_data = Dictionary[String, Variant]({
+"AnimationPlayer": {
+"oneshot_animation_played": false,
+"tin_coin_collected": false
+},
+"Closeup折锡纸": {
+"interacted_times": 0
+},
+"Closeup老鼠精": {
+"interacted_times": 0
+},
+"Closeup花名册": {
+"interacted_times": 0
+},
+"Pickable元宝": {
+"picked": false
+},
+"煤油灯": {
+"interacted_times": 0
+}
+})
oneshot_animation = ""
[node name="VibeSfx" type="Node" parent="Ground/AnimationPlayer" index="0"]
diff --git a/scene/ground/scene/c02/s05_一楼内侧楼道.gd b/scene/ground/scene/c02/s05_一楼内侧楼道.gd
index 6ec7a277..f4ab9487 100644
--- a/scene/ground/scene/c02/s05_一楼内侧楼道.gd
+++ b/scene/ground/scene/c02/s05_一楼内侧楼道.gd
@@ -72,7 +72,25 @@ func xiaochan_disappear():
func wood_puppet() -> void:
+ SceneManager.lock_player()
SceneManager.enable_prop_item("prop_木头人偶")
+ await SceneManager.get_inspector().quit_and_hidden
+ SceneManager.pop_os_with_str("c02_获得木头人偶")
+ SceneManager.player_action(17, true)
+ $"Sfx头痛耳鸣".play()
+ $"../DeployLayer/DizzyShader".dizzy()
+ # SceneManager.get_camera_marker().shake_camera()
+ await Util.wait(2.5)
+ # TODO 更新 Sfx记忆闪回音
+ $"Sfx记忆闪回音效".play()
+ # 白色转场
+ await SceneManager.toggle_ground_mask(true, 3.0, 1.5, Color.WHITE).finished
+ SceneManager.toggle_ground_mask(false, 2.0, 1.0, Color.WHITE)
+ var closeup = $"../DeployLayer/Closeup拿人偶后记忆闪回" as Closeup2D
+ closeup.display()
+ SceneManager.unlock_player()
+ await closeup.exit
+ $"Sfx记忆闪回音效".easing_kill()
func bucket_meat() -> void:
diff --git a/scene/ground/scene/c02/s05_一楼内侧楼道.tscn b/scene/ground/scene/c02/s05_一楼内侧楼道.tscn
index 58560bb2..c9147e8a 100644
--- a/scene/ground/scene/c02/s05_一楼内侧楼道.tscn
+++ b/scene/ground/scene/c02/s05_一楼内侧楼道.tscn
@@ -1,16 +1,19 @@
-[gd_scene load_steps=39 format=3 uid="uid://cp8d3ag5nbjq0"]
+[gd_scene load_steps=43 format=3 uid="uid://cp8d3ag5nbjq0"]
[ext_resource type="PackedScene" uid="uid://dayyx4jerj7io" path="res://scene/ground/ground.tscn" id="1_6w6et"]
[ext_resource type="Script" uid="uid://dydpmjpcvt3v1" path="res://scene/ground/scene/c02/s05_一楼内侧楼道.gd" id="2_70lf6"]
[ext_resource type="Script" uid="uid://cpejxlfni6n52" path="res://manager/audio_manager/vibe_sfx.gd" id="3_laquj"]
[ext_resource type="Texture2D" uid="uid://dbtepltemtmy2" path="res://asset/art/scene/c02/s05_一楼内侧楼道/bg_楼道背景.png" id="3_rcuxq"]
+[ext_resource type="AudioStream" uid="uid://b8sbtn3l37uh" path="res://asset/audio/sfx/旧版/c02/红屏.mp3" id="4_iylo4"]
[ext_resource type="PackedScene" uid="uid://61pis75a8fdq" path="res://scene/entity/portal.tscn" id="4_tueh3"]
+[ext_resource type="Script" uid="uid://rq6w1vuhuq1m" path="res://scene/entity/audio/sfx.gd" id="5_74b3r"]
[ext_resource type="SpriteFrames" uid="uid://3nas025c2c5u" path="res://asset/art/gif/c02_杂项/c02_杂项_frames.tres" id="7_mrltr"]
[ext_resource type="Texture2D" uid="uid://bn47plsx5coug" path="res://asset/art/scene/c02/s05_一楼内侧楼道/l_煤油灯光效.png" id="8_mrltr"]
[ext_resource type="PackedScene" uid="uid://bnf3lkcbpx1ar" path="res://scene/entity/ambush.tscn" id="8_rcuxq"]
[ext_resource type="Texture2D" uid="uid://by506ky6fprab" path="res://asset/art/scene/c02/s07_二楼内侧楼道/fg_前景.png" id="8_tueh3"]
[ext_resource type="PackedScene" uid="uid://0sofmhrl358m" path="res://scene/entity/npc.tscn" id="9_8t4w6"]
[ext_resource type="PackedScene" uid="uid://dqkxiqbq83cmq" path="res://scene/entity/closeup.tscn" id="10_2yvhw"]
+[ext_resource type="PackedScene" uid="uid://b4ilxht544qxu" path="res://scene/ground/script/c02/拿人偶后记忆闪回.tscn" id="10_7mq0m"]
[ext_resource type="PackedScene" uid="uid://jr1yd46wm5je" path="res://scene/entity/note.tscn" id="10_8t4w6"]
[ext_resource type="PackedScene" uid="uid://c1vrp1o8ci512" path="res://scene/ground/script/c02/戏台特写.tscn" id="11_2yvhw"]
[ext_resource type="PackedScene" uid="uid://cw3q5pvciumil" path="res://scene/entity/interactable.tscn" id="13_uj0pt"]
@@ -26,6 +29,7 @@
[ext_resource type="Script" uid="uid://jarjchqsx4u1" path="res://scene/ground/script/c02/event小蝉哼歌.gd" id="23_4c54f"]
[ext_resource type="AudioStream" uid="uid://bhaws2ungqaf5" path="res://asset/audio/sfx/交互/角色/sfx_哼歌.ogg" id="24_7mq0m"]
[ext_resource type="Script" uid="uid://wapo47a1oddf" path="res://scene/entity/audio/sfx2d.gd" id="25_4k6pw"]
+[ext_resource type="PackedScene" uid="uid://decfqoe5v0y6n" path="res://scene/effect/dizzy_shader.tscn" id="29_74b3r"]
[sub_resource type="AnimationLibrary" id="AnimationLibrary_n48fn"]
@@ -112,6 +116,41 @@ data = {
"has_entered": false,
"oneshot_animation_played": false
}
+debug_global_data = Dictionary[String, Variant]({
+"c02_madman_hitwall": true,
+"c02_madman_interacted": 0,
+"c02_meat_dropping": false,
+"c02_meat_given": false,
+"enabled_items": ["prop_火柴", "prop_院长的信", "prop_银元"],
+"player_x": 30.0
+})
+debug_ground_data = Dictionary[String, Variant]({
+"Ambush小蝉消失": {
+"played": false
+},
+"Ambush杂物堆": {
+"played": false
+},
+"Ambush老鼠叼肉": {
+"played": false
+},
+"AnimationPlayer": {
+"has_entered": false,
+"oneshot_animation_played": false
+},
+"Closeup戏台": {
+"interacted_times": 0
+},
+"Closeup拿人偶后记忆闪回": {
+"interacted_times": 0
+},
+"Interactable粘鼠板": {
+"interacted_times": 0
+},
+"Pickable掉落的肉": {
+"picked": false
+}
+})
oneshot_animation = ""
[node name="VibeSfx" type="Node" parent="Ground/AnimationPlayer" index="0"]
@@ -119,6 +158,17 @@ script = ExtResource("3_laquj")
autoplay_group = &"c02_楼道1"
metadata/_custom_type_script = "uid://cpejxlfni6n52"
+[node name="Sfx头痛耳鸣" type="AudioStreamPlayer" parent="Ground/AnimationPlayer" index="1"]
+stream = ExtResource("4_iylo4")
+bus = &"game_sfx"
+script = ExtResource("5_74b3r")
+metadata/_custom_type_script = "uid://rq6w1vuhuq1m"
+
+[node name="Sfx记忆闪回音效" type="AudioStreamPlayer" parent="Ground/AnimationPlayer" index="2"]
+bus = &"game_sfx"
+script = ExtResource("5_74b3r")
+metadata/_custom_type_script = "uid://rq6w1vuhuq1m"
+
[node name="BGSprite2D" parent="Ground" index="2"]
light_mask = 5
scale = Vector2(0.5, 0.5)
@@ -163,7 +213,13 @@ enabled = false
trigger_mode = "interact"
hook_method = "wood_puppet"
-[node name="火苗" type="AnimatedSprite2D" parent="Ground/DeployLayer" index="5"]
+[node name="Closeup拿人偶后记忆闪回" parent="Ground/DeployLayer" index="5" instance=ExtResource("10_2yvhw")]
+position = Vector2(320, 23)
+packed_scene = ExtResource("10_7mq0m")
+quit_closeup_on_escape = false
+first_interact_os_key = "c02_一楼戏台"
+
+[node name="火苗" type="AnimatedSprite2D" parent="Ground/DeployLayer" index="6"]
light_mask = 5
position = Vector2(239, 52)
scale = Vector2(0.4, 0.4)
@@ -196,26 +252,26 @@ energy = 1.5
range_item_cull_mask = 4
texture = ExtResource("8_mrltr")
-[node name="Closeup戏台" parent="Ground/DeployLayer" index="6" instance=ExtResource("10_2yvhw")]
+[node name="Closeup戏台" parent="Ground/DeployLayer" index="7" instance=ExtResource("10_2yvhw")]
position = Vector2(320, 23)
packed_scene = ExtResource("11_2yvhw")
first_interact_os_key = "c02_一楼戏台"
-[node name="Note一楼内侧通道" parent="Ground/DeployLayer" index="7" instance=ExtResource("10_8t4w6")]
+[node name="Note一楼内侧通道" parent="Ground/DeployLayer" index="8" instance=ExtResource("10_8t4w6")]
position = Vector2(394, 26)
title_filter = "c02"
note_key = "c02_一楼楼道被挡住"
-[node name="Note垃圾通道" parent="Ground/DeployLayer" index="8" instance=ExtResource("10_8t4w6")]
+[node name="Note垃圾通道" parent="Ground/DeployLayer" index="9" instance=ExtResource("10_8t4w6")]
position = Vector2(660, -1)
title_filter = "c02"
note_key = "c02_描述垃圾通道"
-[node name="打开的垃圾桶盖" type="Sprite2D" parent="Ground/DeployLayer" index="9"]
+[node name="打开的垃圾桶盖" type="Sprite2D" parent="Ground/DeployLayer" index="10"]
position = Vector2(660, 8)
texture = ExtResource("15_s2g5k")
-[node name="Interactable粘鼠板" parent="Ground/DeployLayer" index="10" instance=ExtResource("13_uj0pt")]
+[node name="Interactable粘鼠板" parent="Ground/DeployLayer" index="11" instance=ExtResource("13_uj0pt")]
position = Vector2(604, 81)
first_interact_os_key = "c02_一楼粘鼠板"
disable_prop_after_interacted = true
@@ -244,19 +300,19 @@ enabled = false
title_filter = "c02"
note_key = "c02_一楼死老鼠"
-[node name="Ambush老鼠叼肉" parent="Ground/DeployLayer" index="11" instance=ExtResource("8_rcuxq")]
+[node name="Ambush老鼠叼肉" parent="Ground/DeployLayer" index="12" instance=ExtResource("8_rcuxq")]
position = Vector2(585, 80)
enabled = false
one_shot = false
hook_method = "mouse_pick_meat"
-[node name="老鼠叼肉" type="AnimatedSprite2D" parent="Ground/DeployLayer" index="12"]
+[node name="老鼠叼肉" type="AnimatedSprite2D" parent="Ground/DeployLayer" index="13"]
visible = false
position = Vector2(687, 69)
sprite_frames = ExtResource("17_bk7rf")
animation = &"奇怪的肉被拖进去动画"
-[node name="Pickable掉落的肉" parent="Ground/DeployLayer" index="13" instance=ExtResource("17_aofps")]
+[node name="Pickable掉落的肉" parent="Ground/DeployLayer" index="14" instance=ExtResource("17_aofps")]
visible = false
position = Vector2(668, 85)
texture = ExtResource("18_bk7rf")
@@ -265,20 +321,20 @@ enabled = false
collision_width_and_x = Vector2(43.96, 0)
prop_key = "prop_奇怪的肉"
-[node name="小蜡烛" type="AnimatedSprite2D" parent="Ground/DeployLayer" index="14"]
+[node name="小蜡烛" type="AnimatedSprite2D" parent="Ground/DeployLayer" index="15"]
self_modulate = Color(0.611765, 0.611765, 0.611765, 1)
position = Vector2(627.8, 79.6172)
sprite_frames = SubResource("SpriteFrames_heq1x")
autoplay = "default"
-[node name="小蜡烛PointLight2D" type="PointLight2D" parent="Ground/DeployLayer" index="15"]
+[node name="小蜡烛PointLight2D" type="PointLight2D" parent="Ground/DeployLayer" index="16"]
position = Vector2(627.8, 66.8)
color = Color(0.999971, 0.912551, 0.842208, 1)
energy = 1.2
texture = ExtResource("22_laquj")
texture_scale = 0.3
-[node name="Ambush小蝉消失" parent="Ground/DeployLayer" index="16" instance=ExtResource("8_rcuxq")]
+[node name="Ambush小蝉消失" parent="Ground/DeployLayer" index="17" instance=ExtResource("8_rcuxq")]
visible = false
visibility_layer = 5
position = Vector2(394, 53)
@@ -292,7 +348,7 @@ animation = &"小蝉背对转头"
autoplay = "小蝉背对呼吸帧"
flip_h = true
-[node name="Event2D小蝉哼歌" type="Node2D" parent="Ground/DeployLayer" index="17"]
+[node name="Event2D小蝉哼歌" type="Node2D" parent="Ground/DeployLayer" index="18"]
position = Vector2(92, 38)
script = ExtResource("23_4c54f")
event = "c02_madman_interacted"
@@ -309,6 +365,9 @@ script = ExtResource("25_4k6pw")
loop = true
metadata/_custom_type_script = "uid://wapo47a1oddf"
+[node name="DizzyShader" parent="Ground/DeployLayer" index="19" instance=ExtResource("29_74b3r")]
+visible = false
+
[node name="MainPlayer" parent="Ground" index="5"]
position = Vector2(41, 98)
@@ -324,7 +383,6 @@ texture = ExtResource("8_tueh3")
points = PackedVector2Array(23, 150, 700, 150)
[node name="DirectionalLight2D" parent="Ground" index="8"]
-visible = false
energy = 0.9
blend_mode = 1
diff --git a/scene/ground/scene/c02/s08_瞎子卧室.tscn b/scene/ground/scene/c02/s08_瞎子卧室.tscn
index 392b4bc9..2664574d 100644
--- a/scene/ground/scene/c02/s08_瞎子卧室.tscn
+++ b/scene/ground/scene/c02/s08_瞎子卧室.tscn
@@ -117,6 +117,9 @@ data = {
"hole_interacted_times": 0,
"oneshot_animation_played": false
}
+debug_global_data = Dictionary[String, Variant]({
+"enabled_items": ["prop_火柴", "prop_院长的信", "prop_银元"]
+})
oneshot_animation = ""
[node name="VibeSfx" type="Node" parent="Ground/AnimationPlayer" index="0"]
diff --git a/scene/ground/scene/c02/s10_空房间.gd b/scene/ground/scene/c02/s10_空房间.gd
index da4014e5..ec469428 100644
--- a/scene/ground/scene/c02/s10_空房间.gd
+++ b/scene/ground/scene/c02/s10_空房间.gd
@@ -62,7 +62,7 @@ func _on_ground_ready() -> void:
else:
xiao_chan_interactable.enabled = false
xiao_chan_sprite.visible = false
- head_cover_closeup.exit.connect(func():
+ head_cover_closeup.exit.connect(func(_arg):
head_cover_closeup.hide()
head_cover_closeup.enabled = false
xiao_chan_interactable.enabled = true
@@ -74,6 +74,7 @@ func _on_ground_ready() -> void:
counter.enabled = true
else:
xiao_chan_interactable.interacted.connect(_on_xiao_chan_interacted)
+ $"Sfx小蝉哼歌".play()
counter_pushed_out = ArchiveManager.get_global_value(&"c02_counter_pushed_out")
if counter_pushed_out:
@@ -82,6 +83,8 @@ func _on_ground_ready() -> void:
else:
# 空柜子 x 坐标
var counter_x = ArchiveManager.get_global_value(&"c02_counter_x", default_counter_x)
+ if counter_x < 0:
+ counter_x = default_counter_x
counter.interacted.connect(_on_counter_interacted)
counter.global_position.x = counter_x
after_counter_moved()
@@ -191,6 +194,7 @@ func after_counter_moved():
func _on_pick_catty_head() -> void:
if SceneManager.has_prop("prop_无头小猫玩具"):
+ SceneManager.lock_player()
var inspector = SceneManager.get_inspector()
await inspector.quit_and_hidden
# 将小猫头与身子合并
@@ -205,6 +209,10 @@ func _on_pick_catty_head() -> void:
SceneManager.enable_prop_item("prop_小猫玩具完整")
await SceneManager.get_inspector().quit_and_hidden
SceneManager.pop_os_with_str("c02_获得小猫玩具")
+ $"Sfx头痛耳鸣".play()
+ SceneManager.player_action(17, true)
+ await SceneManager.get_player().animation_finished
+ SceneManager.unlock_player()
# 进过瞎子卧室后，通道关闭
if not ArchiveManager.get_global_value(&"c02_the_blind_room_unlocked"):
portal_note.enabled = true
diff --git a/scene/ground/scene/c02/s10_空房间.tscn b/scene/ground/scene/c02/s10_空房间.tscn
index 0d567993..e5ad12ad 100644
--- a/scene/ground/scene/c02/s10_空房间.tscn
+++ b/scene/ground/scene/c02/s10_空房间.tscn
@@ -13,11 +13,12 @@
[ext_resource type="AudioStream" uid="uid://b7vxiier136aq" path="res://asset/audio/sfx/旧版/c02/胖子拖.mp3" id="7_5t4pt"]
[ext_resource type="PackedScene" uid="uid://jr1yd46wm5je" path="res://scene/entity/note.tscn" id="7_th1ek"]
[ext_resource type="Texture2D" uid="uid://dg43u88jwlbpu" path="res://asset/art/prop/c02/新小猫头.png" id="8_3ftnp"]
+[ext_resource type="AudioStream" uid="uid://b8sbtn3l37uh" path="res://asset/audio/sfx/旧版/c02/红屏.mp3" id="8_apn51"]
[ext_resource type="Texture2D" uid="uid://gui0ubwlwoi0" path="res://asset/art/ui/action_mark/UI手.png" id="8_to1d1"]
[ext_resource type="Texture2D" uid="uid://cdsq0ylmgtfq0" path="res://asset/art/prop/c02/小蝉人偶.png" id="12_27dvh"]
[ext_resource type="PackedScene" uid="uid://cxw5rovg5mu1a" path="res://scene/ground/script/c02/s00_煤油灯.tscn" id="13_27dvh"]
[ext_resource type="PackedScene" uid="uid://bnf3lkcbpx1ar" path="res://scene/entity/ambush.tscn" id="14_3ftnp"]
-[ext_resource type="Texture2D" uid="uid://f186lvt5y2ql" path="res://asset/art/ui/inspect/inspect背景遮罩.png" id="14_e24j0"]
+[ext_resource type="Texture2D" uid="uid://f186lvt5y2ql" path="res://asset/art/ui/遮罩/inspect背景遮罩.png" id="14_e24j0"]
[ext_resource type="SpriteFrames" uid="uid://cwes55ajc3rd4" path="res://asset/art/gif/c02_空房间/c02_空房间_frames.tres" id="15_2j5dr"]
[ext_resource type="Texture2D" uid="uid://cylsq5cvhlp18" path="res://asset/art/tool/point_light.png" id="15_e24j0"]
[ext_resource type="Texture2D" uid="uid://bp84w8keuelyj" path="res://asset/art/scene/c02/s10_空房间/e_蜡烛-sheet.png" id="15_kqj5r"]
@@ -25,13 +26,6 @@
[ext_resource type="PackedScene" uid="uid://bffqprfmpt0bx" path="res://scene/ground/script/c02/空房间小蝉头套.tscn" id="18_5t4pt"]
[ext_resource type="PackedScene" uid="uid://dqkxiqbq83cmq" path="res://scene/entity/closeup.tscn" id="18_8cwaw"]
-[sub_resource type="AudioStreamSynchronized" id="AudioStreamSynchronized_apn51"]
-stream_count = 2
-stream_0/stream = ExtResource("4_nx6jy")
-stream_0/volume = 0.0
-stream_1/stream = ExtResource("5_8cwaw")
-stream_1/volume = 8.0
-
[sub_resource type="AtlasTexture" id="AtlasTexture_chbaa"]
atlas = ExtResource("15_kqj5r")
region = Rect2(0, 0, 6, 14)
@@ -91,9 +85,41 @@ player_y = 60
script = ExtResource("2_egtqi")
data = {
"display_wood_puppet": false,
-"entered": false,
"oneshot_animation_played": false
}
+debug_global_data = Dictionary[String, Variant]({
+"c02_counter_pushed_out": false,
+"c02_counter_x": -1.0,
+"c02_the_blind_room_unlocked": false,
+"enabled_items": ["prop_火柴", "prop_无头小猫玩具", "prop_木头人偶"]
+})
+debug_ground_data = Dictionary[String, Variant]({
+"Ambush首次进入血脚印": {
+"played": true
+},
+"AnimationPlayer": {
+"display_wood_puppet": false,
+"oneshot_animation_played": false
+},
+"Closeup头套": {
+"interacted_times": 0
+},
+"Interactable小蝉": {
+"interacted_times": 0
+},
+"Interactable柜子": {
+"interacted_times": 0
+},
+"Pickable小猫玩具脑袋": {
+"picked": false
+},
+"Pickable木头人偶": {
+"picked": false
+},
+"煤油灯": {
+"interacted_times": 1
+}
+})
oneshot_animation = ""
[node name="VibeSfx" type="Node" parent="Ground/AnimationPlayer" index="0"]
@@ -102,19 +128,32 @@ autoplay_group = &"c02_房间里1"
metadata/_custom_type_script = "uid://cpejxlfni6n52"
[node name="Sfx小蝉出现" type="AudioStreamPlayer" parent="Ground/AnimationPlayer" index="1"]
-stream = SubResource("AudioStreamSynchronized_apn51")
+stream = ExtResource("4_nx6jy")
volume_db = 12.0
bus = &"game_sfx"
script = ExtResource("6_6uftv")
metadata/_custom_type_script = "uid://rq6w1vuhuq1m"
-[node name="Sfx脚印出现" type="AudioStreamPlayer" parent="Ground/AnimationPlayer" index="2"]
+[node name="Sfx小蝉哼歌" type="AudioStreamPlayer" parent="Ground/AnimationPlayer" index="2"]
+stream = ExtResource("5_8cwaw")
+volume_db = 16.0
+bus = &"game_sfx"
+script = ExtResource("6_6uftv")
+metadata/_custom_type_script = "uid://rq6w1vuhuq1m"
+
+[node name="Sfx脚印出现" type="AudioStreamPlayer" parent="Ground/AnimationPlayer" index="3"]
stream = ExtResource("7_5t4pt")
volume_db = 10.0
bus = &"game_sfx"
script = ExtResource("6_6uftv")
metadata/_custom_type_script = "uid://rq6w1vuhuq1m"
+[node name="Sfx头痛耳鸣" type="AudioStreamPlayer" parent="Ground/AnimationPlayer" index="4"]
+stream = ExtResource("8_apn51")
+bus = &"game_sfx"
+script = ExtResource("6_6uftv")
+metadata/_custom_type_script = "uid://rq6w1vuhuq1m"
+
[node name="BGSprite2D" parent="Ground" index="2"]
position = Vector2(26, 0)
texture = ExtResource("3_ox8et")
diff --git a/scene/ground/scene/c02/s12_盒子猫.tscn b/scene/ground/scene/c02/s12_盒子猫.tscn
index 76e29c10..03e3cbe7 100644
--- a/scene/ground/scene/c02/s12_盒子猫.tscn
+++ b/scene/ground/scene/c02/s12_盒子猫.tscn
@@ -19,6 +19,9 @@ footstep_type = "盒子猫"
[node name="AnimationPlayer" parent="Ground" index="0"]
script = ExtResource("2_7ah3n")
+debug_global_data = Dictionary[String, Variant]({
+"enabled_items": ["prop_火柴", "prop_院长的信", "prop_银元"]
+})
oneshot_animation = ""
[node name="Sfx钻盒子演出" type="AudioStreamPlayer" parent="Ground/AnimationPlayer" index="0"]
diff --git a/scene/ground/scene/c03/s01_瞎子理发店.tscn b/scene/ground/scene/c03/s01_瞎子理发店.tscn
index 33dceaaf..876e09e0 100644
--- a/scene/ground/scene/c03/s01_瞎子理发店.tscn
+++ b/scene/ground/scene/c03/s01_瞎子理发店.tscn
@@ -119,6 +119,9 @@ libraries = {
&"": SubResource("AnimationLibrary_k01ve")
}
script = ExtResource("2_jxanq")
+debug_global_data = Dictionary[String, Variant]({
+"enabled_items": ["prop_火柴", "prop_院长的信", "prop_银元"]
+})
oneshot_animation = ""
[node name="VibeSfx" type="Node" parent="Ground/AnimationPlayer" index="0"]
diff --git a/scene/ground/script/c02/s08_画特写.tscn b/scene/ground/script/c02/s08_画特写.tscn
index 04e8fd0f..16aa0d5e 100644
--- a/scene/ground/script/c02/s08_画特写.tscn
+++ b/scene/ground/script/c02/s08_画特写.tscn
@@ -2,9 +2,9 @@
[ext_resource type="Script" uid="uid://dnrql1t0j6v8i" path="res://scene/ground/script/c02/通用特写脚本.gd" id="1_jgyts"]
[ext_resource type="Texture2D" uid="uid://d1seskftkw08q" path="res://asset/art/scene/c02/s08_瞎子卧室/ux_盒子猫初次特写.png" id="2_jo6o1"]
-[ext_resource type="Texture2D" uid="uid://cbql1i4hblmt1" path="res://asset/art/ui/inspect/inspect特写通用遮罩.png" id="3_myoho"]
+[ext_resource type="Texture2D" uid="uid://cbql1i4hblmt1" path="res://asset/art/ui/遮罩/inspect特写通用遮罩.png" id="3_myoho"]
[ext_resource type="PackedScene" uid="uid://dmysq4sxx8iqh" path="res://scene/entity/ux/content_inspector.tscn" id="4_4p6cc"]
-[ext_resource type="Texture2D" uid="uid://f186lvt5y2ql" path="res://asset/art/ui/inspect/inspect背景遮罩.png" id="5_i34yq"]
+[ext_resource type="Texture2D" uid="uid://f186lvt5y2ql" path="res://asset/art/ui/遮罩/inspect背景遮罩.png" id="5_i34yq"]
[node name="s08_画特写" type="CanvasLayer"]
script = ExtResource("1_jgyts")
diff --git a/scene/ground/script/c02/s08_画特写2.tscn b/scene/ground/script/c02/s08_画特写2.tscn
index 94123db6..d8138d52 100644
--- a/scene/ground/script/c02/s08_画特写2.tscn
+++ b/scene/ground/script/c02/s08_画特写2.tscn
@@ -2,11 +2,11 @@
[ext_resource type="Script" uid="uid://dnrql1t0j6v8i" path="res://scene/ground/script/c02/通用特写脚本.gd" id="1_2sinf"]
[ext_resource type="Texture2D" uid="uid://k6164drvkbg8" path="res://asset/art/scene/c02/s08_瞎子卧室/ux_盒子猫结束特写.png" id="2_qrck0"]
-[ext_resource type="Texture2D" uid="uid://cbql1i4hblmt1" path="res://asset/art/ui/inspect/inspect特写通用遮罩.png" id="3_7dv3t"]
+[ext_resource type="Texture2D" uid="uid://cbql1i4hblmt1" path="res://asset/art/ui/遮罩/inspect特写通用遮罩.png" id="3_7dv3t"]
[ext_resource type="Texture2D" uid="uid://tcjm158n8hnw" path="res://asset/art/scene/c02/s12_to_s17_盒子猫/小脚脚印.png" id="4_tja8r"]
[ext_resource type="Texture2D" uid="uid://cylsq5cvhlp18" path="res://asset/art/tool/point_light.png" id="5_75okh"]
[ext_resource type="PackedScene" uid="uid://dmysq4sxx8iqh" path="res://scene/entity/ux/content_inspector.tscn" id="6_ybyuk"]
-[ext_resource type="Texture2D" uid="uid://f186lvt5y2ql" path="res://asset/art/ui/inspect/inspect背景遮罩.png" id="7_tja8r"]
+[ext_resource type="Texture2D" uid="uid://f186lvt5y2ql" path="res://asset/art/ui/遮罩/inspect背景遮罩.png" id="7_tja8r"]
[node name="s08_盒子猫初次特写" type="CanvasLayer"]
script = ExtResource("1_2sinf")
diff --git a/scene/ground/script/c02/井特写.gd b/scene/ground/script/c02/井特写.gd
index 3047e7b1..8fd92a07 100644
--- a/scene/ground/script/c02/井特写.gd
+++ b/scene/ground/script/c02/井特写.gd
@@ -3,4 +3,8 @@ extends CanvasLayer
func _ready() -> void:
layer = GlobalConfig.CANVAS_LAYER_LITTLE_GAME
-
+ if not ArchiveManager.get_global_value("c02_watched_the_well"):
+ DialogueManager.show_dialogue_balloon(
+ preload("res://asset/dialogue/npc.dialogue"), "c02_看井对话"
+ )
+ ArchiveManager.set_global_entry("c02_watched_the_well", true)
diff --git a/scene/ground/script/c02/刮海报_二楼内侧.tscn b/scene/ground/script/c02/刮海报_二楼内侧.tscn
index aaab8f56..f710d5c9 100644
--- a/scene/ground/script/c02/刮海报_二楼内侧.tscn
+++ b/scene/ground/script/c02/刮海报_二楼内侧.tscn
@@ -4,7 +4,7 @@
[ext_resource type="Texture2D" uid="uid://ca5tpfxmeh5q8" path="res://asset/art/scene/c02/s07_二楼内侧楼道/ux_二楼过道内侧.png" id="2_auxb7"]
[ext_resource type="AudioStream" uid="uid://bomvnle4oh1ol" path="res://asset/audio/sfx/交互/第一章/sfx_折纸.wav" id="2_vl1ak"]
[ext_resource type="PackedScene" uid="uid://bvnclp341hxoh" path="res://scene/entity/ux/刮刮乐.tscn" id="3_auxb7"]
-[ext_resource type="Texture2D" uid="uid://cbql1i4hblmt1" path="res://asset/art/ui/inspect/inspect特写通用遮罩.png" id="3_phw8g"]
+[ext_resource type="Texture2D" uid="uid://cbql1i4hblmt1" path="res://asset/art/ui/遮罩/inspect特写通用遮罩.png" id="3_phw8g"]
[ext_resource type="Script" uid="uid://rq6w1vuhuq1m" path="res://scene/entity/audio/sfx.gd" id="3_ro3vo"]
[sub_resource type="Image" id="Image_vl1ak"]
diff --git a/scene/ground/script/c02/刮海报_过道.tscn b/scene/ground/script/c02/刮海报_过道.tscn
index e8dbf04e..e289a17b 100644
--- a/scene/ground/script/c02/刮海报_过道.tscn
+++ b/scene/ground/script/c02/刮海报_过道.tscn
@@ -2,7 +2,7 @@
[ext_resource type="Script" uid="uid://d31fc1bolhwlf" path="res://scene/ground/script/c02/刮海报.gd" id="1_qroub"]
[ext_resource type="Texture2D" uid="uid://du1gfsc8mp0q0" path="res://asset/art/scene/c02/s02_大门过道/ux_过道面板.png" id="2_5kq43"]
-[ext_resource type="Texture2D" uid="uid://cbql1i4hblmt1" path="res://asset/art/ui/inspect/inspect特写通用遮罩.png" id="3_5kq43"]
+[ext_resource type="Texture2D" uid="uid://cbql1i4hblmt1" path="res://asset/art/ui/遮罩/inspect特写通用遮罩.png" id="3_5kq43"]
[ext_resource type="Texture2D" uid="uid://cyctvbeqxqvpb" path="res://asset/art/prop/c02/海报特写/青岛啤酒.png" id="3_cffxi"]
[ext_resource type="PackedScene" uid="uid://bvnclp341hxoh" path="res://scene/entity/ux/刮刮乐.tscn" id="3_qwopf"]
[ext_resource type="AudioStream" uid="uid://bomvnle4oh1ol" path="res://asset/audio/sfx/交互/第一章/sfx_折纸.wav" id="5_xjg44"]
diff --git a/scene/ground/script/c02/戏台特写.tscn b/scene/ground/script/c02/戏台特写.tscn
index 8be481d7..de44a87e 100644
--- a/scene/ground/script/c02/戏台特写.tscn
+++ b/scene/ground/script/c02/戏台特写.tscn
@@ -2,7 +2,7 @@
[ext_resource type="Script" uid="uid://baocsio2v7pme" path="res://scene/ground/script/c02/戏台特写.gd" id="1_eu5r2"]
[ext_resource type="Texture2D" uid="uid://dhrl5mlivx108" path="res://asset/art/scene/c02/s05_一楼内侧楼道/ux_戏台特写(无道具）.png" id="3_timwg"]
-[ext_resource type="Texture2D" uid="uid://cbql1i4hblmt1" path="res://asset/art/ui/inspect/inspect特写通用遮罩.png" id="4_ujm2t"]
+[ext_resource type="Texture2D" uid="uid://cbql1i4hblmt1" path="res://asset/art/ui/遮罩/inspect特写通用遮罩.png" id="4_ujm2t"]
[node name="戏台特写" type="CanvasLayer"]
script = ExtResource("1_eu5r2")
diff --git a/scene/ground/script/c02/折锡纸.tscn b/scene/ground/script/c02/折锡纸.tscn
index 6493a7a4..d90040cb 100644
--- a/scene/ground/script/c02/折锡纸.tscn
+++ b/scene/ground/script/c02/折锡纸.tscn
@@ -6,7 +6,7 @@
[ext_resource type="SpriteFrames" uid="uid://c2sjavnptjn" path="res://asset/art/gif/c02_保卫科/c02_保卫科_frames.tres" id="3_ckoix"]
[ext_resource type="Script" uid="uid://rq6w1vuhuq1m" path="res://scene/entity/audio/sfx.gd" id="3_ftr7c"]
[ext_resource type="AudioStream" uid="uid://bomvnle4oh1ol" path="res://asset/audio/sfx/交互/第一章/sfx_折纸.wav" id="4_g2p6p"]
-[ext_resource type="Texture2D" uid="uid://f186lvt5y2ql" path="res://asset/art/ui/inspect/inspect背景遮罩.png" id="4_qu4ce"]
+[ext_resource type="Texture2D" uid="uid://f186lvt5y2ql" path="res://asset/art/ui/遮罩/inspect背景遮罩.png" id="4_qu4ce"]
[ext_resource type="Texture2D" uid="uid://bygsskp1cr0y8" path="res://asset/art/scene/c02/s04_保卫科/锡纸.png" id="4_uslgh"]
[ext_resource type="Texture2D" uid="uid://dcubpjb5qgfl2" path="res://asset/art/scene/c02/s04_保卫科/锡纸_hover.png" id="5_6lb1j"]
[ext_resource type="BitMap" uid="uid://cfu2y1q2ercd" path="res://asset/art/scene/c02/s04_保卫科/锡纸_mask.png" id="5_uslgh"]
diff --git a/scene/ground/script/c02/拿人偶后记忆闪回.gd b/scene/ground/script/c02/拿人偶后记忆闪回.gd
new file mode 100644
index 00000000..c1c2a4fa
--- /dev/null
+++ b/scene/ground/script/c02/拿人偶后记忆闪回.gd
@@ -0,0 +1,8 @@
+extends CanvasLayer
+
+signal exit
+
+func _ready() -> void:
+ layer = GlobalConfig.CANVAS_LAYER_LITTLE_GAME
+ await Util.wait(2.0)
+ exit.emit()
\ No newline at end of file
diff --git a/scene/ground/script/c02/拿人偶后记忆闪回.gd.uid b/scene/ground/script/c02/拿人偶后记忆闪回.gd.uid
new file mode 100644
index 00000000..cd5e02af
--- /dev/null
+++ b/scene/ground/script/c02/拿人偶后记忆闪回.gd.uid
@@ -0,0 +1 @@
+uid://dh6f5qeynliaa
diff --git a/scene/ground/script/c02/拿人偶后记忆闪回.tscn b/scene/ground/script/c02/拿人偶后记忆闪回.tscn
new file mode 100644
index 00000000..c92dd287
--- /dev/null
+++ b/scene/ground/script/c02/拿人偶后记忆闪回.tscn
@@ -0,0 +1,49 @@
+[gd_scene load_steps=7 format=3 uid="uid://b4ilxht544qxu"]
+
+[ext_resource type="Script" uid="uid://dh6f5qeynliaa" path="res://scene/ground/script/c02/拿人偶后记忆闪回.gd" id="1_cgi75"]
+[ext_resource type="Texture2D" uid="uid://dhrl5mlivx108" path="res://asset/art/scene/c02/s05_一楼内侧楼道/ux_戏台特写(无道具）.png" id="2_edrik"]
+[ext_resource type="Texture2D" uid="uid://bdisdxc1txm0g" path="res://asset/art/gif/c02_霸凌/小婵_被霸凌/0.png" id="3_edrik"]
+[ext_resource type="Texture2D" uid="uid://cbql1i4hblmt1" path="res://asset/art/ui/遮罩/inspect特写通用遮罩.png" id="3_icubm"]
+[ext_resource type="Texture2D" uid="uid://cfnkmmii6dv47" path="res://asset/art/little_game/弹珠/伸手.png" id="4_icubm"]
+[ext_resource type="Texture2D" uid="uid://7citu6wev1wy" path="res://asset/art/animation/c00_吕萍_记笔记_right/吕萍-拿本子记录24.png" id="5_6edb2"]
+
+[node name="记忆闪回" type="CanvasLayer"]
+script = ExtResource("1_cgi75")
+
+[node name="小蝉" type="TextureRect" parent="."]
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+texture = ExtResource("2_edrik")
+expand_mode = 5
+stretch_mode = 5
+
+[node name="Sprite2D" type="Sprite2D" parent="小蝉"]
+position = Vector2(275, 178)
+scale = Vector2(6.64224, 5.44996)
+texture = ExtResource("3_edrik")
+
+[node name="伸手" type="Sprite2D" parent="."]
+position = Vector2(440, 477)
+scale = Vector2(6.64224, 5.44996)
+texture = ExtResource("4_icubm")
+flip_v = true
+
+[node name="小蝶" type="Sprite2D" parent="."]
+position = Vector2(126, 258)
+scale = Vector2(6.64224, 5.44996)
+texture = ExtResource("5_6edb2")
+
+[node name="TextureRect2" type="TextureRect" parent="."]
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+texture = ExtResource("3_icubm")
+expand_mode = 5
+stretch_mode = 5
+
+[node name="Camera2D" type="Camera2D" parent="."]
diff --git a/scene/ground/script/c02/盒子猫canvas_layer.tscn b/scene/ground/script/c02/盒子猫canvas_layer.tscn
index aa677013..1110709b 100644
--- a/scene/ground/script/c02/盒子猫canvas_layer.tscn
+++ b/scene/ground/script/c02/盒子猫canvas_layer.tscn
@@ -8,7 +8,7 @@
[ext_resource type="AudioStream" uid="uid://7sjwgob6tsu4" path="res://asset/audio/sfx/交互/第一章/sfx_猫退出躲藏.wav" id="4_0rwiy"]
[ext_resource type="Texture2D" uid="uid://tcjm158n8hnw" path="res://asset/art/scene/c02/s12_to_s17_盒子猫/小脚脚印.png" id="4_bc5tk"]
[ext_resource type="Texture2D" uid="uid://ccfbubistf0ov" path="res://asset/art/scene/c02/s12_to_s17_盒子猫/ux_镂空_纸.png" id="5_l6g3a"]
-[ext_resource type="Texture2D" uid="uid://cbql1i4hblmt1" path="res://asset/art/ui/inspect/inspect特写通用遮罩.png" id="6_aeggu"]
+[ext_resource type="Texture2D" uid="uid://cbql1i4hblmt1" path="res://asset/art/ui/遮罩/inspect特写通用遮罩.png" id="6_aeggu"]
[ext_resource type="Texture2D" uid="uid://cylsq5cvhlp18" path="res://asset/art/tool/point_light.png" id="6_qw0v6"]
[ext_resource type="Texture2D" uid="uid://dx3i8mchgux1d" path="res://asset/art/scene/c02/s12_to_s17_盒子猫/ux_纸张.png" id="6_rxlkc"]
diff --git a/scene/ground/script/c02/空房间小蝉头套.tscn b/scene/ground/script/c02/空房间小蝉头套.tscn
index 601d13fc..ad090aca 100644
--- a/scene/ground/script/c02/空房间小蝉头套.tscn
+++ b/scene/ground/script/c02/空房间小蝉头套.tscn
@@ -3,7 +3,7 @@
[ext_resource type="Script" uid="uid://criy10vfyc262" path="res://scene/ground/script/c02/空房间小蝉头套.gd" id="1_yumf6"]
[ext_resource type="Texture2D" uid="uid://ce3kclg1i81l3" path="res://asset/art/scene/c02/s02_大门过道/e_头套（场景中）.png" id="2_4w5ks"]
[ext_resource type="PackedScene" uid="uid://dmysq4sxx8iqh" path="res://scene/entity/ux/content_inspector.tscn" id="3_64wgd"]
-[ext_resource type="Texture2D" uid="uid://f186lvt5y2ql" path="res://asset/art/ui/inspect/inspect背景遮罩.png" id="4_v60v3"]
+[ext_resource type="Texture2D" uid="uid://f186lvt5y2ql" path="res://asset/art/ui/遮罩/inspect背景遮罩.png" id="4_v60v3"]
[node name="老鼠精画像" type="CanvasLayer"]
script = ExtResource("1_yumf6")
@@ -52,6 +52,6 @@ offset_right = 50.0
offset_bottom = 7.0
grow_horizontal = 2
grow_vertical = 2
-text = "???"
+text = "c02_小蝉头套文字"
horizontal_alignment = 1
autowrap_mode = 3
diff --git a/scene/ground/script/c02/老鼠精画像.tscn b/scene/ground/script/c02/老鼠精画像.tscn
index 93dbb063..e7d10b98 100644
--- a/scene/ground/script/c02/老鼠精画像.tscn
+++ b/scene/ground/script/c02/老鼠精画像.tscn
@@ -3,7 +3,7 @@
[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/inspect/inspect背景遮罩.png" id="4_l77sh"]
+[ext_resource type="Texture2D" uid="uid://f186lvt5y2ql" path="res://asset/art/ui/遮罩/inspect背景遮罩.png" id="4_l77sh"]
[node name="老鼠精画像" type="CanvasLayer"]
script = ExtResource("1_l77sh")
diff --git a/scene/ground/script/c02/花名册.tscn b/scene/ground/script/c02/花名册.tscn
index 5338afca..117ed974 100644
--- a/scene/ground/script/c02/花名册.tscn
+++ b/scene/ground/script/c02/花名册.tscn
@@ -4,7 +4,7 @@
[ext_resource type="Texture2D" uid="uid://cypvxj1vsl5yk" path="res://asset/art/scene/c02/s04_保卫科/花名册/bg_花名册桌面.png" id="2_v047l"]
[ext_resource type="Texture2D" uid="uid://sx3i3lkt2vfd" path="res://asset/art/scene/c02/s04_保卫科/花名册/花名册封皮.png" id="3_myeas"]
[ext_resource type="PackedScene" uid="uid://dmysq4sxx8iqh" path="res://scene/entity/ux/content_inspector.tscn" id="4_1s4sv"]
-[ext_resource type="Texture2D" uid="uid://f186lvt5y2ql" path="res://asset/art/ui/inspect/inspect背景遮罩.png" id="4_myeas"]
+[ext_resource type="Texture2D" uid="uid://f186lvt5y2ql" path="res://asset/art/ui/遮罩/inspect背景遮罩.png" id="4_myeas"]
[node name="花名册" type="CanvasLayer"]
script = ExtResource("1_jin3n")
diff --git a/scene/little_game/八音盒/八音盒.tscn b/scene/little_game/八音盒/八音盒.tscn
index 38e7ea3e..6d06b071 100644
--- a/scene/little_game/八音盒/八音盒.tscn
+++ b/scene/little_game/八音盒/八音盒.tscn
@@ -35,7 +35,7 @@
[ext_resource type="Texture2D" uid="uid://c07o1l2hs2ex5" path="res://asset/art/little_game/八音盒/新小猫身体.png" id="31_wq2wm"]
[ext_resource type="Texture2D" uid="uid://b2jnocfgfr3io" path="res://asset/art/little_game/八音盒/小蝉人偶.png" id="32_sg8mt"]
[ext_resource type="SpriteFrames" uid="uid://cwes55ajc3rd4" path="res://asset/art/gif/c02_空房间/c02_空房间_frames.tres" id="34_tgpfj"]
-[ext_resource type="Texture2D" uid="uid://f186lvt5y2ql" path="res://asset/art/ui/inspect/inspect背景遮罩.png" id="35_wq2wm"]
+[ext_resource type="Texture2D" uid="uid://f186lvt5y2ql" path="res://asset/art/ui/遮罩/inspect背景遮罩.png" id="35_wq2wm"]
[ext_resource type="Texture2D" uid="uid://cylsq5cvhlp18" path="res://asset/art/tool/point_light.png" id="36_sg8mt"]
[sub_resource type="Animation" id="Animation_j1llk"]
diff --git a/scene/settings/settings.tscn b/scene/settings/settings.tscn
index 7286d73d..06538822 100644
--- a/scene/settings/settings.tscn
+++ b/scene/settings/settings.tscn
@@ -4,7 +4,7 @@
[ext_resource type="AudioStream" uid="uid://dlt4nv6qjhlpy" path="res://asset/audio/sfx/交互/sfx_打开设置.wav" id="2_6hxkf"]
[ext_resource type="Script" uid="uid://rq6w1vuhuq1m" path="res://scene/entity/audio/sfx.gd" id="3_kn03d"]
[ext_resource type="AudioStream" uid="uid://cmi6fd68s1ukb" path="res://asset/audio/sfx/交互/sfx_关闭设置.wav" id="4_n2b1f"]
-[ext_resource type="Texture2D" uid="uid://f186lvt5y2ql" path="res://asset/art/ui/inspect/inspect背景遮罩.png" id="5_kn03d"]
+[ext_resource type="Texture2D" uid="uid://f186lvt5y2ql" path="res://asset/art/ui/遮罩/inspect背景遮罩.png" id="5_kn03d"]
[ext_resource type="Theme" uid="uid://be5scnhjobkux" path="res://config/settings_theme.tres" id="6_7e43x"]
[ext_resource type="FontVariation" uid="uid://1ryw42kej6lv" path="res://config/font_ui.tres" id="6_n2b1f"]
diff --git a/scene/ux/bag/prop_bag.tscn b/scene/ux/bag/prop_bag.tscn
index b5b02c6a..96484f23 100644
--- a/scene/ux/bag/prop_bag.tscn
+++ b/scene/ux/bag/prop_bag.tscn
@@ -6,7 +6,7 @@
[ext_resource type="PackedScene" uid="uid://ut4a5gwb4naq" path="res://scene/ux/tabs.tscn" id="4_wojfr"]
[ext_resource type="Texture2D" uid="uid://bi7l47cit2xs" path="res://asset/art/ui/ux_panel/完整背景.png" id="6_grmx4"]
[ext_resource type="Texture2D" uid="uid://bhjynxasn03jv" path="res://asset/art/ui/bag/重要物品ui-28.png" id="7_j146j"]
-[ext_resource type="Texture2D" uid="uid://cbql1i4hblmt1" path="res://asset/art/ui/inspect/inspect特写通用遮罩.png" id="7_tgqj6"]
+[ext_resource type="Texture2D" uid="uid://cbql1i4hblmt1" path="res://asset/art/ui/遮罩/inspect特写通用遮罩.png" id="7_tgqj6"]
[ext_resource type="Texture2D" uid="uid://bg77dh6ua3kfo" path="res://asset/art/prop/c01/院长的信物品.png" id="10_tgqj6"]
[ext_resource type="FontFile" uid="uid://dr8bp6p7byb37" path="res://asset/font/字体/方正楷体简体.TTF" id="11_4jvvd"]
diff --git a/scene/ux/memory/memory.tscn b/scene/ux/memory/memory.tscn
index 0d459022..9de7800c 100644
--- a/scene/ux/memory/memory.tscn
+++ b/scene/ux/memory/memory.tscn
@@ -2,7 +2,7 @@
[ext_resource type="Script" uid="uid://bt86ajx7nwnk3" path="res://scene/ux/memory/memory.gd" id="1_22dwm"]
[ext_resource type="Texture2D" uid="uid://bi7l47cit2xs" path="res://asset/art/ui/ux_panel/完整背景.png" id="2_mydtv"]
-[ext_resource type="Texture2D" uid="uid://cbql1i4hblmt1" path="res://asset/art/ui/inspect/inspect特写通用遮罩.png" id="3_6dhhp"]
+[ext_resource type="Texture2D" uid="uid://cbql1i4hblmt1" path="res://asset/art/ui/遮罩/inspect特写通用遮罩.png" id="3_6dhhp"]
[ext_resource type="Texture2D" uid="uid://dsj3l0baqg1g7" path="res://asset/art/ui/ux_panel/小蝶笔记.png" id="3_mydtv"]
[ext_resource type="PackedScene" uid="uid://du6jt6ae5ulvy" path="res://scene/ux/memory/memory_item.tscn" id="4_6dhhp"]
[ext_resource type="PackedScene" uid="uid://ut4a5gwb4naq" path="res://scene/ux/tabs.tscn" id="4_7f8pt"]
diff --git a/scene/ux/memory/memory_item.tscn b/scene/ux/memory/memory_item.tscn
index 8134eea1..c9c09e56 100644
--- a/scene/ux/memory/memory_item.tscn
+++ b/scene/ux/memory/memory_item.tscn
@@ -2,7 +2,7 @@
[ext_resource type="Theme" uid="uid://ro8r1wa1bvua" path="res://config/memory_item_theme.tres" id="1_2f468"]
[ext_resource type="Script" uid="uid://bk8ton7q8i6hb" path="res://scene/ux/memory/memory_item.gd" id="1_2q576"]
-[ext_resource type="Texture2D" uid="uid://cbql1i4hblmt1" path="res://asset/art/ui/inspect/inspect特写通用遮罩.png" id="3_wb2ol"]
+[ext_resource type="Texture2D" uid="uid://cbql1i4hblmt1" path="res://asset/art/ui/遮罩/inspect特写通用遮罩.png" id="3_wb2ol"]
[node name="MemoryItem" type="PanelContainer"]
offset_right = 75.0
diff --git a/scene/ux/note/ux_note.tscn b/scene/ux/note/ux_note.tscn
index 927502f6..ea4cb6a8 100644
--- a/scene/ux/note/ux_note.tscn
+++ b/scene/ux/note/ux_note.tscn
@@ -2,7 +2,7 @@
[ext_resource type="Script" uid="uid://bkyg34xfhe60p" path="res://scene/ux/note/ux_note.gd" id="1_e61yw"]
[ext_resource type="Texture2D" uid="uid://bi7l47cit2xs" path="res://asset/art/ui/ux_panel/完整背景.png" id="2_1ka1m"]
-[ext_resource type="Texture2D" uid="uid://cbql1i4hblmt1" path="res://asset/art/ui/inspect/inspect特写通用遮罩.png" id="3_nk0pj"]
+[ext_resource type="Texture2D" uid="uid://cbql1i4hblmt1" path="res://asset/art/ui/遮罩/inspect特写通用遮罩.png" id="3_nk0pj"]
[ext_resource type="PackedScene" uid="uid://ut4a5gwb4naq" path="res://scene/ux/tabs.tscn" id="4_7vpan"]
[ext_resource type="Texture2D" uid="uid://dsj3l0baqg1g7" path="res://asset/art/ui/ux_panel/小蝶笔记.png" id="5_d1cia"]
[ext_resource type="Texture2D" uid="uid://bv57eyqs03k4y" path="res://asset/art/ui/note/线索笔记内容-29.png" id="6_7vpan"]
diff --git a/scene/ux/panel/ux_panel.tscn b/scene/ux/panel/ux_panel.tscn
index b02ad0f9..14a543ba 100644
--- a/scene/ux/panel/ux_panel.tscn
+++ b/scene/ux/panel/ux_panel.tscn
@@ -4,7 +4,7 @@
[ext_resource type="Texture2D" uid="uid://bi7l47cit2xs" path="res://asset/art/ui/ux_panel/完整背景.png" id="2_5mits"]
[ext_resource type="AudioStream" uid="uid://dyjifofhdx25w" path="res://asset/audio/sfx/交互/打开背包.wav" id="2_v1oku"]
[ext_resource type="Script" uid="uid://rq6w1vuhuq1m" path="res://scene/entity/audio/sfx.gd" id="3_a3uyd"]
-[ext_resource type="Texture2D" uid="uid://cbql1i4hblmt1" path="res://asset/art/ui/inspect/inspect特写通用遮罩.png" id="3_mns6r"]
+[ext_resource type="Texture2D" uid="uid://cbql1i4hblmt1" path="res://asset/art/ui/遮罩/inspect特写通用遮罩.png" id="3_mns6r"]
[ext_resource type="FontFile" uid="uid://255whp7fuig5" path="res://asset/font/字体/三极行楷简体-粗.ttf" id="4_mns6r"]
[ext_resource type="AudioStream" uid="uid://bghyinc16m1nx" path="res://asset/audio/sfx/交互/收起背包.wav" id="4_ombcf"]
diff --git a/scene/ux/prop_inspector.gd b/scene/ux/prop_inspector.gd
index 0af3ca65..83e9dab9 100644
--- a/scene/ux/prop_inspector.gd
+++ b/scene/ux/prop_inspector.gd
@@ -44,7 +44,6 @@ func _ready() -> void:
func _hide():
if status == STATUS_HIDDING:
- SceneManager.unlock_player()
return
if status == STATUS_HIDDEN:
return
@@ -61,7 +60,7 @@ func _hide():
func _post_hide():
status = STATUS_HIDDEN
- SceneManager.unlock_player()
+ locking = false
origin_texture.texture = null
full_texture.texture = null
texture_cover = null
@@ -95,7 +94,7 @@ func pop_standard_inspection(
content_label.horizontal_alignment = HORIZONTAL_ALIGNMENT_LEFT
if status != STATUS_HIDDEN:
_hide()
- SceneManager.lock_player(0)
+ locking = true
status = STATUS_INSPECTING_COVER
visible = true
full_texture.texture = cover_texture
@@ -114,6 +113,15 @@ func pop_standard_inspection(
_blink_label()
+var locking = false:
+ set(val):
+ if val != locking:
+ locking = val
+ if val:
+ SceneManager.lock_player()
+ else:
+ SceneManager.unlock_player()
+
var balloon
@@ -126,8 +134,7 @@ func pop_prop_inspection(
# STATUS_INSPECTING_PROP 状态下不 hide，跳过重复 lock
if status != STATUS_HIDDEN and status != STATUS_INSPECTING_PROP:
_hide()
- if status != STATUS_INSPECTING_PROP:
- SceneManager.lock_player(0)
+ locking = true
status = STATUS_INSPECTING_PROP
visible = true
var tween = create_tween()
diff --git a/scene/ux/prop_inspector.tscn b/scene/ux/prop_inspector.tscn
index fcbae134..11360723 100644
--- a/scene/ux/prop_inspector.tscn
+++ b/scene/ux/prop_inspector.tscn
@@ -1,7 +1,7 @@
[gd_scene load_steps=5 format=3 uid="uid://cekhj65axie0p"]
[ext_resource type="Script" uid="uid://1xdb7s1nigv8" path="res://scene/ux/prop_inspector.gd" id="1_2wpwe"]
-[ext_resource type="Texture2D" uid="uid://f186lvt5y2ql" path="res://asset/art/ui/inspect/inspect背景遮罩.png" id="2_j83lq"]
+[ext_resource type="Texture2D" uid="uid://f186lvt5y2ql" path="res://asset/art/ui/遮罩/inspect背景遮罩.png" id="2_j83lq"]
[ext_resource type="Texture2D" uid="uid://cvgw2mxrlr6io" path="res://asset/art/scene/c02/旧版/s02_走道/ux_进门鼠疫海报yz.png" id="2_wr575"]
[ext_resource type="FontVariation" uid="uid://1ryw42kej6lv" path="res://config/font_ui.tres" id="4_opug5"]