Merge remote-tracking branch 'origin/main'

asset/art/gif/c01_书店外街道/frames.tres

@@ -1,4 +1,4 @@
-[gd_resource type="SpriteFrames" load_steps=298 format=3 uid="uid://cvkuw35ulebme"]
+[gd_resource type="SpriteFrames" load_steps=290 format=3 uid="uid://cvkuw35ulebme"]
 
 [ext_resource type="Texture2D" uid="uid://cjyu2wmfa7dhb" path="res://asset/art/gif/c01_书店外街道/杂戏团黄昏_举碗小孩/0.png" id="1_1vswb"]
 [ext_resource type="Texture2D" uid="uid://dcy3g28cqfc40" path="res://asset/art/gif/c01_书店外街道/杂戏团夜晚_陆仁舞刀/0.png" id="1_3jpe8"]
@@ -248,30 +248,22 @@
 [ext_resource type="Texture2D" uid="uid://doxpjhmnwj1xf" path="res://asset/art/gif/c01_书店外街道/陆仁舞刀-黄昏带红缨/42.png" id="281_ua8rm"]
 [ext_resource type="Texture2D" uid="uid://et72c4udhk1d" path="res://asset/art/gif/c01_书店外街道/陆仁舞刀-黄昏带红缨/43.png" id="282_nl8l1"]
 [ext_resource type="Texture2D" uid="uid://cci3x2nvli2vl" path="res://asset/art/gif/c01_书店外街道/陆仁舞刀-黄昏带红缨/44.png" id="283_o4vq4"]
-[ext_resource type="Texture2D" uid="uid://cekbtgppfvln" path="res://asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/0.png" id="284_7em41"]
+[ext_resource type="Texture2D" uid="uid://b6l27ysh0bpgh" path="res://asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/0.png" id="284_7em41"]
 [ext_resource type="Texture2D" uid="uid://c0um1aq24snna" path="res://asset/art/gif/c01_书店外街道/陆仁舞刀-黄昏带红缨/45.png" id="284_u720u"]
-[ext_resource type="Texture2D" uid="uid://g0onbmobem5y" path="res://asset/art/gif/c01_书店外街道/陆仁收刀/0.png" id="284_vlsm5"]
-[ext_resource type="Texture2D" uid="uid://p7geyjeas81t" path="res://asset/art/gif/c01_书店外街道/陆仁收刀/1.png" id="285_3e6og"]
+[ext_resource type="Texture2D" uid="uid://c311ayix6nmd" path="res://asset/art/gif/c01_书店外街道/陆仁收刀/0.png" id="284_vlsm5"]
+[ext_resource type="Texture2D" uid="uid://cf7re7jrqmmla" path="res://asset/art/gif/c01_书店外街道/陆仁收刀/1.png" id="285_3e6og"]
 [ext_resource type="Texture2D" uid="uid://4u8c6ok5me5o" path="res://asset/art/gif/c01_书店外街道/陆仁舞刀-黄昏带红缨/46.png" id="285_4oygu"]
-[ext_resource type="Texture2D" uid="uid://dyusm5cgxf32x" path="res://asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/1.png" id="285_iq05n"]
-[ext_resource type="Texture2D" uid="uid://dtqf08f1cs2k0" path="res://asset/art/gif/c01_书店外街道/陆仁收刀/2.png" id="286_0a0mf"]
+[ext_resource type="Texture2D" uid="uid://dwgicnbr6ribm" path="res://asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/1.png" id="285_iq05n"]
+[ext_resource type="Texture2D" uid="uid://tbn7m16x57ql" path="res://asset/art/gif/c01_书店外街道/陆仁收刀/2.png" id="286_0a0mf"]
 [ext_resource type="Texture2D" uid="uid://7d8g7ng2xpyb" path="res://asset/art/gif/c01_书店外街道/陆仁舞刀-黄昏带红缨/47.png" id="286_4p3c8"]
-[ext_resource type="Texture2D" uid="uid://csvbfrnx7767" path="res://asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/2.png" id="286_egq1j"]
 [ext_resource type="Texture2D" uid="uid://0mlggoik1x0n" path="res://asset/art/gif/c01_书店外街道/陆仁舞刀-黄昏带红缨/48.png" id="287_4g43k"]
-[ext_resource type="Texture2D" uid="uid://dun8poejk2van" path="res://asset/art/gif/c01_书店外街道/陆仁收刀/3.png" id="287_b7lkb"]
-[ext_resource type="Texture2D" uid="uid://32qxfp5n6srh" path="res://asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/3.png" id="287_iusbw"]
+[ext_resource type="Texture2D" uid="uid://paakxne0sao6" path="res://asset/art/gif/c01_书店外街道/陆仁收刀/3.png" id="287_b7lkb"]
 [ext_resource type="Texture2D" uid="uid://cya5ed0xgwwil" path="res://asset/art/gif/c01_书店外街道/陆仁舞刀-黄昏带红缨/49.png" id="288_7ydas"]
-[ext_resource type="Texture2D" uid="uid://bly8fydjrs0rt" path="res://asset/art/gif/c01_书店外街道/陆仁收刀/4.png" id="288_i6y4i"]
-[ext_resource type="Texture2D" uid="uid://dllp6jv7gbake" path="res://asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/4.png" id="288_m8jtt"]
-[ext_resource type="Texture2D" uid="uid://c8pd3ef326ysi" path="res://asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/5.png" id="289_643sc"]
+[ext_resource type="Texture2D" uid="uid://ciqqxer27ilkg" path="res://asset/art/gif/c01_书店外街道/陆仁收刀/4.png" id="288_i6y4i"]
 [ext_resource type="Texture2D" uid="uid://dk6sh3tcy14yp" path="res://asset/art/gif/c01_书店外街道/陆仁舞刀-黄昏带红缨/50.png" id="289_m5h2g"]
 [ext_resource type="Texture2D" uid="uid://n3go2optbrjh" path="res://asset/art/gif/c01_书店外街道/陆仁舞刀-黄昏带红缨/51.png" id="290_1252k"]
-[ext_resource type="Texture2D" uid="uid://ctorkkaeex6qk" path="res://asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/6.png" id="290_o2bht"]
 [ext_resource type="Texture2D" uid="uid://ce105oaxjpsxl" path="res://asset/art/gif/c01_书店外街道/陆仁舞刀-黄昏带红缨/52.png" id="291_4r8gj"]
-[ext_resource type="Texture2D" uid="uid://bhu2g1jheobfm" path="res://asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/7.png" id="291_yupn7"]
 [ext_resource type="Texture2D" uid="uid://c0x2bhgi32gwv" path="res://asset/art/gif/c01_书店外街道/陆仁舞刀-黄昏带红缨/53.png" id="292_3nsgo"]
-[ext_resource type="Texture2D" uid="uid://w5gp2ciigkqi" path="res://asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/8.png" id="292_nlodd"]
-[ext_resource type="Texture2D" uid="uid://cvkvvk5eytee0" path="res://asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/9.png" id="293_7vsdf"]
 [ext_resource type="Texture2D" uid="uid://d3t4ra4y6rkwg" path="res://asset/art/gif/c01_书店外街道/陆仁舞刀-黄昏带红缨/54.png" id="293_xfy5u"]
 [ext_resource type="Texture2D" uid="uid://dt5occx2ntnus" path="res://asset/art/gif/c01_书店外街道/陆仁舞刀-黄昏带红缨/55.png" id="294_wynmm"]
 [ext_resource type="Texture2D" uid="uid://dq8or4u1hnqoo" path="res://asset/art/gif/c01_书店外街道/陆仁舞刀-黄昏带红缨/56.png" id="295_isvd4"]
