diff --git a/asset/art/gif/c03_一楼院子胖李癞/胖子_撕寻人启事.gif.import b/asset/art/gif/c03_一楼院子胖李癞/胖子_撕寻人启事.gif.import index ca721378..d9bb0f55 100644 --- a/asset/art/gif/c03_一楼院子胖李癞/胖子_撕寻人启事.gif.import +++ b/asset/art/gif/c03_一楼院子胖李癞/胖子_撕寻人启事.gif.import @@ -1,6 +1,6 @@ [remap] -importer="gif.animated.texture.plugin" +importer="import_gif_to_sprite_frames" type="SpriteFrames" uid="uid://cfqglir2ikxq5" path="res://.godot/imported/胖子_撕寻人启事.gif-dc41ffe0e5af29a09371c74297004111.tres" @@ -12,3 +12,4 @@ dest_files=["res://.godot/imported/胖子_撕寻人启事.gif-dc41ffe0e5af29a093 [params] +frames_per_second=30 diff --git a/asset/art/gif/c03_一楼院子胖李癞/胖子_看向右边呼吸.gif.import b/asset/art/gif/c03_一楼院子胖李癞/胖子_看向右边呼吸.gif.import index 3cfb8690..42fadb49 100644 --- a/asset/art/gif/c03_一楼院子胖李癞/胖子_看向右边呼吸.gif.import +++ b/asset/art/gif/c03_一楼院子胖李癞/胖子_看向右边呼吸.gif.import @@ -1,6 +1,6 @@ [remap] -importer="gif.animated.texture.plugin" +importer="import_gif_to_sprite_frames" type="SpriteFrames" uid="uid://blr4217fvp8bh" path="res://.godot/imported/胖子_看向右边呼吸.gif-2c2534156eb3ec0240c24cac8ca2d21b.tres" @@ -12,3 +12,4 @@ dest_files=["res://.godot/imported/胖子_看向右边呼吸.gif-2c2534156eb3ec0 [params] +frames_per_second=30 diff --git a/asset/art/gif/c03_二楼/疯子_慌张跑开.gif.import b/asset/art/gif/c03_二楼/疯子_慌张跑开.gif.import index 9293d68f..ba082322 100644 --- a/asset/art/gif/c03_二楼/疯子_慌张跑开.gif.import +++ b/asset/art/gif/c03_二楼/疯子_慌张跑开.gif.import @@ -1,6 +1,6 @@ [remap] -importer="gif.animated.texture.plugin" +importer="import_gif_to_sprite_frames" type="SpriteFrames" uid="uid://crljtabjreeoy" path="res://.godot/imported/疯子_慌张跑开.gif-147937c8b0ca64b538153586b30f1dc0.tres" @@ -12,3 +12,4 @@ dest_files=["res://.godot/imported/疯子_慌张跑开.gif-147937c8b0ca64b538153 [params] +frames_per_second=30 diff --git a/asset/art/gif/c03_二楼/疯子_慌张转身.gif.import b/asset/art/gif/c03_二楼/疯子_慌张转身.gif.import index 75ad857a..32e5a25d 100644 --- a/asset/art/gif/c03_二楼/疯子_慌张转身.gif.import +++ b/asset/art/gif/c03_二楼/疯子_慌张转身.gif.import @@ -1,6 +1,6 @@ [remap] -importer="gif.animated.texture.plugin" +importer="import_gif_to_sprite_frames" type="SpriteFrames" uid="uid://c2k3auxbal5ca" path="res://.godot/imported/疯子_慌张转身.gif-310a5a85831767950208782be0836659.tres" @@ -12,3 +12,4 @@ dest_files=["res://.godot/imported/疯子_慌张转身.gif-310a5a858317679502087 [params] +frames_per_second=30 diff --git a/asset/art/gif/c03_小蝶询问瞎子/瞎子_咳嗽吐血.gif.import b/asset/art/gif/c03_小蝶询问瞎子/瞎子_咳嗽吐血.gif.import index f195836a..0695361e 100644 --- a/asset/art/gif/c03_小蝶询问瞎子/瞎子_咳嗽吐血.gif.import +++ b/asset/art/gif/c03_小蝶询问瞎子/瞎子_咳嗽吐血.gif.import @@ -1,6 +1,6 @@ [remap] -importer="gif.animated.texture.plugin" +importer="import_gif_to_sprite_frames" type="SpriteFrames" uid="uid://blf80xmvkyu0y" path="res://.godot/imported/瞎子_咳嗽吐血.gif-36857c67ccd4daa9e189399fea3ae23d.tres" @@ -12,3 +12,4 @@ dest_files=["res://.godot/imported/瞎子_咳嗽吐血.gif-36857c67ccd4daa9e1893 [params] +frames_per_second=30 diff --git a/asset/art/prop/c03/2个纸铜钱.png b/asset/art/prop/c03/2个纸铜钱.png new file mode 100644 index 00000000..400458a4 Binary files /dev/null and b/asset/art/prop/c03/2个纸铜钱.png differ diff --git a/asset/art/prop/c03/2个纸铜钱.png.import b/asset/art/prop/c03/2个纸铜钱.png.import new file mode 100644 index 00000000..a21b147a --- /dev/null +++ b/asset/art/prop/c03/2个纸铜钱.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bbkxhyefoh6gn" +path="res://.godot/imported/2个纸铜钱.png-50d4bc65a77edaa45d6f26173525e1bf.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/prop/c03/2个纸铜钱.png" +dest_files=["res://.godot/imported/2个纸铜钱.png-50d4bc65a77edaa45d6f26173525e1bf.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/prop/c03/3个纸铜钱.png b/asset/art/prop/c03/3个纸铜钱.png new file mode 100644 index 00000000..43f72790 Binary files /dev/null and b/asset/art/prop/c03/3个纸铜钱.png differ diff --git a/asset/art/prop/c03/3个纸铜钱.png.import b/asset/art/prop/c03/3个纸铜钱.png.import new file mode 100644 index 00000000..53d2e474 --- /dev/null +++ b/asset/art/prop/c03/3个纸铜钱.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c5exsssyffc7y" +path="res://.godot/imported/3个纸铜钱.png-b54c91fdd1094377481357127b1fb3a0.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/prop/c03/3个纸铜钱.png" +dest_files=["res://.godot/imported/3个纸铜钱.png-b54c91fdd1094377481357127b1fb3a0.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/scene/c03/s03_瞎子理发店/鬼母子神/鬼母子神.gif.import b/asset/art/scene/c03/s03_瞎子理发店/鬼母子神/鬼母子神.gif.import index ecdfcec4..9978edd7 100644 --- a/asset/art/scene/c03/s03_瞎子理发店/鬼母子神/鬼母子神.gif.import +++ b/asset/art/scene/c03/s03_瞎子理发店/鬼母子神/鬼母子神.gif.import @@ -1,6 +1,6 @@ [remap] -importer="gif.animated.texture.plugin" +importer="import_gif_to_sprite_frames" type="SpriteFrames" uid="uid://hijllwwf7gui" path="res://.godot/imported/鬼母子神.gif-3cbf77b6d73642c22e02d0049fc6ac0d.tres" @@ -12,3 +12,4 @@ dest_files=["res://.godot/imported/鬼母子神.gif-3cbf77b6d73642c22e02d0049fc6 [params] +frames_per_second=30 diff --git a/asset/dialogue/item_description.csv b/asset/dialogue/item_description.csv index 52d4d782..ab2f92ad 100644 --- a/asset/dialogue/item_description.csv +++ b/asset/dialogue/item_description.csv @@ -97,7 +97,9 @@ prop_纸舌头,纸舌头,,,[#texture=c03/下半部的舌头.png][#inspect=c03/ux prop_刀把,刀把,,,[#texture=c03/刀把.png][#inspect=c03/ux_刀把.png],, prop_剪下的辫子,剪下的辫子,,,[#texture=c03/剪下的辫子.png][#inspect=c03/ux_剪下的辫子.png],, prop_沾血的纸条,沾血的纸条,,,[#texture=c03/沾血的纸条.png][#inspect=c03/ux_沾血的纸条.png],, -prop_纸铜钱1,纸铜钱1,,,[#texture=c03/纸铜钱1.png][#inspect=c03/ux_纸铜钱1.png],, +prop_纸铜钱1,纸铜钱,,,[#texture=c03/纸铜钱1.png][#inspect=c03/ux_纸铜钱1.png],, +prop_2个纸铜钱,一对纸铜钱,,,[#texture=c03/2个纸铜钱.png],, +prop_3个纸铜钱,三个纸铜钱,,,[#texture=c03/3个纸铜钱.png],, prop_剪刀,剪刀,,,[#texture=c03/缠着符咒的剪刀.png][#inspect=c03/ux_缠着符咒的剪刀.png],, prop_药包,药包,,,[#texture=c03/药包.png][#inspect=c03/ux_药包.png],, prop_菜刀,菜刀,,,[#texture=c03/菜刀.png][#inspect=c03/ux_菜刀.png],, diff --git a/asset/dialogue/item_description.dialogue b/asset/dialogue/item_description.dialogue index f2fce026..41a05899 100644 --- a/asset/dialogue/item_description.dialogue +++ b/asset/dialogue/item_description.dialogue @@ -120,7 +120,9 @@ 刀把 [#texture=c03/刀把.png][#inspect=c03/ux_刀把.png] [ID:prop_刀把] 剪下的辫子 [#texture=c03/剪下的辫子.png][#inspect=c03/ux_剪下的辫子.png] [ID:prop_剪下的辫子] 沾血的纸条 [#texture=c03/沾血的纸条.png] [#inspect=c03/ux_沾血的纸条.png] [ID:prop_沾血的纸条] -纸铜钱1 [#texture=c03/纸铜钱1.png][#inspect=c03/ux_纸铜钱1.png] [ID:prop_纸铜钱1] +纸铜钱 [#texture=c03/纸铜钱1.png][#inspect=c03/ux_纸铜钱1.png] [ID:prop_纸铜钱1] +一对纸铜钱 [#texture=c03/2个纸铜钱.png] [ID:prop_2个纸铜钱] +三个纸铜钱 [#texture=c03/3个纸铜钱.png] [ID:prop_3个纸铜钱] 剪刀 [#texture=c03/缠着符咒的剪刀.png][#inspect=c03/ux_缠着符咒的剪刀.png] [ID:prop_剪刀] 药包 [#texture=c03/药包.png][#inspect=c03/ux_药包.png] [ID:prop_药包] 菜刀 [#texture=c03/菜刀.png][#inspect=c03/ux_菜刀.png] [ID:prop_菜刀]