diff --git a/asset/art/animation/c00_过道小猫/过道小猫1.png b/asset/art/animation/c00_过道小猫/过道小猫1.png new file mode 100644 index 00000000..6632e3ee Binary files /dev/null and b/asset/art/animation/c00_过道小猫/过道小猫1.png differ diff --git a/asset/art/animation/c00_过道小猫/过道小猫1.png.import b/asset/art/animation/c00_过道小猫/过道小猫1.png.import new file mode 100644 index 00000000..54edb6df --- /dev/null +++ b/asset/art/animation/c00_过道小猫/过道小猫1.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://x0xakx6gceq3" +path="res://.godot/imported/过道小猫1.png-3d5fdf0d99b437a1c14a31093de59e68.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/animation/c00_过道小猫/过道小猫1.png" +dest_files=["res://.godot/imported/过道小猫1.png-3d5fdf0d99b437a1c14a31093de59e68.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/asset/art/animation/c00_过道小猫/过道小猫10.png b/asset/art/animation/c00_过道小猫/过道小猫10.png new file mode 100644 index 00000000..71ad626e Binary files /dev/null and b/asset/art/animation/c00_过道小猫/过道小猫10.png differ diff --git a/asset/art/animation/c00_过道小猫/过道小猫10.png.import b/asset/art/animation/c00_过道小猫/过道小猫10.png.import new file mode 100644 index 00000000..ebe902d9 --- /dev/null +++ b/asset/art/animation/c00_过道小猫/过道小猫10.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bytejqa6gq1gw" +path="res://.godot/imported/过道小猫10.png-fc6dd64f8a2b36e5e2f90eded65b95a3.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/animation/c00_过道小猫/过道小猫10.png" +dest_files=["res://.godot/imported/过道小猫10.png-fc6dd64f8a2b36e5e2f90eded65b95a3.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/asset/art/animation/c00_过道小猫/过道小猫11.png b/asset/art/animation/c00_过道小猫/过道小猫11.png new file mode 100644 index 00000000..889f87f0 Binary files /dev/null and b/asset/art/animation/c00_过道小猫/过道小猫11.png differ diff --git a/asset/art/animation/c00_过道小猫/过道小猫11.png.import b/asset/art/animation/c00_过道小猫/过道小猫11.png.import new file mode 100644 index 00000000..7b389bf5 --- /dev/null +++ b/asset/art/animation/c00_过道小猫/过道小猫11.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bl57usqw8wtls" +path="res://.godot/imported/过道小猫11.png-88d96d720152e3c4a9e41c85ca42d45f.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/animation/c00_过道小猫/过道小猫11.png" +dest_files=["res://.godot/imported/过道小猫11.png-88d96d720152e3c4a9e41c85ca42d45f.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/asset/art/animation/c00_过道小猫/过道小猫12.png b/asset/art/animation/c00_过道小猫/过道小猫12.png new file mode 100644 index 00000000..c726f696 Binary files /dev/null and b/asset/art/animation/c00_过道小猫/过道小猫12.png differ diff --git a/asset/art/animation/c00_过道小猫/过道小猫12.png.import b/asset/art/animation/c00_过道小猫/过道小猫12.png.import new file mode 100644 index 00000000..74f6e064 --- /dev/null +++ b/asset/art/animation/c00_过道小猫/过道小猫12.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://sav8qv3xffk3" +path="res://.godot/imported/过道小猫12.png-45d48b9b69b6593d3b26f2e46f1925ab.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/animation/c00_过道小猫/过道小猫12.png" +dest_files=["res://.godot/imported/过道小猫12.png-45d48b9b69b6593d3b26f2e46f1925ab.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/asset/art/animation/c00_过道小猫/过道小猫16.png b/asset/art/animation/c00_过道小猫/过道小猫16.png new file mode 100644 index 00000000..f7ecd4e8 Binary files /dev/null and b/asset/art/animation/c00_过道小猫/过道小猫16.png differ diff --git a/asset/art/animation/c00_过道小猫/过道小猫16.png.import b/asset/art/animation/c00_过道小猫/过道小猫16.png.import new file mode 100644 index 00000000..17246c91 --- /dev/null +++ b/asset/art/animation/c00_过道小猫/过道小猫16.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c01atkjc6wg76" +path="res://.godot/imported/过道小猫16.png-1d0fa4372e8f6024616ae28f606ac3f1.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/animation/c00_过道小猫/过道小猫16.png" +dest_files=["res://.godot/imported/过道小猫16.png-1d0fa4372e8f6024616ae28f606ac3f1.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/asset/art/animation/c00_过道小猫/过道小猫17.png b/asset/art/animation/c00_过道小猫/过道小猫17.png new file mode 100644 index 00000000..832d6456 Binary files /dev/null and b/asset/art/animation/c00_过道小猫/过道小猫17.png differ diff --git a/asset/art/animation/c00_过道小猫/过道小猫17.png.import b/asset/art/animation/c00_过道小猫/过道小猫17.png.import new file mode 100644 index 00000000..218c4f3b --- /dev/null +++ b/asset/art/animation/c00_过道小猫/过道小猫17.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cj18v4yusj2dd" +path="res://.godot/imported/过道小猫17.png-0c4ae00f50fe8fdfd09af8abfc24d00d.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/animation/c00_过道小猫/过道小猫17.png" +dest_files=["res://.godot/imported/过道小猫17.png-0c4ae00f50fe8fdfd09af8abfc24d00d.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/asset/art/animation/c00_过道小猫/过道小猫18.png b/asset/art/animation/c00_过道小猫/过道小猫18.png new file mode 100644 index 00000000..2db24575 Binary files /dev/null and b/asset/art/animation/c00_过道小猫/过道小猫18.png differ diff --git a/asset/art/animation/c00_过道小猫/过道小猫18.png.import b/asset/art/animation/c00_过道小猫/过道小猫18.png.import new file mode 100644 index 00000000..975090c3 --- /dev/null +++ b/asset/art/animation/c00_过道小猫/过道小猫18.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://be5oheu1c6ty7" +path="res://.godot/imported/过道小猫18.png-abda885c60d732248b22ecf73ac0490d.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/animation/c00_过道小猫/过道小猫18.png" +dest_files=["res://.godot/imported/过道小猫18.png-abda885c60d732248b22ecf73ac0490d.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/asset/art/animation/c00_过道小猫/过道小猫2.png b/asset/art/animation/c00_过道小猫/过道小猫2.png new file mode 100644 index 00000000..eadea691 Binary files /dev/null and b/asset/art/animation/c00_过道小猫/过道小猫2.png differ diff --git a/asset/art/animation/c00_过道小猫/过道小猫2.png.import b/asset/art/animation/c00_过道小猫/过道小猫2.png.import new file mode 100644 index 00000000..40da5a5f --- /dev/null +++ b/asset/art/animation/c00_过道小猫/过道小猫2.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://1untb3vqajxc" +path="res://.godot/imported/过道小猫2.png-9d470e822cc4ef2a01700afa20a39baa.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/animation/c00_过道小猫/过道小猫2.png" +dest_files=["res://.godot/imported/过道小猫2.png-9d470e822cc4ef2a01700afa20a39baa.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/asset/art/animation/c00_过道小猫/过道小猫3.png b/asset/art/animation/c00_过道小猫/过道小猫3.png new file mode 100644 index 00000000..cc47fb11 Binary files /dev/null and b/asset/art/animation/c00_过道小猫/过道小猫3.png differ diff --git a/asset/art/animation/c00_过道小猫/过道小猫3.png.import b/asset/art/animation/c00_过道小猫/过道小猫3.png.import new file mode 100644 index 00000000..ff5bf549 --- /dev/null +++ b/asset/art/animation/c00_过道小猫/过道小猫3.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://d0bexp0m4tgoo" +path="res://.godot/imported/过道小猫3.png-a5674f838d3a9eeba90d23903e7948ee.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/animation/c00_过道小猫/过道小猫3.png" +dest_files=["res://.godot/imported/过道小猫3.png-a5674f838d3a9eeba90d23903e7948ee.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/asset/art/animation/c00_过道小猫/过道小猫4.png b/asset/art/animation/c00_过道小猫/过道小猫4.png new file mode 100644 index 00000000..6d0b744a Binary files /dev/null and b/asset/art/animation/c00_过道小猫/过道小猫4.png differ diff --git a/asset/art/animation/c00_过道小猫/过道小猫4.png.import b/asset/art/animation/c00_过道小猫/过道小猫4.png.import new file mode 100644 index 00000000..74eb984b --- /dev/null +++ b/asset/art/animation/c00_过道小猫/过道小猫4.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dl5tr20desys7" +path="res://.godot/imported/过道小猫4.png-3453f1455c09043b60583b63549b285e.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/animation/c00_过道小猫/过道小猫4.png" +dest_files=["res://.godot/imported/过道小猫4.png-3453f1455c09043b60583b63549b285e.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/asset/art/animation/c00_过道小猫/过道小猫5.png b/asset/art/animation/c00_过道小猫/过道小猫5.png new file mode 100644 index 00000000..ba0ea382 Binary files /dev/null and b/asset/art/animation/c00_过道小猫/过道小猫5.png differ diff --git a/asset/art/animation/c00_过道小猫/过道小猫5.png.import b/asset/art/animation/c00_过道小猫/过道小猫5.png.import new file mode 100644 index 00000000..5a80b5ec --- /dev/null +++ b/asset/art/animation/c00_过道小猫/过道小猫5.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c30g8hurjifor" +path="res://.godot/imported/过道小猫5.png-efe5dc54b8d57fa83ad468d263b536be.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/animation/c00_过道小猫/过道小猫5.png" +dest_files=["res://.godot/imported/过道小猫5.png-efe5dc54b8d57fa83ad468d263b536be.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/asset/art/animation/c00_过道小猫/过道小猫6.png b/asset/art/animation/c00_过道小猫/过道小猫6.png new file mode 100644 index 00000000..3e248aa6 Binary files /dev/null and b/asset/art/animation/c00_过道小猫/过道小猫6.png differ diff --git a/asset/art/animation/c00_过道小猫/过道小猫6.png.import b/asset/art/animation/c00_过道小猫/过道小猫6.png.import new file mode 100644 index 00000000..318b71e2 --- /dev/null +++ b/asset/art/animation/c00_过道小猫/过道小猫6.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dd37exi5l8twl" +path="res://.godot/imported/过道小猫6.png-e42a89d84a2433e1539a345b783d3dbc.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/animation/c00_过道小猫/过道小猫6.png" +dest_files=["res://.godot/imported/过道小猫6.png-e42a89d84a2433e1539a345b783d3dbc.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/asset/art/animation/c00_过道小猫/过道小猫7.png b/asset/art/animation/c00_过道小猫/过道小猫7.png new file mode 100644 index 00000000..d5c79d83 Binary files /dev/null and b/asset/art/animation/c00_过道小猫/过道小猫7.png differ diff --git a/asset/art/animation/c00_过道小猫/过道小猫7.png.import b/asset/art/animation/c00_过道小猫/过道小猫7.png.import new file mode 100644 index 00000000..06600aea --- /dev/null +++ b/asset/art/animation/c00_过道小猫/过道小猫7.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://ch00gvlcjwn5o" +path="res://.godot/imported/过道小猫7.png-0a8b5658a3fb62c5982ca830c1757717.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/animation/c00_过道小猫/过道小猫7.png" +dest_files=["res://.godot/imported/过道小猫7.png-0a8b5658a3fb62c5982ca830c1757717.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/asset/art/animation/c00_过道小猫/过道小猫8.png b/asset/art/animation/c00_过道小猫/过道小猫8.png new file mode 100644 index 00000000..b41ae634 Binary files /dev/null and b/asset/art/animation/c00_过道小猫/过道小猫8.png differ diff --git a/asset/art/animation/c00_过道小猫/过道小猫8.png.import b/asset/art/animation/c00_过道小猫/过道小猫8.png.import new file mode 100644 index 00000000..1d919466 --- /dev/null +++ b/asset/art/animation/c00_过道小猫/过道小猫8.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://pcwrp1n7pglh" +path="res://.godot/imported/过道小猫8.png-d4f6f969a11d28f2460aa052750b9f60.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/animation/c00_过道小猫/过道小猫8.png" +dest_files=["res://.godot/imported/过道小猫8.png-d4f6f969a11d28f2460aa052750b9f60.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/asset/art/animation/c00_过道小猫/过道小猫9.png b/asset/art/animation/c00_过道小猫/过道小猫9.png new file mode 100644 index 00000000..b4d1dd7a Binary files /dev/null and b/asset/art/animation/c00_过道小猫/过道小猫9.png differ diff --git a/asset/art/animation/c00_过道小猫/过道小猫9.png.import b/asset/art/animation/c00_过道小猫/过道小猫9.png.import new file mode 100644 index 00000000..9915caef --- /dev/null +++ b/asset/art/animation/c00_过道小猫/过道小猫9.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://pca4moroqv5g" +path="res://.godot/imported/过道小猫9.png-e370893601e756135a92870d4873e3e1.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/animation/c00_过道小猫/过道小猫9.png" +dest_files=["res://.godot/imported/过道小猫9.png-e370893601e756135a92870d4873e3e1.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/asset/art/gif/c00_吕萍通用动作/c00_吕萍通用动作_frames.tres b/asset/art/gif/c00_吕萍通用动作/c00_吕萍通用动作_frames.tres index 82830ed8..df6c4221 100644 --- a/asset/art/gif/c00_吕萍通用动作/c00_吕萍通用动作_frames.tres +++ b/asset/art/gif/c00_吕萍通用动作/c00_吕萍通用动作_frames.tres @@ -1,4 +1,18 @@ -[gd_resource type="SpriteFrames" format=3 uid="uid://di43shn22n5ph"] +[gd_resource type="SpriteFrames" load_steps=3 format=3 uid="uid://di43shn22n5ph"] + +[ext_resource type="Texture2D" path="res://asset/art/gif/c00_吕萍通用动作/小蝶背身/0.png" id="1_4005n"] +[ext_resource type="Texture2D" path="res://asset/art/gif/c00_吕萍通用动作/小蝶背身/1.png" id="2_tglh5"] [resource] -animations = [] +animations = [{ +"frames": [{ +"duration": 30.0, +"texture": ExtResource("1_4005n") +}, { +"duration": 30.0, +"texture": ExtResource("2_tglh5") +}], +"loop": true, +"name": &"小蝶背身", +"speed": 30.0 +}] diff --git a/asset/art/gif/c00_吕萍通用动作/小蝶背身.gif b/asset/art/gif/c00_吕萍通用动作/小蝶背身.gif new file mode 100644 index 00000000..bfd58aba Binary files /dev/null and b/asset/art/gif/c00_吕萍通用动作/小蝶背身.gif differ diff --git a/asset/art/gif/c00_吕萍通用动作/小蝶背身.gif.import b/asset/art/gif/c00_吕萍通用动作/小蝶背身.gif.import new file mode 100644 index 00000000..bcc58e3e --- /dev/null +++ b/asset/art/gif/c00_吕萍通用动作/小蝶背身.gif.import @@ -0,0 +1,14 @@ +[remap] + +importer="gif.animated.texture.plugin" +type="SpriteFrames" +uid="uid://eyl5jfwbktyn" +path="res://.godot/imported/小蝶背身.gif-238cd457190ed7b266dfc8b1c9854476.tres" + +[deps] + +source_file="res://asset/art/gif/c00_吕萍通用动作/小蝶背身.gif" +dest_files=["res://.godot/imported/小蝶背身.gif-238cd457190ed7b266dfc8b1c9854476.tres"] + +[params] + diff --git a/asset/art/gif/c00_吕萍通用动作/小蝶背身/0.png b/asset/art/gif/c00_吕萍通用动作/小蝶背身/0.png new file mode 100644 index 00000000..baf53fa1 Binary files /dev/null and b/asset/art/gif/c00_吕萍通用动作/小蝶背身/0.png differ diff --git a/asset/art/gif/c00_吕萍通用动作/小蝶背身/0.png.import b/asset/art/gif/c00_吕萍通用动作/小蝶背身/0.png.import new file mode 100644 index 00000000..bb728f4b --- /dev/null +++ b/asset/art/gif/c00_吕萍通用动作/小蝶背身/0.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://btkowww28teyj" +path="res://.godot/imported/0.png-38f4a6066e7972e66d9f12ad95d878e1.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/gif/c00_吕萍通用动作/小蝶背身/0.png" +dest_files=["res://.godot/imported/0.png-38f4a6066e7972e66d9f12ad95d878e1.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/asset/art/gif/c00_吕萍通用动作/小蝶背身/1.png b/asset/art/gif/c00_吕萍通用动作/小蝶背身/1.png new file mode 100644 index 00000000..664163a1 Binary files /dev/null and b/asset/art/gif/c00_吕萍通用动作/小蝶背身/1.png differ diff --git a/asset/art/gif/c00_吕萍通用动作/小蝶背身/1.png.import b/asset/art/gif/c00_吕萍通用动作/小蝶背身/1.png.import new file mode 100644 index 00000000..53dd61c2 --- /dev/null +++ b/asset/art/gif/c00_吕萍通用动作/小蝶背身/1.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cybck8rsjbgme" +path="res://.godot/imported/1.png-fb9399dd32a081a5b3d1ab69580fecc3.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/gif/c00_吕萍通用动作/小蝶背身/1.png" +dest_files=["res://.godot/imported/1.png-fb9399dd32a081a5b3d1ab69580fecc3.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/asset/audio/sfx/交互/猫咪呼噜.mp3 b/asset/audio/sfx/交互/猫咪呼噜.mp3 new file mode 100644 index 00000000..a69247ef Binary files /dev/null and b/asset/audio/sfx/交互/猫咪呼噜.mp3 differ diff --git a/asset/audio/sfx/交互/猫咪呼噜.mp3.import b/asset/audio/sfx/交互/猫咪呼噜.mp3.import new file mode 100644 index 00000000..7a7d6f9a --- /dev/null +++ b/asset/audio/sfx/交互/猫咪呼噜.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://l0whtf4cscgx" +path="res://.godot/imported/猫咪呼噜.mp3-f00bc8e9bc5c01ade421a9b49b69908f.mp3str" + +[deps] + +source_file="res://asset/audio/sfx/交互/猫咪呼噜.mp3" +dest_files=["res://.godot/imported/猫咪呼噜.mp3-f00bc8e9bc5c01ade421a9b49b69908f.mp3str"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/asset/audio/sfx/交互/猫咪消失.mp3 b/asset/audio/sfx/交互/猫咪消失.mp3 new file mode 100644 index 00000000..3cec2d0e Binary files /dev/null and b/asset/audio/sfx/交互/猫咪消失.mp3 differ diff --git a/asset/audio/sfx/交互/猫咪消失.mp3.import b/asset/audio/sfx/交互/猫咪消失.mp3.import new file mode 100644 index 00000000..62974c1c --- /dev/null +++ b/asset/audio/sfx/交互/猫咪消失.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://bpvstm0yqoux7" +path="res://.godot/imported/猫咪消失.mp3-f537fc645074f66a7588c920f7076a63.mp3str" + +[deps] + +source_file="res://asset/audio/sfx/交互/猫咪消失.mp3" +dest_files=["res://.godot/imported/猫咪消失.mp3-f537fc645074f66a7588c920f7076a63.mp3str"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/asset/audio/sfx/交互/猫咪走路.mp3 b/asset/audio/sfx/交互/猫咪走路.mp3 new file mode 100644 index 00000000..79ab1ffd Binary files /dev/null and b/asset/audio/sfx/交互/猫咪走路.mp3 differ diff --git a/asset/audio/sfx/交互/猫咪走路.mp3.import b/asset/audio/sfx/交互/猫咪走路.mp3.import new file mode 100644 index 00000000..dc75e275 --- /dev/null +++ b/asset/audio/sfx/交互/猫咪走路.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://egfenxu2p5tw" +path="res://.godot/imported/猫咪走路.mp3-c4f610122cf602056a07e688a3555455.mp3str" + +[deps] + +source_file="res://asset/audio/sfx/交互/猫咪走路.mp3" +dest_files=["res://.godot/imported/猫咪走路.mp3-c4f610122cf602056a07e688a3555455.mp3str"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/asset/dialogue/item_description.dialogue b/asset/dialogue/item_description.dialogue index 3c71fb19..185b37b6 100644 --- a/asset/dialogue/item_description.dialogue +++ b/asset/dialogue/item_description.dialogue @@ -70,6 +70,7 @@ # c02 火柴 [#texture=c02/火柴.png] [ID:prop_火柴] +火柴_说明 [#texture=c02/火柴.png] [ID:prop_火柴_说明] 小猫玩具的脑袋 [#texture=c02/新小猫头.png] [ID:prop_小猫玩具的脑袋] 无头小猫玩具 [#texture=c02/新小猫身体.png] [#inspect=c02/新小猫身体_特写.png] [ID:prop_无头小猫玩具] 小猫玩具 [#texture=c02/新小猫全身.png] [ID:prop_小猫玩具完整] diff --git a/config/animation/entity_sprite_frames.tres b/config/animation/entity_sprite_frames.tres index 38879b40..1478fdb1 100644 --- a/config/animation/entity_sprite_frames.tres +++ b/config/animation/entity_sprite_frames.tres @@ -1,4 +1,4 @@ -[gd_resource type="SpriteFrames" load_steps=806 format=3 uid="uid://b7fhheih1hbvf"] +[gd_resource type="SpriteFrames" load_steps=823 format=3 uid="uid://b7fhheih1hbvf"] [ext_resource type="Texture2D" uid="uid://bpqrd6vo3j17m" path="res://asset/art/animation/c00_吕萍_记笔记_right/吕萍-拿本子记录1.png" id="1_6sdvl"] [ext_resource type="Texture2D" uid="uid://dvq64espa37lx" path="res://asset/art/animation/c00_吕萍_idle_left/zhhx1.png" id="1_ekv0l"] @@ -290,12 +290,14 @@ [ext_resource type="Texture2D" uid="uid://c57b42rij1qil" path="res://asset/art/animation/c01_小小蝶_walking_l/2.png" id="132_eeag4"] [ext_resource type="Texture2D" uid="uid://bxp43nbp1a237" path="res://asset/art/animation/c01_车夫_running/7.png" id="133_4swv0"] [ext_resource type="Texture2D" uid="uid://7off6ty3whn1" path="res://asset/art/animation/c01_小小蝶_walking_l/3.png" id="133_fpldy"] +[ext_resource type="Texture2D" uid="uid://btkowww28teyj" path="res://asset/art/gif/c00_吕萍通用动作/小蝶背身/0.png" id="134_qhkmm"] [ext_resource type="Texture2D" uid="uid://ccxcmml2xrtbh" path="res://asset/art/animation/c01_车夫_running/8.png" id="134_ti84l"] [ext_resource type="Texture2D" uid="uid://dpg0qjnh724tf" path="res://asset/art/animation/c01_小小蝶_walking_l/4.png" id="134_x6ki2"] [ext_resource type="Texture2D" uid="uid://dcb0urbbfkb3f" path="res://asset/art/animation/c01_小小蝶_walking_l/5.png" id="135_5fneh"] [ext_resource type="Texture2D" uid="uid://rwpb2jhx0qe0" path="res://asset/art/animation/c01_小小蝶_抬头_l/1.png" id="135_h2mh7"] [ext_resource type="Texture2D" uid="uid://codjtuksfcxil" path="res://asset/art/animation/c01_小小蝶_侧面下蹲/1.png" id="135_hth06"] [ext_resource type="Texture2D" uid="uid://bxk1v37yblokv" path="res://asset/art/animation/c02_吕萍_匍匐起身蹲着窥视/1.png" id="135_s0r05"] +[ext_resource type="Texture2D" uid="uid://cybck8rsjbgme" path="res://asset/art/gif/c00_吕萍通用动作/小蝶背身/1.png" id="135_x6adg"] [ext_resource type="Texture2D" uid="uid://c3k1sapuomspr" path="res://asset/art/animation/c01_小小蝶_抬头_l/2.png" id="136_g5ypq"] [ext_resource type="Texture2D" uid="uid://cv15erqcotgqg" path="res://asset/art/animation/c01_小小蝶_侧面下蹲/2.png" id="136_ko460"] [ext_resource type="Texture2D" uid="uid://dxkdiwvuon3lx" path="res://asset/art/animation/c01_小小蝶_walking_l/6.png" id="136_rej31"] @@ -408,28 +410,43 @@ [ext_resource type="Texture2D" uid="uid://emtd3r72ewhv" path="res://asset/art/animation/c02_吕萍_看小猫玩具_right/看玩具动作右7.png" id="186_ecyns"] [ext_resource type="Texture2D" uid="uid://lc6luwpq22il" path="res://asset/art/gif/c01_书店外街道/小蝶看向橱窗/23.png" id="186_if2a6"] [ext_resource type="Texture2D" uid="uid://jk7vua3s68q0" path="res://asset/art/gif/c01_书店/小蝶拿报纸/2.png" id="186_xaqjo"] +[ext_resource type="Texture2D" uid="uid://x0xakx6gceq3" path="res://asset/art/animation/c00_过道小猫/过道小猫1.png" id="186_yiibj"] [ext_resource type="Texture2D" uid="uid://lsx7qqkkka0b" path="res://asset/art/gif/c01_书店外街道/小蝶看向橱窗/24.png" id="187_7hrrj"] [ext_resource type="Texture2D" uid="uid://cwakyp1uwatvc" path="res://asset/art/gif/c01_书店/小蝶拿报纸/3.png" id="187_exmgj"] +[ext_resource type="Texture2D" uid="uid://1untb3vqajxc" path="res://asset/art/animation/c00_过道小猫/过道小猫2.png" id="187_qhkmm"] [ext_resource type="Texture2D" uid="uid://b6y8ggopkh8me" path="res://asset/art/gif/c01_书店外街道/小蝶看向橱窗/25.png" id="188_f1lc0"] [ext_resource type="Texture2D" uid="uid://dqdnrlwq5wreh" path="res://asset/art/gif/c01_书店/小蝶拿报纸/4.png" id="188_glo3y"] +[ext_resource type="Texture2D" uid="uid://d0bexp0m4tgoo" path="res://asset/art/animation/c00_过道小猫/过道小猫3.png" id="188_x6adg"] [ext_resource type="Texture2D" uid="uid://b313jbmemspvi" path="res://asset/art/gif/c01_书店外街道/小蝶看向橱窗/26.png" id="189_s1ehm"] +[ext_resource type="Texture2D" uid="uid://dl5tr20desys7" path="res://asset/art/animation/c00_过道小猫/过道小猫4.png" id="189_xbi36"] [ext_resource type="Texture2D" uid="uid://dgn2fagpa2e62" path="res://asset/art/gif/c01_书店/小蝶拿报纸/5.png" id="189_y86r8"] [ext_resource type="Texture2D" uid="uid://c2a3lrhelynp0" path="res://asset/art/gif/c01_书店/小蝶拿报纸/6.png" id="190_16mpc"] +[ext_resource type="Texture2D" uid="uid://c30g8hurjifor" path="res://asset/art/animation/c00_过道小猫/过道小猫5.png" id="190_l6835"] [ext_resource type="Texture2D" uid="uid://cnjaymd5fifij" path="res://asset/art/gif/c01_书店外街道/小蝶看向橱窗/27.png" id="190_mbp6y"] [ext_resource type="Texture2D" uid="uid://citru0vpf5qaf" path="res://asset/art/gif/c01_书店/小蝶拿报纸/7.png" id="191_0ssab"] +[ext_resource type="Texture2D" uid="uid://dd37exi5l8twl" path="res://asset/art/animation/c00_过道小猫/过道小猫6.png" id="191_8ha5y"] +[ext_resource type="Texture2D" uid="uid://ch00gvlcjwn5o" path="res://asset/art/animation/c00_过道小猫/过道小猫7.png" id="192_6n1b2"] [ext_resource type="Texture2D" uid="uid://1wjg5frbftyb" path="res://asset/art/gif/c01_书店/小蝶拿报纸/8.png" id="192_moer7"] [ext_resource type="Texture2D" uid="uid://tfgmyhmed0wp" path="res://asset/art/gif/c01_书店/小蝶拿报纸/9.png" id="193_6xoj6"] +[ext_resource type="Texture2D" uid="uid://pcwrp1n7pglh" path="res://asset/art/animation/c00_过道小猫/过道小猫8.png" id="193_ftljk"] +[ext_resource type="Texture2D" uid="uid://pca4moroqv5g" path="res://asset/art/animation/c00_过道小猫/过道小猫9.png" id="194_mg60w"] [ext_resource type="Texture2D" uid="uid://bpafujc1obco1" path="res://asset/art/gif/c01_书店/小蝶拿报纸/10.png" id="194_n7qvh"] +[ext_resource type="Texture2D" uid="uid://bytejqa6gq1gw" path="res://asset/art/animation/c00_过道小猫/过道小猫10.png" id="195_37jig"] [ext_resource type="Texture2D" uid="uid://bx1w1jc8lgutg" path="res://asset/art/gif/c01_书店/小蝶拿报纸/11.png" id="195_077om"] [ext_resource type="Texture2D" uid="uid://c4xqag7kir1v6" path="res://asset/art/gif/c01_公寓过道/小蝶探头/0.png" id="195_svnph"] [ext_resource type="Texture2D" uid="uid://bg6ripghav65k" path="res://asset/art/gif/c01_公寓过道/小蝶探头/1.png" id="196_4mphc"] [ext_resource type="Texture2D" uid="uid://bteg8gax5ghsp" path="res://asset/art/gif/c01_书店/小蝶拿报纸/12.png" id="196_b6i75"] +[ext_resource type="Texture2D" uid="uid://bl57usqw8wtls" path="res://asset/art/animation/c00_过道小猫/过道小猫11.png" id="196_spcyg"] [ext_resource type="Texture2D" uid="uid://b6xjhx15o1yae" path="res://asset/art/gif/c01_书店/小蝶拿报纸/13.png" id="197_2um7t"] +[ext_resource type="Texture2D" uid="uid://sav8qv3xffk3" path="res://asset/art/animation/c00_过道小猫/过道小猫12.png" id="197_a6bg6"] [ext_resource type="Texture2D" uid="uid://bfinqfmh8mrf0" path="res://asset/art/gif/c01_公寓过道/小蝶探头/2.png" id="197_kqaxi"] +[ext_resource type="Texture2D" uid="uid://c01atkjc6wg76" path="res://asset/art/animation/c00_过道小猫/过道小猫16.png" id="198_1n12f"] [ext_resource type="Texture2D" uid="uid://by6h1qt5js0f0" path="res://asset/art/gif/c01_公寓过道/小蝶探头/3.png" id="198_1pdlh"] [ext_resource type="Texture2D" uid="uid://dlrkctcq3xj8h" path="res://asset/art/gif/c01_书店/小蝶拿报纸/14.png" id="198_iimum"] [ext_resource type="Texture2D" uid="uid://cyhp7u74hybc5" path="res://asset/art/gif/c01_书店/小蝶拿报纸/15.png" id="199_u2jno"] [ext_resource type="Texture2D" uid="uid://rpcw1uwx05s6" path="res://asset/art/gif/c01_公寓过道/小蝶探头/4.png" id="199_vbdvx"] +[ext_resource type="Texture2D" uid="uid://cj18v4yusj2dd" path="res://asset/art/animation/c00_过道小猫/过道小猫17.png" id="199_xhf7n"] +[ext_resource type="Texture2D" uid="uid://be5oheu1c6ty7" path="res://asset/art/animation/c00_过道小猫/过道小猫18.png" id="200_5fksx"] [ext_resource type="Texture2D" uid="uid://dd4ulqngt3623" path="res://asset/art/gif/c01_书店/小蝶拿报纸/16.png" id="200_13qfd"] [ext_resource type="Texture2D" uid="uid://cr1hlbnmh7r4j" path="res://asset/art/gif/c01_公寓过道/小蝶探头/5.png" id="200_gln2v"] [ext_resource type="Texture2D" uid="uid://c8xagoaq1cb4n" path="res://asset/art/gif/c01_书店/小蝶拿报纸/17.png" id="201_a0f2d"] @@ -1334,6 +1351,17 @@ animations = [{ }, { "frames": [{ "duration": 1.0, +"texture": ExtResource("134_qhkmm") +}, { +"duration": 1.0, +"texture": ExtResource("135_x6adg") +}], +"loop": true, +"name": &"c00_吕萍_背身", +"speed": 1.88 +}, { +"frames": [{ +"duration": 1.0, "texture": ExtResource("1_6sdvl") }, { "duration": 1.0, @@ -1530,6 +1558,56 @@ animations = [{ }, { "frames": [{ "duration": 1.0, +"texture": ExtResource("186_yiibj") +}, { +"duration": 1.0, +"texture": ExtResource("187_qhkmm") +}, { +"duration": 1.0, +"texture": ExtResource("188_x6adg") +}, { +"duration": 1.0, +"texture": ExtResource("189_xbi36") +}, { +"duration": 1.0, +"texture": ExtResource("190_l6835") +}, { +"duration": 1.0, +"texture": ExtResource("191_8ha5y") +}, { +"duration": 1.0, +"texture": ExtResource("192_6n1b2") +}, { +"duration": 1.0, +"texture": ExtResource("193_ftljk") +}, { +"duration": 1.0, +"texture": ExtResource("194_mg60w") +}, { +"duration": 1.0, +"texture": ExtResource("195_37jig") +}, { +"duration": 1.0, +"texture": ExtResource("196_spcyg") +}, { +"duration": 1.0, +"texture": ExtResource("197_a6bg6") +}, { +"duration": 1.0, +"texture": ExtResource("198_1n12f") +}, { +"duration": 1.0, +"texture": ExtResource("199_xhf7n") +}, { +"duration": 1.0, +"texture": ExtResource("200_5fksx") +}], +"loop": false, +"name": &"c00_过道小猫", +"speed": 6.0 +}, { +"frames": [{ +"duration": 1.0, "texture": ExtResource("45_ac8l4") }, { "duration": 1.0, diff --git a/scene/player/main_player.gd b/scene/character/main_player.gd similarity index 99% rename from scene/player/main_player.gd rename to scene/character/main_player.gd index 70fdf41e..4097c1f3 100644 --- a/scene/player/main_player.gd +++ b/scene/character/main_player.gd @@ -91,6 +91,11 @@ func _ready() -> void: sprite.animation_finished.connect(animation_finished.emit) +func reparent_light(node: Node): + light.reparent(node) + catty_light.reparent(node) + + # func _enter_tree() -> void: # if is_node_ready() and not Engine.is_editor_hint(): # _check_character_runtime_status() @@ -504,5 +509,3 @@ func _after_walk_to(release_on_arrived: bool) -> void: _play_animation() if release_on_arrived: release_player() - - diff --git a/scene/player/main_player.gd.uid b/scene/character/main_player.gd.uid similarity index 100% rename from scene/player/main_player.gd.uid rename to scene/character/main_player.gd.uid diff --git a/scene/player/main_player.tscn b/scene/character/main_player.tscn similarity index 96% rename from scene/player/main_player.tscn rename to scene/character/main_player.tscn index 0c22dd5e..3a811c50 100644 --- a/scene/player/main_player.tscn +++ b/scene/character/main_player.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=10 format=3 uid="uid://cjhw5ecygrqty"] -[ext_resource type="Script" uid="uid://cwfiim4do4vtk" path="res://scene/player/main_player.gd" id="1_3a78y"] +[ext_resource type="Script" uid="uid://cwfiim4do4vtk" path="res://scene/character/main_player.gd" id="1_3a78y"] [ext_resource type="SpriteFrames" uid="uid://b7fhheih1hbvf" path="res://config/animation/entity_sprite_frames.tres" id="2_3w63u"] [ext_resource type="FontFile" uid="uid://bjmhscwn1ixj1" path="res://asset/font/字体/ChillJinshuSongMedium.otf" id="3_gk3xo"] [ext_resource type="Script" uid="uid://g32um0mltv5d" path="res://addons/dialogue_manager/dialogue_label.gd" id="5_tclgd"] @@ -35,7 +35,7 @@ fill = 1 fill_from = Vector2(0.5, 0.5) fill_to = Vector2(1, 1) -[sub_resource type="RectangleShape2D" id="RectangleShape2D_fno82"] +[sub_resource type="RectangleShape2D" id="RectangleShape2D_jwk3s"] size = Vector2(15, 180) [node name="MainPlayer" type="CharacterBody2D"] @@ -67,7 +67,7 @@ wait_time = 0.7 [node name="CollisionShape2D" type="CollisionShape2D" parent="."] position = Vector2(0, -50) -shape = SubResource("RectangleShape2D_fno82") +shape = SubResource("RectangleShape2D_jwk3s") [node name="OSPivot" type="Control" parent="."] unique_name_in_owner = true diff --git a/scene/player/player_animation_config.gd b/scene/character/player_animation_config.gd similarity index 98% rename from scene/player/player_animation_config.gd rename to scene/character/player_animation_config.gd index 3411a63b..af111da9 100644 --- a/scene/player/player_animation_config.gd +++ b/scene/character/player_animation_config.gd @@ -28,7 +28,7 @@ var ANIMATION_CONFIG = { MOVEMENT_WALKING: [&"c00_吕萍_walking_left", &"c00_吕萍_walking_right"], MOVEMENT_RUNNING: [&"c00_吕萍_running_left", &"c00_吕萍_running_right"], # animation_name, scale, offset - # ACTION_LOOKUP_WALL: [&"c00_吕萍_记笔记_right", Vector2(1.2, 1.2), Vector2(0, -50)], + ACTION_LOOKUP_WALL: [&"c00_吕萍_背身", Vector2.ONE, Vector2(1, -88.5)], # 5 高，6 低 5: [&"c00_吕萍_点灯_high", Vector2.ONE, Vector2(0, -87)], 6: [&"c00_吕萍_点灯_mid", Vector2.ONE, Vector2(1, -50)], diff --git a/scene/player/player_animation_config.gd.uid b/scene/character/player_animation_config.gd.uid similarity index 100% rename from scene/player/player_animation_config.gd.uid rename to scene/character/player_animation_config.gd.uid diff --git a/scene/character/过道小猫.tscn b/scene/character/过道小猫.tscn new file mode 100644 index 00000000..9106e7f8 --- /dev/null +++ b/scene/character/过道小猫.tscn @@ -0,0 +1,34 @@ +[gd_scene load_steps=6 format=3 uid="uid://xoa63do5352k"] + +[ext_resource type="SpriteFrames" uid="uid://b7fhheih1hbvf" path="res://config/animation/entity_sprite_frames.tres" id="1_ske87"] +[ext_resource type="AudioStream" uid="uid://l0whtf4cscgx" path="res://asset/audio/sfx/交互/猫咪呼噜.mp3" id="2_78mp3"] +[ext_resource type="Script" uid="uid://wapo47a1oddf" path="res://scene/entity/audio/sfx2d.gd" id="3_7ff8c"] +[ext_resource type="AudioStream" uid="uid://bpvstm0yqoux7" path="res://asset/audio/sfx/交互/猫咪消失.mp3" id="4_uq27y"] +[ext_resource type="AudioStream" uid="uid://egfenxu2p5tw" path="res://asset/audio/sfx/交互/猫咪走路.mp3" id="5_2ijws"] + +[node name="过道小猫" type="AnimatedSprite2D"] +sprite_frames = ExtResource("1_ske87") +animation = &"c00_过道小猫" + +[node name="Sfx2D呼噜" type="AudioStreamPlayer2D" parent="."] +stream = ExtResource("2_78mp3") +max_distance = 1000.0 +bus = &"game_sfx" +script = ExtResource("3_7ff8c") +metadata/_custom_type_script = "uid://wapo47a1oddf" + +[node name="Sfx2D消失" type="AudioStreamPlayer2D" parent="."] +stream = ExtResource("4_uq27y") +max_distance = 1000.0 +bus = &"game_sfx" +script = ExtResource("3_7ff8c") +metadata/_custom_type_script = "uid://wapo47a1oddf" + +[node name="Sfx2D走路" type="AudioStreamPlayer2D" parent="."] +stream = ExtResource("5_2ijws") +max_distance = 1000.0 +bus = &"game_sfx" +script = ExtResource("3_7ff8c") +loop = true +loop_round_time = 0.5 +metadata/_custom_type_script = "uid://wapo47a1oddf" diff --git a/scene/entity/closeup.gd b/scene/entity/closeup.gd index d0feb2c3..89862147 100644 --- a/scene/entity/closeup.gd +++ b/scene/entity/closeup.gd @@ -6,6 +6,7 @@ class_name Closeup2D # 退出信号，默认 arg 为 null，可能是一个 bool 值，从 packed_scene 的 exit 信号中传递过来 signal exit(arg) +@export var action_key := 4 # 第一次交互时的气泡文字（unrevealed -> revealed） 如果为空则跳过 @export var first_interact_os_key := "" @export var packed_scene: PackedScene @@ -15,6 +16,7 @@ var current_child: Node @onready var sign_snapper = %SignSnapper as SignSnapper + func _ready() -> void: super._ready() if Engine.is_editor_hint(): @@ -25,14 +27,15 @@ func _ready() -> void: func _close_up_interacted() -> void: if interacted_times == 1 and first_interact_os_key: - SceneManager.freeze_player(0) + SceneManager.freeze_player(0, action_key) sign_mark.display_sign = false var tween = await SceneManager.pop_os_with_str(first_interact_os_key) tween.tween_interval(0.5) tween.tween_callback(display) tween.tween_callback(func(): sign_mark.display_sign = true) else: - display() + SceneManager.freeze_player(0, action_key) + get_tree().create_timer(0.5).timeout.connect(display) # 可以直接调用 @@ -41,7 +44,7 @@ func display() -> void: # 先退出 _exit() if packed_scene: - SceneManager.freeze_player(0) + SceneManager.freeze_player(0, action_key) # 展示时，禁用 sign_mark 的输入 sign_mark.pass_unhandled_input = true current_child = packed_scene.instantiate() diff --git a/scene/entity/closeup.tscn b/scene/entity/closeup.tscn index 538c78f3..de5c50df 100644 --- a/scene/entity/closeup.tscn +++ b/scene/entity/closeup.tscn @@ -10,7 +10,7 @@ [sub_resource type="RectangleShape2D" id="RectangleShape2D_ogin7"] resource_local_to_scene = true -size = Vector2(40, 70) +size = Vector2(30, 70) [node name="Closeup" type="Sprite2D"] script = ExtResource("1_tvfr1") @@ -46,5 +46,5 @@ unique_name_in_owner = true script = ExtResource("7_dnubm") release_player_on_arrived = false radius = 3.0 -delay_arrived = 0.3 +delay_arrived = 0.1 metadata/_custom_type_script = "uid://cnt01hiw52bmn" diff --git a/scene/entity/local_inspectable.gd b/scene/entity/local_inspectable.gd index 047fd31f..e2ce6679 100644 --- a/scene/entity/local_inspectable.gd +++ b/scene/entity/local_inspectable.gd @@ -23,6 +23,7 @@ enum { STATUS_NORAML, STATUS_TRANSITIONING, STATUS_INSPECTING_COVER, STATUS_INSP sign_mark_offset_updated.emit(val) # @export var entity_name: String = "" @export var content_centered: bool = false +@export var action_key := 4 @export var texture_cover: Texture2D @export var note_sign_texture: Texture2D @export_enum("none", "c01", "c02", "c03", "c04", "c05", "c06") var editor_filter := "none": @@ -112,7 +113,7 @@ func _on_interacted() -> void: tween.tween_property(container, "modulate:a", 1.0, 0.7) tween.tween_callback(func(): status = STATUS_INSPECTING_COVER) sign_mark.display_sign = false - SceneManager.freeze_player(0.0, PlayerAnimationConfig.ACTION_LOOKUP_WALL) + SceneManager.freeze_player(0.0, action_key) cover_rect.texture = texture_cover if content_key == "": tip_label.text = tip_cover_without_notes diff --git a/scene/entity/local_inspectable.tscn b/scene/entity/local_inspectable.tscn index 0ba99147..3b940999 100644 --- a/scene/entity/local_inspectable.tscn +++ b/scene/entity/local_inspectable.tscn @@ -13,7 +13,7 @@ [sub_resource type="RectangleShape2D" id="RectangleShape2D_4fuic"] resource_local_to_scene = true -size = Vector2(40, 70) +size = Vector2(30, 70) [node name="LocalInspectable" type="Sprite2D"] script = ExtResource("1_85el0") @@ -130,5 +130,5 @@ unique_name_in_owner = true script = ExtResource("10_mtbvd") release_player_on_arrived = false radius = 3.0 -delay_arrived = 0.3 +delay_arrived = 0.2 metadata/_custom_type_script = "uid://cnt01hiw52bmn" diff --git a/scene/gallery/gallery_item.gd b/scene/gallery/gallery_item.gd index 72fdd9eb..a1208812 100644 --- a/scene/gallery/gallery_item.gd +++ b/scene/gallery/gallery_item.gd @@ -35,7 +35,7 @@ func _ready() -> void: var current_scene: Node2D -func _reload_scene(add_to_card:=true): +func _reload_scene(add_to_card := true): if current_scene: current_scene.queue_free() if not packed_scene: @@ -43,9 +43,14 @@ func _reload_scene(add_to_card:=true): current_scene = packed_scene.instantiate() if add_to_card: scene_holder.add_child(current_scene) - current_scene.scale = Vector2.ONE * 0.125 # 1/8 + current_scene.scale = Vector2.ONE * 0.125 # 1/8 # 防止看到上边缘黑边 current_scene.position = Vector2(0, -4.75) + else: + # add to display_layer + display_layer.add_child(current_scene) + current_scene.scale = Vector2.ONE + current_scene.position = Vector2.ZERO func _on_toggle_hover(focus: bool): @@ -71,14 +76,10 @@ var displaying = false: func _on_pressed(): if displaying: return - _reload_scene() + _reload_scene(false) displaying = true - if current_scene: - current_scene.reparent(display_layer, false) - current_scene.scale = Vector2(1, 1) - current_scene.position = Vector2.ZERO - current_scene.run_clip(false) - current_scene.display_finished.connect(_on_display_finished, CONNECT_ONE_SHOT) + current_scene.run_clip(false) + current_scene.display_finished.connect(_on_display_finished, CONNECT_ONE_SHOT) func _on_display_finished(): diff --git a/scene/ground/ground.tscn b/scene/ground/ground.tscn index b0dd7954..41d744ad 100644 --- a/scene/ground/ground.tscn +++ b/scene/ground/ground.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=8 format=3 uid="uid://dayyx4jerj7io"] [ext_resource type="Script" uid="uid://bee4ot74k4wg2" path="res://scene/ground/ground.gd" id="1_0vrlo"] -[ext_resource type="PackedScene" uid="uid://cjhw5ecygrqty" path="res://scene/player/main_player.tscn" id="3_atha7"] +[ext_resource type="PackedScene" uid="uid://cjhw5ecygrqty" path="res://scene/character/main_player.tscn" id="3_atha7"] [ext_resource type="PackedScene" uid="uid://61pis75a8fdq" path="res://scene/entity/portal.tscn" id="3_t73yw"] [ext_resource type="PackedScene" uid="uid://cqkeegrcdjyg4" path="res://scene/ground/camera/camera_focus_marker.tscn" id="4_mgk0a"] [ext_resource type="Script" uid="uid://dpnny2y808k71" path="res://config/audio/random_audio_stream_player.gd" id="5_7mb2q"] diff --git a/scene/ground/scene/c02/s02_过道.tscn b/scene/ground/scene/c02/s02_过道.tscn index 0e32743c..fc2b0350 100644 --- a/scene/ground/scene/c02/s02_过道.tscn +++ b/scene/ground/scene/c02/s02_过道.tscn @@ -122,7 +122,6 @@ position = Vector2(203, -31) sign_mark_offset = Vector2(-1.58, 8.6) content_centered = true texture_cover = ExtResource("7_jg8g0") -content_key = "c02_海报1" [node name="Closeup刮海报" parent="Ground/DeployLayer" index="6" instance=ExtResource("19_6wwyd")] position = Vector2(253, -31) @@ -134,12 +133,10 @@ packed_scene = ExtResource("11_jg8g0") position = Vector2(253, -31) enabled = false texture_cover = ExtResource("16_vqhm5") -content_key = "c02_青岛啤酒" [node name="鼠疫海报" parent="Ground/DeployLayer" index="8" instance=ExtResource("12_0fckv")] position = Vector2(439, -29) texture_cover = ExtResource("7_wdwbi") -content_key = "c02_鼠疫海报" [node name="Ambush纸人" parent="Ground/DeployLayer" index="9" instance=ExtResource("8_52as8")] visible = false diff --git a/scene/ground/scene/c02/s03_animation.gd b/scene/ground/scene/c02/s03_animation.gd index 333852ac..7d649d2e 100644 --- a/scene/ground/scene/c02/s03_animation.gd +++ b/scene/ground/scene/c02/s03_animation.gd @@ -291,7 +291,7 @@ func _on_counter_interacted(): func run_away(): SceneManager.pop_debug_dialog_info("美术", "牵手跑开") - var player = SceneManager.get_player() + var player = SceneManager.get_player() as MainPlayer # 整体修改 player.visible = false var ambush_xiaochan = burning_layer.get_node("Ambush等待的小蝉") @@ -300,8 +300,7 @@ func run_away(): var sprite_together = node.get_node("牵手跑动画") as AnimatedSprite2D sprite_together.visible = true SceneManager.get_camera_marker().focus_node(sprite_together) - player.light.reparent(sprite_together) - player.catty_light.reparent(sprite_together) + player.reparent_light(sprite_together) # 牵手动作 var sprite_xiaochan = burning_layer.get_node("Ambush等待的小蝉/小婵呼吸") sprite_together.play("吕萍牵手动作") diff --git a/scene/ground/scene/c02/s04_保卫科.tscn b/scene/ground/scene/c02/s04_保卫科.tscn index 8e867a1e..0b09eb73 100644 --- a/scene/ground/scene/c02/s04_保卫科.tscn +++ b/scene/ground/scene/c02/s04_保卫科.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=24 format=3 uid="uid://bivc5cdap370p"] +[gd_scene load_steps=21 format=3 uid="uid://bivc5cdap370p"] [ext_resource type="PackedScene" uid="uid://dayyx4jerj7io" path="res://scene/ground/ground.tscn" id="1_2jej0"] [ext_resource type="Script" uid="uid://dmhh4g47bdxxy" path="res://scene/ground/scene/c02/s04_animation.gd" id="2_jyere"] @@ -17,11 +17,8 @@ [ext_resource type="PackedScene" uid="uid://cxw5rovg5mu1a" path="res://scene/ground/script/c02/s00_煤油灯.tscn" id="8_wpvss"] [ext_resource type="Texture2D" uid="uid://ch6uf4qi1i0h2" path="res://asset/art/scene/c02/s03_公寓一楼院子/光晕/光晕3.png" id="9_a43aq"] [ext_resource type="PackedScene" uid="uid://xovlfee503a4" path="res://scene/ground/script/c02/小手讨东西.tscn" id="10_a43aq"] -[ext_resource type="PackedScene" uid="uid://ci5anaxsa1apl" path="res://scene/entity/local_inspectable.tscn" id="10_k74x7"] [ext_resource type="Texture2D" uid="uid://dtmd13ktss5hk" path="res://asset/art/scene/c02/s03_公寓一楼院子/地面物品反光/地反光5.png" id="10_svuj3"] [ext_resource type="Texture2D" uid="uid://v6q6ao6fiqm1" path="res://asset/art/scene/c02/s04_保卫科/e_老鼠画像横板.png" id="11_ffvrp"] -[ext_resource type="Texture2D" uid="uid://day38kany2gmr" path="res://asset/art/scene/c02/小蝉寻人启事/e_寻人启事完整.png" id="11_g8amr"] -[ext_resource type="Texture2D" uid="uid://ce3d785v5lxg2" path="res://asset/art/scene/c02/小蝉寻人启事/ux_寻人启事完整.png" id="12_cq2m4"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_gk1h4"] resource_local_to_scene = true @@ -88,27 +85,21 @@ matched_sign_texture = null position = Vector2(275, 13) texture = ExtResource("6_gk1h4") -[node name="Local寻人启事" parent="Ground/DeployLayer" index="3" instance=ExtResource("10_k74x7")] -position = Vector2(110, -6) -texture = ExtResource("11_g8amr") -texture_cover = ExtResource("12_cq2m4") -content_key = "c02_寻人启事_完整" - -[node name="Closeup折锡纸" parent="Ground/DeployLayer" index="4" instance=ExtResource("6_66gue")] +[node name="Closeup折锡纸" parent="Ground/DeployLayer" index="3" instance=ExtResource("6_66gue")] position = Vector2(189, 15) packed_scene = ExtResource("7_fvlg0") -[node name="Closeup老鼠精" parent="Ground/DeployLayer" index="5" instance=ExtResource("6_66gue")] +[node name="Closeup老鼠精" parent="Ground/DeployLayer" index="4" instance=ExtResource("6_66gue")] position = Vector2(207.5, -40.5) texture = ExtResource("11_ffvrp") packed_scene = ExtResource("8_cm3g6") -[node name="Closeup花名册" parent="Ground/DeployLayer" index="6" instance=ExtResource("6_66gue")] +[node name="Closeup花名册" parent="Ground/DeployLayer" index="5" instance=ExtResource("6_66gue")] position = Vector2(345, 31) first_interact_os_key = "c02_保卫科花名册os" packed_scene = ExtResource("6_fvlg0") -[node name="煤油灯" parent="Ground/DeployLayer" index="7" instance=ExtResource("8_wpvss")] +[node name="煤油灯" parent="Ground/DeployLayer" index="6" instance=ExtResource("8_wpvss")] position = Vector2(370, 39) animation_low_mode = true hide_texture = true @@ -131,7 +122,7 @@ visible = false offset_top = -19.0 offset_bottom = -19.0 -[node name="小手讨东西" parent="Ground/DeployLayer" index="8" instance=ExtResource("10_a43aq")] +[node name="小手讨东西" parent="Ground/DeployLayer" index="7" instance=ExtResource("10_a43aq")] position = Vector2(295, -6) [node name="MainPlayer" parent="Ground" index="4"] diff --git a/scene/ground/scene/c02/s06_二楼.tscn b/scene/ground/scene/c02/s06_二楼.tscn index cb642734..8d5be738 100644 --- a/scene/ground/scene/c02/s06_二楼.tscn +++ b/scene/ground/scene/c02/s06_二楼.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=45 format=3 uid="uid://cootarwb44vvh"] +[gd_scene load_steps=48 format=3 uid="uid://cootarwb44vvh"] [ext_resource type="PackedScene" uid="uid://dayyx4jerj7io" path="res://scene/ground/ground.tscn" id="1_qkymk"] [ext_resource type="Script" uid="uid://cbt0ubygchxvv" path="res://scene/ground/scene/c02/s06_animation.gd" id="2_4dg6u"] @@ -32,6 +32,9 @@ [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"] [ext_resource type="AudioStream" uid="uid://dwa7xdvg5o0i" path="res://asset/audio/sfx/脚步/02_室外_3.wav" id="31_rpn6g"] +[ext_resource type="PackedScene" uid="uid://ci5anaxsa1apl" path="res://scene/entity/local_inspectable.tscn" id="32_4ndyv"] +[ext_resource type="Texture2D" uid="uid://day38kany2gmr" path="res://asset/art/scene/c02/小蝉寻人启事/e_寻人启事完整.png" id="33_h3h1a"] +[ext_resource type="Texture2D" uid="uid://ce3d785v5lxg2" path="res://asset/art/scene/c02/小蝉寻人启事/ux_寻人启事完整.png" id="34_3u30v"] [sub_resource type="Animation" id="Animation_k01ve"] length = 0.001 @@ -993,7 +996,7 @@ frame = 6 frame_progress = 0.121203 [node name="Closeup弹珠游戏" parent="Ground/DeployLayer" index="13" instance=ExtResource("11_owxx3")] -position = Vector2(136, -319) +position = Vector2(322, -269) packed_scene = ExtResource("12_intre") quit_closeup_on_escape = false @@ -1002,7 +1005,8 @@ position = Vector2(289, 16) packed_scene = ExtResource("16_p6da7") [node name="Closeup谢幕演出" parent="Ground/DeployLayer" index="15" instance=ExtResource("11_owxx3")] -position = Vector2(289, 16) +position = Vector2(518, -272) +action_key = 3 packed_scene = ExtResource("25_m28ab") quit_closeup_on_escape = false @@ -1108,6 +1112,11 @@ color = Color(0.895506, 0.638359, 0.208885, 1) energy = 0.0 texture = SubResource("GradientTexture2D_p6da7") +[node name="Local寻人启事" parent="Ground/DeployLayer" index="17" instance=ExtResource("32_4ndyv")] +position = Vector2(749, -2) +texture = ExtResource("33_h3h1a") +texture_cover = ExtResource("34_3u30v") + [node name="MainPlayer" parent="Ground" index="4"] position = Vector2(650, 98) catty_light_energy = 0.5