diff --git a/asset/art/gif/c04_三楼走廊擦墙演出/c04_三楼走廊擦墙演出_frames.tres b/asset/art/gif/c04_三楼走廊擦墙演出/c04_三楼走廊擦墙演出_frames.tres index 1917e5ab..82a219aa 100644 --- a/asset/art/gif/c04_三楼走廊擦墙演出/c04_三楼走廊擦墙演出_frames.tres +++ b/asset/art/gif/c04_三楼走廊擦墙演出/c04_三楼走廊擦墙演出_frames.tres @@ -1,47 +1,49 @@ -[gd_resource type="SpriteFrames" load_steps=43 format=3 uid="uid://pf7mglnhuaab"] +[gd_resource type="SpriteFrames" load_steps=45 format=3 uid="uid://pf7mglnhuaab"] [ext_resource type="Texture2D" uid="uid://dr7nnf3l3cv72" path="res://asset/art/gif/c04_三楼走廊擦墙演出/陆仁艰难站起/0.png" id="1_53246"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c04_三楼走廊擦墙演出/小小小蝶骑在陆仁脖子上擦墙上的涂鸦/0.png" id="1_c4r0o"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c04_三楼走廊擦墙演出/小小小蝶骑在陆仁脖子上擦墙上的涂鸦/1.png" id="2_377fa"] +[ext_resource type="Texture2D" uid="uid://dfg6m5bophi72" path="res://asset/art/gif/c04_三楼走廊擦墙演出/小小小蝶骑在陆仁脖子上擦墙上的涂鸦/0.png" id="1_c4r0o"] +[ext_resource type="Texture2D" uid="uid://ckynljq5pfyg5" path="res://asset/art/gif/c04_三楼走廊擦墙演出/小小小蝶骑在陆仁脖子上擦墙上的涂鸦/1.png" id="2_377fa"] [ext_resource type="Texture2D" uid="uid://dwoy2lphus631" path="res://asset/art/gif/c04_三楼走廊擦墙演出/陆仁艰难站起/1.png" id="2_ux4w6"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c04_三楼走廊擦墙演出/小小小蝶骑在陆仁脖子上擦墙上的涂鸦/2.png" id="3_2u56x"] +[ext_resource type="Texture2D" uid="uid://c3ximoeuxm53g" path="res://asset/art/gif/c04_三楼走廊擦墙演出/小小小蝶骑在陆仁脖子上擦墙上的涂鸦/2.png" id="3_2u56x"] [ext_resource type="Texture2D" uid="uid://cbaqlk03f4byv" path="res://asset/art/gif/c04_三楼走廊擦墙演出/陆仁艰难站起/2.png" id="3_46u2u"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c04_三楼走廊擦墙演出/小小小蝶骑在陆仁脖子上擦墙上的涂鸦/3.png" id="4_qov1e"] +[ext_resource type="Texture2D" uid="uid://djm2bln82evng" path="res://asset/art/gif/c04_三楼走廊擦墙演出/小小小蝶骑在陆仁脖子上擦墙上的涂鸦/3.png" id="4_qov1e"] [ext_resource type="Texture2D" uid="uid://bc3q4tyxc87ba" path="res://asset/art/gif/c04_三楼走廊擦墙演出/陆仁艰难站起/3.png" id="4_s4veq"] [ext_resource type="Texture2D" uid="uid://opre5laq6mo0" path="res://asset/art/gif/c04_三楼走廊擦墙演出/陆仁艰难站起/4.png" id="5_ggpb3"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c04_三楼走廊擦墙演出/小小小蝶骑在陆仁脖子上擦墙上的涂鸦/4.png" id="5_lik32"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c04_三楼走廊擦墙演出/小小小蝶骑在陆仁脖子上擦墙上的涂鸦/5.png" id="6_1jxqo"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c04_三楼走廊擦墙演出/小小小蝶骑在陆仁脖子上擦墙上的涂鸦/6.png" id="7_folpy"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c04_三楼走廊擦墙演出/小小小蝶骑在陆仁脖子上擦墙上的涂鸦/7.png" id="8_ion4a"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/0.png" id="9_av68t"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/1.png" id="10_ts00y"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/2.png" id="11_2mnxt"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/3.png" id="12_r8b8s"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/4.png" id="13_yevpv"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/5.png" id="14_i8od7"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/6.png" id="15_x11xv"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/7.png" id="16_vu64x"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/8.png" id="17_5seew"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/9.png" id="18_t11bv"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/10.png" id="19_jc1qd"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/11.png" id="20_akmyw"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/12.png" id="21_o5rpk"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c04_三楼走廊擦墙演出/陆仁坐下/0.png" id="22_x2fa3"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c04_三楼走廊擦墙演出/陆仁坐下/1.png" id="23_3sjyw"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c04_三楼走廊擦墙演出/陆仁坐下/2.png" id="24_l75nu"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c04_三楼走廊擦墙演出/陆仁坐下/3.png" id="25_joikc"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c04_三楼走廊擦墙演出/陆仁坐下/4.png" id="26_vrnff"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c04_三楼走廊擦墙演出/陆仁坐下/5.png" id="27_cqxg6"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c04_三楼走廊擦墙演出/陆仁坐下/6.png" id="28_fxtc4"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c04_三楼走廊擦墙演出/陆仁坐下/7.png" id="29_5xe32"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c04_三楼走廊擦墙演出/陆仁坐下/8.png" id="30_7fyvq"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c04_三楼走廊擦墙演出/陆仁坐下/9.png" id="31_20505"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c04_三楼走廊擦墙演出/陆仁坐下/10.png" id="32_8f8ow"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c04_三楼走廊擦墙演出/陆仁坐下/11.png" id="33_ro2pw"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c04_三楼走廊擦墙演出/陆仁坐下/12.png" id="34_4m0sh"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c04_三楼走廊擦墙演出/陆仁坐下/13.png" id="35_06i7k"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c04_三楼走廊擦墙演出/陆仁坐下/14.png" id="36_y4l73"] -[ext_resource type="Texture2D" path="res://asset/art/gif/c04_三楼走廊擦墙演出/陆仁坐下/15.png" id="37_e8481"] +[ext_resource type="Texture2D" uid="uid://bxdtj7n6wjogu" path="res://asset/art/gif/c04_三楼走廊擦墙演出/小小小蝶骑在陆仁脖子上擦墙上的涂鸦/4.png" id="5_lik32"] +[ext_resource type="Texture2D" uid="uid://brg1ghjk7xb6j" path="res://asset/art/gif/c04_三楼走廊擦墙演出/小小小蝶骑在陆仁脖子上擦墙上的涂鸦/5.png" id="6_1jxqo"] +[ext_resource type="Texture2D" uid="uid://cm5o5dhwuv1ki" path="res://asset/art/gif/c04_三楼走廊擦墙演出/小小小蝶骑在陆仁脖子上擦墙上的涂鸦/6.png" id="7_folpy"] +[ext_resource type="Texture2D" uid="uid://catx5trrncpoy" path="res://asset/art/gif/c04_三楼走廊擦墙演出/小小小蝶骑在陆仁脖子上擦墙上的涂鸦/7.png" id="8_ion4a"] +[ext_resource type="Texture2D" uid="uid://0ky1f20gohdv" path="res://asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/0.png" id="9_av68t"] +[ext_resource type="Texture2D" uid="uid://bpi00iaq1e6yx" path="res://asset/art/gif/c04_三楼走廊擦墙演出/小小蝶1.png" id="9_l75nu"] +[ext_resource type="Texture2D" uid="uid://cog3jwid2xu3" path="res://asset/art/gif/c04_三楼走廊擦墙演出/小小蝶2.png" id="10_joikc"] +[ext_resource type="Texture2D" uid="uid://xd2d2cseuc44" path="res://asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/1.png" id="10_ts00y"] +[ext_resource type="Texture2D" uid="uid://cewp7q2fc0kwn" path="res://asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/2.png" id="11_2mnxt"] +[ext_resource type="Texture2D" uid="uid://dgj8kx027avpv" path="res://asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/3.png" id="12_r8b8s"] +[ext_resource type="Texture2D" uid="uid://cqiiixspljcfu" path="res://asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/4.png" id="13_yevpv"] +[ext_resource type="Texture2D" uid="uid://bj4s2cnv3hlk7" path="res://asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/5.png" id="14_i8od7"] +[ext_resource type="Texture2D" uid="uid://cvt6yegq5vpuv" path="res://asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/6.png" id="15_x11xv"] +[ext_resource type="Texture2D" uid="uid://co6imcm6ibvr0" path="res://asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/7.png" id="16_vu64x"] +[ext_resource type="Texture2D" uid="uid://d2dxtxm2x3gev" path="res://asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/8.png" id="17_5seew"] +[ext_resource type="Texture2D" uid="uid://jhhwhh2q2ncb" path="res://asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/9.png" id="18_t11bv"] +[ext_resource type="Texture2D" uid="uid://bvx3570v1vkb1" path="res://asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/10.png" id="19_jc1qd"] +[ext_resource type="Texture2D" uid="uid://bg57amaq7x3xe" path="res://asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/11.png" id="20_akmyw"] +[ext_resource type="Texture2D" uid="uid://bu1f0p3akc8tu" path="res://asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/12.png" id="21_o5rpk"] +[ext_resource type="Texture2D" uid="uid://5qmr6mvs7tqj" path="res://asset/art/gif/c04_三楼走廊擦墙演出/陆仁坐下/0.png" id="22_x2fa3"] +[ext_resource type="Texture2D" uid="uid://bevhcje1nujbh" path="res://asset/art/gif/c04_三楼走廊擦墙演出/陆仁坐下/1.png" id="23_3sjyw"] +[ext_resource type="Texture2D" uid="uid://dvofi3bbdyvt1" path="res://asset/art/gif/c04_三楼走廊擦墙演出/陆仁坐下/2.png" id="24_l75nu"] +[ext_resource type="Texture2D" uid="uid://be2477avievtq" path="res://asset/art/gif/c04_三楼走廊擦墙演出/陆仁坐下/3.png" id="25_joikc"] +[ext_resource type="Texture2D" uid="uid://kn80tau688rc" path="res://asset/art/gif/c04_三楼走廊擦墙演出/陆仁坐下/4.png" id="26_vrnff"] +[ext_resource type="Texture2D" uid="uid://d4mm7qvlg2sby" path="res://asset/art/gif/c04_三楼走廊擦墙演出/陆仁坐下/5.png" id="27_cqxg6"] +[ext_resource type="Texture2D" uid="uid://d4am8ypifchij" path="res://asset/art/gif/c04_三楼走廊擦墙演出/陆仁坐下/6.png" id="28_fxtc4"] +[ext_resource type="Texture2D" uid="uid://c8kevskpl3ft6" path="res://asset/art/gif/c04_三楼走廊擦墙演出/陆仁坐下/7.png" id="29_5xe32"] +[ext_resource type="Texture2D" uid="uid://ch68d1f7bekmb" path="res://asset/art/gif/c04_三楼走廊擦墙演出/陆仁坐下/8.png" id="30_7fyvq"] +[ext_resource type="Texture2D" uid="uid://carlyef65hfm5" path="res://asset/art/gif/c04_三楼走廊擦墙演出/陆仁坐下/9.png" id="31_20505"] +[ext_resource type="Texture2D" uid="uid://c1td8ypf2kwec" path="res://asset/art/gif/c04_三楼走廊擦墙演出/陆仁坐下/10.png" id="32_8f8ow"] +[ext_resource type="Texture2D" uid="uid://6rbidd8vs6hv" path="res://asset/art/gif/c04_三楼走廊擦墙演出/陆仁坐下/11.png" id="33_ro2pw"] +[ext_resource type="Texture2D" uid="uid://drw3cbnib060d" path="res://asset/art/gif/c04_三楼走廊擦墙演出/陆仁坐下/12.png" id="34_4m0sh"] +[ext_resource type="Texture2D" uid="uid://ciey7g4bravhy" path="res://asset/art/gif/c04_三楼走廊擦墙演出/陆仁坐下/13.png" id="35_06i7k"] +[ext_resource type="Texture2D" uid="uid://u0md2dl3qpeh" path="res://asset/art/gif/c04_三楼走廊擦墙演出/陆仁坐下/14.png" id="36_y4l73"] +[ext_resource type="Texture2D" uid="uid://cetxyvpri58sn" path="res://asset/art/gif/c04_三楼走廊擦墙演出/陆仁坐下/15.png" id="37_e8481"] [resource] animations = [{ @@ -75,6 +77,17 @@ animations = [{ "speed": 30.0 }, { "frames": [{ +"duration": 1.0, +"texture": ExtResource("9_l75nu") +}, { +"duration": 1.0, +"texture": ExtResource("10_joikc") +}], +"loop": true, +"name": &"小小蝶", +"speed": 5.0 +}, { +"frames": [{ "duration": 6.0, "texture": ExtResource("9_av68t") }, { @@ -167,7 +180,7 @@ animations = [{ "duration": 15.0, "texture": ExtResource("37_e8481") }], -"loop": true, +"loop": false, "name": &"陆仁坐下", "speed": 30.0 }, { @@ -187,7 +200,53 @@ animations = [{ "duration": 15.0, "texture": ExtResource("5_ggpb3") }], -"loop": true, +"loop": false, "name": &"陆仁艰难站起", "speed": 30.0 +}, { +"frames": [{ +"duration": 6.0, +"texture": ExtResource("9_av68t") +}, { +"duration": 6.0, +"texture": ExtResource("10_ts00y") +}, { +"duration": 6.0, +"texture": ExtResource("11_2mnxt") +}, { +"duration": 6.0, +"texture": ExtResource("12_r8b8s") +}, { +"duration": 6.0, +"texture": ExtResource("13_yevpv") +}, { +"duration": 6.0, +"texture": ExtResource("14_i8od7") +}], +"loop": true, +"name": &"陆仁行走1", +"speed": 30.0 +}, { +"frames": [{ +"duration": 6.0, +"texture": ExtResource("9_av68t") +}, { +"duration": 6.0, +"texture": ExtResource("10_ts00y") +}, { +"duration": 6.0, +"texture": ExtResource("11_2mnxt") +}, { +"duration": 6.0, +"texture": ExtResource("12_r8b8s") +}, { +"duration": 6.0, +"texture": ExtResource("13_yevpv") +}, { +"duration": 6.0, +"texture": ExtResource("14_i8od7") +}], +"loop": true, +"name": &"陆仁行走2", +"speed": 30.0 }] diff --git a/asset/art/gif/c04_三楼走廊擦墙演出/小小小蝶骑在陆仁脖子上擦墙上的涂鸦.gif b/asset/art/gif/c04_三楼走廊擦墙演出/小小小蝶骑在陆仁脖子上擦墙上的涂鸦.gif deleted file mode 100644 index e7bbe04e..00000000 Binary files a/asset/art/gif/c04_三楼走廊擦墙演出/小小小蝶骑在陆仁脖子上擦墙上的涂鸦.gif and /dev/null differ diff --git a/asset/art/gif/c04_三楼走廊擦墙演出/小小小蝶骑在陆仁脖子上擦墙上的涂鸦.gif.import b/asset/art/gif/c04_三楼走廊擦墙演出/小小小蝶骑在陆仁脖子上擦墙上的涂鸦.gif.import deleted file mode 100644 index 19add19c..00000000 --- a/asset/art/gif/c04_三楼走廊擦墙演出/小小小蝶骑在陆仁脖子上擦墙上的涂鸦.gif.import +++ /dev/null @@ -1,14 +0,0 @@ -[remap] - -importer="gif.animated.texture.plugin" -type="SpriteFrames" -uid="uid://dssccqwng6tsl" -path="res://.godot/imported/小小小蝶骑在陆仁脖子上擦墙上的涂鸦.gif-004fabc6bf59f692c80398dd2342cd9e.tres" - -[deps] - -source_file="res://asset/art/gif/c04_三楼走廊擦墙演出/小小小蝶骑在陆仁脖子上擦墙上的涂鸦.gif" -dest_files=["res://.godot/imported/小小小蝶骑在陆仁脖子上擦墙上的涂鸦.gif-004fabc6bf59f692c80398dd2342cd9e.tres"] - -[params] - diff --git a/asset/art/gif/c04_三楼走廊擦墙演出/小小蝶1.png b/asset/art/gif/c04_三楼走廊擦墙演出/小小蝶1.png new file mode 100644 index 00000000..b47b8187 Binary files /dev/null and b/asset/art/gif/c04_三楼走廊擦墙演出/小小蝶1.png differ diff --git a/asset/art/gif/c04_三楼走廊擦墙演出/小小蝶1.png.import b/asset/art/gif/c04_三楼走廊擦墙演出/小小蝶1.png.import new file mode 100644 index 00000000..765fe14d --- /dev/null +++ b/asset/art/gif/c04_三楼走廊擦墙演出/小小蝶1.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bpi00iaq1e6yx" +path="res://.godot/imported/小小蝶1.png-0d3fcb98b0e77a8299d1ff5f3ec3b368.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/gif/c04_三楼走廊擦墙演出/小小蝶1.png" +dest_files=["res://.godot/imported/小小蝶1.png-0d3fcb98b0e77a8299d1ff5f3ec3b368.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/c04_三楼走廊擦墙演出/小小蝶2.png b/asset/art/gif/c04_三楼走廊擦墙演出/小小蝶2.png new file mode 100644 index 00000000..6315560a Binary files /dev/null and b/asset/art/gif/c04_三楼走廊擦墙演出/小小蝶2.png differ diff --git a/asset/art/gif/c04_三楼走廊擦墙演出/小小蝶2.png.import b/asset/art/gif/c04_三楼走廊擦墙演出/小小蝶2.png.import new file mode 100644 index 00000000..6aadc0c1 --- /dev/null +++ b/asset/art/gif/c04_三楼走廊擦墙演出/小小蝶2.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cog3jwid2xu3" +path="res://.godot/imported/小小蝶2.png-6f679e3b7704d169b281b4d8549d5552.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/gif/c04_三楼走廊擦墙演出/小小蝶2.png" +dest_files=["res://.godot/imported/小小蝶2.png-6f679e3b7704d169b281b4d8549d5552.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/c04_三楼走廊擦墙演出/陆仁回头.gif b/asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头.gif deleted file mode 100644 index ebf7c9df..00000000 Binary files a/asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头.gif and /dev/null differ diff --git a/asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/0.png b/asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/0.png index d1a6c79e..f4e12db9 100644 Binary files a/asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/0.png and b/asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/0.png differ diff --git a/asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/1.png b/asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/1.png index a69b394e..6e814f16 100644 Binary files a/asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/1.png and b/asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/1.png differ diff --git a/asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/10.png b/asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/10.png index 8a37f964..6acb12fd 100644 Binary files a/asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/10.png and b/asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/10.png differ diff --git a/asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/11.png b/asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/11.png index ef808c32..35ebec88 100644 Binary files a/asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/11.png and b/asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/11.png differ diff --git a/asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/12.png b/asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/12.png index d1a6c79e..f4e12db9 100644 Binary files a/asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/12.png and b/asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/12.png differ diff --git a/asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/2.png b/asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/2.png index 71f15907..78de8f86 100644 Binary files a/asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/2.png and b/asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/2.png differ diff --git a/asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/3.png b/asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/3.png index aa057bb8..e182b344 100644 Binary files a/asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/3.png and b/asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/3.png differ diff --git a/asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/4.png b/asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/4.png index a42f9ae3..0a529e6c 100644 Binary files a/asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/4.png and b/asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/4.png differ diff --git a/asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/5.png b/asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/5.png index f0568956..b37a8941 100644 Binary files a/asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/5.png and b/asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/5.png differ diff --git a/asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/6.png b/asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/6.png index 40b3912a..dd5b679a 100644 Binary files a/asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/6.png and b/asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/6.png differ diff --git a/asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/7.png b/asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/7.png index d1a6c79e..f4e12db9 100644 Binary files a/asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/7.png and b/asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/7.png differ diff --git a/asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/8.png b/asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/8.png index ef808c32..35ebec88 100644 Binary files a/asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/8.png and b/asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/8.png differ diff --git a/asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/9.png b/asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/9.png index 8a37f964..6acb12fd 100644 Binary files a/asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/9.png and b/asset/art/gif/c04_三楼走廊擦墙演出/陆仁回头/9.png differ diff --git a/asset/art/gif/c04_三楼走廊擦墙演出/陆仁坐下.gif b/asset/art/gif/c04_三楼走廊擦墙演出/陆仁坐下.gif deleted file mode 100644 index b42ff139..00000000 Binary files a/asset/art/gif/c04_三楼走廊擦墙演出/陆仁坐下.gif and /dev/null differ diff --git a/asset/art/gif/c04_三楼走廊擦墙演出/陆仁坐下.gif.import b/asset/art/gif/c04_三楼走廊擦墙演出/陆仁坐下.gif.import deleted file mode 100644 index c1c315f3..00000000 --- a/asset/art/gif/c04_三楼走廊擦墙演出/陆仁坐下.gif.import +++ /dev/null @@ -1,14 +0,0 @@ -[remap] - -importer="gif.animated.texture.plugin" -type="SpriteFrames" -uid="uid://plixtbgcr1tj" -path="res://.godot/imported/陆仁坐下.gif-12e0b24c9cfbe15c396591f2ba45b0f8.tres" - -[deps] - -source_file="res://asset/art/gif/c04_三楼走廊擦墙演出/陆仁坐下.gif" -dest_files=["res://.godot/imported/陆仁坐下.gif-12e0b24c9cfbe15c396591f2ba45b0f8.tres"] - -[params] - diff --git a/asset/art/gif/c04_煮肉游戏/三楼走廊互动动画_灶台冒烟烧火.gif b/asset/art/gif/c04_煮肉游戏/三楼走廊互动动画_灶台冒烟烧火.gif deleted file mode 100644 index 04933734..00000000 Binary files a/asset/art/gif/c04_煮肉游戏/三楼走廊互动动画_灶台冒烟烧火.gif and /dev/null differ diff --git a/asset/art/gif/c04_煮肉游戏/三楼走廊互动动画_灶台冒烟烧火.gif.import b/asset/art/gif/c04_煮肉游戏/三楼走廊互动动画_灶台冒烟烧火.gif.import deleted file mode 100644 index 0b4d594c..00000000 --- a/asset/art/gif/c04_煮肉游戏/三楼走廊互动动画_灶台冒烟烧火.gif.import +++ /dev/null @@ -1,14 +0,0 @@ -[remap] - -importer="gif.animated.texture.plugin" -type="SpriteFrames" -uid="uid://5cfcqa4vt2l8" -path="res://.godot/imported/三楼走廊互动动画_灶台冒烟烧火.gif-f9a772ab021bc2384bf903b37e6fc083.tres" - -[deps] - -source_file="res://asset/art/gif/c04_煮肉游戏/三楼走廊互动动画_灶台冒烟烧火.gif" -dest_files=["res://.godot/imported/三楼走廊互动动画_灶台冒烟烧火.gif-f9a772ab021bc2384bf903b37e6fc083.tres"] - -[params] - diff --git a/asset/art/gif/c04_煮肉游戏/三楼走廊互动动画_熄火.gif b/asset/art/gif/c04_煮肉游戏/三楼走廊互动动画_熄火.gif deleted file mode 100644 index 2647861e..00000000 Binary files a/asset/art/gif/c04_煮肉游戏/三楼走廊互动动画_熄火.gif and /dev/null differ diff --git a/asset/art/gif/c04_煮肉游戏/三楼走廊互动动画_熄火.gif.import b/asset/art/gif/c04_煮肉游戏/三楼走廊互动动画_熄火.gif.import deleted file mode 100644 index 8efa37be..00000000 --- a/asset/art/gif/c04_煮肉游戏/三楼走廊互动动画_熄火.gif.import +++ /dev/null @@ -1,14 +0,0 @@ -[remap] - -importer="gif.animated.texture.plugin" -type="SpriteFrames" -uid="uid://bqqp3lpwb55vb" -path="res://.godot/imported/三楼走廊互动动画_熄火.gif-f40da7eb6a8fac2a38d80bbbd54bbe7b.tres" - -[deps] - -source_file="res://asset/art/gif/c04_煮肉游戏/三楼走廊互动动画_熄火.gif" -dest_files=["res://.godot/imported/三楼走廊互动动画_熄火.gif-f40da7eb6a8fac2a38d80bbbd54bbe7b.tres"] - -[params] - diff --git a/asset/art/gif/c04_煮肉游戏/三楼走廊互动动画_陆仁烧饭.gif b/asset/art/gif/c04_煮肉游戏/三楼走廊互动动画_陆仁烧饭.gif deleted file mode 100644 index b7444e8b..00000000 Binary files a/asset/art/gif/c04_煮肉游戏/三楼走廊互动动画_陆仁烧饭.gif and /dev/null differ diff --git a/asset/art/gif/c04_煮肉游戏/三楼走廊互动动画_陆仁烧饭.gif.import b/asset/art/gif/c04_煮肉游戏/三楼走廊互动动画_陆仁烧饭.gif.import deleted file mode 100644 index b2d0e5da..00000000 --- a/asset/art/gif/c04_煮肉游戏/三楼走廊互动动画_陆仁烧饭.gif.import +++ /dev/null @@ -1,14 +0,0 @@ -[remap] - -importer="gif.animated.texture.plugin" -type="SpriteFrames" -uid="uid://blld0oftq7bg1" -path="res://.godot/imported/三楼走廊互动动画_陆仁烧饭.gif-045756b3a30b4e9b75112b6594197480.tres" - -[deps] - -source_file="res://asset/art/gif/c04_煮肉游戏/三楼走廊互动动画_陆仁烧饭.gif" -dest_files=["res://.godot/imported/三楼走廊互动动画_陆仁烧饭.gif-045756b3a30b4e9b75112b6594197480.tres"] - -[params] - diff --git a/asset/art/gif/c04_煮肉游戏/撇肉沫gif/c03_肉沫01.gif b/asset/art/gif/c04_煮肉游戏/撇肉沫gif/c03_肉沫01.gif deleted file mode 100644 index 7698e4c5..00000000 Binary files a/asset/art/gif/c04_煮肉游戏/撇肉沫gif/c03_肉沫01.gif and /dev/null differ diff --git a/asset/art/gif/c04_煮肉游戏/撇肉沫gif/c03_肉沫01.gif.import b/asset/art/gif/c04_煮肉游戏/撇肉沫gif/c03_肉沫01.gif.import deleted file mode 100644 index 4ca754c8..00000000 --- a/asset/art/gif/c04_煮肉游戏/撇肉沫gif/c03_肉沫01.gif.import +++ /dev/null @@ -1,14 +0,0 @@ -[remap] - -importer="gif.animated.texture.plugin" -type="SpriteFrames" -uid="uid://cmucpd3qafxvk" -path="res://.godot/imported/c03_肉沫01.gif-9a908bfbc57fdfd83b132e6d4ba6c9c0.tres" - -[deps] - -source_file="res://asset/art/gif/c04_煮肉游戏/撇肉沫gif/c03_肉沫01.gif" -dest_files=["res://.godot/imported/c03_肉沫01.gif-9a908bfbc57fdfd83b132e6d4ba6c9c0.tres"] - -[params] - diff --git a/asset/art/gif/c04_煮肉游戏/撇肉沫gif/c03_肉沫02.gif b/asset/art/gif/c04_煮肉游戏/撇肉沫gif/c03_肉沫02.gif deleted file mode 100644 index 62ab03dc..00000000 Binary files a/asset/art/gif/c04_煮肉游戏/撇肉沫gif/c03_肉沫02.gif and /dev/null differ diff --git a/asset/art/gif/c04_煮肉游戏/撇肉沫gif/c03_肉沫02.gif.import b/asset/art/gif/c04_煮肉游戏/撇肉沫gif/c03_肉沫02.gif.import deleted file mode 100644 index e2222a5e..00000000 --- a/asset/art/gif/c04_煮肉游戏/撇肉沫gif/c03_肉沫02.gif.import +++ /dev/null @@ -1,14 +0,0 @@ -[remap] - -importer="gif.animated.texture.plugin" -type="SpriteFrames" -uid="uid://bgv88nb8eaykb" -path="res://.godot/imported/c03_肉沫02.gif-a56eab9c6d22b7c0e56b176f681b9716.tres" - -[deps] - -source_file="res://asset/art/gif/c04_煮肉游戏/撇肉沫gif/c03_肉沫02.gif" -dest_files=["res://.godot/imported/c03_肉沫02.gif-a56eab9c6d22b7c0e56b176f681b9716.tres"] - -[params] - diff --git a/asset/art/gif/c04_煮肉游戏/撇肉沫gif/c03_肉沫03.gif b/asset/art/gif/c04_煮肉游戏/撇肉沫gif/c03_肉沫03.gif deleted file mode 100644 index 35f2ddad..00000000 Binary files a/asset/art/gif/c04_煮肉游戏/撇肉沫gif/c03_肉沫03.gif and /dev/null differ diff --git a/asset/art/gif/c04_煮肉游戏/撇肉沫gif/c03_肉沫03.gif.import b/asset/art/gif/c04_煮肉游戏/撇肉沫gif/c03_肉沫03.gif.import deleted file mode 100644 index 57cf383c..00000000 --- a/asset/art/gif/c04_煮肉游戏/撇肉沫gif/c03_肉沫03.gif.import +++ /dev/null @@ -1,14 +0,0 @@ -[remap] - -importer="gif.animated.texture.plugin" -type="SpriteFrames" -uid="uid://s2cipc7hdnw" -path="res://.godot/imported/c03_肉沫03.gif-c7c85486b0320d6dd3ecbc3d2e9c0c95.tres" - -[deps] - -source_file="res://asset/art/gif/c04_煮肉游戏/撇肉沫gif/c03_肉沫03.gif" -dest_files=["res://.godot/imported/c03_肉沫03.gif-c7c85486b0320d6dd3ecbc3d2e9c0c95.tres"] - -[params] - diff --git a/asset/art/gif/c04_煮肉游戏/撇肉沫gif/c03_肉沫04.gif b/asset/art/gif/c04_煮肉游戏/撇肉沫gif/c03_肉沫04.gif deleted file mode 100644 index c0eb7c11..00000000 Binary files a/asset/art/gif/c04_煮肉游戏/撇肉沫gif/c03_肉沫04.gif and /dev/null differ diff --git a/asset/art/gif/c04_煮肉游戏/撇肉沫gif/c03_肉沫04.gif.import b/asset/art/gif/c04_煮肉游戏/撇肉沫gif/c03_肉沫04.gif.import deleted file mode 100644 index b40b2db2..00000000 --- a/asset/art/gif/c04_煮肉游戏/撇肉沫gif/c03_肉沫04.gif.import +++ /dev/null @@ -1,14 +0,0 @@ -[remap] - -importer="gif.animated.texture.plugin" -type="SpriteFrames" -uid="uid://cp2vsb0j304k5" -path="res://.godot/imported/c03_肉沫04.gif-e2bf72ac56ceaf209d61819f62f17ec9.tres" - -[deps] - -source_file="res://asset/art/gif/c04_煮肉游戏/撇肉沫gif/c03_肉沫04.gif" -dest_files=["res://.godot/imported/c03_肉沫04.gif-e2bf72ac56ceaf209d61819f62f17ec9.tres"] - -[params] - diff --git a/asset/art/gif/c04_煮肉游戏/撇肉沫gif/c03_肉沫05.gif b/asset/art/gif/c04_煮肉游戏/撇肉沫gif/c03_肉沫05.gif deleted file mode 100644 index 82924fa4..00000000 Binary files a/asset/art/gif/c04_煮肉游戏/撇肉沫gif/c03_肉沫05.gif and /dev/null differ diff --git a/asset/art/gif/c04_煮肉游戏/撇肉沫gif/c03_肉沫05.gif.import b/asset/art/gif/c04_煮肉游戏/撇肉沫gif/c03_肉沫05.gif.import deleted file mode 100644 index a2842814..00000000 --- a/asset/art/gif/c04_煮肉游戏/撇肉沫gif/c03_肉沫05.gif.import +++ /dev/null @@ -1,14 +0,0 @@ -[remap] - -importer="gif.animated.texture.plugin" -type="SpriteFrames" -uid="uid://rw483ao5qo1t" -path="res://.godot/imported/c03_肉沫05.gif-8fd0b5bf913180dd9ccaa1110bdde13c.tres" - -[deps] - -source_file="res://asset/art/gif/c04_煮肉游戏/撇肉沫gif/c03_肉沫05.gif" -dest_files=["res://.godot/imported/c03_肉沫05.gif-8fd0b5bf913180dd9ccaa1110bdde13c.tres"] - -[params] - diff --git a/asset/art/gif/c04_煮肉游戏/撇肉沫gif/c03_肉沫06.gif b/asset/art/gif/c04_煮肉游戏/撇肉沫gif/c03_肉沫06.gif deleted file mode 100644 index 3aa10070..00000000 Binary files a/asset/art/gif/c04_煮肉游戏/撇肉沫gif/c03_肉沫06.gif and /dev/null differ diff --git a/asset/art/gif/c04_煮肉游戏/撇肉沫gif/c03_肉沫06.gif.import b/asset/art/gif/c04_煮肉游戏/撇肉沫gif/c03_肉沫06.gif.import deleted file mode 100644 index b3d8a549..00000000 --- a/asset/art/gif/c04_煮肉游戏/撇肉沫gif/c03_肉沫06.gif.import +++ /dev/null @@ -1,14 +0,0 @@ -[remap] - -importer="gif.animated.texture.plugin" -type="SpriteFrames" -uid="uid://d0ba5kqa1727t" -path="res://.godot/imported/c03_肉沫06.gif-a1371e01231a468cdb1231747be1ccc4.tres" - -[deps] - -source_file="res://asset/art/gif/c04_煮肉游戏/撇肉沫gif/c03_肉沫06.gif" -dest_files=["res://.godot/imported/c03_肉沫06.gif-a1371e01231a468cdb1231747be1ccc4.tres"] - -[params] - diff --git a/asset/art/gif/c04_煮肉游戏/清水动画.gif b/asset/art/gif/c04_煮肉游戏/清水动画.gif deleted file mode 100644 index 0a86262a..00000000 Binary files a/asset/art/gif/c04_煮肉游戏/清水动画.gif and /dev/null differ diff --git a/asset/art/gif/c04_煮肉游戏/清水动画.gif.import b/asset/art/gif/c04_煮肉游戏/清水动画.gif.import deleted file mode 100644 index 2b0f00bd..00000000 --- a/asset/art/gif/c04_煮肉游戏/清水动画.gif.import +++ /dev/null @@ -1,14 +0,0 @@ -[remap] - -importer="gif.animated.texture.plugin" -type="SpriteFrames" -uid="uid://cn66f4s20h3c1" -path="res://.godot/imported/清水动画.gif-11cd68be39c72fdfabe87277ccd44fd8.tres" - -[deps] - -source_file="res://asset/art/gif/c04_煮肉游戏/清水动画.gif" -dest_files=["res://.godot/imported/清水动画.gif-11cd68be39c72fdfabe87277ccd44fd8.tres"] - -[params] - diff --git a/asset/art/gif/c04_煮肉游戏/煮肉游戏_沸水.gif b/asset/art/gif/c04_煮肉游戏/煮肉游戏_沸水.gif deleted file mode 100644 index cc1c5ee0..00000000 Binary files a/asset/art/gif/c04_煮肉游戏/煮肉游戏_沸水.gif and /dev/null differ diff --git a/asset/art/gif/c04_煮肉游戏/煮肉游戏_沸水.gif.import b/asset/art/gif/c04_煮肉游戏/煮肉游戏_沸水.gif.import deleted file mode 100644 index 5e4c3490..00000000 --- a/asset/art/gif/c04_煮肉游戏/煮肉游戏_沸水.gif.import +++ /dev/null @@ -1,14 +0,0 @@ -[remap] - -importer="gif.animated.texture.plugin" -type="SpriteFrames" -uid="uid://bymyuvsbtk1vs" -path="res://.godot/imported/煮肉游戏_沸水.gif-b2e921bce51279e4f83b7481ceeb2317.tres" - -[deps] - -source_file="res://asset/art/gif/c04_煮肉游戏/煮肉游戏_沸水.gif" -dest_files=["res://.godot/imported/煮肉游戏_沸水.gif-b2e921bce51279e4f83b7481ceeb2317.tres"] - -[params] - diff --git a/asset/art/gif/c04_煮肉游戏/煮肉游戏_锅盖冒烟.gif b/asset/art/gif/c04_煮肉游戏/煮肉游戏_锅盖冒烟.gif deleted file mode 100644 index d2c13469..00000000 Binary files a/asset/art/gif/c04_煮肉游戏/煮肉游戏_锅盖冒烟.gif and /dev/null differ diff --git a/asset/art/gif/c04_煮肉游戏/煮肉游戏_锅盖冒烟.gif.import b/asset/art/gif/c04_煮肉游戏/煮肉游戏_锅盖冒烟.gif.import deleted file mode 100644 index b5bba818..00000000 --- a/asset/art/gif/c04_煮肉游戏/煮肉游戏_锅盖冒烟.gif.import +++ /dev/null @@ -1,14 +0,0 @@ -[remap] - -importer="gif.animated.texture.plugin" -type="SpriteFrames" -uid="uid://bjdr7q7ta30vt" -path="res://.godot/imported/煮肉游戏_锅盖冒烟.gif-6454fe7774772e111f43eaf22fe70174.tres" - -[deps] - -source_file="res://asset/art/gif/c04_煮肉游戏/煮肉游戏_锅盖冒烟.gif" -dest_files=["res://.godot/imported/煮肉游戏_锅盖冒烟.gif-6454fe7774772e111f43eaf22fe70174.tres"] - -[params] - diff --git a/asset/art/gif/c04_煮肉游戏/熟肉汤水动画.gif b/asset/art/gif/c04_煮肉游戏/熟肉汤水动画.gif deleted file mode 100644 index 6dca3cd7..00000000 Binary files a/asset/art/gif/c04_煮肉游戏/熟肉汤水动画.gif and /dev/null differ diff --git a/asset/art/gif/c04_煮肉游戏/熟肉汤水动画.gif.import b/asset/art/gif/c04_煮肉游戏/熟肉汤水动画.gif.import deleted file mode 100644 index 12855b99..00000000 --- a/asset/art/gif/c04_煮肉游戏/熟肉汤水动画.gif.import +++ /dev/null @@ -1,14 +0,0 @@ -[remap] - -importer="gif.animated.texture.plugin" -type="SpriteFrames" -uid="uid://15yfoo8i6v7q" -path="res://.godot/imported/熟肉汤水动画.gif-2fbec10f0bc5e57d6eda57a183589ca0.tres" - -[deps] - -source_file="res://asset/art/gif/c04_煮肉游戏/熟肉汤水动画.gif" -dest_files=["res://.godot/imported/熟肉汤水动画.gif-2fbec10f0bc5e57d6eda57a183589ca0.tres"] - -[params] - diff --git a/asset/dialogue/event_stage.dialogue b/asset/dialogue/event_stage.dialogue index d4dc6673..f33652f7 100644 --- a/asset/dialogue/event_stage.dialogue +++ b/asset/dialogue/event_stage.dialogue @@ -44,6 +44,8 @@ c03_intro_c04: 0:初始化 1:演出完成 => END ~ EventStage_c04 +# 小蝶家门口，陆蝶演出&鬼打墙 +c04_ghost_trapped: 0:初始化 1:第一次开门 2:进入鬼打墙场景 3:鬼打墙结束 # 除晦游戏 c04_erase_curse: 0:初始化 1:开始游戏 2:游戏结束 diff --git a/asset/dialogue/item_description.csv b/asset/dialogue/item_description.csv index 255c1623..47a44ad8 100644 --- a/asset/dialogue/item_description.csv +++ b/asset/dialogue/item_description.csv @@ -364,3 +364,4 @@ c03_李癞胖演出结束,怎么突然出现这么多人？,,,,, c03_冷飕飕风吹过,...{br}这股风...,,,,, c03_保卫科_李癞拜老鼠精,？！{br}他们这是...在拜那幅像？,,,,, c03_小手洞1,洞里有很浓的血腥味...,,,,, +c04_鬼打墙_开始os,当年他们是有多恨我们家？,,,,, diff --git a/asset/dialogue/item_description.dialogue b/asset/dialogue/item_description.dialogue index 55b898ae..aebf0546 100644 --- a/asset/dialogue/item_description.dialogue +++ b/asset/dialogue/item_description.dialogue @@ -457,6 +457,8 @@ skip[ID:prop_沾血的老虎钳_详情] => END ~ Notes_c04 +# 鬼打墙 +当年他们是有多恨我们家？[ID:c04_鬼打墙_开始os] => END ~ Notes_c05 diff --git a/scene/ground/scene/c04/s04_鬼打墙.tscn b/scene/ground/scene/c04/s04_鬼打墙.tscn index ade1bca8..953724df 100644 --- a/scene/ground/scene/c04/s04_鬼打墙.tscn +++ b/scene/ground/scene/c04/s04_鬼打墙.tscn @@ -1,11 +1,12 @@ -[gd_scene load_steps=16 format=3 uid="uid://bykwiuj02tcxa"] +[gd_scene load_steps=17 format=3 uid="uid://bykwiuj02tcxa"] [ext_resource type="PackedScene" uid="uid://dayyx4jerj7io" path="res://scene/ground/ground.tscn" id="1_q48aa"] [ext_resource type="Script" uid="uid://dxu4ss0r68f5d" path="res://scene/ground/scene/c04/s04_鬼打墙.gd" id="2_vek4i"] [ext_resource type="AudioStream" uid="uid://6oc0cgc3mbqb" path="res://asset/audio/sfx/环境音/白噪音/白噪声楼道2.ogg" id="3_ka5ik"] [ext_resource type="Script" uid="uid://rq6w1vuhuq1m" path="res://scene/entity/audio/sfx.gd" id="4_ynt5w"] -[ext_resource type="Texture2D" uid="uid://cpjd3dqri51fq" path="res://asset/art/scene/c03/s01_三楼/bg_三楼走廊.png" id="5_lwq75"] +[ext_resource type="Texture2D" uid="uid://dgflh16vwwgpr" path="res://asset/art/gif/c04_鬼打墙/鬼打墙.png" id="5_4rr4q"] [ext_resource type="PackedScene" uid="uid://61pis75a8fdq" path="res://scene/entity/portal.tscn" id="6_0hnsl"] +[ext_resource type="Texture2D" uid="uid://vktpw07jrmnb" path="res://asset/art/gif/c04_鬼打墙/鬼打墙_砖墙.png" id="9_6q2e1"] [ext_resource type="Texture2D" uid="uid://bp84w8keuelyj" path="res://asset/art/scene/c02/s10_空房间/e_蜡烛-sheet.png" id="11_t03n4"] [ext_resource type="Texture2D" uid="uid://cylsq5cvhlp18" path="res://asset/art/tool/point_light.png" id="12_vt3n2"] [ext_resource type="Texture2D" uid="uid://djoft6600kly6" path="res://asset/art/scene/c03/s01_三楼/fg_前景.png" id="20_k8fkv"] @@ -49,7 +50,7 @@ animations = [{ }] [node name="S04" type="Node2D"] -metadata/_edit_horizontal_guides_ = [98.0] +metadata/_edit_horizontal_guides_ = [98.0, 120.0] [node name="Ground" parent="." instance=ExtResource("1_q48aa")] scene_name = "c04_s04" @@ -76,8 +77,8 @@ metadata/_custom_type_script = "uid://rq6w1vuhuq1m" [node name="BGSprite2D" parent="Ground" index="2"] light_mask = 5 position = Vector2(0, -24) -texture = ExtResource("5_lwq75") -offset = Vector2(0, -155) +texture = ExtResource("5_4rr4q") +offset = Vector2(0, -100) [node name="portal_left" parent="Ground/DeployLayer" index="0"] position = Vector2(34, 8) @@ -164,6 +165,10 @@ blend_mode = 2 texture = ExtResource("12_vt3n2") texture_scale = 0.3 +[node name="砖墙" type="Sprite2D" parent="Ground/DeployLayer" index="4"] +position = Vector2(368, -8) +texture = ExtResource("9_6q2e1") + [node name="MainPlayer" parent="Ground" index="5"] position = Vector2(34, 98) catty_light_energy = 0.5 diff --git a/scene/ground/scene/c04/s08_三楼III.gd b/scene/ground/scene/c04/s08_三楼III.gd new file mode 100644 index 00000000..a0ecff0a --- /dev/null +++ b/scene/ground/scene/c04/s08_三楼III.gd @@ -0,0 +1,26 @@ +@tool +extends AnimationRoot + + +# 覆盖该方法 +func _default_data() -> Dictionary: + return {} + + +func _ready() -> void: + super._ready() + if Engine.is_editor_hint(): + return + + +#region node_reference +#endregion + + +# 读取设置变量名 +func _setup_node_reference() -> void: + pass + + +func _on_ground_ready() -> void: + pass \ No newline at end of file diff --git a/scene/ground/scene/c04/s08_三楼III.gd.uid b/scene/ground/scene/c04/s08_三楼III.gd.uid new file mode 100644 index 00000000..3e6b6c4f --- /dev/null +++ b/scene/ground/scene/c04/s08_三楼III.gd.uid @@ -0,0 +1 @@ +uid://t2p7to688wd3 diff --git a/scene/ground/scene/c04/s08_三楼III.tscn b/scene/ground/scene/c04/s08_三楼III.tscn index fa080249..699495f7 100644 --- a/scene/ground/scene/c04/s08_三楼III.tscn +++ b/scene/ground/scene/c04/s08_三楼III.tscn @@ -1,7 +1,7 @@ -[gd_scene load_steps=27 format=3 uid="uid://dcg8ekvhqxjjs"] +[gd_scene load_steps=30 format=3 uid="uid://dcg8ekvhqxjjs"] [ext_resource type="PackedScene" uid="uid://dayyx4jerj7io" path="res://scene/ground/ground.tscn" id="1_rv7yf"] -[ext_resource type="Script" uid="uid://c0rh2n36ait6i" path="res://scene/ground/scene/c03/s01_三楼.gd" id="2_5wdtb"] +[ext_resource type="Script" uid="uid://t2p7to688wd3" path="res://scene/ground/scene/c04/s08_三楼III.gd" id="2_ryonc"] [ext_resource type="AudioStream" uid="uid://6oc0cgc3mbqb" path="res://asset/audio/sfx/环境音/白噪音/白噪声楼道2.ogg" id="3_3myjn"] [ext_resource type="Script" uid="uid://rq6w1vuhuq1m" path="res://scene/entity/audio/sfx.gd" id="4_q3if8"] [ext_resource type="Texture2D" uid="uid://cpjd3dqri51fq" path="res://asset/art/scene/c03/s01_三楼/bg_三楼走廊.png" id="5_5htbk"] @@ -18,8 +18,11 @@ [ext_resource type="PackedScene" uid="uid://bb6rbriqc27pl" path="res://scene/ground/script/c04/s08_closeup煮肉游戏.tscn" id="16_wdxyg"] [ext_resource type="SpriteFrames" uid="uid://bbey3pnvbxqmr" path="res://asset/art/gif/c04_煮肉游戏/c04_煮肉游戏_frames.tres" id="17_mavq2"] [ext_resource type="Script" uid="uid://cphfob11f7atx" path="res://addons/property-inspector/pro_animation_sprite2d/pro_animated_sprite.gd" id="18_ryonc"] -[ext_resource type="Script" uid="uid://bkkiyk5jkdw4d" path="res://manager/event_manager/event2d.gd" id="19_ryonc"] +[ext_resource type="Script" uid="uid://tgupfwhdlomy" path="res://scene/ground/script/c04/s08_event陆蝶演出.gd" id="19_cl576"] [ext_resource type="Texture2D" uid="uid://djoft6600kly6" path="res://asset/art/scene/c03/s01_三楼/fg_前景.png" id="20_3eqs5"] +[ext_resource type="PackedScene" uid="uid://bnf3lkcbpx1ar" path="res://scene/entity/ambush.tscn" id="20_cl576"] +[ext_resource type="Texture2D" uid="uid://vf0gl8l7hrif" path="res://asset/art/gif/c04_三楼走廊擦墙演出/擦墙字.png" id="21_2rmvt"] +[ext_resource type="SpriteFrames" uid="uid://pf7mglnhuaab" path="res://asset/art/gif/c04_三楼走廊擦墙演出/c04_三楼走廊擦墙演出_frames.tres" id="22_a3f3m"] [sub_resource type="AnimationLibrary" id="AnimationLibrary_k01ve"] @@ -70,7 +73,7 @@ player_y = 60 libraries = { &"": SubResource("AnimationLibrary_k01ve") } -script = ExtResource("2_5wdtb") +script = ExtResource("2_ryonc") [node name="Sfx背景音" type="AudioStreamPlayer" parent="Ground/AnimationPlayer" index="0"] process_mode = 1 @@ -239,11 +242,70 @@ script = ExtResource("18_ryonc") metadata/_custom_type_script = "uid://cphfob11f7atx" [node name="Event陆蝶演出" type="Node2D" parent="Ground/DeployLayer" index="12"] -script = ExtResource("19_ryonc") +script = ExtResource("19_cl576") +event_name = &"c04_ghost_trapped" +event_stages = Array[int]([0]) pre_event_name = &"current_chapter_stage" pre_event_stages = Array[int]([4]) metadata/_custom_type_script = "uid://bkkiyk5jkdw4d" +[node name="Ambush陆蝶演出" parent="Ground/DeployLayer/Event陆蝶演出" instance=ExtResource("20_cl576")] +position = Vector2(535, 31) +one_shot = false + +[node name="墙上的字" type="Sprite2D" parent="Ground/DeployLayer/Event陆蝶演出"] +texture = ExtResource("21_2rmvt") + +[node name="Pro陆蝶" type="AnimatedSprite2D" parent="Ground/DeployLayer/Event陆蝶演出"] +position = Vector2(370, 26) +sprite_frames = ExtResource("22_a3f3m") +animation = &"陆仁行走1" +script = ExtResource("18_ryonc") +action_configs = Array[Dictionary]([{ +"animation_intro": &"陆仁坐下", +&"animation_next": "陆仁艰难站起", +"animation_wait_time": 0.0, +"intro_loop": 1 +}, { +"animation_intro": "陆仁艰难站起", +&"animation_next": "陆仁行走", +"animation_wait_time": 0.0, +"intro_loop": 1 +}, { +"animation_intro": "陆仁行走", +&"animation_next": "陆仁回头", +"animation_wait_time": 0.0, +"intro_loop": 1 +}]) +move_configs = Array[Dictionary]([{ +"animation": "陆仁行走1", +"animation_next": "陆仁回头", +"duration": 1e+07, +"movement_x": 80.0, +"velocity": Vector2(70, 0) +}, { +"animation": "陆仁回头", +"animation_next": "陆仁行走2", +"duration": 1e+07, +"movement_x": 210.0, +"velocity": Vector2(70, 0) +}, { +"animation": &"陆仁行走2", +"animation_next": "", +"duration": 1e+07, +"movement_x": 300.0, +"velocity": Vector2(70, 0) +}]) +metadata/_custom_type_script = "uid://cphfob11f7atx" + +[node name="小小蝶" type="AnimatedSprite2D" parent="Ground/DeployLayer/Event陆蝶演出/Pro陆蝶"] +visible = false +sprite_frames = ExtResource("22_a3f3m") +animation = &"小小蝶" +autoplay = "小小蝶" +script = ExtResource("18_ryonc") +metadata/_custom_type_script = "uid://cphfob11f7atx" + [node name="MainPlayer" parent="Ground" index="5"] position = Vector2(34, 98) catty_light_energy = 0.5 diff --git a/scene/ground/scene/c04/s09_除晦游戏.gd b/scene/ground/scene/c04/s09_除晦游戏.gd new file mode 100644 index 00000000..4b2f923c --- /dev/null +++ b/scene/ground/scene/c04/s09_除晦游戏.gd @@ -0,0 +1,29 @@ +@tool +extends AnimationRoot + + +# 覆盖该方法 +func _default_data() -> Dictionary: + return {} + + +func _ready() -> void: + super._ready() + if Engine.is_editor_hint(): + return + + +#region node_reference +#endregion + + +# 读取设置变量名 +func _setup_node_reference() -> void: + pass + + +var texture_painting_after_tear = preload("uid://deoi4dv42vspn") + + +func _on_ground_ready() -> void: + pass diff --git a/scene/ground/scene/c04/s09_除晦游戏.gd.uid b/scene/ground/scene/c04/s09_除晦游戏.gd.uid new file mode 100644 index 00000000..ef02ec50 --- /dev/null +++ b/scene/ground/scene/c04/s09_除晦游戏.gd.uid @@ -0,0 +1 @@ +uid://b06m3d5mehyin diff --git a/scene/ground/scene/c04/s09_除晦游戏.tscn b/scene/ground/scene/c04/s09_除晦游戏.tscn new file mode 100644 index 00000000..3a670837 --- /dev/null +++ b/scene/ground/scene/c04/s09_除晦游戏.tscn @@ -0,0 +1,112 @@ +[gd_scene load_steps=14 format=3 uid="uid://cchuw5rw6cf0l"] + +[ext_resource type="PackedScene" uid="uid://dayyx4jerj7io" path="res://scene/ground/ground.tscn" id="1_juj5v"] +[ext_resource type="Script" uid="uid://b06m3d5mehyin" path="res://scene/ground/scene/c04/s09_除晦游戏.gd" id="2_juj5v"] +[ext_resource type="AudioStream" uid="uid://b2mudqvq1dmng" path="res://asset/audio/sfx/环境音/白噪音/白噪声房间里1.ogg" id="3_om2jl"] +[ext_resource type="Script" uid="uid://rq6w1vuhuq1m" path="res://scene/entity/audio/sfx.gd" id="4_n4q25"] +[ext_resource type="Texture2D" uid="uid://dsymfb45n1sx1" path="res://asset/art/scene/c04/s00_除晦游戏/客厅连着父母房间.png" id="5_iqexw"] +[ext_resource type="Texture2D" uid="uid://bhygivahwd1yb" path="res://asset/art/scene/c04/s05_客厅/藤曼.png" id="6_qppbt"] +[ext_resource type="Script" uid="uid://0wjaho6qkg6s" path="res://manager/event_manager/event_binder.gd" id="7_3a5uu"] +[ext_resource type="Texture2D" uid="uid://cgjca5flabtkt" path="res://asset/art/scene/c04/s00_除晦游戏/客厅连着父母房间_关着的门.png" id="8_cmpvw"] +[ext_resource type="Texture2D" uid="uid://0l2c7c3qgxs0" path="res://asset/art/scene/c04/s00_除晦游戏/客厅连着父母房间_上层墙.png" id="8_ob3l3"] +[ext_resource type="Texture2D" uid="uid://86yqa60yum4f" path="res://asset/art/scene/c04/s00_除晦游戏/客厅连着父母房间_打开的门.png" id="9_prdnl"] +[ext_resource type="Texture2D" uid="uid://xnqlxofyldx5" path="res://asset/art/scene/c04/s00_除晦游戏/客厅连着父母房间_反色.png" id="11_prdnl"] +[ext_resource type="Texture2D" uid="uid://cpgt884ml6a7d" path="res://asset/art/scene/c04/s05_客厅/前景.png" id="14_0i4ir"] + +[sub_resource type="AnimationLibrary" id="AnimationLibrary_k01ve"] + +[node name="S09" type="Node2D"] +metadata/_edit_horizontal_guides_ = [-627.0] + +[node name="Ground" parent="." instance=ExtResource("1_juj5v")] +scene_name = "c04_s09" +player_y = 60 + +[node name="AnimationPlayer" parent="Ground" index="0"] +libraries = { +&"": SubResource("AnimationLibrary_k01ve") +} +script = ExtResource("2_juj5v") + +[node name="Sfx背景音" type="AudioStreamPlayer" parent="Ground/AnimationPlayer" index="0"] +stream = ExtResource("3_om2jl") +volume_db = -5.0 +autoplay = true +bus = &"game_sfx" +script = ExtResource("4_n4q25") +mode = "场景背景音" +"循环播放" = true +"感应玩家操作" = false +metadata/_custom_type_script = "uid://rq6w1vuhuq1m" + +[node name="BGSprite2D" parent="Ground" index="2"] +light_mask = 5 +texture = ExtResource("5_iqexw") +offset = Vector2(0, -158) + +[node name="portal_left" parent="Ground/DeployLayer" index="0"] +position = Vector2(70, 29) +target_scene = "c04_s08" +target_portal = "1" +status = "opened" + +[node name="portal_right" parent="Ground/DeployLayer" index="1"] +position = Vector2(538, 31) +target_scene = "c04_s01" +target_portal = "left" +status = "opened" + +[node name="藤蔓" type="Sprite2D" parent="Ground/DeployLayer" index="2"] +position = Vector2(294, -17) +texture = ExtResource("6_qppbt") + +[node name="EventBinder" type="Node" parent="Ground/DeployLayer/藤蔓"] +script = ExtResource("7_3a5uu") +updater_event = &"c04_erase_curse" +updater_mode = "shower" +updater_ease_duration = 0.0 +updater_stages = Array[int]([0, 1]) +metadata/_custom_type_script = "uid://0wjaho6qkg6s" + +[node name="关着的门" type="Sprite2D" parent="Ground/DeployLayer" index="3"] +texture = ExtResource("8_cmpvw") +centered = false +offset = Vector2(0, -158) + +[node name="打开的门" type="Sprite2D" parent="Ground/DeployLayer" index="4"] +visible = false +texture = ExtResource("9_prdnl") +centered = false +offset = Vector2(0, -158) + +[node name="隔断墙" type="Sprite2D" parent="Ground/DeployLayer" index="5"] +z_index = 6 +position = Vector2(607.5, 0) +texture = ExtResource("8_ob3l3") + +[node name="反色空间" type="Sprite2D" parent="Ground/DeployLayer" index="6"] +z_index = 6 +texture = ExtResource("11_prdnl") +centered = false +offset = Vector2(0, -158) + +[node name="MainPlayer" parent="Ground" index="5"] +position = Vector2(63, 95) +catty_light_energy = 0.5 +player_movement_rect = Rect2(80, -158, 394, 316) +facing_direction = Vector2(1, 0) + +[node name="FGSprite2D" parent="Ground/ParallaxForeground/FGParallaxLayer" index="0"] +scale = Vector2(1.1, 1.1) +texture = ExtResource("14_0i4ir") +offset = Vector2(0, 50) + +[node name="PlayerLine2D" parent="Ground/ParallaxForeground" index="2"] +points = PackedVector2Array(20, 150, 533, 151) + +[node name="DirectionalLight2D" parent="Ground" index="8"] +visible = false +energy = 0.8 +blend_mode = 1 + +[editable path="Ground"] diff --git a/scene/ground/script/c04/s08_event陆蝶演出.gd b/scene/ground/script/c04/s08_event陆蝶演出.gd new file mode 100644 index 00000000..4e5927ed --- /dev/null +++ b/scene/ground/script/c04/s08_event陆蝶演出.gd @@ -0,0 +1,34 @@ +@tool +extends Event2D + +# var prev_stage := 0 +# var stage := 0 + + +func _ready() -> void: + super._ready() + if Engine.is_editor_hint(): + return + + +func _on_global_stage_updated(e: StringName, s: int) -> void: + super._on_global_stage_updated(e, s) + + +func _on_ground_ready(_ground: Ground2D) -> void: + $"Ambush陆蝶演出".triggered.connect(_start_show, CONNECT_ONE_SHOT) + + +func _on_pre_stage_updated() -> void: + pass + + +func _on_stage_updated() -> void: + pass + + +func _start_show() -> void: + SceneManager.lock_player() + await SceneManager.pop_os_with_str("c04_鬼打墙_开始os") + + SceneManager.unlock_player() \ No newline at end of file diff --git a/scene/ground/script/c04/s08_event陆蝶演出.gd.uid b/scene/ground/script/c04/s08_event陆蝶演出.gd.uid new file mode 100644 index 00000000..616d43a8 --- /dev/null +++ b/scene/ground/script/c04/s08_event陆蝶演出.gd.uid @@ -0,0 +1 @@ +uid://tgupfwhdlomy