diff --git a/asset/art/animation/c01_小小蝶_running/0.png b/asset/art/animation/c01_小小蝶_running/0.png new file mode 100644 index 00000000..f5fc1850 Binary files /dev/null and b/asset/art/animation/c01_小小蝶_running/0.png differ diff --git a/asset/art/animation/c01_小小蝶_running_l/1.png.import b/asset/art/animation/c01_小小蝶_running/0.png.import similarity index 68% rename from asset/art/animation/c01_小小蝶_running_l/1.png.import rename to asset/art/animation/c01_小小蝶_running/0.png.import index 17eded31..fa4a522e 100644 --- a/asset/art/animation/c01_小小蝶_running_l/1.png.import +++ b/asset/art/animation/c01_小小蝶_running/0.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://u14jgyf7bfyg" -path="res://.godot/imported/1.png-7ef84e6c2edd0b50bf390abd6eceef08.ctex" +uid="uid://db4svy7ygvcxh" +path="res://.godot/imported/0.png-8d1806448db6a3b83ad016ae40af179a.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://asset/art/animation/c01_小小蝶_running_l/1.png" -dest_files=["res://.godot/imported/1.png-7ef84e6c2edd0b50bf390abd6eceef08.ctex"] +source_file="res://asset/art/animation/c01_小小蝶_running/0.png" +dest_files=["res://.godot/imported/0.png-8d1806448db6a3b83ad016ae40af179a.ctex"] [params] diff --git a/asset/art/animation/c01_小小蝶_running/1.png b/asset/art/animation/c01_小小蝶_running/1.png old mode 100755 new mode 100644 index f91826c0..f93396bb Binary files a/asset/art/animation/c01_小小蝶_running/1.png and b/asset/art/animation/c01_小小蝶_running/1.png differ diff --git a/asset/art/animation/c01_小小蝶_running/2.png b/asset/art/animation/c01_小小蝶_running/2.png old mode 100755 new mode 100644 index 92e80f0a..868b60c0 Binary files a/asset/art/animation/c01_小小蝶_running/2.png and b/asset/art/animation/c01_小小蝶_running/2.png differ diff --git a/asset/art/animation/c01_小小蝶_running/3.png b/asset/art/animation/c01_小小蝶_running/3.png old mode 100755 new mode 100644 index 873d7ee9..fc967cc5 Binary files a/asset/art/animation/c01_小小蝶_running/3.png and b/asset/art/animation/c01_小小蝶_running/3.png differ diff --git a/asset/art/animation/c01_小小蝶_running/4.png b/asset/art/animation/c01_小小蝶_running/4.png old mode 100755 new mode 100644 index 84ca18e6..afdec609 Binary files a/asset/art/animation/c01_小小蝶_running/4.png and b/asset/art/animation/c01_小小蝶_running/4.png differ diff --git a/asset/art/animation/c01_小小蝶_running/5.png b/asset/art/animation/c01_小小蝶_running/5.png old mode 100755 new mode 100644 index 1df302d0..1d1b2f75 Binary files a/asset/art/animation/c01_小小蝶_running/5.png and b/asset/art/animation/c01_小小蝶_running/5.png differ diff --git a/asset/art/animation/c01_小小蝶_running/6.png b/asset/art/animation/c01_小小蝶_running/6.png old mode 100755 new mode 100644 index 6f78e14c..e171bb35 Binary files a/asset/art/animation/c01_小小蝶_running/6.png and b/asset/art/animation/c01_小小蝶_running/6.png differ diff --git a/asset/art/animation/c01_小小蝶_running/7.png b/asset/art/animation/c01_小小蝶_running/7.png old mode 100755 new mode 100644 index f242169e..570829d6 Binary files a/asset/art/animation/c01_小小蝶_running/7.png and b/asset/art/animation/c01_小小蝶_running/7.png differ diff --git a/asset/art/animation/c01_小小蝶_running_l/1.png b/asset/art/animation/c01_小小蝶_running_l/1.png deleted file mode 100644 index a29cdc47..00000000 Binary files a/asset/art/animation/c01_小小蝶_running_l/1.png and /dev/null differ diff --git a/asset/art/animation/c01_小小蝶_running_l/2.png b/asset/art/animation/c01_小小蝶_running_l/2.png deleted file mode 100644 index 12b31bd8..00000000 Binary files a/asset/art/animation/c01_小小蝶_running_l/2.png and /dev/null differ diff --git a/asset/art/animation/c01_小小蝶_running_l/3.png b/asset/art/animation/c01_小小蝶_running_l/3.png deleted file mode 100644 index d753aa73..00000000 Binary files a/asset/art/animation/c01_小小蝶_running_l/3.png and /dev/null differ diff --git a/asset/art/animation/c01_小小蝶_running_l/4.png b/asset/art/animation/c01_小小蝶_running_l/4.png deleted file mode 100644 index 8aa760f3..00000000 Binary files a/asset/art/animation/c01_小小蝶_running_l/4.png and /dev/null differ diff --git a/asset/art/animation/c01_小小蝶_running_l/5.png b/asset/art/animation/c01_小小蝶_running_l/5.png deleted file mode 100644 index b1c57084..00000000 Binary files a/asset/art/animation/c01_小小蝶_running_l/5.png and /dev/null differ diff --git a/asset/art/animation/c01_小小蝶_running_l/6.png b/asset/art/animation/c01_小小蝶_running_l/6.png deleted file mode 100644 index 82f41ea3..00000000 Binary files a/asset/art/animation/c01_小小蝶_running_l/6.png and /dev/null differ diff --git a/asset/art/animation/c01_小小蝶_running_l/7.png b/asset/art/animation/c01_小小蝶_running_l/7.png deleted file mode 100644 index f45120a6..00000000 Binary files a/asset/art/animation/c01_小小蝶_running_l/7.png and /dev/null differ diff --git a/asset/art/animation/c01_小小蝶_walking （8帧-317px高）/1.png b/asset/art/animation/c01_小小蝶_walking （8帧-317px高）/1.png deleted file mode 100755 index 54b79220..00000000 Binary files a/asset/art/animation/c01_小小蝶_walking （8帧-317px高）/1.png and /dev/null differ diff --git a/asset/art/animation/c01_小小蝶_walking （8帧-317px高）/1.png.import b/asset/art/animation/c01_小小蝶_walking （8帧-317px高）/1.png.import deleted file mode 100644 index 3ef5a12c..00000000 --- a/asset/art/animation/c01_小小蝶_walking （8帧-317px高）/1.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://bug0ummiipg6d" -path="res://.godot/imported/1.png-4120f87dd39e184c40f67672adff6ed4.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://asset/art/animation/c01_小小蝶_walking （8帧-317px高）/1.png" -dest_files=["res://.godot/imported/1.png-4120f87dd39e184c40f67672adff6ed4.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/c01_小小蝶_walking （8帧-317px高）/2.png b/asset/art/animation/c01_小小蝶_walking （8帧-317px高）/2.png deleted file mode 100755 index 6f0163bb..00000000 Binary files a/asset/art/animation/c01_小小蝶_walking （8帧-317px高）/2.png and /dev/null differ diff --git a/asset/art/animation/c01_小小蝶_walking （8帧-317px高）/2.png.import b/asset/art/animation/c01_小小蝶_walking （8帧-317px高）/2.png.import deleted file mode 100644 index 1012e490..00000000 --- a/asset/art/animation/c01_小小蝶_walking （8帧-317px高）/2.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://dy8xixgytw3fc" -path="res://.godot/imported/2.png-44af676127d18f37811b5c56bb426455.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://asset/art/animation/c01_小小蝶_walking （8帧-317px高）/2.png" -dest_files=["res://.godot/imported/2.png-44af676127d18f37811b5c56bb426455.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/c01_小小蝶_walking （8帧-317px高）/3.png b/asset/art/animation/c01_小小蝶_walking （8帧-317px高）/3.png deleted file mode 100755 index 125545e8..00000000 Binary files a/asset/art/animation/c01_小小蝶_walking （8帧-317px高）/3.png and /dev/null differ diff --git a/asset/art/animation/c01_小小蝶_walking （8帧-317px高）/3.png.import b/asset/art/animation/c01_小小蝶_walking （8帧-317px高）/3.png.import deleted file mode 100644 index 80f6abba..00000000 --- a/asset/art/animation/c01_小小蝶_walking （8帧-317px高）/3.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://b6ly683lxhxkv" -path="res://.godot/imported/3.png-e292467450b7ae5ee351ea2a2959bb7a.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://asset/art/animation/c01_小小蝶_walking （8帧-317px高）/3.png" -dest_files=["res://.godot/imported/3.png-e292467450b7ae5ee351ea2a2959bb7a.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/c01_小小蝶_walking （8帧-317px高）/4.png b/asset/art/animation/c01_小小蝶_walking （8帧-317px高）/4.png deleted file mode 100755 index c907d16c..00000000 Binary files a/asset/art/animation/c01_小小蝶_walking （8帧-317px高）/4.png and /dev/null differ diff --git a/asset/art/animation/c01_小小蝶_walking （8帧-317px高）/4.png.import b/asset/art/animation/c01_小小蝶_walking （8帧-317px高）/4.png.import deleted file mode 100644 index 7792d6c4..00000000 --- a/asset/art/animation/c01_小小蝶_walking （8帧-317px高）/4.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://b65h5vha2ohuo" -path="res://.godot/imported/4.png-a74db89cef530ea0490056a2fa96a09a.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://asset/art/animation/c01_小小蝶_walking （8帧-317px高）/4.png" -dest_files=["res://.godot/imported/4.png-a74db89cef530ea0490056a2fa96a09a.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/c01_小小蝶_walking （8帧-317px高）/5.png b/asset/art/animation/c01_小小蝶_walking （8帧-317px高）/5.png deleted file mode 100755 index baa4baa0..00000000 Binary files a/asset/art/animation/c01_小小蝶_walking （8帧-317px高）/5.png and /dev/null differ diff --git a/asset/art/animation/c01_小小蝶_walking （8帧-317px高）/5.png.import b/asset/art/animation/c01_小小蝶_walking （8帧-317px高）/5.png.import deleted file mode 100644 index 033bdbbd..00000000 --- a/asset/art/animation/c01_小小蝶_walking （8帧-317px高）/5.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://bqdhlvwwfro8f" -path="res://.godot/imported/5.png-2171b39bf9c515be2f935b2a81a21323.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://asset/art/animation/c01_小小蝶_walking （8帧-317px高）/5.png" -dest_files=["res://.godot/imported/5.png-2171b39bf9c515be2f935b2a81a21323.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/c01_小小蝶_walking （8帧-317px高）/6.png b/asset/art/animation/c01_小小蝶_walking （8帧-317px高）/6.png deleted file mode 100755 index 47cfb04f..00000000 Binary files a/asset/art/animation/c01_小小蝶_walking （8帧-317px高）/6.png and /dev/null differ diff --git a/asset/art/animation/c01_小小蝶_walking （8帧-317px高）/6.png.import b/asset/art/animation/c01_小小蝶_walking （8帧-317px高）/6.png.import deleted file mode 100644 index 063dbc77..00000000 --- a/asset/art/animation/c01_小小蝶_walking （8帧-317px高）/6.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://p4a6nfq7swqx" -path="res://.godot/imported/6.png-1706631a7b6b1fc486a79139b937093d.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://asset/art/animation/c01_小小蝶_walking （8帧-317px高）/6.png" -dest_files=["res://.godot/imported/6.png-1706631a7b6b1fc486a79139b937093d.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/c01_小小蝶_walking （8帧-317px高）/7.png b/asset/art/animation/c01_小小蝶_walking （8帧-317px高）/7.png deleted file mode 100755 index 68e60699..00000000 Binary files a/asset/art/animation/c01_小小蝶_walking （8帧-317px高）/7.png and /dev/null differ diff --git a/asset/art/animation/c01_小小蝶_walking （8帧-317px高）/7.png.import b/asset/art/animation/c01_小小蝶_walking （8帧-317px高）/7.png.import deleted file mode 100644 index 4f60783e..00000000 --- a/asset/art/animation/c01_小小蝶_walking （8帧-317px高）/7.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://6kuaudtyvh45" -path="res://.godot/imported/7.png-79a7cfedd4f9e7a5cc9b66c7bcbd89f0.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://asset/art/animation/c01_小小蝶_walking （8帧-317px高）/7.png" -dest_files=["res://.godot/imported/7.png-79a7cfedd4f9e7a5cc9b66c7bcbd89f0.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/c01_小小蝶_walking （8帧-317px高）/8.png b/asset/art/animation/c01_小小蝶_walking （8帧-317px高）/8.png deleted file mode 100755 index 2fb6dd9f..00000000 Binary files a/asset/art/animation/c01_小小蝶_walking （8帧-317px高）/8.png and /dev/null differ diff --git a/asset/art/animation/c01_小小蝶_walking （8帧-317px高）/8.png.import b/asset/art/animation/c01_小小蝶_walking （8帧-317px高）/8.png.import deleted file mode 100644 index 316e6ccc..00000000 --- a/asset/art/animation/c01_小小蝶_walking （8帧-317px高）/8.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://51tsbhbesta2" -path="res://.godot/imported/8.png-18123f5a878f846d4562ae0070d1ea13.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://asset/art/animation/c01_小小蝶_walking （8帧-317px高）/8.png" -dest_files=["res://.godot/imported/8.png-18123f5a878f846d4562ae0070d1ea13.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/c01_小小蝶_walking/0.png b/asset/art/animation/c01_小小蝶_walking/0.png new file mode 100644 index 00000000..129c04df Binary files /dev/null and b/asset/art/animation/c01_小小蝶_walking/0.png differ diff --git a/asset/art/animation/c01_小小蝶_walking_l/3.png.import b/asset/art/animation/c01_小小蝶_walking/0.png.import similarity index 68% rename from asset/art/animation/c01_小小蝶_walking_l/3.png.import rename to asset/art/animation/c01_小小蝶_walking/0.png.import index 304d233a..d37a6aaa 100644 --- a/asset/art/animation/c01_小小蝶_walking_l/3.png.import +++ b/asset/art/animation/c01_小小蝶_walking/0.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://7off6ty3whn1" -path="res://.godot/imported/3.png-cd5256bedb6095e37e29f4bb9da4329b.ctex" +uid="uid://bcw6dcx0rybc3" +path="res://.godot/imported/0.png-a062175aeeed3e0dd41f97e1a219ca7f.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://asset/art/animation/c01_小小蝶_walking_l/3.png" -dest_files=["res://.godot/imported/3.png-cd5256bedb6095e37e29f4bb9da4329b.ctex"] +source_file="res://asset/art/animation/c01_小小蝶_walking/0.png" +dest_files=["res://.godot/imported/0.png-a062175aeeed3e0dd41f97e1a219ca7f.ctex"] [params] diff --git a/asset/art/animation/c01_小小蝶_walking/1.png b/asset/art/animation/c01_小小蝶_walking/1.png old mode 100755 new mode 100644 index 5589ad45..63e9a22e Binary files a/asset/art/animation/c01_小小蝶_walking/1.png and b/asset/art/animation/c01_小小蝶_walking/1.png differ diff --git a/asset/art/animation/c01_小小蝶_walking/2.png b/asset/art/animation/c01_小小蝶_walking/2.png old mode 100755 new mode 100644 index edd4cf74..02267f79 Binary files a/asset/art/animation/c01_小小蝶_walking/2.png and b/asset/art/animation/c01_小小蝶_walking/2.png differ diff --git a/asset/art/animation/c01_小小蝶_walking/3.png b/asset/art/animation/c01_小小蝶_walking/3.png old mode 100755 new mode 100644 index 10c65722..0d861388 Binary files a/asset/art/animation/c01_小小蝶_walking/3.png and b/asset/art/animation/c01_小小蝶_walking/3.png differ diff --git a/asset/art/animation/c01_小小蝶_walking/4.png b/asset/art/animation/c01_小小蝶_walking/4.png old mode 100755 new mode 100644 index 709ffccf..6333bbc8 Binary files a/asset/art/animation/c01_小小蝶_walking/4.png and b/asset/art/animation/c01_小小蝶_walking/4.png differ diff --git a/asset/art/animation/c01_小小蝶_walking/5.png b/asset/art/animation/c01_小小蝶_walking/5.png old mode 100755 new mode 100644 index e8f13cdd..46c73870 Binary files a/asset/art/animation/c01_小小蝶_walking/5.png and b/asset/art/animation/c01_小小蝶_walking/5.png differ diff --git a/asset/art/animation/c01_小小蝶_walking/6.png b/asset/art/animation/c01_小小蝶_walking/6.png old mode 100755 new mode 100644 index 551cb1ed..6f31a96c Binary files a/asset/art/animation/c01_小小蝶_walking/6.png and b/asset/art/animation/c01_小小蝶_walking/6.png differ diff --git a/asset/art/animation/c01_小小蝶_walking/7.png b/asset/art/animation/c01_小小蝶_walking/7.png new file mode 100644 index 00000000..83386363 Binary files /dev/null and b/asset/art/animation/c01_小小蝶_walking/7.png differ diff --git a/asset/art/animation/c01_小小蝶_running_l/7.png.import b/asset/art/animation/c01_小小蝶_walking/7.png.import similarity index 68% rename from asset/art/animation/c01_小小蝶_running_l/7.png.import rename to asset/art/animation/c01_小小蝶_walking/7.png.import index 228d7e07..2f944413 100644 --- a/asset/art/animation/c01_小小蝶_running_l/7.png.import +++ b/asset/art/animation/c01_小小蝶_walking/7.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://c0kxv1ffcgbv" -path="res://.godot/imported/7.png-2eb578ccd97dc4ef0f00ab987776c537.ctex" +uid="uid://caqu8a3voekmx" +path="res://.godot/imported/7.png-b5dc73ca73a133021ef53009482ebb74.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://asset/art/animation/c01_小小蝶_running_l/7.png" -dest_files=["res://.godot/imported/7.png-2eb578ccd97dc4ef0f00ab987776c537.ctex"] +source_file="res://asset/art/animation/c01_小小蝶_walking/7.png" +dest_files=["res://.godot/imported/7.png-b5dc73ca73a133021ef53009482ebb74.ctex"] [params] diff --git a/asset/art/animation/c01_小小蝶_walking_l/1.png b/asset/art/animation/c01_小小蝶_walking_l/1.png deleted file mode 100644 index 00b0afa8..00000000 Binary files a/asset/art/animation/c01_小小蝶_walking_l/1.png and /dev/null differ diff --git a/asset/art/animation/c01_小小蝶_walking_l/2.png b/asset/art/animation/c01_小小蝶_walking_l/2.png deleted file mode 100644 index 2c5527b4..00000000 Binary files a/asset/art/animation/c01_小小蝶_walking_l/2.png and /dev/null differ diff --git a/asset/art/animation/c01_小小蝶_walking_l/3.png b/asset/art/animation/c01_小小蝶_walking_l/3.png deleted file mode 100644 index 4c5bf44b..00000000 Binary files a/asset/art/animation/c01_小小蝶_walking_l/3.png and /dev/null differ diff --git a/asset/art/animation/c01_小小蝶_walking_l/4.png b/asset/art/animation/c01_小小蝶_walking_l/4.png deleted file mode 100644 index 1a0acc7f..00000000 Binary files a/asset/art/animation/c01_小小蝶_walking_l/4.png and /dev/null differ diff --git a/asset/art/animation/c01_小小蝶_walking_l/5.png b/asset/art/animation/c01_小小蝶_walking_l/5.png deleted file mode 100644 index e3a7ac7f..00000000 Binary files a/asset/art/animation/c01_小小蝶_walking_l/5.png and /dev/null differ diff --git a/asset/art/animation/c01_小小蝶_walking_l/5.png.import b/asset/art/animation/c01_小小蝶_walking_l/5.png.import deleted file mode 100644 index d867df22..00000000 --- a/asset/art/animation/c01_小小蝶_walking_l/5.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://dcb0urbbfkb3f" -path="res://.godot/imported/5.png-e3736d06232663f8ac2ee3e1f368c3d2.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://asset/art/animation/c01_小小蝶_walking_l/5.png" -dest_files=["res://.godot/imported/5.png-e3736d06232663f8ac2ee3e1f368c3d2.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/c01_小小蝶_walking_l/6.png b/asset/art/animation/c01_小小蝶_walking_l/6.png deleted file mode 100644 index f137f953..00000000 Binary files a/asset/art/animation/c01_小小蝶_walking_l/6.png and /dev/null differ diff --git a/asset/art/animation/c01_小小蝶_walking_l/6.png.import b/asset/art/animation/c01_小小蝶_walking_l/6.png.import deleted file mode 100644 index beafd1e7..00000000 --- a/asset/art/animation/c01_小小蝶_walking_l/6.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://dxkdiwvuon3lx" -path="res://.godot/imported/6.png-180dbea77a83b0bc99e485e51f43b844.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://asset/art/animation/c01_小小蝶_walking_l/6.png" -dest_files=["res://.godot/imported/6.png-180dbea77a83b0bc99e485e51f43b844.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/c01_小小蝶_床上戴假发看书/0.png b/asset/art/animation/c01_小小蝶_床上戴假发看书/0.png new file mode 100644 index 00000000..ee02a866 Binary files /dev/null and b/asset/art/animation/c01_小小蝶_床上戴假发看书/0.png differ diff --git a/asset/art/animation/c01_小小蝶_running_l/4.png.import b/asset/art/animation/c01_小小蝶_床上戴假发看书/0.png.import similarity index 66% rename from asset/art/animation/c01_小小蝶_running_l/4.png.import rename to asset/art/animation/c01_小小蝶_床上戴假发看书/0.png.import index 8bba4bd5..2aab62e2 100644 --- a/asset/art/animation/c01_小小蝶_running_l/4.png.import +++ b/asset/art/animation/c01_小小蝶_床上戴假发看书/0.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://blfpodgbieypt" -path="res://.godot/imported/4.png-1020ced29898de48c8b62d5bcffa94f2.ctex" +uid="uid://ctr6lch1apmvy" +path="res://.godot/imported/0.png-e7888d41fa10bafab246a1493d1ebaea.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://asset/art/animation/c01_小小蝶_running_l/4.png" -dest_files=["res://.godot/imported/4.png-1020ced29898de48c8b62d5bcffa94f2.ctex"] +source_file="res://asset/art/animation/c01_小小蝶_床上戴假发看书/0.png" +dest_files=["res://.godot/imported/0.png-e7888d41fa10bafab246a1493d1ebaea.ctex"] [params] diff --git a/asset/art/animation/c01_小小蝶_床上戴假发看书/1.png b/asset/art/animation/c01_小小蝶_床上戴假发看书/1.png new file mode 100644 index 00000000..960d668e Binary files /dev/null and b/asset/art/animation/c01_小小蝶_床上戴假发看书/1.png differ diff --git a/asset/art/animation/c01_小小蝶_walking_l/1.png.import b/asset/art/animation/c01_小小蝶_床上戴假发看书/1.png.import similarity index 67% rename from asset/art/animation/c01_小小蝶_walking_l/1.png.import rename to asset/art/animation/c01_小小蝶_床上戴假发看书/1.png.import index c716276d..c3e30333 100644 --- a/asset/art/animation/c01_小小蝶_walking_l/1.png.import +++ b/asset/art/animation/c01_小小蝶_床上戴假发看书/1.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://bgryts85aqfxx" -path="res://.godot/imported/1.png-3fe4e8efbd59b65261eeaa07dc064d7e.ctex" +uid="uid://j4xe71qfe83q" +path="res://.godot/imported/1.png-434b3b3698987a31d04ac046357898ea.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://asset/art/animation/c01_小小蝶_walking_l/1.png" -dest_files=["res://.godot/imported/1.png-3fe4e8efbd59b65261eeaa07dc064d7e.ctex"] +source_file="res://asset/art/animation/c01_小小蝶_床上戴假发看书/1.png" +dest_files=["res://.godot/imported/1.png-434b3b3698987a31d04ac046357898ea.ctex"] [params] diff --git a/asset/art/animation/c01_小小蝶_床上戴假发看书/10.png b/asset/art/animation/c01_小小蝶_床上戴假发看书/10.png new file mode 100644 index 00000000..f081da2b Binary files /dev/null and b/asset/art/animation/c01_小小蝶_床上戴假发看书/10.png differ diff --git a/asset/art/animation/c01_小小蝶_床上戴假发看书/10.png.import b/asset/art/animation/c01_小小蝶_床上戴假发看书/10.png.import new file mode 100644 index 00000000..a6cbb70e --- /dev/null +++ b/asset/art/animation/c01_小小蝶_床上戴假发看书/10.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bwfe8apw37kp3" +path="res://.godot/imported/10.png-80c60f60b045774819805cacbe030276.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/animation/c01_小小蝶_床上戴假发看书/10.png" +dest_files=["res://.godot/imported/10.png-80c60f60b045774819805cacbe030276.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/c01_小小蝶_床上戴假发看书/11.png b/asset/art/animation/c01_小小蝶_床上戴假发看书/11.png new file mode 100644 index 00000000..a89747e4 Binary files /dev/null and b/asset/art/animation/c01_小小蝶_床上戴假发看书/11.png differ diff --git a/asset/art/animation/c01_小小蝶_床上戴假发看书/11.png.import b/asset/art/animation/c01_小小蝶_床上戴假发看书/11.png.import new file mode 100644 index 00000000..08201951 --- /dev/null +++ b/asset/art/animation/c01_小小蝶_床上戴假发看书/11.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cvy56lqm2qqba" +path="res://.godot/imported/11.png-a67d6d9a0edfb30ddfab6d00df1106bb.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/animation/c01_小小蝶_床上戴假发看书/11.png" +dest_files=["res://.godot/imported/11.png-a67d6d9a0edfb30ddfab6d00df1106bb.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/c01_小小蝶_床上戴假发看书/12.png b/asset/art/animation/c01_小小蝶_床上戴假发看书/12.png new file mode 100644 index 00000000..f529acf5 Binary files /dev/null and b/asset/art/animation/c01_小小蝶_床上戴假发看书/12.png differ diff --git a/asset/art/animation/c01_小小蝶_床上戴假发看书/12.png.import b/asset/art/animation/c01_小小蝶_床上戴假发看书/12.png.import new file mode 100644 index 00000000..e8055d36 --- /dev/null +++ b/asset/art/animation/c01_小小蝶_床上戴假发看书/12.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://n7fjhk83aqwi" +path="res://.godot/imported/12.png-06c1e437f73f3cbe840b4d21fd99a97f.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/animation/c01_小小蝶_床上戴假发看书/12.png" +dest_files=["res://.godot/imported/12.png-06c1e437f73f3cbe840b4d21fd99a97f.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/c01_小小蝶_床上戴假发看书/13.png b/asset/art/animation/c01_小小蝶_床上戴假发看书/13.png new file mode 100644 index 00000000..fc23ccd5 Binary files /dev/null and b/asset/art/animation/c01_小小蝶_床上戴假发看书/13.png differ diff --git a/asset/art/animation/c01_小小蝶_床上戴假发看书/13.png.import b/asset/art/animation/c01_小小蝶_床上戴假发看书/13.png.import new file mode 100644 index 00000000..b2ca5551 --- /dev/null +++ b/asset/art/animation/c01_小小蝶_床上戴假发看书/13.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b1h0rwy715ll1" +path="res://.godot/imported/13.png-b09c6faa2ab83f29e5250bdd8177052d.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/animation/c01_小小蝶_床上戴假发看书/13.png" +dest_files=["res://.godot/imported/13.png-b09c6faa2ab83f29e5250bdd8177052d.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/c01_小小蝶_床上戴假发看书/14.png b/asset/art/animation/c01_小小蝶_床上戴假发看书/14.png new file mode 100644 index 00000000..d80f3902 Binary files /dev/null and b/asset/art/animation/c01_小小蝶_床上戴假发看书/14.png differ diff --git a/asset/art/animation/c01_小小蝶_床上戴假发看书/14.png.import b/asset/art/animation/c01_小小蝶_床上戴假发看书/14.png.import new file mode 100644 index 00000000..0db51da3 --- /dev/null +++ b/asset/art/animation/c01_小小蝶_床上戴假发看书/14.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://boie0b2vwxtbf" +path="res://.godot/imported/14.png-74f1a9d916a3dd816207af726ce0450c.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/animation/c01_小小蝶_床上戴假发看书/14.png" +dest_files=["res://.godot/imported/14.png-74f1a9d916a3dd816207af726ce0450c.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/c01_小小蝶_床上戴假发看书/2.png b/asset/art/animation/c01_小小蝶_床上戴假发看书/2.png new file mode 100644 index 00000000..dee1b8a5 Binary files /dev/null and b/asset/art/animation/c01_小小蝶_床上戴假发看书/2.png differ diff --git a/asset/art/animation/c01_小小蝶_walking_l/2.png.import b/asset/art/animation/c01_小小蝶_床上戴假发看书/2.png.import similarity index 67% rename from asset/art/animation/c01_小小蝶_walking_l/2.png.import rename to asset/art/animation/c01_小小蝶_床上戴假发看书/2.png.import index 661e3e73..9f01039b 100644 --- a/asset/art/animation/c01_小小蝶_walking_l/2.png.import +++ b/asset/art/animation/c01_小小蝶_床上戴假发看书/2.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://c57b42rij1qil" -path="res://.godot/imported/2.png-205d22e4c6bf613fad29ec059731df6c.ctex" +uid="uid://roig8xuw7ntv" +path="res://.godot/imported/2.png-8afdc149c1fdf8a2588cf3d07a58dbe1.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://asset/art/animation/c01_小小蝶_walking_l/2.png" -dest_files=["res://.godot/imported/2.png-205d22e4c6bf613fad29ec059731df6c.ctex"] +source_file="res://asset/art/animation/c01_小小蝶_床上戴假发看书/2.png" +dest_files=["res://.godot/imported/2.png-8afdc149c1fdf8a2588cf3d07a58dbe1.ctex"] [params] diff --git a/asset/art/animation/c01_小小蝶_床上戴假发看书/3.png b/asset/art/animation/c01_小小蝶_床上戴假发看书/3.png new file mode 100644 index 00000000..f840f4a0 Binary files /dev/null and b/asset/art/animation/c01_小小蝶_床上戴假发看书/3.png differ diff --git a/asset/art/animation/c01_小小蝶_running_l/3.png.import b/asset/art/animation/c01_小小蝶_床上戴假发看书/3.png.import similarity index 66% rename from asset/art/animation/c01_小小蝶_running_l/3.png.import rename to asset/art/animation/c01_小小蝶_床上戴假发看书/3.png.import index 0b47a7f8..42222516 100644 --- a/asset/art/animation/c01_小小蝶_running_l/3.png.import +++ b/asset/art/animation/c01_小小蝶_床上戴假发看书/3.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://bmg7jg3y2i55y" -path="res://.godot/imported/3.png-200a133b52663856b896bc0942e422a4.ctex" +uid="uid://bebqgl5thn4tm" +path="res://.godot/imported/3.png-6d3753e4cbc9c5b6b5f9efa862089399.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://asset/art/animation/c01_小小蝶_running_l/3.png" -dest_files=["res://.godot/imported/3.png-200a133b52663856b896bc0942e422a4.ctex"] +source_file="res://asset/art/animation/c01_小小蝶_床上戴假发看书/3.png" +dest_files=["res://.godot/imported/3.png-6d3753e4cbc9c5b6b5f9efa862089399.ctex"] [params] diff --git a/asset/art/animation/c01_小小蝶_床上戴假发看书/4.png b/asset/art/animation/c01_小小蝶_床上戴假发看书/4.png new file mode 100644 index 00000000..d85e8ee7 Binary files /dev/null and b/asset/art/animation/c01_小小蝶_床上戴假发看书/4.png differ diff --git a/asset/art/animation/c01_小小蝶_walking_l/4.png.import b/asset/art/animation/c01_小小蝶_床上戴假发看书/4.png.import similarity index 66% rename from asset/art/animation/c01_小小蝶_walking_l/4.png.import rename to asset/art/animation/c01_小小蝶_床上戴假发看书/4.png.import index 4593eb37..ed4ebfe6 100644 --- a/asset/art/animation/c01_小小蝶_walking_l/4.png.import +++ b/asset/art/animation/c01_小小蝶_床上戴假发看书/4.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://dpg0qjnh724tf" -path="res://.godot/imported/4.png-ec6c29edece0c2b4ca9bcee9525b141d.ctex" +uid="uid://dn6qbfa5iw8fx" +path="res://.godot/imported/4.png-23b22534047f4ebbc2d508ec6917a8c2.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://asset/art/animation/c01_小小蝶_walking_l/4.png" -dest_files=["res://.godot/imported/4.png-ec6c29edece0c2b4ca9bcee9525b141d.ctex"] +source_file="res://asset/art/animation/c01_小小蝶_床上戴假发看书/4.png" +dest_files=["res://.godot/imported/4.png-23b22534047f4ebbc2d508ec6917a8c2.ctex"] [params] diff --git a/asset/art/animation/c01_小小蝶_床上戴假发看书/5.png b/asset/art/animation/c01_小小蝶_床上戴假发看书/5.png new file mode 100644 index 00000000..37f6e4fe Binary files /dev/null and b/asset/art/animation/c01_小小蝶_床上戴假发看书/5.png differ diff --git a/asset/art/animation/c01_小小蝶_running_l/5.png.import b/asset/art/animation/c01_小小蝶_床上戴假发看书/5.png.import similarity index 66% rename from asset/art/animation/c01_小小蝶_running_l/5.png.import rename to asset/art/animation/c01_小小蝶_床上戴假发看书/5.png.import index 74894df9..c9cdca16 100644 --- a/asset/art/animation/c01_小小蝶_running_l/5.png.import +++ b/asset/art/animation/c01_小小蝶_床上戴假发看书/5.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://clvlsxtbc7aia" -path="res://.godot/imported/5.png-30462337ff653e73eea3b1a47b09f8d6.ctex" +uid="uid://ds8wh04tqsndo" +path="res://.godot/imported/5.png-ec256763a77eb0d4821a131872fe952d.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://asset/art/animation/c01_小小蝶_running_l/5.png" -dest_files=["res://.godot/imported/5.png-30462337ff653e73eea3b1a47b09f8d6.ctex"] +source_file="res://asset/art/animation/c01_小小蝶_床上戴假发看书/5.png" +dest_files=["res://.godot/imported/5.png-ec256763a77eb0d4821a131872fe952d.ctex"] [params] diff --git a/asset/art/animation/c01_小小蝶_床上戴假发看书/6.png b/asset/art/animation/c01_小小蝶_床上戴假发看书/6.png new file mode 100644 index 00000000..c0291a4d Binary files /dev/null and b/asset/art/animation/c01_小小蝶_床上戴假发看书/6.png differ diff --git a/asset/art/animation/c01_小小蝶_running_l/6.png.import b/asset/art/animation/c01_小小蝶_床上戴假发看书/6.png.import similarity index 66% rename from asset/art/animation/c01_小小蝶_running_l/6.png.import rename to asset/art/animation/c01_小小蝶_床上戴假发看书/6.png.import index 8e9daef0..1a71f934 100644 --- a/asset/art/animation/c01_小小蝶_running_l/6.png.import +++ b/asset/art/animation/c01_小小蝶_床上戴假发看书/6.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://c6tiksw8552bs" -path="res://.godot/imported/6.png-4fba6df42ca8da5bd6d080ccbd90ab1f.ctex" +uid="uid://bnrvr5htigcnf" +path="res://.godot/imported/6.png-108829fa4189a5234af996e8a16f3115.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://asset/art/animation/c01_小小蝶_running_l/6.png" -dest_files=["res://.godot/imported/6.png-4fba6df42ca8da5bd6d080ccbd90ab1f.ctex"] +source_file="res://asset/art/animation/c01_小小蝶_床上戴假发看书/6.png" +dest_files=["res://.godot/imported/6.png-108829fa4189a5234af996e8a16f3115.ctex"] [params] diff --git a/asset/art/animation/c01_小小蝶_床上戴假发看书/7.png b/asset/art/animation/c01_小小蝶_床上戴假发看书/7.png new file mode 100644 index 00000000..98a705c8 Binary files /dev/null and b/asset/art/animation/c01_小小蝶_床上戴假发看书/7.png differ diff --git a/asset/art/animation/c01_小小蝶_running_l/2.png.import b/asset/art/animation/c01_小小蝶_床上戴假发看书/7.png.import similarity index 66% rename from asset/art/animation/c01_小小蝶_running_l/2.png.import rename to asset/art/animation/c01_小小蝶_床上戴假发看书/7.png.import index 16e38513..aff4c1f0 100644 --- a/asset/art/animation/c01_小小蝶_running_l/2.png.import +++ b/asset/art/animation/c01_小小蝶_床上戴假发看书/7.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://1mgx0pl2aa0s" -path="res://.godot/imported/2.png-237e69f003caa9e29c1d758fc24e5332.ctex" +uid="uid://ds05fpng1ghto" +path="res://.godot/imported/7.png-6dc8f0f89a4d68d692282088df3b8fa9.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://asset/art/animation/c01_小小蝶_running_l/2.png" -dest_files=["res://.godot/imported/2.png-237e69f003caa9e29c1d758fc24e5332.ctex"] +source_file="res://asset/art/animation/c01_小小蝶_床上戴假发看书/7.png" +dest_files=["res://.godot/imported/7.png-6dc8f0f89a4d68d692282088df3b8fa9.ctex"] [params] diff --git a/asset/art/animation/c01_小小蝶_床上戴假发看书/8.png b/asset/art/animation/c01_小小蝶_床上戴假发看书/8.png new file mode 100644 index 00000000..a843e2eb Binary files /dev/null and b/asset/art/animation/c01_小小蝶_床上戴假发看书/8.png differ diff --git a/asset/art/animation/c01_小小蝶_床上戴假发看书/8.png.import b/asset/art/animation/c01_小小蝶_床上戴假发看书/8.png.import new file mode 100644 index 00000000..1a905b35 --- /dev/null +++ b/asset/art/animation/c01_小小蝶_床上戴假发看书/8.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c8jjtacky4a73" +path="res://.godot/imported/8.png-613cb7dc3a4bf90337c0b6642cec6179.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/animation/c01_小小蝶_床上戴假发看书/8.png" +dest_files=["res://.godot/imported/8.png-613cb7dc3a4bf90337c0b6642cec6179.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/c01_小小蝶_床上戴假发看书/9.png b/asset/art/animation/c01_小小蝶_床上戴假发看书/9.png new file mode 100644 index 00000000..d04c596e Binary files /dev/null and b/asset/art/animation/c01_小小蝶_床上戴假发看书/9.png differ diff --git a/asset/art/animation/c01_小小蝶_床上戴假发看书/9.png.import b/asset/art/animation/c01_小小蝶_床上戴假发看书/9.png.import new file mode 100644 index 00000000..687e3634 --- /dev/null +++ b/asset/art/animation/c01_小小蝶_床上戴假发看书/9.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://do0se3ipsdum4" +path="res://.godot/imported/9.png-8d188d34fb5b473c58c875edf16818e3.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/animation/c01_小小蝶_床上戴假发看书/9.png" +dest_files=["res://.godot/imported/9.png-8d188d34fb5b473c58c875edf16818e3.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/config/animation/entity_sprite_frames.tres b/config/animation/entity_sprite_frames.tres index 2503d3c2..7d5d1e12 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=867 format=3 uid="uid://b7fhheih1hbvf"] +[gd_resource type="SpriteFrames" load_steps=853 format=3 uid="uid://b7fhheih1hbvf"] [ext_resource type="Texture2D" uid="uid://dvq64espa37lx" path="res://asset/art/animation/c00_吕萍_idle_left/zhhx1.png" id="1_ekv0l"] [ext_resource type="Texture2D" uid="uid://dcp4gk5lib4bl" path="res://asset/art/animation/c00_吕萍_idle_left/zhhx2.png" id="2_fq076"] @@ -194,31 +194,24 @@ [ext_resource type="Texture2D" uid="uid://bjha12tnp4oet" path="res://asset/art/animation/c01_小小蝶_running/4.png" id="109_4nuyr"] [ext_resource type="Texture2D" uid="uid://bcy5hxrwf648t" path="res://asset/art/animation/c01_捡球男孩_关键帧/55.png" id="109_5ckmq"] [ext_resource type="Texture2D" uid="uid://bte0qlblh8f7d" path="res://asset/art/gif/c02_保卫科/吕萍被吓倒/9.png" id="109_44oos"] -[ext_resource type="Texture2D" uid="uid://u14jgyf7bfyg" path="res://asset/art/animation/c01_小小蝶_running_l/1.png" id="109_v6eyj"] [ext_resource type="Texture2D" uid="uid://bplvkgfag6832" path="res://asset/art/animation/c01_捡球男孩_关键帧/56.png" id="110_0dcoe"] [ext_resource type="Texture2D" uid="uid://dph0ltwx82t36" path="res://asset/art/animation/c01_小小蝶_running/5.png" id="110_noni0"] -[ext_resource type="Texture2D" uid="uid://1mgx0pl2aa0s" path="res://asset/art/animation/c01_小小蝶_running_l/2.png" id="110_nrq01"] [ext_resource type="Texture2D" uid="uid://clvp012ioo5pp" path="res://asset/art/gif/c02_保卫科/吕萍被吓倒/10.png" id="110_orc8c"] [ext_resource type="Texture2D" uid="uid://dfy0ppvpvak0f" path="res://asset/art/animation/c01_小小蝶_running/6.png" id="111_8kydk"] -[ext_resource type="Texture2D" uid="uid://bmg7jg3y2i55y" path="res://asset/art/animation/c01_小小蝶_running_l/3.png" id="111_arwxu"] [ext_resource type="Texture2D" uid="uid://c0cli7n4q5og6" path="res://asset/art/gif/c02_保卫科/吕萍被吓倒/11.png" id="111_h2j62"] [ext_resource type="Texture2D" uid="uid://sglkhyuaccig" path="res://asset/art/animation/c01_捡球男孩_关键帧/57.png" id="111_p15br"] [ext_resource type="Texture2D" uid="uid://vl43jce7oolv" path="res://asset/art/gif/c02_保卫科/吕萍被吓倒/12.png" id="112_6a88i"] [ext_resource type="Texture2D" uid="uid://t4n0jti3t10h" path="res://asset/art/animation/c01_小小蝶_running/7.png" id="112_m4xei"] -[ext_resource type="Texture2D" uid="uid://blfpodgbieypt" path="res://asset/art/animation/c01_小小蝶_running_l/4.png" id="112_q7dxw"] [ext_resource type="Texture2D" uid="uid://bi0b2gccwjcef" path="res://asset/art/animation/c01_捡球男孩_关键帧/58.png" id="112_r2dja"] [ext_resource type="Texture2D" uid="uid://btycx3g5vjicq" path="res://asset/art/animation/c01_小小蝶_walking/1.png" id="113_1lrkx"] -[ext_resource type="Texture2D" uid="uid://clvlsxtbc7aia" path="res://asset/art/animation/c01_小小蝶_running_l/5.png" id="113_36gw6"] [ext_resource type="Texture2D" uid="uid://byormpqai8ugc" path="res://asset/art/animation/c01_捡球男孩_关键帧/59.png" id="113_a8pao"] [ext_resource type="Texture2D" uid="uid://d4co8pt8ittaq" path="res://asset/art/gif/c02_保卫科/吕萍被吓倒/13.png" id="113_dt0ta"] [ext_resource type="Texture2D" uid="uid://cuwduag0vjtwe" path="res://asset/art/animation/c01_捡球男孩_关键帧/60.png" id="114_2m6mm"] -[ext_resource type="Texture2D" uid="uid://c6tiksw8552bs" path="res://asset/art/animation/c01_小小蝶_running_l/6.png" id="114_7cu0w"] [ext_resource type="Texture2D" uid="uid://cn1o5gf3evo4a" path="res://asset/art/animation/c01_小小蝶_walking/2.png" id="114_i8ndl"] [ext_resource type="Texture2D" uid="uid://bxk6l3b2yleqq" path="res://asset/art/gif/c02_保卫科/吕萍被吓倒/14.png" id="114_oq26j"] [ext_resource type="Texture2D" uid="uid://cjcrb4lt1x6yw" path="res://asset/art/gif/c02_保卫科/吕萍被吓倒/15.png" id="115_ca8s5"] [ext_resource type="Texture2D" uid="uid://di1c4xqcj820" path="res://asset/art/animation/c01_捡球男孩_关键帧/61.png" id="115_ct7bj"] [ext_resource type="Texture2D" uid="uid://kxdbmy38b6p8" path="res://asset/art/animation/c01_小小蝶_walking/3.png" id="115_gfdtf"] -[ext_resource type="Texture2D" uid="uid://c0kxv1ffcgbv" path="res://asset/art/animation/c01_小小蝶_running_l/7.png" id="115_ink27"] [ext_resource type="Texture2D" uid="uid://cqbf4xy8l4i4e" path="res://asset/art/animation/c01_红光鬼差_idle/1.png" id="116_4yqm5"] [ext_resource type="Texture2D" uid="uid://bjjy1tr14buvt" path="res://asset/art/animation/c01_小小蝶_walking/4.png" id="116_ql6a7"] [ext_resource type="Texture2D" uid="uid://b5mf38gpodk48" path="res://asset/art/gif/c02_保卫科/吕萍被吓倒/16.png" id="116_vrcrs"] @@ -240,43 +233,29 @@ [ext_resource type="Texture2D" uid="uid://76s6xq20e7b4" path="res://asset/art/gif/c02_保卫科/吕萍被吓倒/22.png" id="122_cs3vs"] [ext_resource type="Texture2D" uid="uid://l0py275mlyhc" path="res://asset/art/animation/c01_红光鬼差_walking/3.png" id="122_rmksf"] [ext_resource type="Texture2D" uid="uid://drevimrar2ss5" path="res://asset/art/animation/c01_小小蝶_抬头/4.png" id="122_wi84v"] -[ext_resource type="Texture2D" uid="uid://bug0ummiipg6d" path="res://asset/art/animation/c01_小小蝶_walking （8帧-317px高）/1.png" id="123_1rifq"] [ext_resource type="Texture2D" uid="uid://i4hylmfdrjmh" path="res://asset/art/animation/c01_红光鬼差_walking/4.png" id="123_4v81v"] [ext_resource type="Texture2D" uid="uid://b8biat4ueevh" path="res://asset/art/animation/c01_小小蝶_抬头/5.png" id="123_aidva"] [ext_resource type="Texture2D" uid="uid://dne8xs5ssscmo" path="res://asset/art/gif/c02_保卫科/吕萍被吓倒/23.png" id="123_wm8vb"] [ext_resource type="Texture2D" uid="uid://k86qjq6auc85" path="res://asset/art/animation/c01_车夫_idle/1.png" id="124_ddngu"] -[ext_resource type="Texture2D" uid="uid://dy8xixgytw3fc" path="res://asset/art/animation/c01_小小蝶_walking （8帧-317px高）/2.png" id="124_f05ht"] [ext_resource type="Texture2D" uid="uid://dcss70cml36cx" path="res://asset/art/animation/c01_小小蝶_抬头/6.png" id="124_ndtdx"] [ext_resource type="Texture2D" uid="uid://csam45ex4lq6l" path="res://asset/art/animation/c01_车夫_idle/2.png" id="125_6fqgx"] -[ext_resource type="Texture2D" uid="uid://b6ly683lxhxkv" path="res://asset/art/animation/c01_小小蝶_walking （8帧-317px高）/3.png" id="125_bxjt8"] [ext_resource type="Texture2D" uid="uid://dugr2rkjupx0u" path="res://asset/art/animation/c01_小小蝶_抬头/7.png" id="125_hl2pe"] [ext_resource type="Texture2D" uid="uid://caalk3jepxfng" path="res://asset/art/animation/c01_车夫_idle/3.png" id="126_5j17f"] -[ext_resource type="Texture2D" uid="uid://b65h5vha2ohuo" path="res://asset/art/animation/c01_小小蝶_walking （8帧-317px高）/4.png" id="126_yy7k4"] [ext_resource type="Texture2D" uid="uid://0vuafrgdaqns" path="res://asset/art/animation/c01_车夫_running/1.png" id="127_8yqif"] -[ext_resource type="Texture2D" uid="uid://bqdhlvwwfro8f" path="res://asset/art/animation/c01_小小蝶_walking （8帧-317px高）/5.png" id="127_riraf"] -[ext_resource type="Texture2D" uid="uid://p4a6nfq7swqx" path="res://asset/art/animation/c01_小小蝶_walking （8帧-317px高）/6.png" id="128_r5txh"] [ext_resource type="Texture2D" uid="uid://d3k62jslhhdtx" path="res://asset/art/animation/c01_车夫_running/2.png" id="128_vv2bn"] -[ext_resource type="Texture2D" uid="uid://6kuaudtyvh45" path="res://asset/art/animation/c01_小小蝶_walking （8帧-317px高）/7.png" id="129_8qeg7"] [ext_resource type="Texture2D" uid="uid://b776oj8tutnj6" path="res://asset/art/animation/c01_车夫_running/3.png" id="129_caif4"] -[ext_resource type="Texture2D" uid="uid://51tsbhbesta2" path="res://asset/art/animation/c01_小小蝶_walking （8帧-317px高）/8.png" id="130_lpb6w"] [ext_resource type="Texture2D" uid="uid://ci3ewetvyxylq" path="res://asset/art/animation/c01_车夫_running/4.png" id="130_th40a"] [ext_resource type="Texture2D" uid="uid://bmf5d00t02uoe" path="res://asset/art/animation/c01_车夫_running/5.png" id="131_g1eop"] -[ext_resource type="Texture2D" uid="uid://bgryts85aqfxx" path="res://asset/art/animation/c01_小小蝶_walking_l/1.png" id="131_w281a"] [ext_resource type="Texture2D" uid="uid://c2x1k3vm24jv1" path="res://asset/art/animation/c01_车夫_running/6.png" id="132_08jtn"] -[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"] [ext_resource type="Texture2D" uid="uid://dpt2qhn0ypkm" path="res://asset/art/animation/c02_吕萍_匍匐起身蹲着窥视/2.png" id="136_vxrfs"] [ext_resource type="Texture2D" uid="uid://bhnwe7vdb087p" path="res://asset/art/gif/c00_通用动作/吕萍_拿本子记录/0.png" id="136_yiibj"] [ext_resource type="Texture2D" uid="uid://nyh8oolkijpt" path="res://asset/art/animation/c01_小小蝶_侧面下蹲/3.png" id="137_1k3xv"] @@ -315,48 +294,37 @@ [ext_resource type="Texture2D" uid="uid://8soq2th62in1" path="res://asset/art/animation/c02_吕萍_坐着站起来/4.png" id="145_l5pov"] [ext_resource type="Texture2D" uid="uid://dm4diuugareq8" path="res://asset/art/gif/c01_书店外街道/小蝶敲门/3.png" id="146_28dsl"] [ext_resource type="Texture2D" uid="uid://dm4ahmkxid72l" path="res://asset/art/animation/c02_吕萍_坐着站起来/5.png" id="146_80x36"] -[ext_resource type="Texture2D" uid="uid://c8ud56dy3xkhu" path="res://asset/art/animation/c01_小小蝶_床上看书/1.png" id="146_glua7"] [ext_resource type="Texture2D" uid="uid://bd5a41j43yj3u" path="res://asset/art/gif/c00_通用动作/吕萍_拿本子记录/10.png" id="146_spcyg"] [ext_resource type="Texture2D" uid="uid://balno1w14oo1y" path="res://asset/art/animation/c02_吕萍_坐着站起来/6.png" id="147_5dg5p"] [ext_resource type="Texture2D" uid="uid://t1skwh8tduec" path="res://asset/art/gif/c01_书店外街道/小蝶敲门/4.png" id="147_a2njd"] [ext_resource type="Texture2D" uid="uid://bt80uttdkyepy" path="res://asset/art/gif/c00_通用动作/吕萍_拿本子记录/11.png" id="147_a6bg6"] -[ext_resource type="Texture2D" uid="uid://kavoopmi8jll" path="res://asset/art/animation/c01_小小蝶_床上看书/2.png" id="147_jn0hd"] [ext_resource type="Texture2D" uid="uid://1d62ayg75cgk" path="res://asset/art/gif/c00_通用动作/吕萍_拿本子记录/12.png" id="148_1n12f"] [ext_resource type="Texture2D" uid="uid://dkomq2k4qqykc" path="res://asset/art/gif/c01_书店外街道/小蝶敲门/5.png" id="148_fegfu"] -[ext_resource type="Texture2D" uid="uid://dh3qcxqhni86d" path="res://asset/art/animation/c01_小小蝶_床上看书/3.png" id="148_gtwc1"] [ext_resource type="Texture2D" uid="uid://de4gqbxq1whac" path="res://asset/art/animation/c02_吕萍_坐着站起来/7.png" id="148_ii2r7"] [ext_resource type="Texture2D" uid="uid://cum2wytbbk5ux" path="res://asset/art/gif/c02_偷听李氏癞子/吕萍起立/0.png" id="148_l8b30"] -[ext_resource type="Texture2D" uid="uid://wae06jat0wji" path="res://asset/art/animation/c01_小小蝶_床上看书/4.png" id="149_ahx2r"] [ext_resource type="Texture2D" uid="uid://dpvdgjwe15w0x" path="res://asset/art/gif/c02_偷听李氏癞子/吕萍起立/1.png" id="149_u1ns1"] [ext_resource type="Texture2D" uid="uid://cut1pfyieybax" path="res://asset/art/gif/c00_通用动作/吕萍_拿本子记录/13.png" id="149_xhf7n"] [ext_resource type="Texture2D" uid="uid://dtfgmel6l2yy3" path="res://asset/art/gif/c01_书店外街道/小蝶敲门/6.png" id="149_ycyeh"] [ext_resource type="Texture2D" uid="uid://dnck4j4c4ngba" path="res://asset/art/gif/c00_通用动作/吕萍_拿本子记录/14.png" id="150_5fksx"] -[ext_resource type="Texture2D" uid="uid://cfo4wadhb4bus" path="res://asset/art/animation/c01_小小蝶_床上看书/5.png" id="150_e3kfb"] [ext_resource type="Texture2D" uid="uid://d0506uwhyqbyh" path="res://asset/art/gif/c02_偷听李氏癞子/吕萍起立/2.png" id="150_i6nr0"] [ext_resource type="Texture2D" uid="uid://bw1ew146vm7ip" path="res://asset/art/gif/c01_书店外街道/小蝶敲门/7.png" id="150_qhv5o"] [ext_resource type="Texture2D" uid="uid://dkunqld0sv5pl" path="res://asset/art/gif/c00_通用动作/吕萍_拿本子记录/15.png" id="151_45h8i"] [ext_resource type="Texture2D" uid="uid://yinhwtan57lh" path="res://asset/art/gif/c01_书店外街道/小蝶敲门/8.png" id="151_j1eyu"] [ext_resource type="Texture2D" uid="uid://bdf08mnq1ttyw" path="res://asset/art/gif/c02_偷听李氏癞子/吕萍蹲下/0.png" id="151_kk2bf"] -[ext_resource type="Texture2D" uid="uid://dmvy0ytd067d6" path="res://asset/art/animation/c01_小小蝶_床上看书/6.png" id="151_p6hft"] [ext_resource type="Texture2D" uid="uid://ptaa1jm8rdw1" path="res://asset/art/gif/c02_偷听李氏癞子/吕萍蹲下/1.png" id="152_7otbe"] -[ext_resource type="Texture2D" uid="uid://x72dnodrtrpl" path="res://asset/art/animation/c01_小小蝶_床上看书/7.png" id="152_aeo40"] [ext_resource type="Texture2D" uid="uid://da6v4vqyk664o" path="res://asset/art/gif/c01_书店外街道/小蝶敲门/9.png" id="152_dbpky"] [ext_resource type="Texture2D" uid="uid://byreobavo0y3a" path="res://asset/art/gif/c00_通用动作/吕萍_拿本子记录/16.png" id="152_fw42m"] [ext_resource type="Texture2D" uid="uid://dpp2vbha8d5se" path="res://asset/art/gif/c01_书店外街道/小蝶敲门/10.png" id="153_1yeu1"] -[ext_resource type="Texture2D" uid="uid://dmcke4vsfktue" path="res://asset/art/animation/c01_小小蝶_床上看书/8.png" id="153_a380e"] [ext_resource type="Texture2D" uid="uid://bifyu2njqjj2v" path="res://asset/art/gif/c02_偷听李氏癞子/吕萍蹲下/2.png" id="153_pq372"] [ext_resource type="Texture2D" uid="uid://4c2byf4ulsua" path="res://asset/art/gif/c00_通用动作/吕萍_拿本子记录/17.png" id="153_wea4n"] -[ext_resource type="Texture2D" uid="uid://o1iacesauyv" path="res://asset/art/animation/c01_小小蝶_床上看书/9.png" id="154_3io2u"] [ext_resource type="Texture2D" uid="uid://dl8a7p0l3rfan" path="res://asset/art/gif/c00_通用动作/吕萍_拿本子记录/18.png" id="154_6fbxf"] [ext_resource type="Texture2D" uid="uid://dwirixil6sdux" path="res://asset/art/gif/c02_偷听李氏癞子/吕萍蹲下呼吸/0.png" id="154_ax4bo"] [ext_resource type="Texture2D" uid="uid://drbek888ip36r" path="res://asset/art/gif/c01_书店外街道/小蝶敲门/11.png" id="154_nnxju"] [ext_resource type="Texture2D" uid="uid://c5r8wtlif7tf4" path="res://asset/art/gif/c00_通用动作/吕萍_拿本子记录/19.png" id="155_2mqjb"] [ext_resource type="Texture2D" uid="uid://derqsnxbqhdsy" path="res://asset/art/gif/c01_书店外街道/小蝶敲门/12.png" id="155_at65w"] [ext_resource type="Texture2D" uid="uid://cjaqwy23331mo" path="res://asset/art/gif/c02_偷听李氏癞子/吕萍蹲下呼吸/1.png" id="155_k50fa"] -[ext_resource type="Texture2D" uid="uid://d30hf2sxamgdx" path="res://asset/art/animation/c01_小小蝶_床上看书/10.png" id="155_rya2f"] [ext_resource type="Texture2D" uid="uid://djy0mkg075bbg" path="res://asset/art/gif/c00_通用动作/吕萍_拿本子记录/20.png" id="156_asda4"] [ext_resource type="Texture2D" uid="uid://c0fn6qqmg8kn6" path="res://asset/art/gif/c01_书店外街道/小蝶敲门/13.png" id="156_h05uc"] -[ext_resource type="Texture2D" uid="uid://dosgg8v3w7fc6" path="res://asset/art/animation/c01_小小蝶_床上看书/11.png" id="156_nj42l"] [ext_resource type="Texture2D" uid="uid://oi3wyytidjjl" path="res://asset/art/gif/c00_通用动作/吕萍_拿本子记录/21.png" id="157_aobnc"] [ext_resource type="Texture2D" uid="uid://b1e1c1dleaj5" path="res://asset/art/gif/c01_书店外街道/小蝶敲门/14.png" id="157_rrvfp"] [ext_resource type="Texture2D" uid="uid://c76jte8mtvqtt" path="res://asset/art/gif/c01_书店外街道/小蝶敲门/15.png" id="158_7524g"] @@ -484,6 +452,7 @@ [ext_resource type="Texture2D" uid="uid://bgjswxjfjccit" path="res://asset/art/animation/c02_吕萍_蹲下来查看/6.png" id="218_5uqv8"] [ext_resource type="Texture2D" uid="uid://wsk76ctf1a14" path="res://asset/art/gif/c01_公寓过道/小蝶探头/23.png" id="218_dlcc5"] [ext_resource type="Texture2D" uid="uid://dqqyooms4my5q" path="res://asset/art/gif/c01_公寓过道/小蝶探头/24.png" id="219_qql8q"] +[ext_resource type="Texture2D" uid="uid://db4svy7ygvcxh" path="res://asset/art/animation/c01_小小蝶_running/0.png" id="219_y2gjg"] [ext_resource type="Texture2D" uid="uid://bpdkw2174o86f" path="res://asset/art/gif/c01_公寓过道/小蝶探头/25.png" id="220_j6p0q"] [ext_resource type="Texture2D" uid="uid://ckbmupq8krn81" path="res://asset/art/animation/c02_吕萍_钻出/1.png" id="220_pc8vf"] [ext_resource type="Texture2D" uid="uid://lk06dwxf2qer" path="res://asset/art/gif/c01_公寓过道/小蝶探头/26.png" id="221_0di6h"] @@ -497,6 +466,7 @@ [ext_resource type="Texture2D" uid="uid://bnifcn1fbnk2w" path="res://asset/art/gif/c01_公寓过道/小蝶探头/30.png" id="225_exmgj"] [ext_resource type="Texture2D" uid="uid://e1c56ni3omia" path="res://asset/art/animation/c02_吕萍_钻出/6.png" id="225_l0byx"] [ext_resource type="Texture2D" uid="uid://cqv0vf6wkawa0" path="res://asset/art/gif/c01_公寓过道/小蝶探头/31.png" id="226_glo3y"] +[ext_resource type="Texture2D" uid="uid://bcw6dcx0rybc3" path="res://asset/art/animation/c01_小小蝶_walking/0.png" id="227_ikcep"] [ext_resource type="Texture2D" uid="uid://bmyvhdrfj4l3l" path="res://asset/art/animation/c02_吕萍_风吹过/吕萍-风吹过1.png" id="227_n073l"] [ext_resource type="Texture2D" uid="uid://dh6r2vr2m6nrx" path="res://asset/art/gif/c01_公寓过道/小蝶探头/32.png" id="227_y86r8"] [ext_resource type="Texture2D" uid="uid://3lrtlbg8bf83" path="res://asset/art/animation/c02_吕萍_风吹过/吕萍-风吹过2.png" id="228_3bhye"] @@ -511,6 +481,7 @@ [ext_resource type="Texture2D" uid="uid://c14483vondgmh" path="res://asset/art/gif/c01_公寓过道/小蝶探头/37.png" id="232_n7qvh"] [ext_resource type="Texture2D" uid="uid://bej2d72mdsmhx" path="res://asset/art/gif/c01_公寓过道/小蝶探头/38.png" id="233_077om"] [ext_resource type="Texture2D" uid="uid://box75usg4ym7f" path="res://asset/art/animation/c02_吕萍_风吹过/吕萍-风吹过7.png" id="233_i4c25"] +[ext_resource type="Texture2D" uid="uid://caqu8a3voekmx" path="res://asset/art/animation/c01_小小蝶_walking/7.png" id="234_8vhco"] [ext_resource type="Texture2D" uid="uid://ct1blyewa7xod" path="res://asset/art/gif/c01_公寓过道/小蝶探头/39.png" id="234_b6i75"] [ext_resource type="Texture2D" uid="uid://dsm4t3wp6xyd" path="res://asset/art/animation/c02_吕萍_风吹过/吕萍-风吹过8.png" id="234_lgu52"] [ext_resource type="Texture2D" uid="uid://r1vqv2m4juhg" path="res://asset/art/gif/c01_公寓过道/小蝶探头/40.png" id="235_2um7t"] @@ -666,11 +637,26 @@ [ext_resource type="Texture2D" uid="uid://d4ea7fpp4vlf1" path="res://asset/art/animation/c02_黑手_捂屏幕/3.png" id="361_qj3pl"] [ext_resource type="Texture2D" uid="uid://bq7tucxtbjekc" path="res://asset/art/animation/c02_黑手_捂屏幕/4.png" id="362_6y1xc"] [ext_resource type="Texture2D" uid="uid://dwbi82gs4gmm2" path="res://asset/art/animation/c02_黑手_捂屏幕/5.png" id="363_xpj1l"] +[ext_resource type="Texture2D" uid="uid://ctr6lch1apmvy" path="res://asset/art/animation/c01_小小蝶_床上戴假发看书/0.png" id="364_wpe64"] [ext_resource type="Texture2D" uid="uid://c3boxyis86bfg" path="res://asset/art/animation/c02_黑手_捂屏幕/6.png" id="364_xpv3x"] [ext_resource type="Texture2D" uid="uid://dhdkof7qdsgcs" path="res://asset/art/animation/c02_黑手_捂屏幕/7.png" id="365_57pq0"] +[ext_resource type="Texture2D" uid="uid://j4xe71qfe83q" path="res://asset/art/animation/c01_小小蝶_床上戴假发看书/1.png" id="365_88ymt"] +[ext_resource type="Texture2D" uid="uid://roig8xuw7ntv" path="res://asset/art/animation/c01_小小蝶_床上戴假发看书/2.png" id="366_tnlrb"] [ext_resource type="Texture2D" uid="uid://p5pqnjd6t5qj" path="res://asset/art/animation/c02_黑手_捂屏幕/8.png" id="366_yyr4p"] +[ext_resource type="Texture2D" uid="uid://bebqgl5thn4tm" path="res://asset/art/animation/c01_小小蝶_床上戴假发看书/3.png" id="367_f02eb"] [ext_resource type="Texture2D" uid="uid://cxuvfkg7hkhrr" path="res://asset/art/animation/c02_黑手_捂屏幕/9.png" id="367_wevkt"] +[ext_resource type="Texture2D" uid="uid://dn6qbfa5iw8fx" path="res://asset/art/animation/c01_小小蝶_床上戴假发看书/4.png" id="368_fhnjb"] [ext_resource type="Texture2D" uid="uid://bkk1fxxlpnbbi" path="res://asset/art/animation/c02_黑手_捂屏幕/10.png" id="368_qnl4d"] +[ext_resource type="Texture2D" uid="uid://ds8wh04tqsndo" path="res://asset/art/animation/c01_小小蝶_床上戴假发看书/5.png" id="369_2byqq"] +[ext_resource type="Texture2D" uid="uid://bnrvr5htigcnf" path="res://asset/art/animation/c01_小小蝶_床上戴假发看书/6.png" id="370_5rkx7"] +[ext_resource type="Texture2D" uid="uid://ds05fpng1ghto" path="res://asset/art/animation/c01_小小蝶_床上戴假发看书/7.png" id="371_y1k3y"] +[ext_resource type="Texture2D" uid="uid://c8jjtacky4a73" path="res://asset/art/animation/c01_小小蝶_床上戴假发看书/8.png" id="372_l4y1k"] +[ext_resource type="Texture2D" uid="uid://do0se3ipsdum4" path="res://asset/art/animation/c01_小小蝶_床上戴假发看书/9.png" id="373_p7mln"] +[ext_resource type="Texture2D" uid="uid://bwfe8apw37kp3" path="res://asset/art/animation/c01_小小蝶_床上戴假发看书/10.png" id="374_p80h8"] +[ext_resource type="Texture2D" uid="uid://cvy56lqm2qqba" path="res://asset/art/animation/c01_小小蝶_床上戴假发看书/11.png" id="375_pechk"] +[ext_resource type="Texture2D" uid="uid://n7fjhk83aqwi" path="res://asset/art/animation/c01_小小蝶_床上戴假发看书/12.png" id="376_v8kdt"] +[ext_resource type="Texture2D" uid="uid://b1h0rwy715ll1" path="res://asset/art/animation/c01_小小蝶_床上戴假发看书/13.png" id="377_1r2fo"] +[ext_resource type="Texture2D" uid="uid://boie0b2vwxtbf" path="res://asset/art/animation/c01_小小蝶_床上戴假发看书/14.png" id="378_uu3nj"] [ext_resource type="Texture2D" uid="uid://cf3h4eoh5qa3c" path="res://asset/art/gif/c00_通用动作/吕萍_高位点灯/2.png" id="445_dsiga"] [ext_resource type="Texture2D" uid="uid://c87pytx32ikt4" path="res://asset/art/gif/c00_通用动作/吕萍_高位点灯/3.png" id="446_fso4g"] [ext_resource type="Texture2D" uid="uid://s7blpvb4orm1" path="res://asset/art/gif/c00_通用动作/吕萍_高位点灯/4.png" id="447_8c2os"] @@ -1715,32 +1701,9 @@ animations = [{ }, { "frames": [{ "duration": 0.8, -"texture": ExtResource("109_v6eyj") +"texture": ExtResource("219_y2gjg") }, { "duration": 0.8, -"texture": ExtResource("110_nrq01") -}, { -"duration": 0.8, -"texture": ExtResource("111_arwxu") -}, { -"duration": 0.8, -"texture": ExtResource("112_q7dxw") -}, { -"duration": 0.8, -"texture": ExtResource("113_36gw6") -}, { -"duration": 0.8, -"texture": ExtResource("114_7cu0w") -}, { -"duration": 0.8, -"texture": ExtResource("115_ink27") -}], -"loop": true, -"name": &"c01_小小蝶_running_l", -"speed": 8.0 -}, { -"frames": [{ -"duration": 0.8, "texture": ExtResource("106_uovoh") }, { "duration": 0.8, @@ -1762,82 +1725,36 @@ animations = [{ "texture": ExtResource("112_m4xei") }], "loop": true, -"name": &"c01_小小蝶_running_r", +"name": &"c01_小小蝶_running", "speed": 8.0 }, { "frames": [{ -"duration": 1.0, -"texture": ExtResource("123_1rifq") +"duration": 0.7, +"texture": ExtResource("227_ikcep") }, { -"duration": 1.0, -"texture": ExtResource("124_f05ht") -}, { -"duration": 1.0, -"texture": ExtResource("125_bxjt8") -}, { -"duration": 1.0, -"texture": ExtResource("126_yy7k4") -}, { -"duration": 1.0, -"texture": ExtResource("127_riraf") -}, { -"duration": 1.0, -"texture": ExtResource("128_r5txh") -}, { -"duration": 1.0, -"texture": ExtResource("129_8qeg7") -}, { -"duration": 1.0, -"texture": ExtResource("130_lpb6w") -}], -"loop": true, -"name": &"c01_小小蝶_walking （8帧-317px高）", -"speed": 6.0 -}, { -"frames": [{ -"duration": 0.8, -"texture": ExtResource("131_w281a") -}, { -"duration": 0.8, -"texture": ExtResource("132_eeag4") -}, { -"duration": 0.8, -"texture": ExtResource("133_fpldy") -}, { -"duration": 0.8, -"texture": ExtResource("134_x6ki2") -}, { -"duration": 0.8, -"texture": ExtResource("135_5fneh") -}, { -"duration": 0.8, -"texture": ExtResource("136_rej31") -}], -"loop": true, -"name": &"c01_小小蝶_walking_l", -"speed": 6.0 -}, { -"frames": [{ -"duration": 0.8, +"duration": 0.7, "texture": ExtResource("113_1lrkx") }, { -"duration": 0.8, +"duration": 0.7, "texture": ExtResource("114_i8ndl") }, { -"duration": 0.8, +"duration": 0.7, "texture": ExtResource("115_gfdtf") }, { -"duration": 0.8, +"duration": 0.7, "texture": ExtResource("116_ql6a7") }, { -"duration": 0.8, +"duration": 0.7, "texture": ExtResource("117_1a4yh") }, { -"duration": 0.8, +"duration": 0.7, "texture": ExtResource("118_2n8cs") +}, { +"duration": 0.7, +"texture": ExtResource("234_8vhco") }], "loop": true, -"name": &"c01_小小蝶_walking_r", +"name": &"c01_小小蝶_walking", "speed": 6.0 }, { "frames": [{ @@ -2253,56 +2170,56 @@ animations = [{ "speed": 30.0 }, { "frames": [{ -"duration": 1.0, -"texture": ExtResource("146_glua7") +"duration": 2.5, +"texture": ExtResource("364_wpe64") +}, { +"duration": 2.5, +"texture": ExtResource("365_88ymt") +}, { +"duration": 2.5, +"texture": ExtResource("364_wpe64") +}, { +"duration": 2.5, +"texture": ExtResource("365_88ymt") +}, { +"duration": 2.0, +"texture": ExtResource("366_tnlrb") +}, { +"duration": 2.0, +"texture": ExtResource("367_f02eb") +}, { +"duration": 2.0, +"texture": ExtResource("368_fhnjb") +}, { +"duration": 1.8, +"texture": ExtResource("369_2byqq") +}, { +"duration": 1.5, +"texture": ExtResource("370_5rkx7") +}, { +"duration": 1.4, +"texture": ExtResource("371_y1k3y") +}, { +"duration": 1.3, +"texture": ExtResource("372_l4y1k") +}, { +"duration": 1.2, +"texture": ExtResource("373_p7mln") +}, { +"duration": 1.1, +"texture": ExtResource("374_p80h8") }, { "duration": 1.0, -"texture": ExtResource("147_jn0hd") +"texture": ExtResource("375_pechk") }, { "duration": 1.0, -"texture": ExtResource("146_glua7") +"texture": ExtResource("376_v8kdt") }, { "duration": 1.0, -"texture": ExtResource("147_jn0hd") +"texture": ExtResource("377_1r2fo") }, { "duration": 1.0, -"texture": ExtResource("146_glua7") -}, { -"duration": 1.0, -"texture": ExtResource("147_jn0hd") -}, { -"duration": 1.0, -"texture": ExtResource("146_glua7") -}, { -"duration": 1.0, -"texture": ExtResource("147_jn0hd") -}, { -"duration": 1.0, -"texture": ExtResource("148_gtwc1") -}, { -"duration": 1.0, -"texture": ExtResource("149_ahx2r") -}, { -"duration": 1.0, -"texture": ExtResource("150_e3kfb") -}, { -"duration": 1.0, -"texture": ExtResource("151_p6hft") -}, { -"duration": 1.0, -"texture": ExtResource("152_aeo40") -}, { -"duration": 1.0, -"texture": ExtResource("153_a380e") -}, { -"duration": 1.0, -"texture": ExtResource("154_3io2u") -}, { -"duration": 1.0, -"texture": ExtResource("155_rya2f") -}, { -"duration": 1.0, -"texture": ExtResource("156_nj42l") +"texture": ExtResource("378_uu3nj") }], "loop": false, "name": &"c01_小小蝶_床上看书", diff --git a/manager/archive_manager/archive_manager.gd b/manager/archive_manager/archive_manager.gd index be34a4c1..cd89e33b 100644 --- a/manager/archive_manager/archive_manager.gd +++ b/manager/archive_manager/archive_manager.gd @@ -132,7 +132,7 @@ func _check_dirs_and_archives() -> bool: var res = ResourceLoader.load( path, "AssembledArchive", ResourceLoader.CACHE_MODE_REPLACE_DEEP ) - if is_instance_valid(res) and res.version == CURRENT_VERSION: + if is_instance_valid(res) and res.version >= CURRENT_VERSION: archives[id] = res else: printerr("SKIP INVALID ARCHIVE! file=", file) @@ -212,7 +212,7 @@ func load_config() -> void: var path = user_root_dir + "config" + GlobalConfig.RES_FILE_FORMAT if FileAccess.file_exists(path): var config = ResourceLoader.load(path) - if is_instance_valid(config) and config.version == CURRENT_VERSION: + if is_instance_valid(config) and config.version >= CURRENT_VERSION: GlobalConfigManager.config = config else: printerr("SKIP INVALID CONFIG!") diff --git a/scene/character/player_animation_config.gd b/scene/character/player_animation_config.gd index 33ea089d..9cb619a0 100644 --- a/scene/character/player_animation_config.gd +++ b/scene/character/player_animation_config.gd @@ -132,8 +132,8 @@ var ANIMATION_CONFIG = { "foot_offset": Vector2(0, -37.0), MOVEMENT_IDLE: [&"c01_小小蝶_idle_l", &"c01_小小蝶_idle_r"], # 此处为[2][3]分别为 sprite 向左、向右时的 offset - MOVEMENT_WALKING: [&"c01_小小蝶_walking_l", &"c01_小小蝶_walking_r"], - MOVEMENT_RUNNING: [&"c01_小小蝶_running_l", &"c01_小小蝶_running_r"], + MOVEMENT_WALKING: [&"", &"c01_小小蝶_walking"], + MOVEMENT_RUNNING: [&"", &"c01_小小蝶_running"], # animation_name, left, right # ACTION_LOOKUP_WALL: # [&"c01_小小蝶_背面抬头", Vector2.ONE, Vector2(-3.0, -37.0), &"c01_小小蝶_抬头_l", &"c01_小小蝶_抬头_r"],