@@ -562,79 +554,79 @@ animations = [{
 "speed": 30.0
 }, {
 "frames": [{
-"duration": 6.0,
+"duration": 8.0,
 "texture": ExtResource("71_3jvux")
 }, {
-"duration": 6.0,
+"duration": 8.0,
 "texture": ExtResource("72_5hb5o")
 }, {
-"duration": 6.0,
+"duration": 8.0,
 "texture": ExtResource("73_cjpg1")
 }, {
-"duration": 6.0,
+"duration": 8.0,
 "texture": ExtResource("74_f10vf")
 }, {
-"duration": 6.0,
+"duration": 8.0,
 "texture": ExtResource("75_6xgk4")
 }, {
-"duration": 6.0,
+"duration": 8.0,
 "texture": ExtResource("76_g8kkt")
 }, {
-"duration": 6.0,
+"duration": 8.0,
 "texture": ExtResource("77_qhrtf")
 }, {
-"duration": 6.0,
+"duration": 8.0,
 "texture": ExtResource("78_yk8i7")
 }, {
-"duration": 6.0,
+"duration": 8.0,
 "texture": ExtResource("79_fkhvh")
 }, {
-"duration": 6.0,
+"duration": 8.0,
 "texture": ExtResource("80_5uv37")
 }, {
-"duration": 6.0,
+"duration": 8.0,
 "texture": ExtResource("81_7bw88")
 }, {
-"duration": 6.0,
+"duration": 8.0,
 "texture": ExtResource("82_3u4nq")
 }, {
-"duration": 6.0,
+"duration": 8.0,
 "texture": ExtResource("83_qrsew")
 }, {
-"duration": 6.0,
+"duration": 8.0,
 "texture": ExtResource("84_uo4wb")
 }, {
-"duration": 6.0,
+"duration": 8.0,
 "texture": ExtResource("85_fkotq")
 }, {
-"duration": 6.0,
+"duration": 8.0,
 "texture": ExtResource("86_uis1u")
 }, {
-"duration": 6.0,
+"duration": 8.0,
 "texture": ExtResource("87_58pi6")
 }, {
-"duration": 6.0,
+"duration": 8.0,
 "texture": ExtResource("88_hkw0j")
 }, {
-"duration": 6.0,
+"duration": 8.0,
 "texture": ExtResource("89_gmi4a")
 }, {
-"duration": 6.0,
+"duration": 8.0,
 "texture": ExtResource("90_i6d5b")
 }, {
-"duration": 6.0,
+"duration": 8.0,
 "texture": ExtResource("91_rvhwd")
 }, {
-"duration": 6.0,
+"duration": 8.0,
 "texture": ExtResource("92_aokro")
 }, {
-"duration": 6.0,
+"duration": 8.0,
 "texture": ExtResource("93_p7pti")
 }, {
-"duration": 6.0,
+"duration": 8.0,
 "texture": ExtResource("94_polw3")
 }, {
-"duration": 6.0,
+"duration": 8.0,
 "texture": ExtResource("95_b08kf")
 }],
 "loop": false,
@@ -1007,40 +999,16 @@ animations = [{
 "duration": 9.0,
 "texture": ExtResource("288_i6y4i")
 }],
-"loop": false,
+"loop": true,
 "name": &"陆仁收刀",
 "speed": 30.0
 }, {
 "frames": [{
-"duration": 9.0,
+"duration": 15.0,
 "texture": ExtResource("284_7em41")
 }, {
-"duration": 9.0,
+"duration": 15.0,
 "texture": ExtResource("285_iq05n")
-}, {
-"duration": 9.0,
-"texture": ExtResource("286_egq1j")
-}, {
-"duration": 9.0,
-"texture": ExtResource("287_iusbw")
-}, {
-"duration": 9.0,
-"texture": ExtResource("288_m8jtt")
-}, {
-"duration": 9.0,
-"texture": ExtResource("289_643sc")
-}, {
-"duration": 9.0,
-"texture": ExtResource("290_o2bht")
-}, {
-"duration": 9.0,
-"texture": ExtResource("291_yupn7")
-}, {
-"duration": 9.0,
-"texture": ExtResource("292_nlodd")
-}, {
-"duration": 9.0,
-"texture": ExtResource("293_7vsdf")
 }],
 "loop": true,
 "name": &"陆仁收刀后呼吸",

asset/art/gif/c01_书店外街道/陆仁收刀.gif.import

@@ -2,7 +2,7 @@
 
 importer="gif.animated.texture.plugin"
 type="SpriteFrames"
-uid="uid://de1evrm08ud20"
+uid="uid://cya2jmb8rdbur"
 path="res://.godot/imported/陆仁收刀.gif-b37c489e9ebf7ff9e4ff10d6d5edc843.tres"
 
 [deps]

asset/art/gif/c01_书店外街道/陆仁收刀/0.png.import

@@ -2,7 +2,7 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://g0onbmobem5y"
+uid="uid://c311ayix6nmd"
 path="res://.godot/imported/0.png-43bbc36ee36542a64cd01c218f812af0.ctex"
 metadata={
 "vram_texture": false

asset/art/gif/c01_书店外街道/陆仁收刀/1.png.import

@@ -2,7 +2,7 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://p7geyjeas81t"
+uid="uid://cf7re7jrqmmla"
 path="res://.godot/imported/1.png-07c99170b27cd55f90237619c2d29771.ctex"
 metadata={
 "vram_texture": false

asset/art/gif/c01_书店外街道/陆仁收刀/2.png.import

@@ -2,7 +2,7 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://dtqf08f1cs2k0"
+uid="uid://tbn7m16x57ql"
 path="res://.godot/imported/2.png-c891e20404b33d044f899b31cf8ccf33.ctex"
 metadata={
 "vram_texture": false

asset/art/gif/c01_书店外街道/陆仁收刀/3.png.import

@@ -2,7 +2,7 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://dun8poejk2van"
+uid="uid://paakxne0sao6"
 path="res://.godot/imported/3.png-8f3448e25ebcdb5ea6c6214e4b8394de.ctex"
 metadata={
 "vram_texture": false

asset/art/gif/c01_书店外街道/陆仁收刀/4.png.import

@@ -2,7 +2,7 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://bly8fydjrs0rt"
+uid="uid://ciqqxer27ilkg"
 path="res://.godot/imported/4.png-14fa0fe29f85e42c1fe7164531f68e8c.ctex"
 metadata={
 "vram_texture": false

asset/art/gif/c01_书店外街道/陆仁收刀后呼吸.gif.import

@@ -2,7 +2,7 @@
 
 importer="gif.animated.texture.plugin"
 type="SpriteFrames"
-uid="uid://hib5bkfy0k0v"
+uid="uid://pmta6vn8obgp"
 path="res://.godot/imported/陆仁收刀后呼吸.gif-e85806f06a4bcd77eb1d83124bc7e294.tres"
 
 [deps]

asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/0.png.import

@@ -2,7 +2,7 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://cekbtgppfvln"
+uid="uid://b6l27ysh0bpgh"
 path="res://.godot/imported/0.png-9932776fce482b8b5c2b8100bdc35d5e.ctex"
 metadata={
 "vram_texture": false

asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/1.png.import

@@ -2,7 +2,7 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://dyusm5cgxf32x"
+uid="uid://dwgicnbr6ribm"
 path="res://.godot/imported/1.png-1ce493c76ec6ccfdf6531fd5381597bd.ctex"
 metadata={
 "vram_texture": false

asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/2.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://csvbfrnx7767"
-path="res://.godot/imported/2.png-3d911b476b3295281b8a4c2f8fd1e52c.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/2.png"
-dest_files=["res://.godot/imported/2.png-3d911b476b3295281b8a4c2f8fd1e52c.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/gif/c01_书店外街道/陆仁收刀后呼吸/3.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://32qxfp5n6srh"
-path="res://.godot/imported/3.png-e4b9097dc169046da04574378948a140.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/3.png"
-dest_files=["res://.godot/imported/3.png-e4b9097dc169046da04574378948a140.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/gif/c01_书店外街道/陆仁收刀后呼吸/5.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://c8pd3ef326ysi"
-path="res://.godot/imported/5.png-174f9e61b331e70a617d14e50b249ef8.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/5.png"
-dest_files=["res://.godot/imported/5.png-174f9e61b331e70a617d14e50b249ef8.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/gif/c01_书店外街道/陆仁收刀后呼吸/6.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://ctorkkaeex6qk"
-path="res://.godot/imported/6.png-cc7b39f9c68b7e75006b62fc02f78ea8.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/6.png"
-dest_files=["res://.godot/imported/6.png-cc7b39f9c68b7e75006b62fc02f78ea8.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/gif/c01_书店外街道/陆仁收刀后呼吸/7.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://bhu2g1jheobfm"
-path="res://.godot/imported/7.png-9d431ae24a879c421697b49de59a6792.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/7.png"
-dest_files=["res://.godot/imported/7.png-9d431ae24a879c421697b49de59a6792.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/gif/c01_书店外街道/陆仁收刀后呼吸/8.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://w5gp2ciigkqi"
-path="res://.godot/imported/8.png-35738fe61c62cc5dd49dce35f5326234.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/8.png"
-dest_files=["res://.godot/imported/8.png-35738fe61c62cc5dd49dce35f5326234.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/gif/c01_书店外街道/陆仁收刀后呼吸/9.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://cvkvvk5eytee0"
-path="res://.godot/imported/9.png-4859b36acf4ef4f995a855f30df9a34e.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/9.png"
-dest_files=["res://.godot/imported/9.png-4859b36acf4ef4f995a855f30df9a34e.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/prop/c01/院长的信物品.png.import

@@ -2,16 +2,16 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://dllp6jv7gbake"
-path="res://.godot/imported/4.png-bb74ccd78dfcb7f428df24ad05d7a6e1.ctex"
+uid="uid://bg77dh6ua3kfo"
+path="res://.godot/imported/院长的信物品.png-a689d7549aa71e15e7515e0c89cc9b6a.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://asset/art/gif/c01_书店外街道/陆仁收刀后呼吸/4.png"
-dest_files=["res://.godot/imported/4.png-bb74ccd78dfcb7f428df24ad05d7a6e1.ctex"]
+source_file="res://asset/art/prop/c01/院长的信物品.png"
+dest_files=["res://.godot/imported/院长的信物品.png-a689d7549aa71e15e7515e0c89cc9b6a.ctex"]
 
 [params]
 

asset/art/scene/c01/s06_孤儿院长廊围墙/fg_花圃.gif.import

@@ -2,7 +2,7 @@
 
 importer="gif.animated.texture.plugin"
 type="SpriteFrames"
-uid="uid://o5poucsu57l7"
+uid="uid://cramkual6vemp"
 path="res://.godot/imported/fg_花圃.gif-1cbdaf33bbc2d3e1d8081e40e5f51799.tres"
 
 [deps]

asset/dialogue/c01.csv

@@ -25,19 +25,22 @@ c01_老人喂食_3,“吃饱了......就会帮我找......”,,老人,,
 c01_老人喂食_4,“帮我找到我的孩子......”,,老人,,
 c01_在这儿吗,“在这儿吗......”,,,,
 c01_s08_书店老板任务,（台词设计：安排⼯作，整理书架，有封寄给玩家的信，放在柜台上）,,书店老板,,
-c01_s06_走廊前对话1,昨天认的字，现在全忘了？,,老师,# note,
+c01_s06_对话3_1,画完了没有？你小子咋比秤砣还沉！,,胖小孩,猫鼠游戏前，与跟班2（同乡）的对话,
+c01_s06_对话3_2,快了、快了。,,残疾小孩,,
+...后面看不清了。,...后面看不清了。,,？？？,# note,
+c01_s06_走廊前对话1,昨天认的字，现在全忘了？,,老师,,
 c01_s06_走廊前对话2,（唉呀）黄鱼脑子！,,老师,,
+画完了没有？你小子咋比秤砣还沉！,画完了没有？你小子咋比秤砣还沉！,,胖小孩,,
+快了、快了。,快了、快了。,,残疾小孩,,
+这是个啥？黑乎乎的，旁边还有两朵花。,这是个啥？黑乎乎的，旁边还有两朵花。,,跟班甲,,
+非也，非也。谁规定神仙不能长成这样的？,非也，非也。谁规定神仙不能长成这样的？,,残疾小孩,,
+呸，神仙要是真长得这么丑，老子以后都倒立撒尿！,呸，神仙要是真长得这么丑，老子以后都倒立撒尿！,,胖小孩,,
 嘶，总觉得好像在哪见过……,嘶，总觉得好像在哪见过……,,跟班乙,,
 这画是六指儿画的，你问他去！,这画是六指儿画的，你问他去！,,跟班甲,,
 我知道什么？知道也不能告诉你！,我知道什么？知道也不能告诉你！,,残疾小孩,,
 还有，以后别叫我六指儿！,还有，以后别叫我六指儿！,,残疾小孩,,
 那个怪人是最近才出现的，总是透过门缝往院子里头看。,那个怪人是最近才出现的，总是透过门缝往院子里头看。,,跟班乙,,
 搞得大家都不去墙根底下玩儿了，真晦气。,搞得大家都不去墙根底下玩儿了，真晦气。,,跟班乙,,
-c01_s06_对话3_1,画完了没有？你小子咋比秤砣还沉！,,胖小孩,猫鼠游戏前，与跟班2（同乡）的对话,
-c01_s06_对话3_2,快了、快了。,,残疾小孩,,
-这是个啥？黑乎乎的，旁边还有两朵花。,这是个啥？黑乎乎的，旁边还有两朵花。,,跟班甲,,
-非也，非也。谁规定神仙不能长成这样的？,非也，非也。谁规定神仙不能长成这样的？,,残疾小孩,,
-呸，神仙要是真长得这么丑，老子以后都倒立撒尿！,呸，神仙要是真长得这么丑，老子以后都倒立撒尿！,,胖小孩,,
 c01_s06_谈论鬼差1,站住！,,胖小孩,,
 c01_s06_谈论鬼差2,我们可没让你走！,,胖小孩,,
 c01_s06_谈论鬼差3,我们玩游戏还差个人，就你了，吕萍。,,残疾小孩,,
@@ -49,9 +52,9 @@ c01_s06_谈论鬼差8,倒数三个数，你要是被抓到了，我们就请你
 c01_s06_猫鼠游戏1,三！,,小胖孩,,[#wait=2]
 c01_s06_猫鼠游戏2,二！,,小胖孩,,[#wait=0.5]
 c01_s06_猫鼠游戏3,一！,,小胖孩,,[#wait=3]
-瞧一瞧，看一看，动动各位的发财手，老爷夫人别急走，什么把戏咱都有……,瞧一瞧，看一看，动动各位的发财手，老爷夫人别急走，什么把戏咱都有……,,监督小孩,,
-不要千、不要万，只求一顿温饱饭，又集福、又集善，亲戚儿孙中状元！,不要千、不要万，只求一顿温饱饭，又集福、又集善，亲戚儿孙中状元！,,监督小孩,,
-儿孙坐在那金銮殿，荣华富贵顶上天！,儿孙坐在那金銮殿，荣华富贵顶上天！,,监督小孩,,
+瞧一瞧，看一看，动动各位的发财手，老爷夫人别急走，什么把戏咱都有……,瞧一瞧，看一看，动动各位的发财手，老爷夫人别急走，什么把戏咱都有……,,？？？,,
+不要千、不要万，只求一顿温饱饭，又集福、又集善，亲戚儿孙中状元！,不要千、不要万，只求一顿温饱饭，又集福、又集善，亲戚儿孙中状元！,,？？？,,
+儿孙坐在那金銮殿，荣华富贵顶上天！,儿孙坐在那金銮殿，荣华富贵顶上天！,,？？？,,
 您、您行行好，给点...,您、您行行好，给点...,,小孩甲,,
 祝恁身子骨儿杠赛来，吃嘛嘛香木个病，一年更比一年行！,祝恁身子骨儿杠赛来，吃嘛嘛香木个病，一年更比一年行！,,小孩乙,,
 宾安哗在，有才有财！,宾安哗在，有才有财！,,小孩丙,,

asset/dialogue/c01.dialogue

@@ -34,14 +34,23 @@
 跟班甲: 这是个啥？黑乎乎的，旁边还有两朵花。
 残疾小孩: 非也，非也。谁规定神仙不能长成这样的？
 胖小孩: 呸，神仙要是真长得这么丑，老子以后都倒立撒尿！
-跟班乙: 嘶，总觉得好像在哪见过……
+跟班乙: 嘶，总觉得好像在哪见过...
+=> END
+
+~ c01_s06_四个小孩_对话1
 跟班甲: 这画是六指儿画的，你问他去！
-残疾小孩: 我知道什么？知道也不能告诉你！
-残疾小孩: 还有，以后别叫我六指儿！
+=> END
+
+~ c01_s06_四个小孩_对话2
 跟班乙: 那个怪人是最近才出现的，总是透过门缝往院子里头看。
 跟班乙: 搞得大家都不去墙根底下玩儿了，真晦气。
 => END
 
+~  c01_s06_四个小孩_对话3
+残疾小孩: 我知道什么？知道也不能告诉你！
+残疾小孩: 还有，以后别叫我六指儿！
+=> END
+
 ~ c01_s06_谈论鬼差与猫鼠游戏
 胖小孩: 站住！ [ID:c01_s06_谈论鬼差1]
 胖小孩: 我们可没让你走！ [ID:c01_s06_谈论鬼差2]
@@ -54,16 +63,16 @@
 => END
 
 ~ c01_s06_猫鼠游戏
-小胖孩: 三！  [#wait=2] [ID:c01_s06_猫鼠游戏1]
+小胖孩: 三！  [#wait=0.5] [ID:c01_s06_猫鼠游戏1]
 小胖孩: 二！ [#wait=0.5] [ID:c01_s06_猫鼠游戏2]
-小胖孩: 一！  [#wait=3] [ID:c01_s06_猫鼠游戏3]
+小胖孩: 一！  [#wait=2] [ID:c01_s06_猫鼠游戏3]
 => END
 
 
 ~ c01_s07_监督小孩吉祥话
-监督小孩: 瞧一瞧，看一看，动动各位的发财手，老爷夫人别急走，什么把戏咱都有……
-监督小孩: 不要千、不要万，只求一顿温饱饭，又集福、又集善，亲戚儿孙中状元！
-监督小孩: 儿孙坐在那金銮殿，荣华富贵顶上天！
+？？？: 瞧一瞧，看一看，动动各位的发财手，老爷夫人别急走，什么把戏咱都有……
+？？？: 不要千、不要万，只求一顿温饱饭，又集福、又集善，亲戚儿孙中状元！
+？？？: 儿孙坐在那金銮殿，荣华富贵顶上天！
 => END
 
 ~ c01_s07_小孩吉祥话1

asset/dialogue/inspect_content.dialogue

@@ -3,10 +3,6 @@ x年 [ID:t89c0f4a8de]
 下午一点 [ID:t356af5308e] 
 => END
 
-~ c01_信件全文
-小蝶：\n信件正文内容...\n落款 [ID:c01_信件全文]
-=> END
-
 ~ c02_鼠疫海报
 据闻奉贤县分水墩又有七人染受鼠疫，病状可怖，闻医官药治无用，免职。 [ID:t344c97cf2c]
 有地方人称鼠疫为妖邪作祟，甚为惊骇，一时人心惶惶，竟有聚众滋闹之事，政府以防疫事宜关系紧要，拟赴分水墩一带调查防疫事宜云。 [ID:tdb119a3714]

asset/dialogue/item_description.csv

@@ -2,6 +2,7 @@ keys,zh_CN,_character,_notes,_tags
 说明文本,说明文本,,,
 ui_press_b,按 B 打开背包,,,
 5,5,,,
+院长的信...,院长的信...,,,
 index_新游戏,新游戏,,,
 index_继续游戏,继续游戏,,,
 index_退出游戏,退出游戏,,,
@@ -37,7 +38,7 @@ prop_空手,空手,,,
 prop_信碎片1,信碎片(一),,,[#texture=c01/信件左上.png]
 prop_信碎片2,信碎片(二),,,[#texture=c01/信件右上.png]
 prop_银元,银元,,,[#texture=c01/银元.png]
-prop_院长的信,院长的信,,,[#texture=c01/院长的信.png]
+prop_院长的信,院长的信,,,[#texture=c01/院长的信物品.png][#inspect=c01/院长的信.png]
 prop_重要物品示例,重要物品示例,,,[#texture=c01/银元.png]
 prop_令牌,令牌,,,[#texture=c01/令牌物品.png][#inspect=c01/令牌.png]
 prop_装有灵魂的令牌,装有灵魂的令牌,,,[#texture=c01/装有灵魂的令牌物品.png][#inspect=c01/装有灵魂的令牌.png]
@@ -50,11 +51,14 @@ prop_3014旋转锁钥匙,3014旋转锁钥匙,,,[#texture=c02/3014旋转锁钥匙
 prop_小猫玩具完整,小猫玩具,,,[#texture=c02/小猫玩具完整物品.png][#inspect=c02/小猫玩具完整.png]
 prop_信碎片1_说明,浦育院院长秦阳，民国21年，11月20日,,ID格式： prop_xx_说明,
 prop_银元_说明,一枚“袁大头”银元，中華民國十年造。,,,
-院长的信...,院长的信...,,,
+prop_院长的信_说明,"院长的信...
+1
+2
+3",,,
+重要物品示例,重要物品示例,,,
 1,1,,,
 2,2,,,
 3,3,,,
-重要物品示例,重要物品示例,,,
 4,4,,,
 c01_s05_检查院长房间,好像忘记了什么事情，再回去检查一遍吧。,,,
 c01_s07_需要报纸,书店还没开门。,,,
@@ -83,6 +87,8 @@ c01_s06_院长房间,这是院长的房间,,,
 c01_s06_小朋友房间,这是其他小朋友的房间,,,
 c01_s06_熟悉的墙画,"墙上的画看起来好熟悉。
 过去问问看吧，没准他们几个知道些什么。",,,
+c01_s06_四小孩对话结束,"怪人、花、门...
+他在找什么东西，或是什么人？",,,
 c01_s07_钱碗,碗里只有一枚铜钱。,,,
 c01_s07_获得报纸,这是什么？,,,
 c01_s07_书店展柜,"院长说，读一百本书，就可以成为无所不能的大人。

asset/dialogue/item_description.dialogue

@@ -48,7 +48,7 @@
 信碎片(一) [#texture=c01/信件左上.png] [ID:prop_信碎片1]
 信碎片(二) [#texture=c01/信件右上.png] [ID:prop_信碎片2]
 银元 [#texture=c01/银元.png] [ID:prop_银元]
-院长的信 [#texture=c01/院长的信.png] [ID:prop_院长的信]
+院长的信 [#texture=c01/院长的信物品.png][#inspect=c01/院长的信.png] [ID:prop_院长的信]
 重要物品示例 [#texture=c01/银元.png] [ID:prop_重要物品示例]
 
 令牌 [#texture=c01/令牌物品.png][#inspect=c01/令牌.png]  [ID:prop_令牌]
@@ -77,10 +77,7 @@
 => END
 
 ~ prop_院长的信
-院长的信...
-1
-2
-3
+院长的信...\n1\n2\n3 [ID:prop_院长的信_说明]
 => END
 
 ~ prop_重要物品示例
@@ -121,6 +118,7 @@
 这是其他小朋友的房间 [ID:c01_s06_小朋友房间]
 # 院子里四个小孩交谈结束后
 墙上的画看起来好熟悉。\n过去问问看吧，没准他们几个知道些什么。 [ID:c01_s06_熟悉的墙画]
+怪人、花、门...\n他在找什么东西，或是什么人？ [ID:c01_s06_四小孩对话结束]
 # c01-s07 书店外
 碗里只有一枚铜钱。 [ID:c01_s07_钱碗]
 这是什么？ [ID:c01_s07_获得报纸]

config/animation/entity_sprite_frames.tres

@@ -1324,85 +1324,85 @@ animations = [{
 "speed": 30.0
 }, {
 "frames": [{
-"duration": 9.0,
+"duration": 15.0,
 "texture": ExtResource("184_tsskx")
 }, {
-"duration": 9.0,
+"duration": 15.0,
 "texture": ExtResource("185_adpbv")
 }, {
-"duration": 9.0,
+"duration": 15.0,
 "texture": ExtResource("186_xaqjo")
 }, {
-"duration": 9.0,
+"duration": 15.0,
 "texture": ExtResource("187_exmgj")
 }, {
-"duration": 9.0,
+"duration": 15.0,
 "texture": ExtResource("188_glo3y")
 }, {
-"duration": 9.0,
+"duration": 15.0,
 "texture": ExtResource("189_y86r8")
 }, {
-"duration": 9.0,
+"duration": 15.0,
 "texture": ExtResource("190_16mpc")
 }, {
-"duration": 9.0,
+"duration": 15.0,
 "texture": ExtResource("191_0ssab")
 }, {
-"duration": 9.0,
+"duration": 15.0,
 "texture": ExtResource("192_moer7")
 }, {
-"duration": 9.0,
+"duration": 15.0,
 "texture": ExtResource("193_6xoj6")
 }, {
-"duration": 9.0,
+"duration": 15.0,
 "texture": ExtResource("194_n7qvh")
 }, {
-"duration": 9.0,
+"duration": 15.0,
 "texture": ExtResource("195_077om")
 }, {
-"duration": 9.0,
+"duration": 15.0,
 "texture": ExtResource("196_b6i75")
 }, {
-"duration": 9.0,
+"duration": 15.0,
 "texture": ExtResource("197_2um7t")
 }, {
-"duration": 9.0,
+"duration": 15.0,
 "texture": ExtResource("198_iimum")
 }, {
-"duration": 9.0,
+"duration": 15.0,
 "texture": ExtResource("199_u2jno")
 }, {
-"duration": 9.0,
+"duration": 15.0,
 "texture": ExtResource("200_13qfd")
 }, {
-"duration": 9.0,
+"duration": 15.0,
 "texture": ExtResource("201_a0f2d")
 }, {
-"duration": 9.0,
+"duration": 15.0,
 "texture": ExtResource("202_ypwpj")
 }, {
-"duration": 9.0,
+"duration": 15.0,
 "texture": ExtResource("203_3qf2e")
 }, {
-"duration": 9.0,
+"duration": 15.0,
 "texture": ExtResource("204_ktwt1")
 }, {
-"duration": 9.0,
+"duration": 15.0,
 "texture": ExtResource("205_2v3u4")
 }, {
-"duration": 9.0,
+"duration": 15.0,
 "texture": ExtResource("206_dlydb")
 }, {
-"duration": 9.0,
+"duration": 15.0,
 "texture": ExtResource("207_xewty")
 }, {
-"duration": 9.0,
+"duration": 15.0,
 "texture": ExtResource("208_yjsfv")
 }, {
-"duration": 9.0,
+"duration": 15.0,
 "texture": ExtResource("209_253oi")
 }, {
-"duration": 9.0,
+"duration": 15.0,
 "texture": ExtResource("210_mlkjm")
 }],
 "loop": false,

manager/config_manager/global_config.gd

@@ -9,10 +9,10 @@ const RES_FILE_FORMAT = ".tres"
 ## layers
 const CANVAS_LAYER_SETTINGS = 30
 const CANVAS_LAYER_BAG = 25
+const CANVAS_LAYER_DIALOG = 23
 const CANVAS_LAYER_UI = 22
-const CANVAS_LAYER_PROP_INSPECTOR = 21
+const CANVAS_LAYER_PROP_INSPECTOR = 20
 const CANVAS_LAYER_GROUND_MASK = 14
-const CANVAS_LAYER_DIALOG = 12
 const CANVAS_LAYER_SHADING = 10
 const CANVAS_LAYER_LITTLE_GAME = 5
 const CANVAS_LAYER_FG = 2

scene/dialog/balloon_debug.tscn

@@ -56,7 +56,7 @@ MarginContainer/constants/margin_top = 15
 Panel/styles/panel = SubResource("StyleBoxEmpty_jydvi")
 
 [node name="Balloon" type="CanvasLayer"]
-layer = 12
+layer = 100
 script = ExtResource("1_jfh0c")
 metadata/_edit_vertical_guides_ = [-78.0]
 metadata/_edit_horizontal_guides_ = [276.0]

scene/ground/scene/c01/s05_animation.gd

@@ -71,19 +71,23 @@ func _on_ground_ready() -> void:
 
 	piano.interacted.connect(_on_piano_interacted)
 
+
+var intro_dialog_played = false
+
 func _on_bed_reading_frame_changed():
 	if bed_reading.animation == "c01_小小蝶_床上看书":
-		if bed_reading.frame == 5:
+		if bed_reading.frame == 5 and not intro_dialog_played:
+			intro_dialog_played = true
 			DialogueManager.show_dialogue_balloon(dialogue_c01, "c01_s05_院长房间_开场")
 		elif bed_reading.frame == 10:
 			# 播放结束，0.5s 后释放角色
 			get_tree().create_timer(0.5).timeout.connect(SceneManager.release_player)
-
+			$"../DeployLayer/床".enabled = true
 
 func _on_note_read():
 	frame.enabled = false
 	# 稍加延时后显示鸡毛掸子
-	get_tree().create_timer(1.0).timeout.connect(func(): ambush.enabled = true)
+	get_tree().create_timer(4.5).timeout.connect(func(): ambush.enabled = true)
 
 
 func _on_ambush_triggered():

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

@@ -606,6 +606,7 @@ default_texture = ExtResource("4_gdhoy")
 [node name="床" parent="Ground/DeployLayer" index="2" instance=ExtResource("10_18v0g")]
 position = Vector2(84, 50)
 texture = ExtResource("7_xakd0")
+enabled = false
 title_filter = "c01"
 note_key = "c01_院长床"
 

scene/ground/scene/c01/s06_animation.gd

@@ -101,6 +101,10 @@ func pre_game_os_finished():
 	SceneManager.release_player()
 
 func game_intro() -> void:
+	standing_kid1.get_node("对话1ambush").enabled = false
+	standing_kid2.get_node("对话2ambush").enabled = false
+	game_kid.get_node("对话3ambush").enabled = false
+
 	# 禁用猫鼠游戏开始 ambush 检测
 	cat_rat_game_start_ambush.enabled = false
 	var camera = SceneManager.get_camera_marker() as CameraFocusMarker
@@ -136,6 +140,33 @@ func _game_counting_down(_res = null):
 	cat.visible = true
 	cat.play("【墙上黑猫】跑步")
 
+# 与小孩 1 对话
+func talk1():
+	_on_talked()
+
+# 与小孩 2 对话
+func talk2():
+	_on_talked()
+
+# 与残疾小孩对话
+func talk3():
+	_on_talked()
+
+# 玩家与三个小孩的互动计数
+var talk_count := 0
+
+func _on_talked():
+	talk_count += 1
+	if talk_count == 3:
+		# 三个小孩都对话完毕
+		await DialogueManager.dialogue_ended
+		SceneManager.freeze_player(0)
+		await get_tree().create_timer(1.0).timeout
+		var lines = await DialogueUtil.generate_lines(tr("c01_s06_四小孩对话结束"))
+		var player = SceneManager.get_player() as MainPlayer
+		player.pop_os(lines)
+		player.os_finished.connect(SceneManager.release_player, CONNECT_ONE_SHOT)
+
 
 var kid_run_tween
 

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

@@ -20,7 +20,7 @@
 [ext_resource type="PackedScene" uid="uid://bicuc35kbn8hd" path="res://scene/shading/fog.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="SpriteFrames" uid="uid://o5poucsu57l7" path="res://asset/art/scene/c01/s06_孤儿院长廊围墙/fg_花圃.gif" id="15_wtosl"]
+[ext_resource type="SpriteFrames" uid="uid://cramkual6vemp" path="res://asset/art/scene/c01/s06_孤儿院长廊围墙/fg_花圃.gif" id="15_wtosl"]
 [ext_resource type="Texture2D" uid="uid://dol25yn3fixim" path="res://asset/art/fog_mask.png" id="17_rdmp5"]
 
 [sub_resource type="Animation" id="Animation_723yg"]
@@ -340,6 +340,13 @@ enabled = false
 [node name="CollisionShape2D" parent="Ground/DeployLayer/【站立小孩-1】/猫鼠游戏重置ambush/Area2D" index="0"]
 shape = SubResource("RectangleShape2D_7cdhx")
 
+[node name="对话1ambush" parent="Ground/DeployLayer/【站立小孩-1】" instance=ExtResource("11_tudob")]
+position = Vector2(0, 51)
+trigger_mode = "interact"
+freeze_time = 1.0
+hook_dialogue_title = "c01_s06_四个小孩_对话1"
+hook_method = "talk1"
+
 [node name="【站立小孩-2】" parent="Ground/DeployLayer" index="15" instance=ExtResource("8_ouldg")]
 z_index = 10
 position = Vector2(1505, 19)
@@ -378,6 +385,13 @@ collision_mask = 64
 [node name="CollisionShape2D" parent="Ground/DeployLayer/【站立小孩-2】/桌椅ambush2/Area2D" index="0"]
 shape = SubResource("RectangleShape2D_ceat6")
 
+[node name="对话2ambush" parent="Ground/DeployLayer/【站立小孩-2】" instance=ExtResource("11_tudob")]
+position = Vector2(2, 39)
+trigger_mode = "interact"
+freeze_time = 1.0
+hook_dialogue_title = "c01_s06_四个小孩_对话2"
+hook_method = "talk2"
+
 [node name="【墙上黑猫】" parent="Ground/DeployLayer" index="16" instance=ExtResource("8_ouldg")]
 position = Vector2(1453, -14)
 scale = Vector2(0.8, 0.8)
@@ -439,7 +453,6 @@ z_as_relative = false
 position = Vector2(-23, 1)
 sprite_frames = ExtResource("7_dsj2r")
 animation = &"【单残疾小孩】爬行"
-autoplay = "【单残疾小孩】爬行"
 autostart = false
 move_configs = Array[Dictionary]([{
 "animation": &"【单残疾小孩】爬行",
@@ -473,6 +486,13 @@ enabled = false
 [node name="CollisionShape2D" parent="Ground/DeployLayer/【胖小孩背着残疾小孩】/【单残疾小孩】/猫鼠游戏失败ambush/Area2D" index="0"]
 shape = SubResource("RectangleShape2D_7cdhx")
 
+[node name="对话3ambush" parent="Ground/DeployLayer/【胖小孩背着残疾小孩】" instance=ExtResource("11_tudob")]
+position = Vector2(-4, 41)
+trigger_mode = "interact"
+freeze_time = 1.0
+hook_dialogue_title = "c01_s06_四个小孩_对话3"
+hook_method = "talk3"
+
 [node name="猫鼠游戏胜利ambush" parent="Ground/DeployLayer" index="19" instance=ExtResource("11_tudob")]
 position = Vector2(4546, 45)
 one_shot = false

scene/ground/scene/c01/s07_animation.gd

@@ -16,12 +16,14 @@ func _ready() -> void:
 		return
 
 
+var luren
 var fog
 var seller
 var ambush_seller: Ambush2D
 
 
 func _on_ground_ready() -> void:
+	luren = $"../DeployLayer/陆仁舞刀" as ProAnimatedSprite2D
 	fog = $"../DeployLayer/portal_1/Fog" as Fog2D
 	if data.fog_disappeared:
 		# 雾已经消失，直接隐藏
@@ -45,6 +47,18 @@ func _on_ground_ready() -> void:
 		bookstore_portal.before_pre_transport_wait.connect(_knock_door)
 
 
+func greetings_ambush() -> void:
+	(luren.sprite_frames as SpriteFrames).set_animation_loop("陆仁舞刀-黄昏带红缨", false)
+	luren.animation_finished.connect(_on_luren_animation_finished, CONNECT_ONE_SHOT)
+
+
+func _on_luren_animation_finished() -> void:
+	luren.play("陆仁收刀")
+	# luren.offset = Vector2(-9.5, -0.5)
+	luren.offset = Vector2(-19, -1)
+	$"../DeployLayer/其余小孩/Note吉祥话4".enabled = true
+
+
 func _knock_door():
 	# 6 号动作：敲门
 	SceneManager.freeze_player(3.5, 6)

scene/ground/scene/c01/s07_书店外.tscn

@@ -132,11 +132,15 @@ character_name = "小孩甲"
 anonymous = false
 height = -10.0
 
-[node name="陆仁舞刀" type="AnimatedSprite2D" parent="Ground/DeployLayer" index="7"]
-position = Vector2(1028, 1)
+[node name="陆仁舞刀" parent="Ground/DeployLayer" index="7" instance=ExtResource("9_slaub")]
+position = Vector2(970, 4)
 sprite_frames = ExtResource("6_thm8f")
 animation = &"陆仁舞刀-黄昏带红缨"
 autoplay = "陆仁舞刀-黄昏带红缨"
+action_configs = Array[Dictionary]([{
+"animation_intro": "陆仁收刀",
+&"animation_next": "陆仁收刀后呼吸"
+}])
 
 [node name="其余小孩" type="AnimatedSprite2D" parent="Ground/DeployLayer" index="8"]
 position = Vector2(1160, 7)
@@ -145,9 +149,11 @@ animation = &"杂戏团黄昏-其余小孩"
 autoplay = "杂戏团黄昏-其余小孩"
 
 [node name="Ambush监督小孩" parent="Ground/DeployLayer/其余小孩" instance=ExtResource("9_f61dl")]
-position = Vector2(-117, 65)
-freeze_time = 1.0
+position = Vector2(-255, 63)
+freeze_time = 0.1
+lock_player_on_playing_dialogue = false
 hook_dialogue_title = "c01_s07_监督小孩吉祥话"
+hook_method = "greetings_ambush"
 
 [node name="Note吉祥话1" parent="Ground/DeployLayer/其余小孩" instance=ExtResource("5_3pha1")]
 position = Vector2(-41, 63)
@@ -171,8 +177,8 @@ title_filter = "c01"
 note_key = "c01_s07_小孩吉祥话3"
 
 [node name="Note吉祥话4" parent="Ground/DeployLayer/其余小孩" instance=ExtResource("5_3pha1")]
-visible = false
-position = Vector2(-209, 51)
+position = Vector2(-203, 46)
+enabled = false
 mode = "ballon"
 dialogue = "c01"
 title_filter = "c01"

scene/ground/scene/c01/s08_书店.tscn

@@ -135,7 +135,6 @@ offset = Vector2(317, 0)
 
 [node name="MainPlayer" parent="Ground" index="5"]
 position = Vector2(437, 98)
-character = "小小蝶"
 
 [node name="FGSprite2D" parent="Ground/ParallaxForeground/FGParallaxLayer" index="0"]
 position = Vector2(-1, 22)

scene/ground/scene/c01/s11_黄包车演出.tscn

@@ -181,6 +181,7 @@ target_scene = "c02_s01"
 [node name="车夫与吕萍" type="AnimatedSprite2D" parent="Ground/DeployLayer" index="2"]
 z_index = 5
 position = Vector2(157, 68)
+scale = Vector2(0.9, 0.9)
 sprite_frames = ExtResource("7_wo6md")
 animation = &"车夫静止"
 autoplay = "车夫静止"

scene/ground/scene/c01/s12_书店外_诡异版.tscn

@@ -139,7 +139,7 @@ hook_method = "player_been_catched"
 
 [node name="飘动的寻人启事" parent="Ground/DeployLayer" index="6" instance=ExtResource("11_pwu7i")]
 z_index = 1
-position = Vector2(943, -51)
+position = Vector2(1021, -48)
 
 [node name="陆仁舞刀" parent="Ground/DeployLayer" index="7" instance=ExtResource("14_ct084")]
 position = Vector2(1748, 10)
@@ -271,7 +271,6 @@ texture = ExtResource("17_nta2f")
 
 [node name="MainPlayer" parent="Ground" index="5"]
 position = Vector2(41, 98)
-character = "小小蝶"
 
 [node name="FGSprite2D" parent="Ground/ParallaxForeground/FGParallaxLayer" index="0"]
 texture = null

scene/ground/script/c01/s12_飘动的寻人启事.gd

@@ -1,7 +1,6 @@
 @tool
 extends Node2D
 
-@export var velocity := 0.15
 @export var area_size := Vector2(500, 150):
 	set(val):
 		area_size = val
@@ -15,9 +14,9 @@ extends Node2D
 @onready var remote_sprite := %Sprite2D
 @onready var sign_mark := %Sign as Sign
 
+var velocity := 2.0
 var interacted_x = -10000
 
-
 func _draw() -> void:
 	if Engine.is_editor_hint():
 		# draw gizmo
@@ -31,7 +30,7 @@ func _draw() -> void:
 
 
 # 最多保持 4 个点; 先生成两个在左侧，再生成两个在右侧，然后再回到左侧，以此循环，形成左右摇摆的闭合路径
-var bezier_points = [Vector2(0, 0), Vector2(150, 20), Vector2(250, 40), Vector2(350, 60), Vector2(400, 80), Vector2(300, 100), Vector2(250, 120), Vector2(160, 130), Vector2(120, 140), Vector2(60, 150), Vector2(0, 150)]
+var bezier_points = [Vector2(300, 0), Vector2(400, 20), Vector2(350, 40), Vector2(300, 60), Vector2(250, 80), Vector2(200, 100), Vector2(150, 120), Vector2(100, 140), Vector2(60, 150), Vector2(0, 150)]
 var current_position = Vector2.ZERO
 var weight := 0.0
 

scene/ground/script/c01/s12_飘动的寻人启事.tscn

@@ -22,7 +22,6 @@ size = Vector2(20, 10)
 [node name="飘动的寻人启事" type="Node2D"]
 position = Vector2(43, 96)
 script = ExtResource("1_like6")
-velocity = 0.5
 
 [node name="Node2D" type="Node2D" parent="."]
 

scene/little_game/书架/生死簿.tscn

@@ -78,6 +78,18 @@ tracks/4/keys = {
 "update": 0,
 "values": [0.0]
 }
+tracks/5/type = "value"
+tracks/5/imported = false
+tracks/5/enabled = true
+tracks/5/path = NodePath("%陆小蝶/../effect:visible")
+tracks/5/interp = 1
+tracks/5/loop_wrap = true
+tracks/5/keys = {
+"times": PackedFloat32Array(0),
+"transitions": PackedFloat32Array(1),
+"update": 1,
+"values": [false]
+}
 
 [sub_resource type="Animation" id="Animation_adstd"]
 resource_name = "flash"
@@ -102,10 +114,10 @@ tracks/1/path = NodePath("DirectionalLight2D:color")
 tracks/1/interp = 1
 tracks/1/loop_wrap = true
 tracks/1/keys = {
-"times": PackedFloat32Array(0, 0.19, 0.38, 0.47),
+"times": PackedFloat32Array(0, 0.19, 0.36, 0.47),
 "transitions": PackedFloat32Array(1, 1, 1, 1),
 "update": 0,
-"values": [Color(0.325954, 0.00240348, 3.62184e-06, 1), Color(1, 0.4655, 0.395153, 1), Color(0.373978, 0.00319589, 4.81308e-06, 1), Color(0.68393, 0.0117872, 1.79046e-05, 1)]
+"values": [Color(0.325954, 0.00240348, 3.62184e-06, 1), Color(1, 0.714681, 0.697898, 1), Color(0.836998, 0.0185265, 3.07074e-05, 1), Color(0.68393, 0.0117872, 1.79046e-05, 1)]
 }
 tracks/2/type = "value"
 tracks/2/imported = false
@@ -126,7 +138,7 @@ tracks/3/path = NodePath("DirectionalLight2D2:color")
 tracks/3/interp = 1
 tracks/3/loop_wrap = true
 tracks/3/keys = {
-"times": PackedFloat32Array(0, 0.19, 0.3, 0.44),
+"times": PackedFloat32Array(0, 0.17, 0.3, 0.48),
 "transitions": PackedFloat32Array(1, 1, 1, 1),
 "update": 0,
 "values": [Color(1, 0.873302, 0.851352, 1), Color(1, 0.341404, 0.271965, 1), Color(0.25098, 0.631373, 0.756863, 1), Color(1, 0.938654, 0.927912, 1)]
@@ -141,7 +153,19 @@ tracks/4/keys = {
 "times": PackedFloat32Array(0, 0.18, 0.21, 0.27, 0.34, 0.38, 0.46, 0.52),
 "transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1, 1, 1),
 "update": 0,
-"values": [0.0, 1.0, 0.5, 10.0, 0.3, 3.0, 0.2, 0.0]
+"values": [0.0, 2.0, 0.5, 5.0, 0.3, 2.0, 0.2, 0.0]
+}
+tracks/5/type = "value"
+tracks/5/imported = false
+tracks/5/enabled = true
+tracks/5/path = NodePath("%陆小蝶/../effect:visible")
+tracks/5/interp = 1
+tracks/5/loop_wrap = true
+tracks/5/keys = {
+"times": PackedFloat32Array(0.00999999, 0.15, 0.27, 0.36, 0.5, 0.6),
+"transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1),
+"update": 1,
+"values": [false, true, false, true, false, false]
 }
 
 [sub_resource type="AnimationLibrary" id="AnimationLibrary_7rw5g"]
@@ -364,6 +388,7 @@ centered = false
 
 [node name="p1" type="Sprite2D" parent="Control/页面"]
 unique_name_in_owner = true
+visible = false
 texture = ExtResource("5_qhrv2")
 centered = false
 
@@ -373,7 +398,6 @@ centered = false
 
 [node name="陆小蝶" type="Sprite2D" parent="Control/页面"]
 unique_name_in_owner = true
-modulate = Color(0.503203, 0.320866, 0.30312, 1)
 position = Vector2(309, 158)
 texture = ExtResource("7_hohup")
 offset = Vector2(-20, 0)

scene/little_game/拼凑信件.gd

@@ -29,7 +29,6 @@ func _ready() -> void:
 	_display_selected()
 	content_rect.modulate.a = 0.0
 	content_rect.visible = true
-	# %Label.text = tr("c01_信件全文")
 	SceneManager.pop_center_notification(tr("input_拼凑信件"))
 
 
@@ -136,6 +135,9 @@ func _post_success():
 	# var tween = create_tween()
 	# tween.tween_property(content_rect, "modulate:a", 1.0, 1.0)
 	SceneManager.pop_center_notification(tr("ui_important_item_update"))
+	var texture = preload("res://asset/art/prop/c01/院长的信.png")
+	var inspector = SceneManager.get_inspector()
+	inspector.pop_standard_inspection(texture, null, tr("prop_院长的信_说明"))
 	SceneManager.enable_important_item("prop_院长的信")
 	# 1s 后退出
 	await get_tree().create_timer(1.0).timeout

scene/notification/notification.tscn

@@ -6,8 +6,7 @@
 
 [sub_resource type="LabelSettings" id="LabelSettings_ycsas"]
 font = ExtResource("2_eh7gu")
-font_size = 20
-outline_size = 5
+outline_size = 4
 outline_color = Color(0.184314, 0.12549, 0.141176, 1)
 
 [node name="Notification" type="Control"]

scene/player/main_player.tscn

@@ -29,7 +29,6 @@ z_index = 5
 collision_mask = 2
 script = ExtResource("1_3a78y")
 running_locked = true
-debug_freeze = 4
 metadata/_edit_vertical_guides_ = [-120.0]
 metadata/_edit_horizontal_guides_ = [-9.0]
 

scene/prop/prop_hud.gd

@@ -404,6 +404,7 @@ func enable_prop_item(prop_key: String) -> void:
 	var inspector = SceneManager.get_inspector()
 	if inspector:
 		var inspect_path = items_dict[prop_key].inspect_path
+		# 是否有独立的 inspect 图片
 		if inspect_path:
 			var texture = load(inspect_path) as Texture2D
 			inspector.pop_prop_inspection(prop_key, texture)

scene/prop/prop_inspector.gd

@@ -73,7 +73,7 @@ func _blink_label(init := true):
 		blinking_tween.tween_callback(_blink_label.bind(true))
 
 
-func pop_standard_inspection(cover_texture, notes_texture, inspection_note, centered := true):
+func pop_standard_inspection(cover_texture, notes_texture, inspection_note, centered := false):
 	if centered:
 		content_label.horizontal_alignment = HORIZONTAL_ALIGNMENT_CENTER
 	else:

scene/prop/prop_inspector.tscn

@@ -94,7 +94,6 @@ theme_override_constants/margin_bottom = 60
 
 [node name="ContentLabel" type="Label" parent="MarginContainer2"]
 unique_name_in_owner = true
-modulate = Color(1, 1, 1, 0)
 custom_minimum_size = Vector2(150, 0)
 layout_mode = 2
 size_flags_horizontal = 4
@@ -104,7 +103,6 @@ text = "据闻奉贤县分水墩又有七人染受鼠疫，病状可怖，闻医
 《申报》
 民国五年一月十三日"
 label_settings = SubResource("LabelSettings_5qe7a")
-horizontal_alignment = 1
 vertical_alignment = 1
 autowrap_mode = 3
 
@@ -127,6 +125,6 @@ unique_name_in_owner = true
 modulate = Color(1, 1, 1, 0)
 layout_mode = 2
 size_flags_horizontal = 4
-text = "Q: ui_退出     E: ui_阅读"
+text = "Q: Exit     E: Read"
 horizontal_alignment = 1
 vertical_alignment = 1