diff --git a/asset/art/scene/c02/s01_公寓一楼/bg_一楼.png b/asset/art/scene/c02/s01_公寓一楼/bg_一楼.png old mode 100755 new mode 100644 index 223d0b9e..74121867 Binary files a/asset/art/scene/c02/s01_公寓一楼/bg_一楼.png and b/asset/art/scene/c02/s01_公寓一楼/bg_一楼.png differ diff --git a/asset/art/scene/c02/s01_公寓一楼/bg_一楼.png.import b/asset/art/scene/c02/s01_公寓一楼/bg_一楼.png.import index 427fe31b..d2b0274f 100644 --- a/asset/art/scene/c02/s01_公寓一楼/bg_一楼.png.import +++ b/asset/art/scene/c02/s01_公寓一楼/bg_一楼.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://7j41vncgcjlp" +uid="uid://b3odt4ojsvu5n" path="res://.godot/imported/bg_一楼.png-a2edba91755f3a70dd9fe8093f341444.ctex" metadata={ "vram_texture": false diff --git a/asset/art/scene/c02/s01_公寓一楼/e_煤油灯座.png b/asset/art/scene/c02/s01_公寓一楼/e_煤油灯座.png new file mode 100644 index 00000000..f2590364 Binary files /dev/null and b/asset/art/scene/c02/s01_公寓一楼/e_煤油灯座.png differ diff --git a/asset/art/scene/c02/s01_公寓一楼/e_煤油灯座.png.import b/asset/art/scene/c02/s01_公寓一楼/e_煤油灯座.png.import new file mode 100644 index 00000000..7585cb06 --- /dev/null +++ b/asset/art/scene/c02/s01_公寓一楼/e_煤油灯座.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://1pr32tkx4ttl" +path="res://.godot/imported/e_煤油灯座.png-07b5c1dd21d638a398bef9ec4fd4bd54.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/scene/c02/s01_公寓一楼/e_煤油灯座.png" +dest_files=["res://.godot/imported/e_煤油灯座.png-07b5c1dd21d638a398bef9ec4fd4bd54.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/c02/s01_公寓一楼/光晕/光晕1.png b/asset/art/scene/c02/s01_公寓一楼/光晕/光晕1.png new file mode 100644 index 00000000..5881810c Binary files /dev/null and b/asset/art/scene/c02/s01_公寓一楼/光晕/光晕1.png differ diff --git a/asset/art/scene/c02/s01_公寓一楼/光晕/光晕1.png.import b/asset/art/scene/c02/s01_公寓一楼/光晕/光晕1.png.import new file mode 100644 index 00000000..8dbdbf02 --- /dev/null +++ b/asset/art/scene/c02/s01_公寓一楼/光晕/光晕1.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c3cobdikuo3x8" +path="res://.godot/imported/光晕1.png-1e62068bace41194e8af14e33b3fbc3b.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/scene/c02/s01_公寓一楼/光晕/光晕1.png" +dest_files=["res://.godot/imported/光晕1.png-1e62068bace41194e8af14e33b3fbc3b.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/c02/s01_公寓一楼/光晕/光晕2.png b/asset/art/scene/c02/s01_公寓一楼/光晕/光晕2.png new file mode 100644 index 00000000..effa877b Binary files /dev/null and b/asset/art/scene/c02/s01_公寓一楼/光晕/光晕2.png differ diff --git a/asset/art/scene/c02/s01_公寓一楼/光晕/光晕2.png.import b/asset/art/scene/c02/s01_公寓一楼/光晕/光晕2.png.import new file mode 100644 index 00000000..8b727186 --- /dev/null +++ b/asset/art/scene/c02/s01_公寓一楼/光晕/光晕2.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bddt7yod8hgel" +path="res://.godot/imported/光晕2.png-20b9efba94aee4b965f62aed90a045f0.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/scene/c02/s01_公寓一楼/光晕/光晕2.png" +dest_files=["res://.godot/imported/光晕2.png-20b9efba94aee4b965f62aed90a045f0.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/c02/s01_公寓一楼/光晕/光晕3.png b/asset/art/scene/c02/s01_公寓一楼/光晕/光晕3.png new file mode 100644 index 00000000..584272f6 Binary files /dev/null and b/asset/art/scene/c02/s01_公寓一楼/光晕/光晕3.png differ diff --git a/asset/art/scene/c02/s01_公寓一楼/光晕/光晕3.png.import b/asset/art/scene/c02/s01_公寓一楼/光晕/光晕3.png.import new file mode 100644 index 00000000..cc9e8541 --- /dev/null +++ b/asset/art/scene/c02/s01_公寓一楼/光晕/光晕3.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://ikr1wktus3ea" +path="res://.godot/imported/光晕3.png-8105732fee7ca5e35450f2aa06b1bebe.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/scene/c02/s01_公寓一楼/光晕/光晕3.png" +dest_files=["res://.godot/imported/光晕3.png-8105732fee7ca5e35450f2aa06b1bebe.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/c02/s01_公寓一楼/光晕/光晕4.png b/asset/art/scene/c02/s01_公寓一楼/光晕/光晕4.png new file mode 100644 index 00000000..fc6918b4 Binary files /dev/null and b/asset/art/scene/c02/s01_公寓一楼/光晕/光晕4.png differ diff --git a/asset/art/scene/c02/s01_公寓一楼/光晕/光晕4.png.import b/asset/art/scene/c02/s01_公寓一楼/光晕/光晕4.png.import new file mode 100644 index 00000000..c0530553 --- /dev/null +++ b/asset/art/scene/c02/s01_公寓一楼/光晕/光晕4.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dbr4gsjp3r4iv" +path="res://.godot/imported/光晕4.png-6a5633f9b9f3b5201840c6452c182e6d.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/scene/c02/s01_公寓一楼/光晕/光晕4.png" +dest_files=["res://.godot/imported/光晕4.png-6a5633f9b9f3b5201840c6452c182e6d.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/c02/s01_公寓一楼/光晕/光晕5.png b/asset/art/scene/c02/s01_公寓一楼/光晕/光晕5.png new file mode 100644 index 00000000..ee804498 Binary files /dev/null and b/asset/art/scene/c02/s01_公寓一楼/光晕/光晕5.png differ diff --git a/asset/art/scene/c02/s01_公寓一楼/光晕/光晕5.png.import b/asset/art/scene/c02/s01_公寓一楼/光晕/光晕5.png.import new file mode 100644 index 00000000..d35298cc --- /dev/null +++ b/asset/art/scene/c02/s01_公寓一楼/光晕/光晕5.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://d4fmu5685j2m3" +path="res://.godot/imported/光晕5.png-aad619bceb2871abc0bc088ce24d51c5.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/scene/c02/s01_公寓一楼/光晕/光晕5.png" +dest_files=["res://.godot/imported/光晕5.png-aad619bceb2871abc0bc088ce24d51c5.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/c02/s01_公寓一楼/光晕/光晕6.png b/asset/art/scene/c02/s01_公寓一楼/光晕/光晕6.png new file mode 100644 index 00000000..25848715 Binary files /dev/null and b/asset/art/scene/c02/s01_公寓一楼/光晕/光晕6.png differ diff --git a/asset/art/scene/c02/s01_公寓一楼/光晕/光晕6.png.import b/asset/art/scene/c02/s01_公寓一楼/光晕/光晕6.png.import new file mode 100644 index 00000000..02a5e4c9 --- /dev/null +++ b/asset/art/scene/c02/s01_公寓一楼/光晕/光晕6.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c8jufil8yrka8" +path="res://.godot/imported/光晕6.png-0d62748cdb9e080cab37eb63341fc16b.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/scene/c02/s01_公寓一楼/光晕/光晕6.png" +dest_files=["res://.godot/imported/光晕6.png-0d62748cdb9e080cab37eb63341fc16b.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/c02/s01_公寓一楼/地面物品反光/地反光1.png b/asset/art/scene/c02/s01_公寓一楼/地面物品反光/地反光1.png new file mode 100644 index 00000000..26a8981a Binary files /dev/null and b/asset/art/scene/c02/s01_公寓一楼/地面物品反光/地反光1.png differ diff --git a/asset/art/scene/c02/s01_公寓一楼/地面物品反光/地反光1.png.import b/asset/art/scene/c02/s01_公寓一楼/地面物品反光/地反光1.png.import new file mode 100644 index 00000000..aee0c1d1 --- /dev/null +++ b/asset/art/scene/c02/s01_公寓一楼/地面物品反光/地反光1.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c1nrsyh1ss82v" +path="res://.godot/imported/地反光1.png-b2732dc6bd64815b384a35ea9e8ca4fa.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/scene/c02/s01_公寓一楼/地面物品反光/地反光1.png" +dest_files=["res://.godot/imported/地反光1.png-b2732dc6bd64815b384a35ea9e8ca4fa.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/c02/s01_公寓一楼/地面物品反光/地反光2.png b/asset/art/scene/c02/s01_公寓一楼/地面物品反光/地反光2.png new file mode 100644 index 00000000..81dbcec7 Binary files /dev/null and b/asset/art/scene/c02/s01_公寓一楼/地面物品反光/地反光2.png differ diff --git a/asset/art/scene/c02/s01_公寓一楼/地面物品反光/地反光2.png.import b/asset/art/scene/c02/s01_公寓一楼/地面物品反光/地反光2.png.import new file mode 100644 index 00000000..29990c50 --- /dev/null +++ b/asset/art/scene/c02/s01_公寓一楼/地面物品反光/地反光2.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://d33jmss6vlhk7" +path="res://.godot/imported/地反光2.png-95d839f4e4d2f8502181f1a2cc096bc4.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/scene/c02/s01_公寓一楼/地面物品反光/地反光2.png" +dest_files=["res://.godot/imported/地反光2.png-95d839f4e4d2f8502181f1a2cc096bc4.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/c02/s01_公寓一楼/地面物品反光/地反光3.png b/asset/art/scene/c02/s01_公寓一楼/地面物品反光/地反光3.png new file mode 100644 index 00000000..be24dd53 Binary files /dev/null and b/asset/art/scene/c02/s01_公寓一楼/地面物品反光/地反光3.png differ diff --git a/asset/art/scene/c02/s01_公寓一楼/地面物品反光/地反光3.png.import b/asset/art/scene/c02/s01_公寓一楼/地面物品反光/地反光3.png.import new file mode 100644 index 00000000..79b375ca --- /dev/null +++ b/asset/art/scene/c02/s01_公寓一楼/地面物品反光/地反光3.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b78jbthcfkod7" +path="res://.godot/imported/地反光3.png-c7e52f76b9de0fc2fc20b7aa7a9891f6.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/scene/c02/s01_公寓一楼/地面物品反光/地反光3.png" +dest_files=["res://.godot/imported/地反光3.png-c7e52f76b9de0fc2fc20b7aa7a9891f6.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/c02/s01_公寓一楼/地面物品反光/地反光4.png b/asset/art/scene/c02/s01_公寓一楼/地面物品反光/地反光4.png new file mode 100644 index 00000000..a3178663 Binary files /dev/null and b/asset/art/scene/c02/s01_公寓一楼/地面物品反光/地反光4.png differ diff --git a/asset/art/scene/c02/s01_公寓一楼/地面物品反光/地反光4.png.import b/asset/art/scene/c02/s01_公寓一楼/地面物品反光/地反光4.png.import new file mode 100644 index 00000000..05a26dc5 --- /dev/null +++ b/asset/art/scene/c02/s01_公寓一楼/地面物品反光/地反光4.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b7uo33bdiwpl3" +path="res://.godot/imported/地反光4.png-3f550cd6365590626182495f3fccb514.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/scene/c02/s01_公寓一楼/地面物品反光/地反光4.png" +dest_files=["res://.godot/imported/地反光4.png-3f550cd6365590626182495f3fccb514.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/c02/s01_公寓一楼/地面物品反光/地反光5.png b/asset/art/scene/c02/s01_公寓一楼/地面物品反光/地反光5.png new file mode 100644 index 00000000..6f846187 Binary files /dev/null and b/asset/art/scene/c02/s01_公寓一楼/地面物品反光/地反光5.png differ diff --git a/asset/art/scene/c02/s01_公寓一楼/地面物品反光/地反光5.png.import b/asset/art/scene/c02/s01_公寓一楼/地面物品反光/地反光5.png.import new file mode 100644 index 00000000..d572b554 --- /dev/null +++ b/asset/art/scene/c02/s01_公寓一楼/地面物品反光/地反光5.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dtmd13ktss5hk" +path="res://.godot/imported/地反光5.png-f9583ff8f8577d12d79d23be3c010452.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/scene/c02/s01_公寓一楼/地面物品反光/地反光5.png" +dest_files=["res://.godot/imported/地反光5.png-f9583ff8f8577d12d79d23be3c010452.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/c02/s01_公寓一楼/地面物品反光/地反光（加井反光）6.png b/asset/art/scene/c02/s01_公寓一楼/地面物品反光/地反光（加井反光）6.png new file mode 100644 index 00000000..0c3a6390 Binary files /dev/null and b/asset/art/scene/c02/s01_公寓一楼/地面物品反光/地反光（加井反光）6.png differ diff --git a/asset/art/scene/c02/s01_公寓一楼/地面物品反光/地反光（加井反光）6.png.import b/asset/art/scene/c02/s01_公寓一楼/地面物品反光/地反光（加井反光）6.png.import new file mode 100644 index 00000000..2c1433b9 --- /dev/null +++ b/asset/art/scene/c02/s01_公寓一楼/地面物品反光/地反光（加井反光）6.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bx16p7ufxcnul" +path="res://.godot/imported/地反光（加井反光）6.png-ec555f588e9d03bc3795d0266d0976ec.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/scene/c02/s01_公寓一楼/地面物品反光/地反光（加井反光）6.png" +dest_files=["res://.godot/imported/地反光（加井反光）6.png-ec555f588e9d03bc3795d0266d0976ec.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/scene/ground/ground_loader.gd b/scene/ground/ground_loader.gd index ae25f96e..d43729bb 100644 --- a/scene/ground/ground_loader.gd +++ b/scene/ground/ground_loader.gd @@ -32,6 +32,21 @@ static var GROUND_SCENE_PATH_DICT = { "c01_s10": "res://scene/ground/scene/c01/s10_公寓楼道.tscn", "c01_s11": "res://scene/ground/scene/c01/s11_黄包车演出.tscn", "c01_s12": "res://scene/ground/scene/c01/s12_书店外_诡异版.tscn", + "c02_s01": "res://scene/ground/scene/c02/s01_街道.tscn", + "c02_s02": "res://scene/ground/scene/c02/s02_走道.tscn", + "c02_s03": "res://scene/ground/scene/c02/s03_院子_黄昏无人.tscn", + "c02_s04": "res://scene/ground/scene/c02/s04_院子现实版.tscn", + "c02_s05": "res://scene/ground/scene/c02/s05_1012外间现实版.tscn", + "c02_s06": "res://scene/ground/scene/c02/s06_院子_黄昏有人.tscn", + "c02_s07": "res://scene/ground/scene/c02/s07_过道回忆版.tscn", + "c02_s08": "res://scene/ground/scene/c02/s08_1012外间回忆版.tscn", + "c02_s09": "res://scene/ground/scene/c02/s09_1014现实版.tscn", + "c02_s10": "res://scene/ground/scene/c02/s10_裂缝通道.tscn", + "c02_s11": "res://scene/ground/scene/c02/s11_3014回忆版.tscn", + "c02_s12": "res://scene/ground/scene/c02/s12_1014诡异版.tscn", + "c02_s13": "res://scene/ground/scene/c02/s13_院子诡异版.tscn", + "c02_s14": "res://scene/ground/scene/c02/s14_过道诡异版.tscn", + "c02_s15": "res://scene/ground/scene/c02/s15_1014家具版.tscn", } func _ready() -> void: diff --git a/scene/ground/scene/c02/s01_街道.tscn b/scene/ground/scene/c02/s01_街道.tscn index a157f112..6bd47700 100644 --- a/scene/ground/scene/c02/s01_街道.tscn +++ b/scene/ground/scene/c02/s01_街道.tscn @@ -30,7 +30,6 @@ immediately = true position = Vector2(392, 2) target_scene = "c02_s02" target_portal = "left" -status = "opened" [node name="Note寻人启事" parent="Ground/DeployLayer" index="2" instance=ExtResource("3_6lnxd")] position = Vector2(250, -22) diff --git a/scene/ground/scene/c02/s02_走道.tscn b/scene/ground/scene/c02/s02_走道.tscn index 558f821f..584f7156 100644 --- a/scene/ground/scene/c02/s02_走道.tscn +++ b/scene/ground/scene/c02/s02_走道.tscn @@ -1,9 +1,9 @@ -[gd_scene load_steps=24 format=3 uid="uid://brck77w81fhvc"] +[gd_scene load_steps=22 format=3 uid="uid://brck77w81fhvc"] [ext_resource type="PackedScene" uid="uid://dayyx4jerj7io" path="res://scene/ground/ground.tscn" id="1_wrr6r"] [ext_resource type="Script" uid="uid://bfrgnmde3hjn0" path="res://scene/ground/scene/c02/s02_animation.gd" id="2_5p8ev"] -[ext_resource type="Texture2D" uid="uid://tqkhrogci71d" path="res://asset/art/scene/c02/旧版/s02_走道/bg_过道.png" id="2_cn1s8"] [ext_resource type="PackedScene" uid="uid://jr1yd46wm5je" path="res://scene/entity/note.tscn" id="3_fy0o1"] +[ext_resource type="Texture2D" uid="uid://clsj2fcth8ts3" path="res://asset/art/scene/c01/s10_公寓过道/bg_过道夜晚.png" id="3_pga7u"] [ext_resource type="SpriteFrames" uid="uid://b7fhheih1hbvf" path="res://config/animation/entity_sprite_frames.tres" id="4_wbif8"] [ext_resource type="Texture2D" uid="uid://cvgw2mxrlr6io" path="res://asset/art/scene/c02/旧版/s02_走道/ux_进门鼠疫海报yz.png" id="7_wdwbi"] [ext_resource type="Texture2D" uid="uid://5pl1b7cor715" path="res://asset/art/scene/c02/旧版/s02_走道/e_纸人.png" id="7_xsghn"] @@ -13,8 +13,6 @@ [ext_resource type="AudioStream" uid="uid://dq2ndg5yd3rps" path="res://asset/audio/sfx/c02/出现.mp3" id="11_u68d7"] [ext_resource type="PackedScene" uid="uid://ci5anaxsa1apl" path="res://scene/entity/local_inspectable.tscn" id="12_0fckv"] [ext_resource type="PackedScene" uid="uid://cw3q5pvciumil" path="res://scene/entity/interactable.tscn" id="13_ck13g"] -[ext_resource type="Texture2D" uid="uid://c4c7t2lttcf0a" path="res://asset/art/临时草稿/c02_第一章/煤油灯.png" id="14_db4pu"] -[ext_resource type="Texture2D" uid="uid://doqtpiaf1weqc" path="res://asset/art/临时草稿/c02_第一章/煤油灯_点燃.png" id="15_5rpxj"] [ext_resource type="Texture2D" uid="uid://b7gyapghy3tsy" path="res://asset/art/neutral_point_light.png" id="16_asses"] [ext_resource type="AudioStream" uid="uid://dvwiuesd0qi1l" path="res://asset/audio/sfx/ui/门牌互动音.wav" id="16_d08tt"] [ext_resource type="AudioStream" uid="uid://dky3j8lwcy5sk" path="res://asset/audio/sfx/ui/物品查看.mp3" id="17_lqks2"] @@ -62,7 +60,7 @@ player_y = 60 [node name="AnimationPlayer" parent="Ground" index="0"] libraries = { -"": SubResource("AnimationLibrary_fjkfm") +&"": SubResource("AnimationLibrary_fjkfm") } script = ExtResource("2_5p8ev") data = { @@ -73,7 +71,7 @@ oneshot_animation = "oneshot_天冷" [node name="BGSprite2D" parent="Ground" index="2"] position = Vector2(-1, 0) -texture = ExtResource("2_cn1s8") +texture = ExtResource("3_pga7u") [node name="portal_left" parent="Ground/DeployLayer" index="0"] position = Vector2(53, 15) @@ -85,8 +83,7 @@ target_portal = "left" [node name="WindBlows" type="AnimatedSprite2D" parent="Ground/DeployLayer" index="2"] unique_name_in_owner = true -position = Vector2(462, 9) -scale = Vector2(1.2, 1.2) +position = Vector2(394, 23) sprite_frames = ExtResource("4_wbif8") animation = &"c02_吕萍_风吹过" @@ -150,14 +147,12 @@ text = "杂物堆 " [node name="Note老鼠洞" parent="Ground/DeployLayer" index="8" instance=ExtResource("3_fy0o1")] -position = Vector2(510, 60) +position = Vector2(97, 72) title_filter = "c02" note_key = "c02_老鼠洞" [node name="Interactable煤油灯" parent="Ground/DeployLayer" index="9" instance=ExtResource("13_ck13g")] -position = Vector2(334, 69) -texture = ExtResource("14_db4pu") -interacted_texture = ExtResource("15_5rpxj") +position = Vector2(122, -8) prop_key = "prop_火柴" [node name="SfxInvalid" parent="Ground/DeployLayer/Interactable煤油灯" index="0"] diff --git a/scene/ground/scene/c02/s03_院子_黄昏无人.tscn b/scene/ground/scene/c02/s03_院子_黄昏无人.tscn index 8faee9f6..42a7c5e5 100644 --- a/scene/ground/scene/c02/s03_院子_黄昏无人.tscn +++ b/scene/ground/scene/c02/s03_院子_黄昏无人.tscn @@ -1,20 +1,15 @@ -[gd_scene load_steps=16 format=3 uid="uid://djc2uaefhmu7"] +[gd_scene load_steps=14 format=3 uid="uid://djc2uaefhmu7"] [ext_resource type="PackedScene" uid="uid://dayyx4jerj7io" path="res://scene/ground/ground.tscn" id="1_0dylx"] [ext_resource type="Script" uid="uid://dsp5plrdkrsd7" path="res://scene/ground/scene/c02/s03_animation.gd" id="2_dt5aj"] -[ext_resource type="Texture2D" uid="uid://c5xrsf623s0id" path="res://asset/art/scene/c02/旧版/s03_院子切换/bg_院子1楼(黄昏无人).png" id="3_bpjlk"] -[ext_resource type="Texture2D" uid="uid://gfb3g4vj5og0" path="res://asset/art/scene/c02/旧版/s03_院子切换/n_院子1楼(黄昏无人).png" id="4_1g6ks"] +[ext_resource type="Texture2D" uid="uid://7j41vncgcjlp" path="res://asset/art/scene/c02/s01_公寓一楼/bg_一楼.png" id="3_sqv8l"] [ext_resource type="PackedScene" uid="uid://61pis75a8fdq" path="res://scene/entity/portal.tscn" id="5_00b7a"] [ext_resource type="PackedScene" uid="uid://jr1yd46wm5je" path="res://scene/entity/note.tscn" id="6_t48d1"] [ext_resource type="Texture2D" uid="uid://dcnlkhicejjqk" path="res://asset/art/scene/c02/旧版/s04_院子现实版/e_铁门.png" id="8_fqsc2"] [ext_resource type="PackedScene" uid="uid://cw3q5pvciumil" path="res://scene/entity/interactable.tscn" id="8_xt8j0"] [ext_resource type="Texture2D" uid="uid://b343nvvbtpglb" path="res://asset/art/ui/互动提示符/ui 像素版_纯白.png" id="9_c36u3"] [ext_resource type="Texture2D" uid="uid://i16byso2sxio" path="res://asset/art/scene/c02/旧版/s04_院子现实版/e_铁门栏杆背景部分.png" id="9_dck7k"] -[ext_resource type="Texture2D" uid="uid://b72loyn1of7tb" path="res://asset/art/scene/c02/旧版/s04_院子现实版/fg_楼梯.png" id="9_r21bs"] - -[sub_resource type="CanvasTexture" id="CanvasTexture_41q0k"] -diffuse_texture = ExtResource("3_bpjlk") -normal_texture = ExtResource("4_1g6ks") +[ext_resource type="Texture2D" uid="uid://dooaferyy44rs" path="res://asset/art/scene/c02/s01_公寓一楼/e_前侧楼梯.png" id="10_ud2jg"] [sub_resource type="AtlasTexture" id="AtlasTexture_03n47"] atlas = ExtResource("9_c36u3") @@ -38,7 +33,7 @@ script = ExtResource("2_dt5aj") oneshot_animation = "" [node name="BGSprite2D" parent="Ground" index="2"] -texture = SubResource("CanvasTexture_41q0k") +texture = ExtResource("3_sqv8l") [node name="portal_left" parent="Ground/DeployLayer" index="0"] position = Vector2(25, 3) @@ -51,7 +46,6 @@ position = Vector2(2286, 16) [node name="portal_1" parent="Ground/DeployLayer" index="2" instance=ExtResource("5_00b7a")] position = Vector2(193, 14) debug_note = "1012保卫科" -immediately = false portal_name = "1" target_scene = "c02_s05" target_portal = "left" @@ -59,7 +53,7 @@ status = "locked" prop_key = "prop_1012钥匙" [node name="Interactable铁门" parent="Ground/DeployLayer" index="3" instance=ExtResource("8_xt8j0")] -position = Vector2(1072, 22) +position = Vector2(1, 0) texture = ExtResource("8_fqsc2") matched_sign_texture = SubResource("AtlasTexture_03n47") interacted_texture = ExtResource("9_dck7k") @@ -89,7 +83,7 @@ use_parent_material = true [node name="楼梯" type="Sprite2D" parent="Ground/ParallaxForeground/BGParallaxLayer" index="0"] position = Vector2(1250, 2) scale = Vector2(1.05, 1.05) -texture = ExtResource("9_r21bs") +texture = ExtResource("10_ud2jg") [node name="FGSprite2D" parent="Ground/ParallaxForeground/FGParallaxLayer" index="0"] position = Vector2(0, -7) diff --git a/scene/index_page.tscn b/scene/index_page.tscn index a55661e1..3ba5933f 100644 --- a/scene/index_page.tscn +++ b/scene/index_page.tscn @@ -1,9 +1,8 @@ -[gd_scene load_steps=12 format=3 uid="uid://c4ycvdsabi7lw"] +[gd_scene load_steps=11 format=3 uid="uid://c4ycvdsabi7lw"] [ext_resource type="Script" uid="uid://b4rw4hk7ns4m8" path="res://scene/index_page.gd" id="1_c7y7r"] [ext_resource type="Texture2D" uid="uid://bcc0bk34l5gbc" path="res://asset/art/ui/entrance/菜单背景1.png" id="1_jxn4k"] [ext_resource type="PackedScene" uid="uid://c85t6stvytvjn" path="res://scene/entity/general/sfx.tscn" id="2_cac5f"] -[ext_resource type="AudioStream" uid="uid://cvttds81trcoc" path="res://asset/audio/sfx/ui/click.wav" id="3_te6ya"] [ext_resource type="PackedScene" uid="uid://beok2r6fgburn" path="res://scene/settings/settings.tscn" id="4_5m37n"] [sub_resource type="Animation" id="Animation_8kiap"] @@ -66,7 +65,6 @@ mouse_filter = 2 [node name="Sfx" parent="." instance=ExtResource("2_cac5f")] unique_name_in_owner = true -stream = ExtResource("3_te6ya") [node name="TextureRect" type="TextureRect" parent="."] layout_mode = 1 diff --git a/scene/player/main_player.tscn b/scene/player/main_player.tscn index d17bddc4..855a6810 100644 --- a/scene/player/main_player.tscn +++ b/scene/player/main_player.tscn @@ -94,7 +94,7 @@ seconds_per_pause_step = 0.15 [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."] unique_name_in_owner = true light_mask = 9 -scale = Vector2(0.6, 0.6) +scale = Vector2(0.5, 0.5) sprite_frames = ExtResource("2_3w63u") animation = &"c00_吕萍_idle_right" offset = Vector2(0, -100) diff --git a/scene/player/player_animation_config.gd b/scene/player/player_animation_config.gd index 9d6a5ebd..9d98f61c 100644 --- a/scene/player/player_animation_config.gd +++ b/scene/player/player_animation_config.gd @@ -13,7 +13,7 @@ enum { var ANIMATION_CONFIG = { "吕萍": { - "scale": Vector2(0.6, 0.6), + "scale": Vector2(0.5, 0.5), "speed_walking": 60.0, "can_run": true, "speed_runnig": 110.0,