diff --git a/asset/art/animation/c01_小小蝶_床上戴假发看书/10.png b/asset/art/animation/c01_小小蝶_床上戴假发看书/10.png index f081da2b..a24ba6f1 100644 Binary files a/asset/art/animation/c01_小小蝶_床上戴假发看书/10.png and b/asset/art/animation/c01_小小蝶_床上戴假发看书/10.png differ diff --git a/asset/art/animation/c01_小小蝶_床上戴假发看书/11.png b/asset/art/animation/c01_小小蝶_床上戴假发看书/11.png index a89747e4..d85e8ee7 100644 Binary files a/asset/art/animation/c01_小小蝶_床上戴假发看书/11.png and b/asset/art/animation/c01_小小蝶_床上戴假发看书/11.png differ diff --git a/asset/art/animation/c01_小小蝶_床上戴假发看书/12.png b/asset/art/animation/c01_小小蝶_床上戴假发看书/12.png index f529acf5..6ae96f87 100644 Binary files a/asset/art/animation/c01_小小蝶_床上戴假发看书/12.png and b/asset/art/animation/c01_小小蝶_床上戴假发看书/12.png differ diff --git a/asset/art/animation/c01_小小蝶_床上戴假发看书/13.png b/asset/art/animation/c01_小小蝶_床上戴假发看书/13.png index fc23ccd5..6ae96f87 100644 Binary files a/asset/art/animation/c01_小小蝶_床上戴假发看书/13.png and b/asset/art/animation/c01_小小蝶_床上戴假发看书/13.png differ diff --git a/asset/art/animation/c01_小小蝶_床上戴假发看书/14.png b/asset/art/animation/c01_小小蝶_床上戴假发看书/14.png index d80f3902..6ae96f87 100644 Binary files a/asset/art/animation/c01_小小蝶_床上戴假发看书/14.png and b/asset/art/animation/c01_小小蝶_床上戴假发看书/14.png differ diff --git a/asset/art/animation/c01_小小蝶_床上戴假发看书/15.png b/asset/art/animation/c01_小小蝶_床上戴假发看书/15.png new file mode 100644 index 00000000..6ae96f87 Binary files /dev/null and b/asset/art/animation/c01_小小蝶_床上戴假发看书/15.png differ diff --git a/asset/art/animation/c01_小小蝶_床上戴假发看书/15.png.import b/asset/art/animation/c01_小小蝶_床上戴假发看书/15.png.import new file mode 100644 index 00000000..e8d91fd7 --- /dev/null +++ b/asset/art/animation/c01_小小蝶_床上戴假发看书/15.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://2nnqnjcsu1ej" +path="res://.godot/imported/15.png-0ac3bd64fe2c9fe8f7ef14715a1da5ce.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/animation/c01_小小蝶_床上戴假发看书/15.png" +dest_files=["res://.godot/imported/15.png-0ac3bd64fe2c9fe8f7ef14715a1da5ce.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_小小蝶_床上戴假发看书/16.png b/asset/art/animation/c01_小小蝶_床上戴假发看书/16.png new file mode 100644 index 00000000..6ae96f87 Binary files /dev/null and b/asset/art/animation/c01_小小蝶_床上戴假发看书/16.png differ diff --git a/asset/art/animation/c01_小小蝶_床上戴假发看书/16.png.import b/asset/art/animation/c01_小小蝶_床上戴假发看书/16.png.import new file mode 100644 index 00000000..bb8d30f1 --- /dev/null +++ b/asset/art/animation/c01_小小蝶_床上戴假发看书/16.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c27wuni06un2c" +path="res://.godot/imported/16.png-7437df128fab39603183221572523e8d.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/animation/c01_小小蝶_床上戴假发看书/16.png" +dest_files=["res://.godot/imported/16.png-7437df128fab39603183221572523e8d.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_小小蝶_床上戴假发看书/17.png b/asset/art/animation/c01_小小蝶_床上戴假发看书/17.png new file mode 100644 index 00000000..6ae96f87 Binary files /dev/null and b/asset/art/animation/c01_小小蝶_床上戴假发看书/17.png differ diff --git a/asset/art/animation/c01_小小蝶_床上戴假发看书/17.png.import b/asset/art/animation/c01_小小蝶_床上戴假发看书/17.png.import new file mode 100644 index 00000000..e74558d0 --- /dev/null +++ b/asset/art/animation/c01_小小蝶_床上戴假发看书/17.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b6vklm4tkydb3" +path="res://.godot/imported/17.png-13dcb2dd8cf23ddec0f8c37c89412246.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/animation/c01_小小蝶_床上戴假发看书/17.png" +dest_files=["res://.godot/imported/17.png-13dcb2dd8cf23ddec0f8c37c89412246.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_小小蝶_床上戴假发看书/18.png b/asset/art/animation/c01_小小蝶_床上戴假发看书/18.png new file mode 100644 index 00000000..fd3c3846 Binary files /dev/null and b/asset/art/animation/c01_小小蝶_床上戴假发看书/18.png differ diff --git a/asset/art/animation/c01_小小蝶_床上戴假发看书/18.png.import b/asset/art/animation/c01_小小蝶_床上戴假发看书/18.png.import new file mode 100644 index 00000000..911a1a62 --- /dev/null +++ b/asset/art/animation/c01_小小蝶_床上戴假发看书/18.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://gonjb38sigux" +path="res://.godot/imported/18.png-876bfc677844459a391f66545aac4969.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/animation/c01_小小蝶_床上戴假发看书/18.png" +dest_files=["res://.godot/imported/18.png-876bfc677844459a391f66545aac4969.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_小小蝶_床上戴假发看书/19.png b/asset/art/animation/c01_小小蝶_床上戴假发看书/19.png new file mode 100644 index 00000000..c0291a4d Binary files /dev/null and b/asset/art/animation/c01_小小蝶_床上戴假发看书/19.png differ diff --git a/asset/art/animation/c01_小小蝶_床上戴假发看书/19.png.import b/asset/art/animation/c01_小小蝶_床上戴假发看书/19.png.import new file mode 100644 index 00000000..1b68b683 --- /dev/null +++ b/asset/art/animation/c01_小小蝶_床上戴假发看书/19.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://gumj5o032a3w" +path="res://.godot/imported/19.png-f5d1999e51fa0da976dfd2ca9ec5269b.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/animation/c01_小小蝶_床上戴假发看书/19.png" +dest_files=["res://.godot/imported/19.png-f5d1999e51fa0da976dfd2ca9ec5269b.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_小小蝶_床上戴假发看书/20.png b/asset/art/animation/c01_小小蝶_床上戴假发看书/20.png new file mode 100644 index 00000000..98a705c8 Binary files /dev/null and b/asset/art/animation/c01_小小蝶_床上戴假发看书/20.png differ diff --git a/asset/art/animation/c01_小小蝶_床上戴假发看书/20.png.import b/asset/art/animation/c01_小小蝶_床上戴假发看书/20.png.import new file mode 100644 index 00000000..6ec9a4b1 --- /dev/null +++ b/asset/art/animation/c01_小小蝶_床上戴假发看书/20.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c0lfmgqb5s801" +path="res://.godot/imported/20.png-5f5435649683d95b6b9aad010f30d1af.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/animation/c01_小小蝶_床上戴假发看书/20.png" +dest_files=["res://.godot/imported/20.png-5f5435649683d95b6b9aad010f30d1af.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_小小蝶_床上戴假发看书/21.png b/asset/art/animation/c01_小小蝶_床上戴假发看书/21.png new file mode 100644 index 00000000..a843e2eb Binary files /dev/null and b/asset/art/animation/c01_小小蝶_床上戴假发看书/21.png differ diff --git a/asset/art/animation/c01_小小蝶_床上戴假发看书/21.png.import b/asset/art/animation/c01_小小蝶_床上戴假发看书/21.png.import new file mode 100644 index 00000000..fabab910 --- /dev/null +++ b/asset/art/animation/c01_小小蝶_床上戴假发看书/21.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bjmmj3jg3npxf" +path="res://.godot/imported/21.png-57db15640c224ce9504e541da73992aa.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/animation/c01_小小蝶_床上戴假发看书/21.png" +dest_files=["res://.godot/imported/21.png-57db15640c224ce9504e541da73992aa.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_小小蝶_床上戴假发看书/22.png b/asset/art/animation/c01_小小蝶_床上戴假发看书/22.png new file mode 100644 index 00000000..d04c596e Binary files /dev/null and b/asset/art/animation/c01_小小蝶_床上戴假发看书/22.png differ diff --git a/asset/art/animation/c01_小小蝶_床上戴假发看书/22.png.import b/asset/art/animation/c01_小小蝶_床上戴假发看书/22.png.import new file mode 100644 index 00000000..d535d495 --- /dev/null +++ b/asset/art/animation/c01_小小蝶_床上戴假发看书/22.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://ry75nhc4qyx6" +path="res://.godot/imported/22.png-eee5a8473e0c08ac324c0075d0aa9da3.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/animation/c01_小小蝶_床上戴假发看书/22.png" +dest_files=["res://.godot/imported/22.png-eee5a8473e0c08ac324c0075d0aa9da3.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_小小蝶_床上戴假发看书/23.png b/asset/art/animation/c01_小小蝶_床上戴假发看书/23.png new file mode 100644 index 00000000..f081da2b Binary files /dev/null and b/asset/art/animation/c01_小小蝶_床上戴假发看书/23.png differ diff --git a/asset/art/animation/c01_小小蝶_床上戴假发看书/23.png.import b/asset/art/animation/c01_小小蝶_床上戴假发看书/23.png.import new file mode 100644 index 00000000..a270291c --- /dev/null +++ b/asset/art/animation/c01_小小蝶_床上戴假发看书/23.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://honons27oefm" +path="res://.godot/imported/23.png-ac2b3ad4adda1418f78a27f0941de95d.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/animation/c01_小小蝶_床上戴假发看书/23.png" +dest_files=["res://.godot/imported/23.png-ac2b3ad4adda1418f78a27f0941de95d.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_小小蝶_床上戴假发看书/24.png b/asset/art/animation/c01_小小蝶_床上戴假发看书/24.png new file mode 100644 index 00000000..a89747e4 Binary files /dev/null and b/asset/art/animation/c01_小小蝶_床上戴假发看书/24.png differ diff --git a/asset/art/animation/c01_小小蝶_床上戴假发看书/24.png.import b/asset/art/animation/c01_小小蝶_床上戴假发看书/24.png.import new file mode 100644 index 00000000..168d7185 --- /dev/null +++ b/asset/art/animation/c01_小小蝶_床上戴假发看书/24.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bn4043aka6wv6" +path="res://.godot/imported/24.png-e88ce30e0606af160d2ad1c78c28e6e3.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/animation/c01_小小蝶_床上戴假发看书/24.png" +dest_files=["res://.godot/imported/24.png-e88ce30e0606af160d2ad1c78c28e6e3.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_小小蝶_床上戴假发看书/25.png b/asset/art/animation/c01_小小蝶_床上戴假发看书/25.png new file mode 100644 index 00000000..f529acf5 Binary files /dev/null and b/asset/art/animation/c01_小小蝶_床上戴假发看书/25.png differ diff --git a/asset/art/animation/c01_小小蝶_床上戴假发看书/25.png.import b/asset/art/animation/c01_小小蝶_床上戴假发看书/25.png.import new file mode 100644 index 00000000..49245360 --- /dev/null +++ b/asset/art/animation/c01_小小蝶_床上戴假发看书/25.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cu7ig2haq32yl" +path="res://.godot/imported/25.png-a0b4f67577bc0ba47f3576bd2a9b2fb0.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/animation/c01_小小蝶_床上戴假发看书/25.png" +dest_files=["res://.godot/imported/25.png-a0b4f67577bc0ba47f3576bd2a9b2fb0.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_小小蝶_床上戴假发看书/26.png b/asset/art/animation/c01_小小蝶_床上戴假发看书/26.png new file mode 100644 index 00000000..fc23ccd5 Binary files /dev/null and b/asset/art/animation/c01_小小蝶_床上戴假发看书/26.png differ diff --git a/asset/art/animation/c01_小小蝶_床上戴假发看书/26.png.import b/asset/art/animation/c01_小小蝶_床上戴假发看书/26.png.import new file mode 100644 index 00000000..cf340c3a --- /dev/null +++ b/asset/art/animation/c01_小小蝶_床上戴假发看书/26.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://31ps08336ge1" +path="res://.godot/imported/26.png-be990e20c88a8b175151ad932714b878.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/animation/c01_小小蝶_床上戴假发看书/26.png" +dest_files=["res://.godot/imported/26.png-be990e20c88a8b175151ad932714b878.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_小小蝶_床上戴假发看书/27.png b/asset/art/animation/c01_小小蝶_床上戴假发看书/27.png new file mode 100644 index 00000000..d80f3902 Binary files /dev/null and b/asset/art/animation/c01_小小蝶_床上戴假发看书/27.png differ diff --git a/asset/art/animation/c01_小小蝶_床上戴假发看书/27.png.import b/asset/art/animation/c01_小小蝶_床上戴假发看书/27.png.import new file mode 100644 index 00000000..923198d8 --- /dev/null +++ b/asset/art/animation/c01_小小蝶_床上戴假发看书/27.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://ccx2sg1t3gs6s" +path="res://.godot/imported/27.png-7cc37585661c05f8eb89562d8b40f3fe.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/animation/c01_小小蝶_床上戴假发看书/27.png" +dest_files=["res://.godot/imported/27.png-7cc37585661c05f8eb89562d8b40f3fe.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_小小蝶_床上戴假发看书/5.png b/asset/art/animation/c01_小小蝶_床上戴假发看书/5.png index 37f6e4fe..d85e8ee7 100644 Binary files a/asset/art/animation/c01_小小蝶_床上戴假发看书/5.png and b/asset/art/animation/c01_小小蝶_床上戴假发看书/5.png differ diff --git a/asset/art/animation/c01_小小蝶_床上戴假发看书/6.png b/asset/art/animation/c01_小小蝶_床上戴假发看书/6.png index c0291a4d..cdd76d19 100644 Binary files a/asset/art/animation/c01_小小蝶_床上戴假发看书/6.png and b/asset/art/animation/c01_小小蝶_床上戴假发看书/6.png differ diff --git a/asset/art/animation/c01_小小蝶_床上戴假发看书/7.png b/asset/art/animation/c01_小小蝶_床上戴假发看书/7.png index 98a705c8..a24ba6f1 100644 Binary files a/asset/art/animation/c01_小小蝶_床上戴假发看书/7.png and b/asset/art/animation/c01_小小蝶_床上戴假发看书/7.png differ diff --git a/asset/art/animation/c01_小小蝶_床上戴假发看书/8.png b/asset/art/animation/c01_小小蝶_床上戴假发看书/8.png index a843e2eb..a24ba6f1 100644 Binary files a/asset/art/animation/c01_小小蝶_床上戴假发看书/8.png and b/asset/art/animation/c01_小小蝶_床上戴假发看书/8.png differ diff --git a/asset/art/animation/c01_小小蝶_床上戴假发看书/9.png b/asset/art/animation/c01_小小蝶_床上戴假发看书/9.png index d04c596e..a24ba6f1 100644 Binary files a/asset/art/animation/c01_小小蝶_床上戴假发看书/9.png and b/asset/art/animation/c01_小小蝶_床上戴假发看书/9.png differ diff --git a/asset/art/gif/c01_书店/c01_书店_frames.tres b/asset/art/gif/c01_书店/c01_书店_frames.tres index 47603899..850bf1ce 100644 --- a/asset/art/gif/c01_书店/c01_书店_frames.tres +++ b/asset/art/gif/c01_书店/c01_书店_frames.tres @@ -1,4 +1,4 @@ -[gd_resource type="SpriteFrames" load_steps=54 format=3 uid="uid://bmwm400w8r4ju"] +[gd_resource type="SpriteFrames" load_steps=61 format=3 uid="uid://bmwm400w8r4ju"] [ext_resource type="Texture2D" uid="uid://fecla6x8gm2t" path="res://asset/art/gif/c01_书店/小小蝶坠落/0.png" id="1_1u5cc"] [ext_resource type="Texture2D" uid="uid://dsgcymq0lqvc2" path="res://asset/art/gif/c01_书店/书架扶正/0.png" id="1_c130l"] @@ -23,20 +23,27 @@ [ext_resource type="Texture2D" uid="uid://2itmtqlsqsl" path="res://asset/art/gif/c01_书店/小小蝶坠落/10.png" id="11_hv5lj"] [ext_resource type="Texture2D" uid="uid://mafqlg3xnt31" path="res://asset/art/gif/c01_书店/小小蝶坠落/11.png" id="12_sojnc"] [ext_resource type="Texture2D" uid="uid://sfully60mqek" path="res://asset/art/gif/c01_书店/小小蝶坠落/12.png" id="13_was4t"] -[ext_resource type="Texture2D" uid="uid://c020xt40edcog" path="res://asset/art/gif/c01_书店/小小蝶坠落/13.png" id="14_flghj"] -[ext_resource type="Texture2D" uid="uid://c8tx1v4mp2kc8" path="res://asset/art/gif/c01_书店/小小蝶坠落/14.png" id="15_g228c"] [ext_resource type="Texture2D" uid="uid://ca2k1soobfs8d" path="res://asset/art/gif/c01_书店/小小蝶坠落/15.png" id="16_aco8s"] [ext_resource type="Texture2D" uid="uid://cp71rayg8ynfr" path="res://asset/art/gif/c01_书店/小蝶拿报纸/0.png" id="23_hx5cp"] [ext_resource type="Texture2D" uid="uid://cjgj5oq5e2qt6" path="res://asset/art/gif/c01_书店/小蝶拿报纸/1.png" id="24_ljsy7"] [ext_resource type="Texture2D" uid="uid://jk7vua3s68q0" path="res://asset/art/gif/c01_书店/小蝶拿报纸/2.png" id="25_rm0sj"] +[ext_resource type="Texture2D" uid="uid://dbwlr2wq4g8bd" path="res://asset/art/gif/c01_书店/小小蝶坠落/18.png" id="25_v6tvs"] +[ext_resource type="Texture2D" uid="uid://3f6feit3hiwx" path="res://asset/art/gif/c01_书店/小小蝶坠落/19.png" id="26_6xcko"] [ext_resource type="Texture2D" uid="uid://cwakyp1uwatvc" path="res://asset/art/gif/c01_书店/小蝶拿报纸/3.png" id="26_kgx8k"] +[ext_resource type="Texture2D" uid="uid://cxx4jnxq3evt0" path="res://asset/art/gif/c01_书店/小小蝶坠落/20.png" id="27_nyeuc"] [ext_resource type="Texture2D" uid="uid://dqdnrlwq5wreh" path="res://asset/art/gif/c01_书店/小蝶拿报纸/4.png" id="27_oc6mp"] +[ext_resource type="Texture2D" uid="uid://durkr8chhhltx" path="res://asset/art/gif/c01_书店/小小蝶坠落/21.png" id="28_0pom7"] [ext_resource type="Texture2D" uid="uid://dgn2fagpa2e62" path="res://asset/art/gif/c01_书店/小蝶拿报纸/5.png" id="28_7p210"] +[ext_resource type="Texture2D" uid="uid://dibnxlshv36c0" path="res://asset/art/gif/c01_书店/小小蝶坠落/22.png" id="29_gkduc"] [ext_resource type="Texture2D" uid="uid://c2a3lrhelynp0" path="res://asset/art/gif/c01_书店/小蝶拿报纸/6.png" id="29_urb3k"] +[ext_resource type="Texture2D" uid="uid://jqaeca62xlx6" path="res://asset/art/gif/c01_书店/小小蝶坠落/23.png" id="30_7lkiw"] [ext_resource type="Texture2D" uid="uid://citru0vpf5qaf" path="res://asset/art/gif/c01_书店/小蝶拿报纸/7.png" id="30_vjkk5"] [ext_resource type="Texture2D" uid="uid://1wjg5frbftyb" path="res://asset/art/gif/c01_书店/小蝶拿报纸/8.png" id="31_7vfi1"] +[ext_resource type="Texture2D" uid="uid://deei7h31ylmju" path="res://asset/art/gif/c01_书店/小小蝶坠落/24.png" id="31_87jjo"] +[ext_resource type="Texture2D" uid="uid://bjshqa2uadjcf" path="res://asset/art/gif/c01_书店/小小蝶坠落/25.png" id="32_mqlg0"] [ext_resource type="Texture2D" uid="uid://tfgmyhmed0wp" path="res://asset/art/gif/c01_书店/小蝶拿报纸/9.png" id="32_pa3dv"] [ext_resource type="Texture2D" uid="uid://bpafujc1obco1" path="res://asset/art/gif/c01_书店/小蝶拿报纸/10.png" id="33_dc5si"] +[ext_resource type="Texture2D" uid="uid://dbh8ld0nutbvx" path="res://asset/art/gif/c01_书店/小小蝶坠落/26.png" id="33_ljiep"] [ext_resource type="Texture2D" uid="uid://bx1w1jc8lgutg" path="res://asset/art/gif/c01_书店/小蝶拿报纸/11.png" id="34_q8u4c"] [ext_resource type="Texture2D" uid="uid://bteg8gax5ghsp" path="res://asset/art/gif/c01_书店/小蝶拿报纸/12.png" id="35_64f46"] [ext_resource type="Texture2D" uid="uid://b6xjhx15o1yae" path="res://asset/art/gif/c01_书店/小蝶拿报纸/13.png" id="36_crkgv"] @@ -85,57 +92,78 @@ animations = [{ "speed": 30.0 }, { "frames": [{ -"duration": 4.5, +"duration": 1.0, "texture": ExtResource("1_1u5cc") }, { -"duration": 4.5, +"duration": 1.0, "texture": ExtResource("2_dwxsu") }, { -"duration": 4.5, +"duration": 1.0, "texture": ExtResource("3_yfheg") }, { -"duration": 4.5, +"duration": 1.0, "texture": ExtResource("4_jba0n") }, { -"duration": 4.5, +"duration": 1.0, "texture": ExtResource("5_iyqty") }, { -"duration": 4.5, +"duration": 1.0, "texture": ExtResource("6_66ltp") }, { -"duration": 7.0, +"duration": 1.0, "texture": ExtResource("7_53ty2") }, { -"duration": 7.0, +"duration": 4.0, "texture": ExtResource("8_uq185") }, { -"duration": 7.0, +"duration": 4.0, "texture": ExtResource("9_qjtvh") }, { -"duration": 7.0, +"duration": 4.0, "texture": ExtResource("10_nv77n") }, { -"duration": 7.0, +"duration": 4.0, "texture": ExtResource("11_hv5lj") }, { -"duration": 4.5, +"duration": 3.0, "texture": ExtResource("12_sojnc") }, { -"duration": 4.5, +"duration": 2.0, "texture": ExtResource("13_was4t") }, { -"duration": 4.5, -"texture": ExtResource("14_flghj") -}, { -"duration": 4.5, -"texture": ExtResource("15_g228c") -}, { -"duration": 4.5, +"duration": 2.0, "texture": ExtResource("16_aco8s") +}, { +"duration": 2.0, +"texture": ExtResource("25_v6tvs") +}, { +"duration": 2.0, +"texture": ExtResource("26_6xcko") +}, { +"duration": 2.5, +"texture": ExtResource("27_nyeuc") +}, { +"duration": 2.0, +"texture": ExtResource("28_0pom7") +}, { +"duration": 1.7, +"texture": ExtResource("29_gkduc") +}, { +"duration": 1.7, +"texture": ExtResource("30_7lkiw") +}, { +"duration": 1.7, +"texture": ExtResource("31_87jjo") +}, { +"duration": 1.7, +"texture": ExtResource("32_mqlg0") +}, { +"duration": 1.7, +"texture": ExtResource("33_ljiep") }], "loop": false, "name": &"小小蝶坠落", -"speed": 30.0 +"speed": 10.0 }, { "frames": [{ "duration": 9.0, diff --git a/asset/art/gif/c01_书店/小小蝶坠落/1.png b/asset/art/gif/c01_书店/小小蝶坠落/1.png index b407ed80..278b5181 100644 Binary files a/asset/art/gif/c01_书店/小小蝶坠落/1.png and b/asset/art/gif/c01_书店/小小蝶坠落/1.png differ diff --git a/asset/art/gif/c01_书店/小小蝶坠落/10.png b/asset/art/gif/c01_书店/小小蝶坠落/10.png index 938ef2e0..7e32b55d 100644 Binary files a/asset/art/gif/c01_书店/小小蝶坠落/10.png and b/asset/art/gif/c01_书店/小小蝶坠落/10.png differ diff --git a/asset/art/gif/c01_书店/小小蝶坠落/11.png b/asset/art/gif/c01_书店/小小蝶坠落/11.png index e766b67a..7e32b55d 100644 Binary files a/asset/art/gif/c01_书店/小小蝶坠落/11.png and b/asset/art/gif/c01_书店/小小蝶坠落/11.png differ diff --git a/asset/art/gif/c01_书店/小小蝶坠落/12.png b/asset/art/gif/c01_书店/小小蝶坠落/12.png index 47367ee9..be27e4f3 100644 Binary files a/asset/art/gif/c01_书店/小小蝶坠落/12.png and b/asset/art/gif/c01_书店/小小蝶坠落/12.png differ diff --git a/asset/art/gif/c01_书店/小小蝶坠落/13.png b/asset/art/gif/c01_书店/小小蝶坠落/13.png index 33048423..be27e4f3 100644 Binary files a/asset/art/gif/c01_书店/小小蝶坠落/13.png and b/asset/art/gif/c01_书店/小小蝶坠落/13.png differ diff --git a/asset/art/gif/c01_书店/小小蝶坠落/14.png b/asset/art/gif/c01_书店/小小蝶坠落/14.png index f6d6bb8c..be27e4f3 100644 Binary files a/asset/art/gif/c01_书店/小小蝶坠落/14.png and b/asset/art/gif/c01_书店/小小蝶坠落/14.png differ diff --git a/asset/art/gif/c01_书店/小小蝶坠落/15.png b/asset/art/gif/c01_书店/小小蝶坠落/15.png index f7d44e21..ba58e01c 100644 Binary files a/asset/art/gif/c01_书店/小小蝶坠落/15.png and b/asset/art/gif/c01_书店/小小蝶坠落/15.png differ diff --git a/asset/art/gif/c01_书店/小小蝶坠落/16.png b/asset/art/gif/c01_书店/小小蝶坠落/16.png new file mode 100644 index 00000000..ba58e01c Binary files /dev/null and b/asset/art/gif/c01_书店/小小蝶坠落/16.png differ diff --git a/asset/art/gif/c01_书店/小小蝶坠落/16.png.import b/asset/art/gif/c01_书店/小小蝶坠落/16.png.import new file mode 100644 index 00000000..ec7a962d --- /dev/null +++ b/asset/art/gif/c01_书店/小小蝶坠落/16.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b06w5xvyhcchm" +path="res://.godot/imported/16.png-1a85811440141195530534a5b9123bef.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/gif/c01_书店/小小蝶坠落/16.png" +dest_files=["res://.godot/imported/16.png-1a85811440141195530534a5b9123bef.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/c01_书店/小小蝶坠落/17.png b/asset/art/gif/c01_书店/小小蝶坠落/17.png new file mode 100644 index 00000000..ba58e01c Binary files /dev/null and b/asset/art/gif/c01_书店/小小蝶坠落/17.png differ diff --git a/asset/art/gif/c01_书店/小小蝶坠落/17.png.import b/asset/art/gif/c01_书店/小小蝶坠落/17.png.import new file mode 100644 index 00000000..69157f14 --- /dev/null +++ b/asset/art/gif/c01_书店/小小蝶坠落/17.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bj42oic7d4ie" +path="res://.godot/imported/17.png-83cc143e2395b21dfe2e05b137db8f32.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/gif/c01_书店/小小蝶坠落/17.png" +dest_files=["res://.godot/imported/17.png-83cc143e2395b21dfe2e05b137db8f32.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/c01_书店/小小蝶坠落/18.png b/asset/art/gif/c01_书店/小小蝶坠落/18.png new file mode 100644 index 00000000..1892c349 Binary files /dev/null and b/asset/art/gif/c01_书店/小小蝶坠落/18.png differ diff --git a/asset/art/gif/c01_书店/小小蝶坠落/18.png.import b/asset/art/gif/c01_书店/小小蝶坠落/18.png.import new file mode 100644 index 00000000..ca3aa724 --- /dev/null +++ b/asset/art/gif/c01_书店/小小蝶坠落/18.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dbwlr2wq4g8bd" +path="res://.godot/imported/18.png-4b63ecfd49e746679829c3567e0d48e7.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/gif/c01_书店/小小蝶坠落/18.png" +dest_files=["res://.godot/imported/18.png-4b63ecfd49e746679829c3567e0d48e7.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/c01_书店/小小蝶坠落/19.png b/asset/art/gif/c01_书店/小小蝶坠落/19.png new file mode 100644 index 00000000..376cc62c Binary files /dev/null and b/asset/art/gif/c01_书店/小小蝶坠落/19.png differ diff --git a/asset/art/gif/c01_书店/小小蝶坠落/19.png.import b/asset/art/gif/c01_书店/小小蝶坠落/19.png.import new file mode 100644 index 00000000..5648107f --- /dev/null +++ b/asset/art/gif/c01_书店/小小蝶坠落/19.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://3f6feit3hiwx" +path="res://.godot/imported/19.png-65766ae7b738914a9d5a14ed4fcea8ee.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/gif/c01_书店/小小蝶坠落/19.png" +dest_files=["res://.godot/imported/19.png-65766ae7b738914a9d5a14ed4fcea8ee.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/c01_书店/小小蝶坠落/2.png b/asset/art/gif/c01_书店/小小蝶坠落/2.png index a75699bd..ecedf661 100644 Binary files a/asset/art/gif/c01_书店/小小蝶坠落/2.png and b/asset/art/gif/c01_书店/小小蝶坠落/2.png differ diff --git a/asset/art/gif/c01_书店/小小蝶坠落/20.png b/asset/art/gif/c01_书店/小小蝶坠落/20.png new file mode 100644 index 00000000..376cc62c Binary files /dev/null and b/asset/art/gif/c01_书店/小小蝶坠落/20.png differ diff --git a/asset/art/gif/c01_书店/小小蝶坠落/20.png.import b/asset/art/gif/c01_书店/小小蝶坠落/20.png.import new file mode 100644 index 00000000..62bb8840 --- /dev/null +++ b/asset/art/gif/c01_书店/小小蝶坠落/20.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cxx4jnxq3evt0" +path="res://.godot/imported/20.png-ae98d5333d262118d2dd1c76754caa55.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/gif/c01_书店/小小蝶坠落/20.png" +dest_files=["res://.godot/imported/20.png-ae98d5333d262118d2dd1c76754caa55.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/c01_书店/小小蝶坠落/21.png b/asset/art/gif/c01_书店/小小蝶坠落/21.png new file mode 100644 index 00000000..0567ea4a Binary files /dev/null and b/asset/art/gif/c01_书店/小小蝶坠落/21.png differ diff --git a/asset/art/gif/c01_书店/小小蝶坠落/21.png.import b/asset/art/gif/c01_书店/小小蝶坠落/21.png.import new file mode 100644 index 00000000..18c88d92 --- /dev/null +++ b/asset/art/gif/c01_书店/小小蝶坠落/21.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://durkr8chhhltx" +path="res://.godot/imported/21.png-1fabb9c645dadfa6a313475fb811ae85.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/gif/c01_书店/小小蝶坠落/21.png" +dest_files=["res://.godot/imported/21.png-1fabb9c645dadfa6a313475fb811ae85.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/c01_书店/小小蝶坠落/22.png b/asset/art/gif/c01_书店/小小蝶坠落/22.png new file mode 100644 index 00000000..68e2dc3b Binary files /dev/null and b/asset/art/gif/c01_书店/小小蝶坠落/22.png differ diff --git a/asset/art/gif/c01_书店/小小蝶坠落/22.png.import b/asset/art/gif/c01_书店/小小蝶坠落/22.png.import new file mode 100644 index 00000000..0a612cb0 --- /dev/null +++ b/asset/art/gif/c01_书店/小小蝶坠落/22.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dibnxlshv36c0" +path="res://.godot/imported/22.png-fa4c652bf3b77dcf9c6613d7a13e5749.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/gif/c01_书店/小小蝶坠落/22.png" +dest_files=["res://.godot/imported/22.png-fa4c652bf3b77dcf9c6613d7a13e5749.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/c01_书店/小小蝶坠落/23.png b/asset/art/gif/c01_书店/小小蝶坠落/23.png new file mode 100644 index 00000000..8a0c2200 Binary files /dev/null and b/asset/art/gif/c01_书店/小小蝶坠落/23.png differ diff --git a/asset/art/gif/c01_书店/小小蝶坠落/23.png.import b/asset/art/gif/c01_书店/小小蝶坠落/23.png.import new file mode 100644 index 00000000..25388253 --- /dev/null +++ b/asset/art/gif/c01_书店/小小蝶坠落/23.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://jqaeca62xlx6" +path="res://.godot/imported/23.png-088db9366657ae1928a50cf8fddf1ddb.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/gif/c01_书店/小小蝶坠落/23.png" +dest_files=["res://.godot/imported/23.png-088db9366657ae1928a50cf8fddf1ddb.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/c01_书店/小小蝶坠落/24.png b/asset/art/gif/c01_书店/小小蝶坠落/24.png new file mode 100644 index 00000000..256dc834 Binary files /dev/null and b/asset/art/gif/c01_书店/小小蝶坠落/24.png differ diff --git a/asset/art/gif/c01_书店/小小蝶坠落/24.png.import b/asset/art/gif/c01_书店/小小蝶坠落/24.png.import new file mode 100644 index 00000000..0c5c6d41 --- /dev/null +++ b/asset/art/gif/c01_书店/小小蝶坠落/24.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://deei7h31ylmju" +path="res://.godot/imported/24.png-a124e4b2cb3d3b5ee87b1b6992511602.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/gif/c01_书店/小小蝶坠落/24.png" +dest_files=["res://.godot/imported/24.png-a124e4b2cb3d3b5ee87b1b6992511602.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/c01_书店/小小蝶坠落/25.png b/asset/art/gif/c01_书店/小小蝶坠落/25.png new file mode 100644 index 00000000..371b13b4 Binary files /dev/null and b/asset/art/gif/c01_书店/小小蝶坠落/25.png differ diff --git a/asset/art/gif/c01_书店/小小蝶坠落/25.png.import b/asset/art/gif/c01_书店/小小蝶坠落/25.png.import new file mode 100644 index 00000000..d7ecbd5b --- /dev/null +++ b/asset/art/gif/c01_书店/小小蝶坠落/25.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bjshqa2uadjcf" +path="res://.godot/imported/25.png-4f8b7fa9e2b6c2f8ac361bebeb722051.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/gif/c01_书店/小小蝶坠落/25.png" +dest_files=["res://.godot/imported/25.png-4f8b7fa9e2b6c2f8ac361bebeb722051.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/c01_书店/小小蝶坠落/26.png b/asset/art/gif/c01_书店/小小蝶坠落/26.png new file mode 100644 index 00000000..0daa2acc Binary files /dev/null and b/asset/art/gif/c01_书店/小小蝶坠落/26.png differ diff --git a/asset/art/gif/c01_书店/小小蝶坠落/26.png.import b/asset/art/gif/c01_书店/小小蝶坠落/26.png.import new file mode 100644 index 00000000..a86befd7 --- /dev/null +++ b/asset/art/gif/c01_书店/小小蝶坠落/26.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dbh8ld0nutbvx" +path="res://.godot/imported/26.png-8fa7aa42c4d736346d35aeff735dd32c.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/gif/c01_书店/小小蝶坠落/26.png" +dest_files=["res://.godot/imported/26.png-8fa7aa42c4d736346d35aeff735dd32c.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/c01_书店/小小蝶坠落/3.png b/asset/art/gif/c01_书店/小小蝶坠落/3.png index 43e2ed70..04fa1a57 100644 Binary files a/asset/art/gif/c01_书店/小小蝶坠落/3.png and b/asset/art/gif/c01_书店/小小蝶坠落/3.png differ diff --git a/asset/art/gif/c01_书店/小小蝶坠落/4.png b/asset/art/gif/c01_书店/小小蝶坠落/4.png index dca9ff45..a2c8d0d1 100644 Binary files a/asset/art/gif/c01_书店/小小蝶坠落/4.png and b/asset/art/gif/c01_书店/小小蝶坠落/4.png differ diff --git a/asset/art/gif/c01_书店/小小蝶坠落/5.png b/asset/art/gif/c01_书店/小小蝶坠落/5.png index 16a04e97..2456eb3c 100644 Binary files a/asset/art/gif/c01_书店/小小蝶坠落/5.png and b/asset/art/gif/c01_书店/小小蝶坠落/5.png differ diff --git a/asset/art/gif/c01_书店/小小蝶坠落/6.png b/asset/art/gif/c01_书店/小小蝶坠落/6.png index 938ef2e0..128c8e57 100644 Binary files a/asset/art/gif/c01_书店/小小蝶坠落/6.png and b/asset/art/gif/c01_书店/小小蝶坠落/6.png differ diff --git a/asset/art/gif/c01_书店/小小蝶坠落/7.png b/asset/art/gif/c01_书店/小小蝶坠落/7.png index 16a04e97..8ccde2fd 100644 Binary files a/asset/art/gif/c01_书店/小小蝶坠落/7.png and b/asset/art/gif/c01_书店/小小蝶坠落/7.png differ diff --git a/asset/art/gif/c01_书店/小小蝶坠落/8.png b/asset/art/gif/c01_书店/小小蝶坠落/8.png index 938ef2e0..bb5dfd9d 100644 Binary files a/asset/art/gif/c01_书店/小小蝶坠落/8.png and b/asset/art/gif/c01_书店/小小蝶坠落/8.png differ diff --git a/asset/art/gif/c01_书店/小小蝶坠落/9.png b/asset/art/gif/c01_书店/小小蝶坠落/9.png index 16a04e97..83bcbe0e 100644 Binary files a/asset/art/gif/c01_书店/小小蝶坠落/9.png and b/asset/art/gif/c01_书店/小小蝶坠落/9.png differ diff --git a/config/animation/entity_sprite_frames.tres b/config/animation/entity_sprite_frames.tres index 7e36f072..8fa7ae53 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=992 format=3 uid="uid://b7fhheih1hbvf"] +[gd_resource type="SpriteFrames" load_steps=857 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"] @@ -645,14 +645,26 @@ [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://2nnqnjcsu1ej" path="res://asset/art/animation/c01_小小蝶_床上戴假发看书/15.png" id="371_fhnjb"] [ext_resource type="Texture2D" uid="uid://ds05fpng1ghto" path="res://asset/art/animation/c01_小小蝶_床上戴假发看书/7.png" id="371_y1k3y"] +[ext_resource type="Texture2D" uid="uid://c27wuni06un2c" path="res://asset/art/animation/c01_小小蝶_床上戴假发看书/16.png" id="372_2byqq"] [ext_resource type="Texture2D" uid="uid://c8jjtacky4a73" path="res://asset/art/animation/c01_小小蝶_床上戴假发看书/8.png" id="372_l4y1k"] +[ext_resource type="Texture2D" uid="uid://b6vklm4tkydb3" path="res://asset/art/animation/c01_小小蝶_床上戴假发看书/17.png" id="373_5rkx7"] [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://gonjb38sigux" path="res://asset/art/animation/c01_小小蝶_床上戴假发看书/18.png" id="374_y1k3y"] +[ext_resource type="Texture2D" uid="uid://gumj5o032a3w" path="res://asset/art/animation/c01_小小蝶_床上戴假发看书/19.png" id="375_l4y1k"] [ext_resource type="Texture2D" uid="uid://cvy56lqm2qqba" path="res://asset/art/animation/c01_小小蝶_床上戴假发看书/11.png" id="375_pechk"] +[ext_resource type="Texture2D" uid="uid://c0lfmgqb5s801" path="res://asset/art/animation/c01_小小蝶_床上戴假发看书/20.png" id="376_p7mln"] [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://bjmmj3jg3npxf" path="res://asset/art/animation/c01_小小蝶_床上戴假发看书/21.png" id="377_p80h8"] +[ext_resource type="Texture2D" uid="uid://ry75nhc4qyx6" path="res://asset/art/animation/c01_小小蝶_床上戴假发看书/22.png" id="378_pechk"] [ext_resource type="Texture2D" uid="uid://boie0b2vwxtbf" path="res://asset/art/animation/c01_小小蝶_床上戴假发看书/14.png" id="378_uu3nj"] +[ext_resource type="Texture2D" uid="uid://honons27oefm" path="res://asset/art/animation/c01_小小蝶_床上戴假发看书/23.png" id="379_v8kdt"] +[ext_resource type="Texture2D" uid="uid://bn4043aka6wv6" path="res://asset/art/animation/c01_小小蝶_床上戴假发看书/24.png" id="380_1r2fo"] +[ext_resource type="Texture2D" uid="uid://cu7ig2haq32yl" path="res://asset/art/animation/c01_小小蝶_床上戴假发看书/25.png" id="381_uu3nj"] +[ext_resource type="Texture2D" uid="uid://31ps08336ge1" path="res://asset/art/animation/c01_小小蝶_床上戴假发看书/26.png" id="382_tr2k3"] [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"] @@ -2325,44 +2337,92 @@ animations = [{ "duration": 2.5, "texture": ExtResource("365_88ymt") }, { -"duration": 2.0, +"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.5, "texture": ExtResource("366_tnlrb") }, { -"duration": 2.0, +"duration": 2.5, "texture": ExtResource("367_f02eb") }, { -"duration": 2.0, +"duration": 2.5, "texture": ExtResource("368_fhnjb") }, { -"duration": 1.8, +"duration": 2.5, "texture": ExtResource("369_2byqq") }, { "duration": 1.5, "texture": ExtResource("370_5rkx7") }, { -"duration": 1.4, +"duration": 1.5, "texture": ExtResource("371_y1k3y") }, { -"duration": 1.3, +"duration": 1.5, "texture": ExtResource("372_l4y1k") }, { -"duration": 1.2, +"duration": 1.5, "texture": ExtResource("373_p7mln") }, { -"duration": 1.1, +"duration": 1.5, "texture": ExtResource("374_p80h8") }, { -"duration": 1.0, +"duration": 1.5, "texture": ExtResource("375_pechk") }, { -"duration": 1.0, +"duration": 1.5, "texture": ExtResource("376_v8kdt") }, { -"duration": 1.0, +"duration": 1.5, "texture": ExtResource("377_1r2fo") }, { -"duration": 1.0, +"duration": 1.5, "texture": ExtResource("378_uu3nj") +}, { +"duration": 1.5, +"texture": ExtResource("371_fhnjb") +}, { +"duration": 1.5, +"texture": ExtResource("372_2byqq") +}, { +"duration": 1.5, +"texture": ExtResource("373_5rkx7") +}, { +"duration": 1.5, +"texture": ExtResource("374_y1k3y") +}, { +"duration": 1.0, +"texture": ExtResource("375_l4y1k") +}, { +"duration": 1.0, +"texture": ExtResource("376_p7mln") +}, { +"duration": 1.0, +"texture": ExtResource("377_p80h8") +}, { +"duration": 1.0, +"texture": ExtResource("378_pechk") +}, { +"duration": 1.0, +"texture": ExtResource("379_v8kdt") +}, { +"duration": 1.0, +"texture": ExtResource("380_1r2fo") +}, { +"duration": 1.0, +"texture": ExtResource("381_uu3nj") +}, { +"duration": 1.0, +"texture": ExtResource("382_tr2k3") }], "loop": false, "name": &"c01_小小蝶_床上看书", diff --git a/manager/config_manager/global_config.gd b/manager/config_manager/global_config.gd index d94bb802..147a94de 100644 --- a/manager/config_manager/global_config.gd +++ b/manager/config_manager/global_config.gd @@ -84,6 +84,7 @@ signal auto_save_seconds_changed @export var version: int #存档版本 @export var debug_mode := false # 开启 debug 模式 +@export_enum("unspecified", "checking", "opengl3", "non-opengl3") var compatibility_mode := 0 @export var skip_trailer := false # 跳过 trailer @export var game_launched_times := 0 # 启动游戏次数 @export var game_total_seconds := 0 # 游戏总时长 diff --git a/manager/config_manager/global_config_manager.gd b/manager/config_manager/global_config_manager.gd index 98f28d98..17e62249 100644 --- a/manager/config_manager/global_config_manager.gd +++ b/manager/config_manager/global_config_manager.gd @@ -7,7 +7,7 @@ const TIMER_LOG_INTERVAL := 6 # 30秒打印一次 (6 * 5秒) const TIMER_EDITOR_LOG_INTERVAL := 120 # 编辑器中600秒打印一次 # Static config -static var config: GlobalConfig: +var config: GlobalConfig: set = _set_config # Timer for tracking game time @@ -27,23 +27,49 @@ func _setup_timer() -> void: timer.start() -static func _set_config(val: GlobalConfig) -> void: +func _set_config(val: GlobalConfig) -> void: config = val if not config or Engine.is_editor_hint(): return + _apply_compatibility() _apply_debug_mode() _apply_window_settings() _apply_audio_settings() _apply_locale_settings() -static func _apply_debug_mode() -> void: +func _apply_compatibility() -> void: + # ("unspecified", "checking", "opengl3", "non-opengl3") + if config.compatibility_mode == 0: + config.compatibility_mode = 1 + ResourceSaver.save(config) + elif config.compatibility_mode == 1: + config.compatibility_mode = 2 + print("[Compatibility] Compatibility mode set to 'opengl3' for checking launch.") + + if config.compatibility_mode == 2: + # 检测是否已经启用 opengl3 + if RenderingServer.get_current_rendering_driver_name().begins_with("opengl3"): + print("[Compatibility] Compatibility mode is already 'opengl3'. No action needed.") + return + print("[Compatibility] Switching to 'opengl3' rendering driver.") + # 重启游戏以应用新渲染器 + var args = ["--rendering-driver", "opengl3"] + # 启动新实例 + var executable_path = OS.get_executable_path() + OS.create_process(executable_path, args) + get_tree().quit() + elif config.compatibility_mode == 3: + print("[Compatibility] Running on 'non-opengl3' rendering driver.") + + +func _apply_debug_mode() -> void: if config.debug_mode: GlobalConfig.DEBUG = true print_rich("[color=orange]Debug mode enabled[/color]") -static func _apply_window_settings() -> void: +func _apply_window_settings() -> void: var window = Engine.get_main_loop().root.get_window() if config.window_fullscreen: window.mode = Window.MODE_EXCLUSIVE_FULLSCREEN @@ -52,7 +78,7 @@ static func _apply_window_settings() -> void: window.always_on_top = config.window_top -static func _apply_audio_settings() -> void: +func _apply_audio_settings() -> void: AudioServer.set_bus_volume_db( AudioServer.get_bus_index(GlobalConfig.BUS_MASTER), config.db_master ) @@ -70,7 +96,7 @@ static func _apply_audio_settings() -> void: ) -static func _apply_locale_settings() -> void: +func _apply_locale_settings() -> void: var locale = config.get_locale() print("set language to: ", locale) TranslationServer.set_locale(locale) @@ -136,7 +162,7 @@ func print_global_info() -> void: ) -static func _format_game_time(total_seconds: int) -> String: +func _format_game_time(total_seconds: int) -> String: @warning_ignore("integer_division") var hours := total_seconds / 3600 @warning_ignore("integer_division") @@ -145,14 +171,14 @@ static func _format_game_time(total_seconds: int) -> String: return "game:%d:%02d:%02d" % [hours, minutes, seconds] -static func _get_round_info() -> String: +func _get_round_info() -> String: # 0:未开始游戏；1:序章；2-5:一～四章；6:结尾 var chapter := EventManager.get_chapter_stage() return "r%d_c%d" % [config.game_rounds, chapter] @warning_ignore_start("integer_division") -static func _format_tick_time() -> String: +func _format_tick_time() -> String: var ticks = Time.get_ticks_msec() var hours := ticks / 3600000 as int var minutes := (ticks % 3600000) / 60000 as int diff --git a/scene/ground/scene/c01/s05_院长房间.tscn b/scene/ground/scene/c01/s05_院长房间.tscn index 5eb98f88..f3357546 100644 --- a/scene/ground/scene/c01/s05_院长房间.tscn +++ b/scene/ground/scene/c01/s05_院长房间.tscn @@ -288,7 +288,7 @@ tracks/20/keys = { [sub_resource type="Animation" id="Animation_7k2c8"] resource_name = "intro" -length = 25.0 +length = 30.0 capture_included = true tracks/0/type = "value" tracks/0/imported = false @@ -333,7 +333,7 @@ tracks/3/path = NodePath("DeployLayer/小小蝶看书:visible") tracks/3/interp = 1 tracks/3/loop_wrap = true tracks/3/keys = { -"times": PackedFloat32Array(0, 24.9334), +"times": PackedFloat32Array(0, 30), "transitions": PackedFloat32Array(1, 1), "update": 1, "values": [true, false] @@ -345,10 +345,10 @@ tracks/4/path = NodePath("DeployLayer/小小蝶看书:frame") tracks/4/interp = 1 tracks/4/loop_wrap = false tracks/4/keys = { -"times": PackedFloat32Array(19.4667, 24.9334), -"transitions": PackedFloat32Array(1, 1), +"times": PackedFloat32Array(19.4667, 24.8, 30), +"transitions": PackedFloat32Array(1, 1, 1), "update": 2, -"values": [0, 16] +"values": [0, 9, 32] } tracks/5/type = "method" tracks/5/imported = false @@ -357,7 +357,7 @@ tracks/5/path = NodePath("AnimationPlayer") tracks/5/interp = 1 tracks/5/loop_wrap = true tracks/5/keys = { -"times": PackedFloat32Array(0, 3, 20.1667, 21.7), +"times": PackedFloat32Array(0, 3, 20.1667, 24.9), "transitions": PackedFloat32Array(1, 1, 1, 1), "values": [{ "args": [], @@ -394,7 +394,7 @@ tracks/7/path = NodePath("AnimationPlayer/下床与铃声音效:playing") tracks/7/interp = 1 tracks/7/loop_wrap = true tracks/7/keys = { -"times": PackedFloat32Array(22.8334), +"times": PackedFloat32Array(28.7), "transitions": PackedFloat32Array(1), "update": 1, "values": [true] @@ -406,7 +406,7 @@ tracks/8/path = NodePath("MainPlayer:hide_sprite") tracks/8/interp = 1 tracks/8/loop_wrap = true tracks/8/keys = { -"times": PackedFloat32Array(0, 24.9334), +"times": PackedFloat32Array(0, 30), "transitions": PackedFloat32Array(1, 1), "update": 1, "values": [true, false] diff --git a/scene/ground/scene/c01/s08_书店.tscn b/scene/ground/scene/c01/s08_书店.tscn index 8ac2a0cf..023c65d4 100644 --- a/scene/ground/scene/c01/s08_书店.tscn +++ b/scene/ground/scene/c01/s08_书店.tscn @@ -176,6 +176,8 @@ visible = false position = Vector2(427, 1) sprite_frames = ExtResource("8_hunwx") animation = &"小小蝶坠落" +frame = 22 +frame_progress = 1.0 [node name="PointLight2D" type="PointLight2D" parent="Ground/AmbientLayer" index="0"] position = Vector2(-31, 20) diff --git a/scene/trailer.gd b/scene/trailer.gd index cec39197..6e13f51a 100644 --- a/scene/trailer.gd +++ b/scene/trailer.gd @@ -39,6 +39,13 @@ func _ready() -> void: _setup_video_player() _setup_language_settings(game_launched_times) _connect_button_signals() + # 第一次启动成功, 设置 compatibility_mode + var config = GlobalConfigManager.config + # ("unspecified", "checking", "opengl3", "non-opengl3") + if config.compatibility_mode < 2: + config.compatibility_mode = 3 + ResourceSaver.save(config) + print("[FirstLaunch] Compatibility mode set to 'non-opengl3' for first launch.") func _setup_video_player() -> void: @@ -47,7 +54,7 @@ func _setup_video_player() -> void: func _setup_language_settings(game_launched_times: int) -> void: - if game_launched_times == 0: + if game_launched_times == 1: _read_system_locale() _update_language_display() @@ -118,7 +125,6 @@ func _on_earplug_notice_finished() -> void: func _unhandled_input(event: InputEvent) -> void: if not event.is_action_pressed("escape") or first_launching_game: return - if video_player.is_playing(): _skip_video() elif earplug_notice_tween and earplug_notice_tween.is_running():