完成 gallery 集锦：偷听李氏癞子 + 瞎子看井

addons/property-inspector/pro_animation_sprite2d/pro_animated_sprite.gd

@@ -76,7 +76,7 @@ func _debug_mov_projection():
 	if debug_mov_animation and animation_mov_dict.has(debug_mov_animation):
 		var mov_config = animation_mov_dict[debug_mov_animation]
 		# 展示 accumulated animation 的目标位置
-		debug_mov_onion_sprite2d.position.x = mov_config.movement_x * (1 if flip_h else -1)
+		debug_mov_onion_sprite2d.position.x = mov_config.movement_x * (-1 if flip_h else 1) / scale.x
 		debug_mov_onion_sprite2d.texture = sprite_frames.get_frame_texture(debug_mov_animation, 0)
 	elif debug_mov_animation:
 		push_warning("Debug move config not found:", debug_mov_animation)

asset/art/gif/c02_小小小蝶上楼道/小小小蝶动画(呼吸）.gif.import

@@ -1,14 +0,0 @@
-[remap]
-
-importer="gif.animated.texture.plugin"
-type="SpriteFrames"
-uid="uid://c8pjtla0qebwg"
-path="res://.godot/imported/小小小蝶动画(呼吸）.gif-759bec50ae1f764ead232dbc18bc0c2e.tres"
-
-[deps]
-
-source_file="res://asset/art/gif/c02_小小小蝶上楼道/小小小蝶动画(呼吸）.gif"
-dest_files=["res://.godot/imported/小小小蝶动画(呼吸）.gif-759bec50ae1f764ead232dbc18bc0c2e.tres"]
-
-[params]
-

asset/art/gif/c02_杂项/c02_杂项_frames.tres

@@ -1,4 +1,4 @@
-[gd_resource type="SpriteFrames" load_steps=110 format=3 uid="uid://3nas025c2c5u"]
+[gd_resource type="SpriteFrames" load_steps=112 format=3 uid="uid://3nas025c2c5u"]
 
 [ext_resource type="Texture2D" uid="uid://dwhh5uck24og4" path="res://asset/art/gif/c02_杂项/听纸杯/0.png" id="1_jpxok"]
 [ext_resource type="Texture2D" uid="uid://b7gqorave0ung" path="res://asset/art/gif/c02_杂项/f3/0.png" id="1_o3ytw"]
@@ -101,14 +101,16 @@
 [ext_resource type="Texture2D" uid="uid://dyp0q0a6lcswk" path="res://asset/art/gif/c02_杂项/小婵晃脚掉鞋/57.png" id="74_csbcu"]
 [ext_resource type="Texture2D" uid="uid://dsom0pwipi4gm" path="res://asset/art/gif/c02_杂项/小婵晃脚掉鞋/58.png" id="75_kdvnj"]
 [ext_resource type="Texture2D" uid="uid://bdhj86py8gca7" path="res://asset/art/gif/c02_杂项/小婵晃脚掉鞋/59.png" id="76_0647m"]
-[ext_resource type="Texture2D" path="res://asset/art/gif/c02_杂项/火苗/0.png" id="87_tgdu0"]
-[ext_resource type="Texture2D" path="res://asset/art/gif/c02_杂项/火苗/1.png" id="88_i5ln4"]
-[ext_resource type="Texture2D" path="res://asset/art/gif/c02_杂项/火苗/2.png" id="89_eshku"]
-[ext_resource type="Texture2D" path="res://asset/art/gif/c02_杂项/火苗/3.png" id="90_j06p0"]
-[ext_resource type="Texture2D" path="res://asset/art/gif/c02_杂项/火苗/4.png" id="91_7cwcn"]
+[ext_resource type="Texture2D" uid="uid://bkfxnc8jc6ad" path="res://asset/art/gif/c02_杂项/火苗/0.png" id="87_tgdu0"]
+[ext_resource type="Texture2D" uid="uid://dw1abmepuchpf" path="res://asset/art/gif/c02_杂项/火苗/1.png" id="88_i5ln4"]
+[ext_resource type="Texture2D" uid="uid://ixgcovre8mwg" path="res://asset/art/gif/c02_杂项/火苗/2.png" id="89_eshku"]
+[ext_resource type="Texture2D" uid="uid://kmh5o86bl4nv" path="res://asset/art/gif/c02_杂项/火苗/3.png" id="90_j06p0"]
+[ext_resource type="Texture2D" uid="uid://c4ktgdyxw72g8" path="res://asset/art/gif/c02_杂项/火苗/4.png" id="91_7cwcn"]
 [ext_resource type="Texture2D" uid="uid://cy4ewvsa44qn0" path="res://asset/art/gif/c02_杂项/瞎子谈话_一起/瞎子谈话z1.png" id="91_v5jul"]
 [ext_resource type="Texture2D" uid="uid://dv2leuis2bvgv" path="res://asset/art/gif/c02_杂项/瞎子谈话_一起/瞎子谈话z2.png" id="92_vajth"]
 [ext_resource type="Texture2D" uid="uid://cjth2u1ovlt2h" path="res://asset/art/scene/c02/s03_公寓一楼院子/血迹（肉铺门）.png" id="94_vajth"]
+[ext_resource type="Texture2D" uid="uid://dlbaaanunwivi" path="res://asset/art/gif/c02_杂项/疯子看井/疯子看井1.png" id="96_d1ugn"]
+[ext_resource type="Texture2D" uid="uid://dj1k72ky2e3yc" path="res://asset/art/gif/c02_杂项/疯子看井/疯子看井2.png" id="97_efx3w"]
 
 [resource]
 animations = [{
@@ -433,6 +435,17 @@ animations = [{
 "speed": 30.0
 }, {
 "frames": [{
+"duration": 1.0,
+"texture": ExtResource("96_d1ugn")
+}, {
+"duration": 1.0,
+"texture": ExtResource("97_efx3w")
+}],
+"loop": true,
+"name": &"疯子看井",
+"speed": 1.5
+}, {
+"frames": [{
 "duration": 2.0,
 "texture": ExtResource("91_v5jul")
 }, {

asset/art/gif/c02_谢幕演出/c02_谢幕演出_frames.tres

@@ -1,4 +1,4 @@
-[gd_resource type="SpriteFrames" load_steps=834 format=3 uid="uid://b0icyhxpj16tv"]
+[gd_resource type="SpriteFrames" load_steps=832 format=3 uid="uid://b0icyhxpj16tv"]
 
 [ext_resource type="Texture2D" uid="uid://qpq2s8ocvuce" path="res://asset/art/gif/c02_谢幕演出/吕萍小婵跑步/0.png" id="1_44qi3"]
 [ext_resource type="Texture2D" uid="uid://bk8llpiwa2phg" path="res://asset/art/gif/c02_谢幕演出/一起牵手跑步-22/0.png" id="1_m1qf2"]
@@ -752,12 +752,10 @@
 [ext_resource type="Texture2D" uid="uid://qins2034oklc" path="res://asset/art/gif/c02_谢幕演出/小婵呼吸/0.png" id="743_obx78"]
 [ext_resource type="Texture2D" uid="uid://b5odye7vwom3u" path="res://asset/art/gif/c02_谢幕演出/小婵牵手动作/5.png" id="743_uj788"]
 [ext_resource type="Texture2D" uid="uid://c1dqhxkfwq7ts" path="res://asset/art/gif/c02_谢幕演出/小婵牵手动作/6.png" id="744_6ix4r"]
-[ext_resource type="Texture2D" uid="uid://clte7w3245gk5" path="res://asset/art/临时草稿/c02_第一章/瞎子静态.png" id="744_bnrfw"]
 [ext_resource type="Texture2D" uid="uid://bfqscm5f6uis1" path="res://asset/art/gif/c02_谢幕演出/方瞎子呼吸-右/0.png" id="744_ighpp"]
 [ext_resource type="Texture2D" uid="uid://80i8hhkb6q6d" path="res://asset/art/gif/c02_谢幕演出/小婵呼吸/1.png" id="744_ke7o4"]
 [ext_resource type="Texture2D" uid="uid://b63ir0xlcirgj" path="res://asset/art/gif/c02_谢幕演出/小婵牵手小跑/0.png" id="745_6hoic"]
 [ext_resource type="Texture2D" uid="uid://565jg4ktibts" path="res://asset/art/gif/c02_谢幕演出/小婵捂脸/0.png" id="745_h0u7m"]
-[ext_resource type="Texture2D" uid="uid://btlqxqq2b47i7" path="res://asset/art/临时草稿/c02_第一章/胖子静态.png" id="745_hsrnb"]
 [ext_resource type="Texture2D" uid="uid://cffraix0oq6qs" path="res://asset/art/gif/c02_谢幕演出/方瞎子呼吸-右/1.png" id="745_poi3q"]
 [ext_resource type="Texture2D" uid="uid://clou7264vj7nj" path="res://asset/art/gif/c02_谢幕演出/小婵走路/0.png" id="745_sw6r7"]
 [ext_resource type="Texture2D" uid="uid://lbc4ld5cf7di" path="res://asset/art/gif/c02_谢幕演出/小婵捂脸/1.png" id="746_2qaxg"]
@@ -3482,22 +3480,6 @@ animations = [{
 "speed": 30.0
 }, {
 "frames": [{
-"duration": 1.0,
-"texture": ExtResource("744_bnrfw")
-}],
-"loop": true,
-"name": &"瞎子",
-"speed": 5.0
-}, {
-"frames": [{
-"duration": 1.0,
-"texture": ExtResource("745_hsrnb")
-}],
-"loop": true,
-"name": &"胖子",
-"speed": 5.0
-}, {
-"frames": [{
 "duration": 14.7,
 "texture": ExtResource("746_hsrnb")
 }, {

asset/art/gif/c03_小小小蝶上楼道/c02_小小小蝶上楼道_frames.tres

@@ -1,20 +1,20 @@
 [gd_resource type="SpriteFrames" load_steps=16 format=3 uid="uid://by3207ou8ph7"]
 
-[ext_resource type="Texture2D" uid="uid://ctk8sh3rhvmi5" path="res://asset/art/gif/c02_小小小蝶上楼道/小小小蝶动画(上楼梯）/0.png" id="1_ctqo0"]
-[ext_resource type="Texture2D" uid="uid://bwykxtvdujimd" path="res://asset/art/gif/c02_小小小蝶上楼道/小小小蝶动画(呼吸）/0.png" id="1_fcnvy"]
-[ext_resource type="Texture2D" uid="uid://djwxl1tebi5x" path="res://asset/art/gif/c02_小小小蝶上楼道/小小小蝶动画(往前走）/0.png" id="1_o1csg"]
-[ext_resource type="Texture2D" uid="uid://1uk6oj7c1pc0" path="res://asset/art/gif/c02_小小小蝶上楼道/小小小蝶动画(往前走）/1.png" id="2_brixb"]
-[ext_resource type="Texture2D" uid="uid://ddf3kd4kukuga" path="res://asset/art/gif/c02_小小小蝶上楼道/小小小蝶动画(呼吸）/1.png" id="2_ctqo0"]
-[ext_resource type="Texture2D" uid="uid://c35poyn3mxvtt" path="res://asset/art/gif/c02_小小小蝶上楼道/小小小蝶动画(上楼梯）/1.png" id="2_w48pf"]
-[ext_resource type="Texture2D" uid="uid://cahlj0u5mot6v" path="res://asset/art/gif/c02_小小小蝶上楼道/小小小蝶动画(上楼梯）/2.png" id="3_cfyr2"]
-[ext_resource type="Texture2D" uid="uid://qn51u1b00n2v" path="res://asset/art/gif/c02_小小小蝶上楼道/小小小蝶动画(呼吸）/2.png" id="3_w48pf"]
-[ext_resource type="Texture2D" uid="uid://n30xu12f6pcw" path="res://asset/art/gif/c02_小小小蝶上楼道/小小小蝶动画(呼吸）/3.png" id="4_cfyr2"]
-[ext_resource type="Texture2D" uid="uid://d2ecwhkld8u2d" path="res://asset/art/gif/c02_小小小蝶上楼道/小小小蝶动画(上楼梯）/3.png" id="4_j51jw"]
-[ext_resource type="Texture2D" uid="uid://bf6wfuhcejrv1" path="res://asset/art/gif/c02_小小小蝶上楼道/小小小蝶动画(上楼梯）/4.png" id="5_w7h7c"]
-[ext_resource type="Texture2D" uid="uid://bsclq0o3gtr3i" path="res://asset/art/gif/c02_小小小蝶上楼道/小小小蝶动画(跑）/0.png" id="10_l0u5u"]
-[ext_resource type="Texture2D" uid="uid://c6rdik24wvgw5" path="res://asset/art/gif/c02_小小小蝶上楼道/小小小蝶动画(跑）/1.png" id="11_dy5ih"]
-[ext_resource type="Texture2D" uid="uid://c5a5lj527f0kp" path="res://asset/art/gif/c02_小小小蝶上楼道/小小小蝶动画(跑）/2.png" id="12_33ryh"]
-[ext_resource type="Texture2D" uid="uid://cwq8t3q80x0du" path="res://asset/art/gif/c02_小小小蝶上楼道/小小小蝶动画(跑）/3.png" id="13_86osl"]
+[ext_resource type="Texture2D" uid="uid://ctk8sh3rhvmi5" path="res://asset/art/gif/c03_小小小蝶上楼道/小小小蝶动画(上楼梯）/0.png" id="1_ctqo0"]
+[ext_resource type="Texture2D" uid="uid://bwykxtvdujimd" path="res://asset/art/gif/c03_小小小蝶上楼道/小小小蝶动画(呼吸）/0.png" id="1_fcnvy"]
+[ext_resource type="Texture2D" uid="uid://djwxl1tebi5x" path="res://asset/art/gif/c03_小小小蝶上楼道/小小小蝶动画(往前走）/0.png" id="1_o1csg"]
+[ext_resource type="Texture2D" uid="uid://1uk6oj7c1pc0" path="res://asset/art/gif/c03_小小小蝶上楼道/小小小蝶动画(往前走）/1.png" id="2_brixb"]
+[ext_resource type="Texture2D" uid="uid://ddf3kd4kukuga" path="res://asset/art/gif/c03_小小小蝶上楼道/小小小蝶动画(呼吸）/1.png" id="2_ctqo0"]
+[ext_resource type="Texture2D" uid="uid://c35poyn3mxvtt" path="res://asset/art/gif/c03_小小小蝶上楼道/小小小蝶动画(上楼梯）/1.png" id="2_w48pf"]
+[ext_resource type="Texture2D" uid="uid://cahlj0u5mot6v" path="res://asset/art/gif/c03_小小小蝶上楼道/小小小蝶动画(上楼梯）/2.png" id="3_cfyr2"]
+[ext_resource type="Texture2D" uid="uid://qn51u1b00n2v" path="res://asset/art/gif/c03_小小小蝶上楼道/小小小蝶动画(呼吸）/2.png" id="3_w48pf"]
+[ext_resource type="Texture2D" uid="uid://n30xu12f6pcw" path="res://asset/art/gif/c03_小小小蝶上楼道/小小小蝶动画(呼吸）/3.png" id="4_cfyr2"]
+[ext_resource type="Texture2D" uid="uid://d2ecwhkld8u2d" path="res://asset/art/gif/c03_小小小蝶上楼道/小小小蝶动画(上楼梯）/3.png" id="4_j51jw"]
+[ext_resource type="Texture2D" uid="uid://bf6wfuhcejrv1" path="res://asset/art/gif/c03_小小小蝶上楼道/小小小蝶动画(上楼梯）/4.png" id="5_w7h7c"]
+[ext_resource type="Texture2D" uid="uid://bsclq0o3gtr3i" path="res://asset/art/gif/c03_小小小蝶上楼道/小小小蝶动画(跑）/0.png" id="10_l0u5u"]
+[ext_resource type="Texture2D" uid="uid://c6rdik24wvgw5" path="res://asset/art/gif/c03_小小小蝶上楼道/小小小蝶动画(跑）/1.png" id="11_dy5ih"]
+[ext_resource type="Texture2D" uid="uid://c5a5lj527f0kp" path="res://asset/art/gif/c03_小小小蝶上楼道/小小小蝶动画(跑）/2.png" id="12_33ryh"]
+[ext_resource type="Texture2D" uid="uid://cwq8t3q80x0du" path="res://asset/art/gif/c03_小小小蝶上楼道/小小小蝶动画(跑）/3.png" id="13_86osl"]
 
 [resource]
 animations = [{

asset/art/gif/c03_小小小蝶上楼道/小小小蝶动画(上楼梯）.gif.import

@@ -3,12 +3,12 @@
 importer="gif.animated.texture.plugin"
 type="SpriteFrames"
 uid="uid://nqsdsjdsfdab"
-path="res://.godot/imported/小小小蝶动画(上楼梯）.gif-e25807418cec020c0cba637652cb0814.tres"
+path="res://.godot/imported/小小小蝶动画(上楼梯）.gif-7c54830d3c0e0c66b29238348f4df7a1.tres"
 
 [deps]
 
-source_file="res://asset/art/gif/c02_小小小蝶上楼道/小小小蝶动画(上楼梯）.gif"
-dest_files=["res://.godot/imported/小小小蝶动画(上楼梯）.gif-e25807418cec020c0cba637652cb0814.tres"]
+source_file="res://asset/art/gif/c03_小小小蝶上楼道/小小小蝶动画(上楼梯）.gif"
+dest_files=["res://.godot/imported/小小小蝶动画(上楼梯）.gif-7c54830d3c0e0c66b29238348f4df7a1.tres"]
 
 [params]
 

asset/art/gif/c03_小小小蝶上楼道/小小小蝶动画(上楼梯）/0.png.import

@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://ctk8sh3rhvmi5"
-path="res://.godot/imported/0.png-280c6b8ec93dc14dedbb83257351b4c9.ctex"
+path="res://.godot/imported/0.png-78a8d4d71fbf5571b704b881066a9461.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://asset/art/gif/c02_小小小蝶上楼道/小小小蝶动画(上楼梯）/0.png"
-dest_files=["res://.godot/imported/0.png-280c6b8ec93dc14dedbb83257351b4c9.ctex"]
+source_file="res://asset/art/gif/c03_小小小蝶上楼道/小小小蝶动画(上楼梯）/0.png"
+dest_files=["res://.godot/imported/0.png-78a8d4d71fbf5571b704b881066a9461.ctex"]
 
 [params]
 

asset/art/gif/c03_小小小蝶上楼道/小小小蝶动画(上楼梯）/1.png.import

@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://c35poyn3mxvtt"
-path="res://.godot/imported/1.png-7ab6c63804100efba39675de714f3631.ctex"
+path="res://.godot/imported/1.png-5dea8510fa6a5d57e027d80c256a265d.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://asset/art/gif/c02_小小小蝶上楼道/小小小蝶动画(上楼梯）/1.png"
-dest_files=["res://.godot/imported/1.png-7ab6c63804100efba39675de714f3631.ctex"]
+source_file="res://asset/art/gif/c03_小小小蝶上楼道/小小小蝶动画(上楼梯）/1.png"
+dest_files=["res://.godot/imported/1.png-5dea8510fa6a5d57e027d80c256a265d.ctex"]
 
 [params]
 

asset/art/gif/c03_小小小蝶上楼道/小小小蝶动画(上楼梯）/2.png.import

@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://cahlj0u5mot6v"
-path="res://.godot/imported/2.png-f8016185640963d5177cdcae59e6d2aa.ctex"
+path="res://.godot/imported/2.png-a6dbc1682dc09a621e7b6502e7ede6b7.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://asset/art/gif/c02_小小小蝶上楼道/小小小蝶动画(上楼梯）/2.png"
-dest_files=["res://.godot/imported/2.png-f8016185640963d5177cdcae59e6d2aa.ctex"]
+source_file="res://asset/art/gif/c03_小小小蝶上楼道/小小小蝶动画(上楼梯）/2.png"
+dest_files=["res://.godot/imported/2.png-a6dbc1682dc09a621e7b6502e7ede6b7.ctex"]
 
 [params]
 

asset/art/gif/c03_小小小蝶上楼道/小小小蝶动画(上楼梯）/3.png.import

@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://d2ecwhkld8u2d"
-path="res://.godot/imported/3.png-89f9595b89bed9c8264fefcf2154910d.ctex"
+path="res://.godot/imported/3.png-ba593b00fc362c726db2074dc8480b8e.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://asset/art/gif/c02_小小小蝶上楼道/小小小蝶动画(上楼梯）/3.png"
-dest_files=["res://.godot/imported/3.png-89f9595b89bed9c8264fefcf2154910d.ctex"]
+source_file="res://asset/art/gif/c03_小小小蝶上楼道/小小小蝶动画(上楼梯）/3.png"
+dest_files=["res://.godot/imported/3.png-ba593b00fc362c726db2074dc8480b8e.ctex"]
 
 [params]
 

asset/art/gif/c03_小小小蝶上楼道/小小小蝶动画(上楼梯）/4.png.import

@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://bf6wfuhcejrv1"
-path="res://.godot/imported/4.png-656f2d0e765151368f69ef973ede2433.ctex"
+path="res://.godot/imported/4.png-924871c7e42a548c3c255e57ec9793e3.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://asset/art/gif/c02_小小小蝶上楼道/小小小蝶动画(上楼梯）/4.png"
-dest_files=["res://.godot/imported/4.png-656f2d0e765151368f69ef973ede2433.ctex"]
+source_file="res://asset/art/gif/c03_小小小蝶上楼道/小小小蝶动画(上楼梯）/4.png"
+dest_files=["res://.godot/imported/4.png-924871c7e42a548c3c255e57ec9793e3.ctex"]
 
 [params]
 

asset/art/gif/c03_小小小蝶上楼道/小小小蝶动画(呼吸）.gif.import

@@ -0,0 +1,14 @@
+[remap]
+
+importer="gif.animated.texture.plugin"
+type="SpriteFrames"
+uid="uid://c8pjtla0qebwg"
+path="res://.godot/imported/小小小蝶动画(呼吸）.gif-91af45452014e2c866580755b40c9d46.tres"
+
+[deps]
+
+source_file="res://asset/art/gif/c03_小小小蝶上楼道/小小小蝶动画(呼吸）.gif"
+dest_files=["res://.godot/imported/小小小蝶动画(呼吸）.gif-91af45452014e2c866580755b40c9d46.tres"]
+
+[params]
+

asset/art/gif/c03_小小小蝶上楼道/小小小蝶动画(呼吸）/0.png.import

@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://bwykxtvdujimd"
-path="res://.godot/imported/0.png-f65f38b419076995df562d19b1f5da33.ctex"
+path="res://.godot/imported/0.png-ce4f73e5fc3d7138c070a7fd3fdc58dd.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://asset/art/gif/c02_小小小蝶上楼道/小小小蝶动画(呼吸）/0.png"
-dest_files=["res://.godot/imported/0.png-f65f38b419076995df562d19b1f5da33.ctex"]
+source_file="res://asset/art/gif/c03_小小小蝶上楼道/小小小蝶动画(呼吸）/0.png"
+dest_files=["res://.godot/imported/0.png-ce4f73e5fc3d7138c070a7fd3fdc58dd.ctex"]
 
 [params]
 

asset/art/gif/c03_小小小蝶上楼道/小小小蝶动画(呼吸）/1.png.import

@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://ddf3kd4kukuga"
-path="res://.godot/imported/1.png-d87b47f8051936634352bf201a5f2b81.ctex"
+path="res://.godot/imported/1.png-922973505b3ee75b3c06a2737ab742b6.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://asset/art/gif/c02_小小小蝶上楼道/小小小蝶动画(呼吸）/1.png"
-dest_files=["res://.godot/imported/1.png-d87b47f8051936634352bf201a5f2b81.ctex"]
+source_file="res://asset/art/gif/c03_小小小蝶上楼道/小小小蝶动画(呼吸）/1.png"
+dest_files=["res://.godot/imported/1.png-922973505b3ee75b3c06a2737ab742b6.ctex"]
 
 [params]
 

asset/art/gif/c03_小小小蝶上楼道/小小小蝶动画(呼吸）/2.png.import

@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://qn51u1b00n2v"
-path="res://.godot/imported/2.png-4bbd64cbed1ac1e3bf7d18eb3beaea4c.ctex"
+path="res://.godot/imported/2.png-77da9ed3eee1ae3b92eafe91b404bdab.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://asset/art/gif/c02_小小小蝶上楼道/小小小蝶动画(呼吸）/2.png"
-dest_files=["res://.godot/imported/2.png-4bbd64cbed1ac1e3bf7d18eb3beaea4c.ctex"]
+source_file="res://asset/art/gif/c03_小小小蝶上楼道/小小小蝶动画(呼吸）/2.png"
+dest_files=["res://.godot/imported/2.png-77da9ed3eee1ae3b92eafe91b404bdab.ctex"]
 
 [params]
 

asset/art/gif/c03_小小小蝶上楼道/小小小蝶动画(呼吸）/3.png.import

@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://n30xu12f6pcw"
-path="res://.godot/imported/3.png-74ebeaabfca9906ba6c84ca7c99f498f.ctex"
+path="res://.godot/imported/3.png-78b50785190630462b5c83bcee1ebf43.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://asset/art/gif/c02_小小小蝶上楼道/小小小蝶动画(呼吸）/3.png"
-dest_files=["res://.godot/imported/3.png-74ebeaabfca9906ba6c84ca7c99f498f.ctex"]
+source_file="res://asset/art/gif/c03_小小小蝶上楼道/小小小蝶动画(呼吸）/3.png"
+dest_files=["res://.godot/imported/3.png-78b50785190630462b5c83bcee1ebf43.ctex"]
 
 [params]
 

asset/art/gif/c03_小小小蝶上楼道/小小小蝶动画(往前走）.gif.import

@@ -3,12 +3,12 @@
 importer="gif.animated.texture.plugin"
 type="SpriteFrames"
 uid="uid://b3y8bhdt3flfb"
-path="res://.godot/imported/小小小蝶动画(往前走）.gif-631dc6a575bbb6de5470b8aa8a0adc28.tres"
+path="res://.godot/imported/小小小蝶动画(往前走）.gif-52f373bd454008ca93aeabe897321504.tres"
 
 [deps]
 
-source_file="res://asset/art/gif/c02_小小小蝶上楼道/小小小蝶动画(往前走）.gif"
-dest_files=["res://.godot/imported/小小小蝶动画(往前走）.gif-631dc6a575bbb6de5470b8aa8a0adc28.tres"]
+source_file="res://asset/art/gif/c03_小小小蝶上楼道/小小小蝶动画(往前走）.gif"
+dest_files=["res://.godot/imported/小小小蝶动画(往前走）.gif-52f373bd454008ca93aeabe897321504.tres"]
 
 [params]
 

asset/art/gif/c03_小小小蝶上楼道/小小小蝶动画(往前走）/0.png.import

@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://djwxl1tebi5x"
-path="res://.godot/imported/0.png-0a7318ccbd16d7ea3172f8b612b185ef.ctex"
+path="res://.godot/imported/0.png-724d8608d9000f7b9f0048d54eab217a.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://asset/art/gif/c02_小小小蝶上楼道/小小小蝶动画(往前走）/0.png"
-dest_files=["res://.godot/imported/0.png-0a7318ccbd16d7ea3172f8b612b185ef.ctex"]
+source_file="res://asset/art/gif/c03_小小小蝶上楼道/小小小蝶动画(往前走）/0.png"
+dest_files=["res://.godot/imported/0.png-724d8608d9000f7b9f0048d54eab217a.ctex"]
 
 [params]
 

asset/art/gif/c03_小小小蝶上楼道/小小小蝶动画(往前走）/1.png.import

@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://1uk6oj7c1pc0"
-path="res://.godot/imported/1.png-856d6d2e6a5a41068c09603784cd0791.ctex"
+path="res://.godot/imported/1.png-dfbf3a73dd48e58138834c0bd419a378.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://asset/art/gif/c02_小小小蝶上楼道/小小小蝶动画(往前走）/1.png"
-dest_files=["res://.godot/imported/1.png-856d6d2e6a5a41068c09603784cd0791.ctex"]
+source_file="res://asset/art/gif/c03_小小小蝶上楼道/小小小蝶动画(往前走）/1.png"
+dest_files=["res://.godot/imported/1.png-dfbf3a73dd48e58138834c0bd419a378.ctex"]
 
 [params]
 

asset/art/gif/c03_小小小蝶上楼道/小小小蝶动画(跑）.gif.import

@@ -3,12 +3,12 @@
 importer="gif.animated.texture.plugin"
 type="SpriteFrames"
 uid="uid://kqlt5uewnedw"
-path="res://.godot/imported/小小小蝶动画(跑）.gif-8187384629b831ee77fb0baa2444db8c.tres"
+path="res://.godot/imported/小小小蝶动画(跑）.gif-1dd387a332e9d39dc933f234758b5e53.tres"
 
 [deps]
 
-source_file="res://asset/art/gif/c02_小小小蝶上楼道/小小小蝶动画(跑）.gif"
-dest_files=["res://.godot/imported/小小小蝶动画(跑）.gif-8187384629b831ee77fb0baa2444db8c.tres"]
+source_file="res://asset/art/gif/c03_小小小蝶上楼道/小小小蝶动画(跑）.gif"
+dest_files=["res://.godot/imported/小小小蝶动画(跑）.gif-1dd387a332e9d39dc933f234758b5e53.tres"]
 
 [params]
 

asset/art/gif/c03_小小小蝶上楼道/小小小蝶动画(跑）/0.png.import

@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://bsclq0o3gtr3i"
-path="res://.godot/imported/0.png-942e48f581edda967c90035f044eff7c.ctex"
+path="res://.godot/imported/0.png-60280c8fd45952e7df9b96e291860ffe.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://asset/art/gif/c02_小小小蝶上楼道/小小小蝶动画(跑）/0.png"
-dest_files=["res://.godot/imported/0.png-942e48f581edda967c90035f044eff7c.ctex"]
+source_file="res://asset/art/gif/c03_小小小蝶上楼道/小小小蝶动画(跑）/0.png"
+dest_files=["res://.godot/imported/0.png-60280c8fd45952e7df9b96e291860ffe.ctex"]
 
 [params]
 

asset/art/gif/c03_小小小蝶上楼道/小小小蝶动画(跑）/1.png.import

@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://c6rdik24wvgw5"
-path="res://.godot/imported/1.png-579cae55ea60ea7e1be2749288c6d3ca.ctex"
+path="res://.godot/imported/1.png-d01feb083416d9768ff23ec7d63ba562.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://asset/art/gif/c02_小小小蝶上楼道/小小小蝶动画(跑）/1.png"
-dest_files=["res://.godot/imported/1.png-579cae55ea60ea7e1be2749288c6d3ca.ctex"]
+source_file="res://asset/art/gif/c03_小小小蝶上楼道/小小小蝶动画(跑）/1.png"
+dest_files=["res://.godot/imported/1.png-d01feb083416d9768ff23ec7d63ba562.ctex"]
 
 [params]
 

asset/art/gif/c03_小小小蝶上楼道/小小小蝶动画(跑）/2.png.import

@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://c5a5lj527f0kp"
-path="res://.godot/imported/2.png-8552dd978856ffac2bd79b8d09ac2230.ctex"
+path="res://.godot/imported/2.png-b6372c9fb49112edff670bf4484c2373.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://asset/art/gif/c02_小小小蝶上楼道/小小小蝶动画(跑）/2.png"
-dest_files=["res://.godot/imported/2.png-8552dd978856ffac2bd79b8d09ac2230.ctex"]
+source_file="res://asset/art/gif/c03_小小小蝶上楼道/小小小蝶动画(跑）/2.png"
+dest_files=["res://.godot/imported/2.png-b6372c9fb49112edff670bf4484c2373.ctex"]
 
 [params]
 

asset/art/gif/c03_小小小蝶上楼道/小小小蝶动画(跑）/3.png.import

@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://cwq8t3q80x0du"
-path="res://.godot/imported/3.png-abe1ef137864dddf5a3fc09b43a8a06a.ctex"
+path="res://.godot/imported/3.png-8ffb7363131c44fd5f1a8e2d740ec584.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://asset/art/gif/c02_小小小蝶上楼道/小小小蝶动画(跑）/3.png"
-dest_files=["res://.godot/imported/3.png-abe1ef137864dddf5a3fc09b43a8a06a.ctex"]
+source_file="res://asset/art/gif/c03_小小小蝶上楼道/小小小蝶动画(跑）/3.png"
+dest_files=["res://.godot/imported/3.png-8ffb7363131c44fd5f1a8e2d740ec584.ctex"]
 
 [params]
 

asset/art/scene/c02/s03_公寓一楼院子/李氏癞子窗户/李氏癞子窗户人影.png.import

@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://bcji0qu0u6yo0"
-path="res://.godot/imported/李氏癞子窗户人影.png-225c83f96acd2d48c1b60168d23c3ae6.ctex"
+path="res://.godot/imported/李氏癞子窗户人影.png-23d48327b9ff49e713f20464c893d0cd.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://asset/art/临时草稿/c02_第一章/李氏癞子窗户人影.png"
-dest_files=["res://.godot/imported/李氏癞子窗户人影.png-225c83f96acd2d48c1b60168d23c3ae6.ctex"]
+source_file="res://asset/art/scene/c02/s03_公寓一楼院子/李氏癞子窗户/李氏癞子窗户人影.png"
+dest_files=["res://.godot/imported/李氏癞子窗户人影.png-23d48327b9ff49e713f20464c893d0cd.ctex"]
 
 [params]
 

asset/art/scene/c02/s03_公寓一楼院子/李氏癞子窗户/李氏癞子窗户人影2.png.import

@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://cq65jye47jbxw"
-path="res://.godot/imported/李氏癞子窗户人影2.png-7a5e5ea478bc64e4ce89949ea0f3ddcf.ctex"
+path="res://.godot/imported/李氏癞子窗户人影2.png-be7770aecc6d0bbc49f4fd1ec0abf8f3.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://asset/art/临时草稿/c02_第一章/李氏癞子窗户人影2.png"
-dest_files=["res://.godot/imported/李氏癞子窗户人影2.png-7a5e5ea478bc64e4ce89949ea0f3ddcf.ctex"]
+source_file="res://asset/art/scene/c02/s03_公寓一楼院子/李氏癞子窗户/李氏癞子窗户人影2.png"
+dest_files=["res://.godot/imported/李氏癞子窗户人影2.png-be7770aecc6d0bbc49f4fd1ec0abf8f3.ctex"]
 
 [params]
 

asset/art/ui/style_box/ui_gallery_item_panel.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://ioq21bstunce"
-path="res://.godot/imported/ui_gallery_item_panel.png-436b9727ead8707f0d5503398ff1048d.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://asset/art/ui/style_box/ui_gallery_item_panel.png"
-dest_files=["res://.godot/imported/ui_gallery_item_panel.png-436b9727ead8707f0d5503398ff1048d.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

asset/art/临时草稿/c02_第一章/三霸凌男孩.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://b0jstdieefev5"
-path="res://.godot/imported/三霸凌男孩.png-cc248d72f02096b8555371df2bfc1ca5.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://asset/art/临时草稿/c02_第一章/三霸凌男孩.png"
-dest_files=["res://.godot/imported/三霸凌男孩.png-cc248d72f02096b8555371df2bfc1ca5.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

asset/art/临时草稿/c02_第一章/小婵被霸凌.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://bu4sa63wecdh4"
-path="res://.godot/imported/小婵被霸凌.png-2e23526c1d3a4388c282e736dbad4d57.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://asset/art/临时草稿/c02_第一章/小婵被霸凌.png"
-dest_files=["res://.godot/imported/小婵被霸凌.png-2e23526c1d3a4388c282e736dbad4d57.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

asset/art/临时草稿/c02_第一章/小婵静态.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://b78nkbg8t5an5"
-path="res://.godot/imported/小婵静态.png-8c4792a1e8c542e5872afcc24965055e.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://asset/art/临时草稿/c02_第一章/小婵静态.png"
-dest_files=["res://.godot/imported/小婵静态.png-8c4792a1e8c542e5872afcc24965055e.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

asset/art/临时草稿/c02_第一章/小床上.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://d3hhfnnsiyxp"
-path="res://.godot/imported/小床上.png-8ada24920d5590cb88132938584ffd74.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://asset/art/临时草稿/c02_第一章/小床上.png"
-dest_files=["res://.godot/imported/小床上.png-8ada24920d5590cb88132938584ffd74.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

asset/art/临时草稿/c02_第一章/疯子看井.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://c7lrjyytehe5u"
-path="res://.godot/imported/疯子看井.png-00cedd25199bc5ba39920be675dd18c7.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://asset/art/临时草稿/c02_第一章/疯子看井.png"
-dest_files=["res://.godot/imported/疯子看井.png-00cedd25199bc5ba39920be675dd18c7.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

asset/art/临时草稿/c02_第一章/瞎子静态.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://clte7w3245gk5"
-path="res://.godot/imported/瞎子静态.png-439a7c3752a4d3433fc438d9485ddad3.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://asset/art/临时草稿/c02_第一章/瞎子静态.png"
-dest_files=["res://.godot/imported/瞎子静态.png-439a7c3752a4d3433fc438d9485ddad3.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

asset/art/临时草稿/c02_第一章/老鼠衔大洋.gif.import

@@ -1,14 +0,0 @@
-[remap]
-
-importer="gif.animated.texture.plugin"
-type="SpriteFrames"
-uid="uid://ba4wyywjb6epi"
-path="res://.godot/imported/老鼠衔大洋.gif-1ec77811c3ce35d20cd2a849ba3a0b96.tres"
-
-[deps]
-
-source_file="res://asset/art/临时草稿/c02_第一章/老鼠衔大洋.gif"
-dest_files=["res://.godot/imported/老鼠衔大洋.gif-1ec77811c3ce35d20cd2a849ba3a0b96.tres"]
-
-[params]
-

asset/art/临时草稿/c02_第一章/老鼠衔大洋进洞.gif.import

@@ -1,14 +0,0 @@
-[remap]
-
-importer="gif.animated.texture.plugin"
-type="SpriteFrames"
-uid="uid://b78xbw32pkjij"
-path="res://.godot/imported/老鼠衔大洋进洞.gif-f9efb485e8eaef324c0aa4de001f1fd3.tres"
-
-[deps]
-
-source_file="res://asset/art/临时草稿/c02_第一章/老鼠衔大洋进洞.gif"
-dest_files=["res://.godot/imported/老鼠衔大洋进洞.gif-f9efb485e8eaef324c0aa4de001f1fd3.tres"]
-
-[params]
-

asset/art/临时草稿/c02_第一章/胖子静态.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://btlqxqq2b47i7"
-path="res://.godot/imported/胖子静态.png-3f2a70dfcaff02f96091bf2e0b334077.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://asset/art/临时草稿/c02_第一章/胖子静态.png"
-dest_files=["res://.godot/imported/胖子静态.png-3f2a70dfcaff02f96091bf2e0b334077.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

asset/art/临时草稿/瞎子小蝉谈话.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://b2o75ahjqq0yg"
-path="res://.godot/imported/瞎子小蝉谈话.png-18cc9b9e5616131e71c94befc285be8b.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://asset/art/临时草稿/瞎子小蝉谈话.png"
-dest_files=["res://.godot/imported/瞎子小蝉谈话.png-18cc9b9e5616131e71c94befc285be8b.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

asset/art/临时草稿/瞎子撞墙.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://c1v037jxxkt31"
-path="res://.godot/imported/瞎子撞墙.png-148ead1672dcad5516c6f58bf0363f8b.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://asset/art/临时草稿/瞎子撞墙.png"
-dest_files=["res://.godot/imported/瞎子撞墙.png-148ead1672dcad5516c6f58bf0363f8b.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

asset/dialogue/item_description.csv

@@ -20,8 +20,8 @@ setting_窗口置顶,窗口置顶,,,,,Top Window
 setting_自动保存,自动保存,,,,,Auto Save
 setting_主界面,回到主界面,,,,,Back to Menu
 setting_退出,保存并退出,,,,,Save & Exit
-setting_日志,打开日志,,,,,Open the Log
-setting_画册,打开画册,,,,,
+setting_日志,日志（B）,,,,,Open the Log
+setting_画册,画册（G）,,,,,
 ui_秒,秒,,,,,S
 ui_saved_all,已保存所有数据,,,,,All the data have been saved
 ui_new_archive,已创建新存档,,,,,A new archive has been created
@@ -133,3 +133,5 @@ c02_瞎子卧室_十字架,院长房间里也有一个类似的十字架。,,,,,
 c02_火灾等待准备,还没准备好点火呢,,,,,
 c02_霸凌救小蝉开始,啊！我得赶紧想办法救小蝉...,,,,,
 c02_点火前阻止右移,没时间浪费了！想想办法救出小蝉...,,,,,
+g_偷听对话,偷听对话,,,,,
+g_疯子看井,疯子看井,,,,,

asset/dialogue/item_description.dialogue

@@ -13,8 +13,8 @@
 自动保存[ID:setting_自动保存]
 回到主界面[ID:setting_主界面]
 保存并退出[ID:setting_退出]
-打开日志[ID:setting_日志]
-打开画册[ID:setting_画册]
+日志（B）[ID:setting_日志]
+画册（G）[ID:setting_画册]
 秒 [ID:ui_秒]
 
 已保存所有数据 [ID:ui_saved_all]
@@ -179,5 +179,9 @@
 还没准备好点火呢 [ID:c02_火灾等待准备]
 啊！我得赶紧想办法救小蝉... [ID:c02_霸凌救小蝉开始]
 没时间浪费了！想想办法救出小蝉... [ID:c02_点火前阻止右移]
-
+=> END
+
+~ Gallery
+偷听对话[ID:g_偷听对话]
+疯子看井[ID:g_疯子看井]
 => END

asset/shader/palette/herbs-n-spices-1x.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dhfixmnq68383"
+path="res://.godot/imported/herbs-n-spices-1x.png-9ead520769a5a3cdb4a0f1102f850857.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://asset/shader/palette/herbs-n-spices-1x.png"
+dest_files=["res://.godot/imported/herbs-n-spices-1x.png-9ead520769a5a3cdb4a0f1102f850857.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

asset/shader/palette/purplemorning8-1x.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dk1h6bg7k2bkt"
+path="res://.godot/imported/purplemorning8-1x.png-e5300369b2629a78391ad80e25c96885.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://asset/shader/palette/purplemorning8-1x.png"
+dest_files=["res://.godot/imported/purplemorning8-1x.png-e5300369b2629a78391ad80e25c96885.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

asset/shader/palette/walking-in-the-woods-8-1x.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dlolehjaaxx7d"
+path="res://.godot/imported/walking-in-the-woods-8-1x.png-5e16ad65cbc37b8fb0afd3e7ff0954c1.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://asset/shader/palette/walking-in-the-woods-8-1x.png"
+dest_files=["res://.godot/imported/walking-in-the-woods-8-1x.png-5e16ad65cbc37b8fb0afd3e7ff0954c1.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

asset/shader/palette/warm-summer-1x.png.import

@@ -2,16 +2,16 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://bsy6yo1ilg6m3"
-path="res://.godot/imported/大洋.png-2a816a6cae3fd991c9ab0c44991f3f52.ctex"
+uid="uid://c2fs06jvtupi7"
+path="res://.godot/imported/warm-summer-1x.png-dfe18bdfe832ca51c057d663c42b8b1a.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://asset/art/临时草稿/c02_第一章/大洋.png"
-dest_files=["res://.godot/imported/大洋.png-2a816a6cae3fd991c9ab0c44991f3f52.ctex"]
+source_file="res://asset/shader/palette/warm-summer-1x.png"
+dest_files=["res://.godot/imported/warm-summer-1x.png-dfe18bdfe832ca51c057d663c42b8b1a.ctex"]
 
 [params]
 

manager/archive_manager/archive_manager.gd

@@ -44,14 +44,10 @@ func _notification(what):
 	# handle window close request
 	if what == NOTIFICATION_WM_CLOSE_REQUEST:
 		save_all()
-		if has_node("/root/Main"):
-			print("Saved all success before Quit")
-			# 已保存所有数据 [ID:ui_saved_all]
-			SceneManager.pop_notification(tr("ui_saved_all"))
-			var tree = get_tree()
-			tree.create_timer(1.5).timeout.connect(tree.quit)
-		else:
-			get_tree().quit()
+		print("Saved all success before Quit")
+		# 已保存所有数据 [ID:ui_saved_all]
+		SceneManager.pop_notification(tr("ui_saved_all"))
+		SceneManager.quit_game()
 
 
 func _on_archive_id_changed():

manager/scene/scene_manager.gd

@@ -240,10 +240,6 @@ func pop_notification(msg: String, number := 1) -> void:
 	var notification_node = get_node_or_null("/root/Main/UILayer/Notification")
 	if notification_node:
 		notification_node.show_notification(msg, number)
-	elif GlobalConfig.DEBUG:
-		# debug 模式，新建一个
-		var n = _create_debug_notification()
-		n.call_deferred("show_notification", msg, number)
 	else:
 		printerr("pop_notification: Notification node not found")
 
@@ -252,10 +248,6 @@ func pop_center_notification(msg: String) -> void:
 	var notification_node = get_node_or_null("/root/Main/UILayer/Notification")
 	if notification_node:
 		notification_node.show_center_notification(msg)
-	elif GlobalConfig.DEBUG:
-		# debug 模式，新建一个
-		var n = _create_debug_notification()
-		n.call_deferred("show_center_notification", msg)
 	else:
 		printerr("pop_center_notification: Notification node not found")
 
@@ -264,29 +256,10 @@ func pop_center_texture(texture: Texture2D, duration := 3.5) -> void:
 	var notification_node = get_node_or_null("/root/Main/UILayer/Notification")
 	if notification_node:
 		notification_node.show_center_texture(texture, duration)
-	elif GlobalConfig.DEBUG:
-		# debug 模式，新建一个
-		var n = _create_debug_notification()
-		n.call_deferred("show_center_texture", texture)
 	else:
 		printerr("pop_center_texture: Notification node not found")
 
 
-# debug 模式，新建一个 notification node
-func _create_debug_notification() -> Notification:
-	if not GlobalConfig.DEBUG:
-		return null
-	var main = get_node_or_null("/root/Main")
-	if not main:
-		main = Control.new()
-		main.set_anchors_preset(Control.PRESET_FULL_RECT)
-		main.name = "Main"
-		get_tree().root.call_deferred("add_child", main)
-	var n = preload("res://scene/notification/notification.tscn").instantiate()
-	main.add_child(n)
-	return n
-
-
 func pop_dialog(
 	character: String,
 	content: String,
@@ -314,11 +287,14 @@ func get_inspector() -> PropInspector:
 
 
 func checkout_index_page(transition := true):
+	# 保存后，渐隐切换场景
 	ArchiveManager.save_all()
 	if transition:
 		var ground = get_ground()
 		if ground:
 			var tween = create_tween()
+			if GlobalConfig.DEBUG:
+				print("transition to index page")
 			tween.tween_property(ground, "modulate:a", 0.0, 1.0)
 			tween.tween_callback(_jump_back_to_index_and_quit_main)
 		else:
@@ -340,9 +316,9 @@ func _jump_back_to_index_and_quit_main():
 # 问题出现在 Ground 中 	get_node("/root").add_child(main)
 # 需要再指定 current_scene: get_tree().current_scene = main
 	get_tree().change_scene_to_packed(packed_index_page)
-	# var main = get_node_or_null("/root/Main")
-	# if main:
-	# 	main.queue_free()
+	# 防止游戏卡死 reset pause counter
+	pause_counter = 0
+	get_tree().paused = false
 
 
 var prop_bag_scene = preload("res://scene/prop/prop_bag.tscn")
@@ -359,9 +335,33 @@ func show_gallery():
 	get_tree().current_scene.add_child(gallery_scene.instantiate())
 
 
+var settings_scene = preload("uid://beok2r6fgburn")
+
+
+func show_settings():
+	get_tree().current_scene.add_child(settings_scene.instantiate())
+
+
+#### 游戏场景树暂停计数器，设置、gallery、bag 等菜单都会导致 pause
+var pause_counter := 0
+
+
+func toggle_pause_counter(plus := true):
+	pause_counter += 1 if plus else -1
+	get_tree().paused = pause_counter > 0
+
+
 func quit_game():
 	ArchiveManager.save_all()
-	get_tree().quit()
+	var ground = get_ground()
+	if ground:
+		var tween = create_tween()
+		if GlobalConfig.DEBUG:
+			print("quit_game with transition")
+		tween.tween_property(ground, "modulate:a", 0.0, 1.5)
+		tween.tween_callback(get_tree().quit)
+	else:
+		get_tree().quit()
 
 
 ###### Effects

scene/dialog/balloon.gd

@@ -195,8 +195,8 @@ func apply_dialogue_line() -> void:
 	elif audio_stream_player.playing:
 		audio_stream_player.stop()
 
-	if dialogue_label.is_typing:
-		await dialogue_label.finished_typing
+	# if dialogue_label.is_typing:
+	# 	await dialogue_label.finished_typing
 	if audio_stream_player.playing:
 		await audio_stream_player.finished
 

scene/gallery/clips/clip1.gd

@@ -1,28 +1,25 @@
 extends Node2D
 
+# 发送此信号会重载当前 clip（重置所有进度，自动退出 display 状态）
 signal display_finished
 
 var dialogue_c02 = preload("res://asset/dialogue/c02.dialogue")
 
 
-# 在展示界面使用
-func toggle_card(start := true):
-	if start:
-		$ProPlayer.play("c00_吕萍_蹲下")
-		$"李氏赖子房间人影".play()
-	else:
-		$ProPlayer.stop()
-		$"李氏赖子房间人影".stop()
+# card_mode 卡片模式 / 完整模式
+func run_clip(card_mode: bool):
+	$ProPlayer.play("c00_吕萍_蹲下")
+	$"李氏赖子房间人影".play()
+	if not card_mode:
+		# 增加配音
+		dialog_node = DialogueManager.show_dialogue_balloon(dialogue_c02, "c02_04_李氏癞子")
+		dialog_node.process_mode = Node.PROCESS_MODE_ALWAYS
+		await DialogueManager.dialogue_ended
+		display_finished.emit()
+
 
 var dialog_node
 
-# 全屏展示
-func display():
-	toggle_card(true)
-	# 增加配音
-	dialog_node = DialogueManager.show_dialogue_balloon(dialogue_c02, "c02_04_李氏癞子")
-	await DialogueManager.dialogue_ended
-	display_finished.emit()
 
 func _exit_tree() -> void:
 	if is_instance_valid(dialog_node):

scene/gallery/clips/clip1_偷听.tscn

@@ -1,11 +1,17 @@
-[gd_scene load_steps=9 format=3 uid="uid://ckd26q67hm7j0"]
+[gd_scene load_steps=12 format=3 uid="uid://ckd26q67hm7j0"]
 
 [ext_resource type="Script" uid="uid://cykq6mvsahrog" path="res://scene/gallery/clips/clip1.gd" id="1_kxumr"]
 [ext_resource type="Texture2D" uid="uid://b3odt4ojsvu5n" path="res://asset/art/scene/c02/s03_公寓一楼院子/bg_一楼.png" id="2_qjtsy"]
+[ext_resource type="Shader" uid="uid://cwuxtdwmhahhp" path="res://asset/shader/palette.gdshader" id="2_t5ghu"]
+[ext_resource type="Texture2D" uid="uid://c2fs06jvtupi7" path="res://asset/shader/palette/warm-summer-1x.png" id="3_5a5os"]
 [ext_resource type="PackedScene" uid="uid://b50n0hvs4yh75" path="res://addons/property-inspector/pro_animation_sprite2d/pro_animated_sprite.tscn" id="3_iqsgx"]
-[ext_resource type="Texture2D" uid="uid://bcji0qu0u6yo0" path="res://asset/art/临时草稿/c02_第一章/李氏癞子窗户人影.png" id="3_k1g1m"]
+[ext_resource type="Texture2D" uid="uid://bcji0qu0u6yo0" path="res://asset/art/scene/c02/s03_公寓一楼院子/李氏癞子窗户/李氏癞子窗户人影.png" id="3_k1g1m"]
 [ext_resource type="SpriteFrames" uid="uid://b7fhheih1hbvf" path="res://config/animation/entity_sprite_frames.tres" id="4_8fisa"]
-[ext_resource type="Texture2D" uid="uid://cq65jye47jbxw" path="res://asset/art/临时草稿/c02_第一章/李氏癞子窗户人影2.png" id="4_o3rxb"]
+[ext_resource type="Texture2D" uid="uid://cq65jye47jbxw" path="res://asset/art/scene/c02/s03_公寓一楼院子/李氏癞子窗户/李氏癞子窗户人影2.png" id="4_o3rxb"]
+
+[sub_resource type="ShaderMaterial" id="ShaderMaterial_mu1jh"]
+shader = ExtResource("2_t5ghu")
+shader_parameter/palette = ExtResource("3_5a5os")
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_iqsgx"]
 atlas = ExtResource("2_qjtsy")
@@ -40,22 +46,48 @@ animations = [{
 [node name="Clip1" type="Node2D"]
 script = ExtResource("1_kxumr")
 
-[node name="Frame" type="Node2D" parent="."]
+[node name="Frame" type="Control" parent="."]
 z_index = 100
+custom_minimum_size = Vector2(564, 316)
+layout_mode = 3
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+offset_right = 564.0
+offset_bottom = 316.0
+grow_horizontal = 2
+grow_vertical = 2
+mouse_filter = 2
+
+[node name="PaletteShading" type="Panel" parent="Frame"]
+z_index = 200
+material = SubResource("ShaderMaterial_mu1jh")
+layout_mode = 2
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+mouse_filter = 2
 
 [node name="ColorRect" type="ColorRect" parent="Frame"]
+z_index = 200
 custom_minimum_size = Vector2(564, 38)
+layout_mode = 2
 offset_right = 564.0
 offset_bottom = 38.0
 size_flags_vertical = 0
+mouse_filter = 2
 color = Color(0, 0, 0, 1)
 
 [node name="ColorRect2" type="ColorRect" parent="Frame"]
+z_index = 200
 custom_minimum_size = Vector2(564, 38)
+layout_mode = 2
 offset_top = 278.0
 offset_right = 564.0
 offset_bottom = 316.0
 size_flags_vertical = 8
+mouse_filter = 2
 color = Color(0, 0, 0, 1)
 
 [node name="BG" type="Sprite2D" parent="."]

scene/gallery/clips/clip2.gd

@@ -0,0 +1,28 @@
+extends Node2D
+
+# 发送此信号会重载当前 clip（重置所有进度，自动退出 display 状态）
+signal display_finished
+
+
+# card_mode 卡片模式 / 完整模式
+func run_clip(card_mode: bool):
+	$ProPlayer.play("c00_吕萍_walking_right")
+	var tween = create_tween()
+	tween.tween_interval(5.0)
+	tween.tween_property($"井", "modulate:a", 1.0, 5.0)
+	if not card_mode:
+		await get_tree().create_timer(3.0).timeout
+		# 增加配音
+		dialog_node = DialogueManager.show_dialogue_balloon(dialogue_res, "c02_s11_井边疯子对话")
+		dialog_node.process_mode = Node.PROCESS_MODE_ALWAYS
+		await DialogueManager.dialogue_ended
+		display_finished.emit()
+
+
+var dialogue_res = preload("res://asset/dialogue/npc.dialogue")
+var dialog_node
+
+
+func _exit_tree() -> void:
+	if is_instance_valid(dialog_node):
+		dialog_node.queue_free()

scene/gallery/clips/clip2.gd.uid

@@ -0,0 +1 @@
+uid://b72o7pitx4dst

scene/gallery/clips/clip2_疯子看井.tscn

@@ -0,0 +1,155 @@
+[gd_scene load_steps=14 format=3 uid="uid://da4rposvvqo3d"]
+
+[ext_resource type="Script" uid="uid://b72o7pitx4dst" path="res://scene/gallery/clips/clip2.gd" id="1_3cva3"]
+[ext_resource type="Shader" uid="uid://cwuxtdwmhahhp" path="res://asset/shader/palette.gdshader" id="2_c3umb"]
+[ext_resource type="Texture2D" uid="uid://dk1h6bg7k2bkt" path="res://asset/shader/palette/purplemorning8-1x.png" id="3_2w0uy"]
+[ext_resource type="Texture2D" uid="uid://b3odt4ojsvu5n" path="res://asset/art/scene/c02/s03_公寓一楼院子/bg_一楼.png" id="4_dagyf"]
+[ext_resource type="PackedScene" uid="uid://b50n0hvs4yh75" path="res://addons/property-inspector/pro_animation_sprite2d/pro_animated_sprite.tscn" id="5_sw8ne"]
+[ext_resource type="SpriteFrames" uid="uid://b7fhheih1hbvf" path="res://config/animation/entity_sprite_frames.tres" id="6_3quw6"]
+[ext_resource type="SpriteFrames" uid="uid://3nas025c2c5u" path="res://asset/art/gif/c02_杂项/c02_杂项_frames.tres" id="7_8wktg"]
+
+[sub_resource type="ShaderMaterial" id="ShaderMaterial_h76ar"]
+shader = ExtResource("2_c3umb")
+shader_parameter/palette = ExtResource("3_2w0uy")
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_iqsgx"]
+atlas = ExtResource("4_dagyf")
+region = Rect2(1670, 0, 600, 240)
+
+[sub_resource type="Gradient" id="Gradient_em2ma"]
+offsets = PackedFloat32Array(0.00928382, 0.681698, 1)
+colors = PackedColorArray(1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0)
+
+[sub_resource type="GradientTexture2D" id="GradientTexture2D_3cva3"]
+gradient = SubResource("Gradient_em2ma")
+width = 500
+height = 1000
+fill = 1
+fill_from = Vector2(0.5, 0.495726)
+fill_to = Vector2(1, 1)
+
+[sub_resource type="Gradient" id="Gradient_tkhcj"]
+offsets = PackedFloat32Array(0, 0.330239, 0.667109)
+colors = PackedColorArray(1, 1, 1, 1, 1, 1, 1, 0.470588, 1, 1, 1, 0)
+
+[sub_resource type="GradientTexture2D" id="GradientTexture2D_twvyd"]
+gradient = SubResource("Gradient_tkhcj")
+width = 361
+height = 930
+fill = 1
+fill_from = Vector2(0.414092, 0.722222)
+fill_to = Vector2(1, 1)
+
+[node name="Clip2" type="Node2D"]
+script = ExtResource("1_3cva3")
+
+[node name="Frame" type="Control" parent="."]
+z_index = 100
+custom_minimum_size = Vector2(564, 316)
+layout_mode = 3
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+offset_right = 564.0
+offset_bottom = 316.0
+grow_horizontal = 2
+grow_vertical = 2
+mouse_filter = 2
+
+[node name="PaletteShading" type="Panel" parent="Frame"]
+visible = false
+z_index = 200
+material = SubResource("ShaderMaterial_h76ar")
+layout_mode = 2
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+mouse_filter = 2
+
+[node name="ColorRect" type="ColorRect" parent="Frame"]
+z_index = 200
+custom_minimum_size = Vector2(564, 38)
+layout_mode = 2
+offset_right = 564.0
+offset_bottom = 38.0
+size_flags_vertical = 0
+mouse_filter = 2
+color = Color(0, 0, 0, 1)
+
+[node name="ColorRect2" type="ColorRect" parent="Frame"]
+z_index = 200
+custom_minimum_size = Vector2(564, 38)
+layout_mode = 2
+offset_top = 278.0
+offset_right = 564.0
+offset_bottom = 316.0
+size_flags_vertical = 8
+mouse_filter = 2
+color = Color(0, 0, 0, 1)
+
+[node name="BG" type="Sprite2D" parent="."]
+light_mask = 5
+position = Vector2(-3, 38)
+texture = SubResource("AtlasTexture_iqsgx")
+centered = false
+
+[node name="ProPlayer" parent="." instance=ExtResource("5_sw8ne")]
+light_mask = 5
+position = Vector2(188, 204)
+scale = Vector2(0.5, 0.5)
+sprite_frames = ExtResource("6_3quw6")
+animation = &"c00_吕萍_idle_right"
+autoplay = "c00_吕萍_idle_right"
+move_configs = Array[Dictionary]([{
+"animation": "c00_吕萍_walking_right",
+"animation_next": "c00_吕萍_idle_right",
+"duration": 1e+07,
+"movement_x": 100.0,
+"velocity": Vector2(65, 0)
+}])
+debug_mov_animation = "c00_吕萍_walking_right"
+
+[node name="Pro疯子" parent="." instance=ExtResource("5_sw8ne")]
+light_mask = 5
+position = Vector2(348.942, 156.718)
+sprite_frames = ExtResource("7_8wktg")
+animation = &"疯子看井"
+autoplay = "疯子看井"
+offset = Vector2(0, 67)
+
+[node name="PointLight2D" type="PointLight2D" parent="."]
+position = Vector2(495.942, 123.718)
+rotation = 0.496352
+energy = 1.2
+range_item_cull_mask = 4
+texture = SubResource("GradientTexture2D_3cva3")
+
+[node name="井" type="AnimatedSprite2D" parent="."]
+modulate = Color(1, 1, 1, 0)
+z_index = 100
+position = Vector2(284, 158)
+scale = Vector2(1.3, 1.3)
+sprite_frames = ExtResource("7_8wktg")
+animation = &"水井特写"
+autoplay = "水井特写"
+frame_progress = 0.649972
+
+[node name="PointLight2D" type="PointLight2D" parent="井"]
+position = Vector2(143.077, -84.6154)
+rotation = 0.494425
+scale = Vector2(0.769231, 0.769231)
+energy = 3.0
+range_layer_min = 5
+range_layer_max = 5
+texture = SubResource("GradientTexture2D_twvyd")
+texture_scale = 1.5
+height = 10.0
+
+[node name="DirectionalLight2D" type="DirectionalLight2D" parent="井"]
+position = Vector2(-217.692, -111.538)
+scale = Vector2(0.769231, 0.769231)
+energy = 0.4
+blend_mode = 1
+range_layer_min = 5
+range_layer_max = 5

scene/gallery/clips/clip_template.gd

@@ -1,13 +1,19 @@
 extends Node2D
 
-
+# 发送此信号会重载当前 clip（重置所有进度，自动退出 display 状态）
 signal display_finished
 
-# 
-# 在展示界面使用
-func toggle_card(start := true):
-	pass
+
+# card_mode 卡片模式 / 完整模式
+func run_clip(card_mode: bool):
+	if card_mode:
+		return
+	display_finished.emit()
+
+var dialogue_res = preload("res://asset/dialogue/npc.dialogue")
+var dialog_node
 
 
-func toggle_display(display := true):
-	pass
+func _exit_tree() -> void:
+	if is_instance_valid(dialog_node):
+		dialog_node.queue_free()

scene/gallery/clips/clip_template.tscn

@@ -1,12 +1,18 @@
-[gd_scene load_steps=9 format=3 uid="uid://4yju7mbcmejw"]
+[gd_scene load_steps=12 format=3 uid="uid://4yju7mbcmejw"]
 
 [ext_resource type="Script" uid="uid://bvbtl3sp4pq1a" path="res://scene/gallery/clips/clip_template.gd" id="1_234wg"]
 [ext_resource type="Texture2D" uid="uid://b3odt4ojsvu5n" path="res://asset/art/scene/c02/s03_公寓一楼院子/bg_一楼.png" id="2_bu61q"]
-[ext_resource type="Texture2D" uid="uid://bcji0qu0u6yo0" path="res://asset/art/临时草稿/c02_第一章/李氏癞子窗户人影.png" id="3_wd24l"]
-[ext_resource type="Texture2D" uid="uid://cq65jye47jbxw" path="res://asset/art/临时草稿/c02_第一章/李氏癞子窗户人影2.png" id="4_vrni0"]
+[ext_resource type="Shader" uid="uid://cwuxtdwmhahhp" path="res://asset/shader/palette.gdshader" id="2_wd24l"]
+[ext_resource type="Texture2D" uid="uid://c2fs06jvtupi7" path="res://asset/shader/palette/warm-summer-1x.png" id="3_vrni0"]
+[ext_resource type="Texture2D" uid="uid://bcji0qu0u6yo0" path="res://asset/art/scene/c02/s03_公寓一楼院子/李氏癞子窗户/李氏癞子窗户人影.png" id="3_wd24l"]
+[ext_resource type="Texture2D" uid="uid://cq65jye47jbxw" path="res://asset/art/scene/c02/s03_公寓一楼院子/李氏癞子窗户/李氏癞子窗户人影2.png" id="4_vrni0"]
 [ext_resource type="PackedScene" uid="uid://b50n0hvs4yh75" path="res://addons/property-inspector/pro_animation_sprite2d/pro_animated_sprite.tscn" id="5_rmgj2"]
 [ext_resource type="SpriteFrames" uid="uid://b7fhheih1hbvf" path="res://config/animation/entity_sprite_frames.tres" id="6_feiyw"]
 
+[sub_resource type="ShaderMaterial" id="ShaderMaterial_rmgj2"]
+shader = ExtResource("2_wd24l")
+shader_parameter/palette = ExtResource("3_vrni0")
+
 [sub_resource type="AtlasTexture" id="AtlasTexture_iqsgx"]
 atlas = ExtResource("2_bu61q")
 region = Rect2(1595, 0, 638, 240)
@@ -40,22 +46,48 @@ animations = [{
 [node name="ClipTemplate" type="Node2D"]
 script = ExtResource("1_234wg")
 
-[node name="Frame" type="Node2D" parent="."]
+[node name="Frame" type="Control" parent="."]
 z_index = 100
+custom_minimum_size = Vector2(564, 316)
+layout_mode = 3
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+offset_right = 564.0
+offset_bottom = 316.0
+grow_horizontal = 2
+grow_vertical = 2
+mouse_filter = 2
+
+[node name="PaletteShading" type="Panel" parent="Frame"]
+z_index = 200
+material = SubResource("ShaderMaterial_rmgj2")
+layout_mode = 2
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+mouse_filter = 2
 
 [node name="ColorRect" type="ColorRect" parent="Frame"]
+z_index = 200
 custom_minimum_size = Vector2(564, 38)
+layout_mode = 2
 offset_right = 564.0
 offset_bottom = 38.0
 size_flags_vertical = 0
+mouse_filter = 2
 color = Color(0, 0, 0, 1)
 
 [node name="ColorRect2" type="ColorRect" parent="Frame"]
+z_index = 200
 custom_minimum_size = Vector2(564, 38)
+layout_mode = 2
 offset_top = 278.0
 offset_right = 564.0
 offset_bottom = 316.0
 size_flags_vertical = 8
+mouse_filter = 2
 color = Color(0, 0, 0, 1)
 
 [node name="BG" type="Sprite2D" parent="."]

scene/gallery/gallery.gd

@@ -3,24 +3,19 @@ extends CanvasLayer
 
 func _ready() -> void:
 	layer = GlobalConfig.CANVAS_LAYER_GALLERY
-	get_tree().paused = true
+	SceneManager.toggle_pause_counter(true)
 	$OpenSfx.play()
 
 
-
-func display():
-	pass
-
-
 func _unhandled_input(event: InputEvent) -> void:
-	# gallery 界面阻塞所有输入事件
-	get_viewport().set_input_as_handled()
 	if (
-		event.is_action_pressed("cancel")
-		or event.is_action_pressed("escape")
+		event.is_action_pressed("escape")
+		or event.is_action_pressed("cancel")
 		or event.is_action_pressed("gallery")
 	):
-		get_tree().paused = false
+		SceneManager.toggle_pause_counter(false)
 		var close_stream = preload("res://asset/audio/sfx/交互/收起背包.wav")
 		AudioManager.play_sfx(close_stream)
 		queue_free()
+	# gallery 界面阻塞所有输入事件，除了 escape
+	get_viewport().set_input_as_handled()

scene/gallery/gallery.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=7 format=3 uid="uid://gfkdh8pqhixn"]
+[gd_scene load_steps=8 format=3 uid="uid://gfkdh8pqhixn"]
 
 [ext_resource type="Script" uid="uid://bt86ajx7nwnk3" path="res://scene/gallery/gallery.gd" id="1_mpm8n"]
 [ext_resource type="AudioStream" uid="uid://dyjifofhdx25w" path="res://asset/audio/sfx/交互/打开背包.wav" id="2_kfxav"]
@@ -6,6 +6,7 @@
 [ext_resource type="Script" uid="uid://rq6w1vuhuq1m" path="res://scene/entity/audio/sfx.gd" id="3_cntvv"]
 [ext_resource type="Texture2D" uid="uid://dkvuc5llqax6d" path="res://asset/art/scene/c02/s03_公寓一楼院子/肉铺门板.png" id="3_db1ov"]
 [ext_resource type="PackedScene" uid="uid://ckd26q67hm7j0" path="res://scene/gallery/clips/clip1_偷听.tscn" id="3_ymhcd"]
+[ext_resource type="PackedScene" uid="uid://da4rposvvqo3d" path="res://scene/gallery/clips/clip2_疯子看井.tscn" id="7_cntvv"]
 
 [node name="Gallery" type="CanvasLayer"]
 process_mode = 3
@@ -46,9 +47,79 @@ columns = 4
 [node name="GalleryItem" parent="MarginContainer/GridContainer" instance=ExtResource("2_m3ngl")]
 layout_mode = 2
 packed_scene = ExtResource("3_ymhcd")
-title = "偷听"
+title = "g_偷听对话"
 
 [node name="GalleryItem2" parent="MarginContainer/GridContainer" instance=ExtResource("2_m3ngl")]
 layout_mode = 2
+packed_scene = ExtResource("7_cntvv")
+title = "g_疯子看井"
+
+[node name="GalleryItem3" parent="MarginContainer/GridContainer" instance=ExtResource("2_m3ngl")]
+layout_mode = 2
 packed_scene = ExtResource("3_ymhcd")
-title = "偷听"
+title = "g_偷听对话"
+
+[node name="GalleryItem4" parent="MarginContainer/GridContainer" instance=ExtResource("2_m3ngl")]
+layout_mode = 2
+packed_scene = ExtResource("7_cntvv")
+title = "g_疯子看井"
+
+[node name="GalleryItem5" parent="MarginContainer/GridContainer" instance=ExtResource("2_m3ngl")]
+layout_mode = 2
+packed_scene = ExtResource("3_ymhcd")
+title = "g_偷听对话"
+
+[node name="GalleryItem6" parent="MarginContainer/GridContainer" instance=ExtResource("2_m3ngl")]
+layout_mode = 2
+packed_scene = ExtResource("7_cntvv")
+title = "g_疯子看井"
+
+[node name="GalleryItem7" parent="MarginContainer/GridContainer" instance=ExtResource("2_m3ngl")]
+layout_mode = 2
+packed_scene = ExtResource("3_ymhcd")
+title = "g_偷听对话"
+
+[node name="GalleryItem8" parent="MarginContainer/GridContainer" instance=ExtResource("2_m3ngl")]
+layout_mode = 2
+packed_scene = ExtResource("7_cntvv")
+title = "g_疯子看井"
+
+[node name="GalleryItem9" parent="MarginContainer/GridContainer" instance=ExtResource("2_m3ngl")]
+layout_mode = 2
+packed_scene = ExtResource("3_ymhcd")
+title = "g_偷听对话"
+
+[node name="GalleryItem10" parent="MarginContainer/GridContainer" instance=ExtResource("2_m3ngl")]
+layout_mode = 2
+packed_scene = ExtResource("7_cntvv")
+title = "g_疯子看井"
+
+[node name="GalleryItem11" parent="MarginContainer/GridContainer" instance=ExtResource("2_m3ngl")]
+layout_mode = 2
+packed_scene = ExtResource("3_ymhcd")
+title = "g_偷听对话"
+
+[node name="GalleryItem12" parent="MarginContainer/GridContainer" instance=ExtResource("2_m3ngl")]
+layout_mode = 2
+packed_scene = ExtResource("7_cntvv")
+title = "g_疯子看井"
+
+[node name="GalleryItem13" parent="MarginContainer/GridContainer" instance=ExtResource("2_m3ngl")]
+layout_mode = 2
+packed_scene = ExtResource("3_ymhcd")
+title = "g_偷听对话"
+
+[node name="GalleryItem14" parent="MarginContainer/GridContainer" instance=ExtResource("2_m3ngl")]
+layout_mode = 2
+packed_scene = ExtResource("7_cntvv")
+title = "g_疯子看井"
+
+[node name="GalleryItem15" parent="MarginContainer/GridContainer" instance=ExtResource("2_m3ngl")]
+layout_mode = 2
+packed_scene = ExtResource("3_ymhcd")
+title = "g_偷听对话"
+
+[node name="GalleryItem16" parent="MarginContainer/GridContainer" instance=ExtResource("2_m3ngl")]
+layout_mode = 2
+packed_scene = ExtResource("7_cntvv")
+title = "g_疯子看井"

scene/gallery/gallery_item.gd

@@ -1,4 +1,5 @@
 @tool
+class_name GalleryItem
 extends Container
 
 @export var packed_scene: PackedScene:
@@ -19,6 +20,7 @@ extends Container
 @onready var scene_btn = %SceneButton as Button
 @onready var scene_holder = %SceneHolder as Control
 @onready var display_layer = %DisplayLayer as CanvasLayer
+@onready var display_control_mask = %ControlMask as Control
 
 
 func _ready() -> void:
@@ -33,37 +35,49 @@ func _ready() -> void:
 var current_scene: Node2D
 
 
-func _reload_scene():
+func _reload_scene(add_to_card:=true):
 	if current_scene:
 		current_scene.queue_free()
 	if not packed_scene:
 		return
 	current_scene = packed_scene.instantiate()
-	scene_holder.add_child(current_scene)
-	current_scene.scale = Vector2.ONE / 6.0
-	current_scene.position = Vector2(0, -7)
+	if add_to_card:
+		scene_holder.add_child(current_scene)
+		current_scene.scale = Vector2.ONE / 6.0
+		# 防止看到上边缘黑边
+		current_scene.position = Vector2(0, -7)
 
 
 func _on_toggle_hover(focus: bool):
 	if current_scene and not displaying:
-		current_scene.toggle_card(focus)
+		if focus:
+			grab_focus()
+			current_scene.run_clip(true)
+		else:
+			if has_focus():
+				release_focus()
+			_reload_scene()
 
 
 var displaying = false:
 	set(val):
 		displaying = val
-		%ControlMask.visible = val
+		display_control_mask.visible = val
+		if not val:
+			if display_control_mask.has_focus():
+				display_control_mask.release_focus()
 
 
 func _on_pressed():
 	if displaying:
 		return
+	_reload_scene()
 	displaying = true
 	if current_scene:
 		current_scene.reparent(display_layer, false)
 		current_scene.scale = Vector2(1, 1)
 		current_scene.position = Vector2.ZERO
-		current_scene.display()
+		current_scene.run_clip(false)
 		current_scene.display_finished.connect(_on_display_finished, CONNECT_ONE_SHOT)
 
 
@@ -73,7 +87,12 @@ func _on_display_finished():
 
 
 func _unhandled_input(event: InputEvent) -> void:
-	if event.is_action_released("cancel") or event.is_action_released("escape"):
-		if displaying:
+	# 只有在 displaying 状态下生效
+	if displaying:
+		if (
+			event.is_action_pressed("escape")
+			or event.is_action_pressed("cancel")
+			or event.is_action_pressed("gallery")
+		):
 			_on_display_finished()
 			get_viewport().set_input_as_handled()

scene/gallery/gallery_item.tscn

@@ -1,7 +1,8 @@
-[gd_scene load_steps=3 format=3 uid="uid://du6jt6ae5ulvy"]
+[gd_scene load_steps=4 format=3 uid="uid://du6jt6ae5ulvy"]
 
 [ext_resource type="Theme" uid="uid://ro8r1wa1bvua" path="res://config/gallery_theme.tres" id="1_2f468"]
 [ext_resource type="Script" uid="uid://bk8ton7q8i6hb" path="res://scene/gallery/gallery_item.gd" id="1_2q576"]
+[ext_resource type="Texture2D" uid="uid://cbql1i4hblmt1" path="res://asset/art/ui/prop/特写通用遮罩.png" id="3_wb2ol"]
 
 [node name="GalleryItem" type="PanelContainer"]
 offset_right = 96.0
@@ -28,7 +29,7 @@ offset_left = 1.0
 offset_top = 1.0
 offset_right = 95.0
 offset_bottom = 40.0
-mouse_filter = 1
+mouse_filter = 2
 
 [node name="Title" type="Label" parent="VBox"]
 unique_name_in_owner = true
@@ -39,12 +40,15 @@ size_flags_horizontal = 4
 unique_name_in_owner = true
 layer = 23
 
-[node name="ControlMask" type="Control" parent="VBox/DisplayLayer"]
+[node name="ControlMask" type="TextureRect" parent="VBox/DisplayLayer"]
 unique_name_in_owner = true
 visible = false
-layout_mode = 3
+z_index = 200
 anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
+texture = ExtResource("3_wb2ol")
+expand_mode = 3
+stretch_mode = 5

scene/ground/scene/c02/s03_院子.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=79 format=3 uid="uid://djc2uaefhmu7"]
+[gd_scene load_steps=76 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_animation.gd" id="2_dt5aj"]
@@ -38,17 +38,15 @@
 [ext_resource type="PackedScene" uid="uid://dqkxiqbq83cmq" path="res://scene/entity/closeup.tscn" id="23_81juy"]
 [ext_resource type="PackedScene" uid="uid://bxpexbk7f3rax" path="res://scene/ground/script/c02/敲门游戏.tscn" id="24_0o4rt"]
 [ext_resource type="PackedScene" uid="uid://bnf3lkcbpx1ar" path="res://scene/entity/ambush.tscn" id="25_iyaiw"]
-[ext_resource type="Texture2D" uid="uid://bcji0qu0u6yo0" path="res://asset/art/临时草稿/c02_第一章/李氏癞子窗户人影.png" id="26_mmgys"]
+[ext_resource type="Texture2D" uid="uid://bcji0qu0u6yo0" path="res://asset/art/scene/c02/s03_公寓一楼院子/李氏癞子窗户/李氏癞子窗户人影.png" id="26_mmgys"]
 [ext_resource type="PackedScene" uid="uid://drq7ul1eikypv" path="res://scene/ground/script/c02/井特写.tscn" id="26_yy4fp"]
-[ext_resource type="Texture2D" uid="uid://cq65jye47jbxw" path="res://asset/art/临时草稿/c02_第一章/李氏癞子窗户人影2.png" id="27_7ey5t"]
+[ext_resource type="Texture2D" uid="uid://cq65jye47jbxw" path="res://asset/art/scene/c02/s03_公寓一楼院子/李氏癞子窗户/李氏癞子窗户人影2.png" id="27_7ey5t"]
 [ext_resource type="Texture2D" uid="uid://cuno8okh8ytw2" path="res://asset/art/scene/c02/s10_空房间/柜子.png" id="32_cpifc"]
 [ext_resource type="SpriteFrames" uid="uid://d23vigq1lv3dq" path="res://asset/art/gif/c02_一楼火灾/c02_一楼火灾_frames.tres" id="33_6137k"]
 [ext_resource type="PackedScene" uid="uid://b50n0hvs4yh75" path="res://addons/property-inspector/pro_animation_sprite2d/pro_animated_sprite.tscn" id="33_ycojw"]
 [ext_resource type="SpriteFrames" uid="uid://daixhei6rc8lh" path="res://asset/art/gif/c02_霸凌/c02_霸凌_frames.tres" id="34_1tart"]
-[ext_resource type="Texture2D" uid="uid://dj1k72ky2e3yc" path="res://asset/art/gif/c02_杂项/疯子看井/疯子看井2.png" id="34_plfv5"]
 [ext_resource type="Script" uid="uid://beqjkho1my6qc" path="res://scene/ground/script/c02/火灾区域燃烧脚本.gd" id="34_yy4fp"]
 [ext_resource type="Texture2D" uid="uid://bcbmfgn2ut8i3" path="res://asset/art/gif/c02_一楼火灾/7-最左门 烧痕.png" id="35_dsgmu"]
-[ext_resource type="Texture2D" uid="uid://dlbaaanunwivi" path="res://asset/art/gif/c02_杂项/疯子看井/疯子看井1.png" id="35_kyfht"]
 [ext_resource type="PackedScene" uid="uid://0sofmhrl358m" path="res://scene/entity/npc.tscn" id="35_plfv5"]
 [ext_resource type="Texture2D" uid="uid://3hruwr03tox1" path="res://asset/art/gif/c02_一楼火灾/7-最左木箱 烧痕.png" id="36_rnk1v"]
 [ext_resource type="Texture2D" uid="uid://bdisdxc1txm0g" path="res://asset/art/gif/c02_霸凌/小婵_被霸凌/0.png" id="37_dsgmu"]
@@ -291,20 +289,6 @@ animations = [{
 "speed": 4.0
 }]
 
-[sub_resource type="SpriteFrames" id="SpriteFrames_kyfht"]
-animations = [{
-"frames": [{
-"duration": 1.0,
-"texture": ExtResource("34_plfv5")
-}, {
-"duration": 1.0,
-"texture": ExtResource("35_kyfht")
-}],
-"loop": true,
-"name": &"default",
-"speed": 2.0
-}]
-
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_2y8cu"]
 resource_local_to_scene = true
 size = Vector2(30, 100)
@@ -660,8 +644,9 @@ frame_progress = 0.643855
 [node name="Npc井边疯子" parent="Ground/DeployLayer" index="26" instance=ExtResource("35_plfv5")]
 z_index = 10
 position = Vector2(2037, 67)
-sprite_frames = SubResource("SpriteFrames_kyfht")
-frame_progress = 0.952326
+sprite_frames = ExtResource("4_gd6xp")
+animation = &"疯子看井"
+frame_progress = 0.298829
 height = 49.11
 dialogue_title = "c02_s11_井边疯子对话"
 

scene/ground/scene/c02/s06_二楼.tscn

@@ -27,7 +27,7 @@
 [ext_resource type="PackedScene" uid="uid://trkypc4gox20" path="res://scene/ground/script/c02/水盆特写.tscn" id="16_p6da7"]
 [ext_resource type="AudioStream" uid="uid://fc7ocwfmtjyb" path="res://asset/audio/sfx/交互/第一章/sfx_撞墙1.wav" id="17_4lf48"]
 [ext_resource type="AudioStream" uid="uid://cw6ho7gklq2sa" path="res://asset/audio/sfx/交互/第一章/sfx_撞墙2.wav" id="18_m28ab"]
-[ext_resource type="SpriteFrames" uid="uid://by3207ou8ph7" path="res://asset/art/gif/c02_小小小蝶上楼道/c02_小小小蝶上楼道_frames.tres" id="23_2e08x"]
+[ext_resource type="SpriteFrames" uid="uid://by3207ou8ph7" path="res://asset/art/gif/c03_小小小蝶上楼道/c02_小小小蝶上楼道_frames.tres" id="23_2e08x"]
 [ext_resource type="PackedScene" uid="uid://bait5vh6jhmss" path="res://scene/ground/script/c02/谢幕演出.tscn" id="25_m28ab"]
 [ext_resource type="AudioStream" uid="uid://bxp3f263aaqkp" path="res://asset/audio/sfx/脚步/02_室外_1.wav" id="29_tqnu8"]
 [ext_resource type="AudioStream" uid="uid://d3h0xe0qtai18" path="res://asset/audio/sfx/脚步/02_室外_2.wav" id="30_r7b2r"]

scene/index_page.gd

@@ -16,8 +16,6 @@ var animation_finished = false
 func _ready():
 	if GlobalConfig.DEBUG:
 		print("Index Page Ready")
-	# 推到 index 时禁用 paused
-	get_tree().paused = false
 	newgame_btn.pressed.connect(_on_newgame_pressed)
 	resume_btn.pressed.connect(_on_resume_pressed)
 	quit_btn.pressed.connect(_on_quit_pressed)

scene/main.gd

@@ -5,8 +5,6 @@ extends Node2D
 		TranslationServer.set_locale(val)
 		locale = val
 
-@onready var settings = %Settings
-
 
 func _ready() -> void:
 	%UILayer.layer = GlobalConfig.CANVAS_LAYER_UI
@@ -16,13 +14,10 @@ func _ready() -> void:
 	# settings.exited.connect(grab_focus)
 
 
-func _on_settings_hide():
-	SceneManager.release_player()
-
 
 func _unhandled_input(event: InputEvent) -> void:
 	if event.is_action_pressed("escape"):
-		settings.visible = true
+		SceneManager.show_settings()
 		get_viewport().set_input_as_handled()
 	elif event.is_action_pressed("bag"):
 		SceneManager.show_bag()

scene/main.tscn

@@ -1,11 +1,10 @@
-[gd_scene load_steps=8 format=3 uid="uid://dygvcmykn02n8"]
+[gd_scene load_steps=7 format=3 uid="uid://dygvcmykn02n8"]
 
 [ext_resource type="Script" uid="uid://jn2alpdl4eal" path="res://scene/main.gd" id="1_pks84"]
 [ext_resource type="PackedScene" uid="uid://dc778gsjfr3ky" path="res://scene/prop/prop_hud.tscn" id="4_t7gb2"]
 [ext_resource type="PackedScene" uid="uid://5g07x6q7wwr1" path="res://scene/notification/notification.tscn" id="5_3gg5t"]
 [ext_resource type="PackedScene" uid="uid://cekhj65axie0p" path="res://scene/prop/prop_inspector.tscn" id="5_ux0rw"]
 [ext_resource type="Environment" uid="uid://c6ri8tn5qt6fe" path="res://scene/ground/environment.tres" id="9_jsof5"]
-[ext_resource type="PackedScene" uid="uid://beok2r6fgburn" path="res://scene/settings/settings.tscn" id="9_muu0b"]
 [ext_resource type="PackedScene" uid="uid://clxgkj80yin2" path="res://scene/ground/ground_loader.tscn" id="10_8rc5n"]
 
 [node name="Main" type="Node2D"]
@@ -28,7 +27,6 @@ layer = 12
 
 [node name="ColorRectTop" type="ColorRect" parent="UILayer"]
 unique_name_in_owner = true
-visible = false
 custom_minimum_size = Vector2(564, 38.5)
 anchors_preset = 5
 anchor_left = 0.5
@@ -42,7 +40,6 @@ color = Color(0, 0, 0, 1)
 
 [node name="ColorRectBottom" type="ColorRect" parent="UILayer"]
 unique_name_in_owner = true
-visible = false
 custom_minimum_size = Vector2(564, 38.5)
 anchors_preset = 7
 anchor_left = 0.5
@@ -64,7 +61,3 @@ scale = Vector2(0.24, 0.24)
 item_key = "prop_令牌"
 display_time = 1.5
 metadata/_edit_use_anchors_ = true
-
-[node name="Settings" parent="." instance=ExtResource("9_muu0b")]
-unique_name_in_owner = true
-visible = false

scene/prop/prop_bag.gd

@@ -7,8 +7,7 @@ extends Panel
 
 func _ready():
 	get_parent().layer = GlobalConfig.CANVAS_LAYER_BAG
-	# SceneManager.lock_player()
-	get_tree().paused = true
+	SceneManager.toggle_pause_counter(true)
 	_load_item_buttons()
 	$OpenBagSfx.play()
 
@@ -67,8 +66,7 @@ func _unhandled_input(event: InputEvent) -> void:
 		or event.is_action_pressed("cancel")
 		or event.is_action_pressed("escape")
 	):
-		get_tree().paused = false
-		# SceneManager.unlock_player()
 		var close_stream = preload("res://asset/audio/sfx/交互/收起背包.wav")
 		AudioManager.play_sfx(close_stream)
+		SceneManager.toggle_pause_counter(false)
 		queue_free()

scene/settings/settings.gd

@@ -1,7 +1,5 @@
 extends CanvasLayer
 
-signal exited
-
 @onready var master_bus_slider = %HSliderMasterBus as HSlider
 @onready var sfx_bus_slider = %HSliderSfxBus as HSlider
 @onready var dialog_bus_slider = %HSliderDialogBus as HSlider
@@ -17,11 +15,11 @@ signal exited
 
 # 音量 DB 偏移
 var sfx_db_offset := 6.0
-var dialog_db_offset := -10.0
+var dialog_db_offset := -20.0
+
 
 func _ready():
 	layer = GlobalConfig.CANVAS_LAYER_SETTINGS
-	visibility_changed.connect(_on_visibility_changed)
 	# bus
 	master_bus_slider.value = db_to_linear(
 		AudioServer.get_bus_volume_db(AudioServer.get_bus_index("Master"))
@@ -56,24 +54,15 @@ func _ready():
 	index_btn.pressed.connect(_on_index_btn_pressed)
 	diary_btn.pressed.connect(_on_diary_btn_pressed)
 	gallery_btn.pressed.connect(_on_gallery_btn_pressed)
+	# open
+	$"Sfx打开".play()
+	SceneManager.toggle_pause_counter(true)
+	diary_btn.grab_focus()
 
 
-
-
-func _on_visibility_changed() -> void:
-	if visible:
-		$"Sfx打开".play()
-		get_tree().paused = true
-		SceneManager.lock_player()
-	else:
-		$"Sfx关闭".play()
-		get_tree().paused = false
-		SceneManager.unlock_player()
-
-
-func exit_settings():
-	visible = false
-	exited.emit()
+func _exit_tree() -> void:
+	$"Sfx关闭".global_play()
+	SceneManager.toggle_pause_counter(false)
 
 
 func _on_master_bus_slider_value_changed(value: float) -> void:
@@ -93,6 +82,7 @@ func _on_dialog_bus_slider_value_changed(value: float) -> void:
 	GlobalConfigManager.config.db_dialog = db_value
 	AudioServer.set_bus_volume_db(AudioServer.get_bus_index("dialog"), db_value)
 
+
 func _on_language_options_selected(id: int) -> void:
 	# -1 null; 0 zh_CN; 1 zh_SH; 2 en
 	var lang = ""
@@ -140,29 +130,31 @@ func _on_top_box_toggled(is_pressed: bool) -> void:
 
 
 func _on_exit_btn_pressed() -> void:
-	SceneManager.quit_game()
+	# 从 ArchiveManager 处理退出信号
+	ArchiveManager.notification(NOTIFICATION_WM_CLOSE_REQUEST)
+	# 隐藏 setting 界面
+	queue_free()
 
 
 func _on_index_btn_pressed() -> void:
-	# 防止游戏卡死
-	get_tree().paused = false
 	ArchiveManager.save_all()
 	SceneManager.checkout_index_page()
+	# 隐藏 setting 界面
+	queue_free()
 
 
 func _on_diary_btn_pressed() -> void:
 	SceneManager.show_bag()
-	exit_settings()
+	queue_free()
+
 
 func _on_gallery_btn_pressed() -> void:
 	SceneManager.show_gallery()
-	exit_settings()
+	queue_free()
 
 
 func _unhandled_key_input(event: InputEvent) -> void:
-	if not visible:
-		return
 	# settings 界面接受所有输入事件
 	get_viewport().set_input_as_handled()
 	if event.is_action_pressed("escape"):
-		exit_settings()
+		queue_free()