diff --git a/asset/art/gif/c02_盒子猫/frames.tres b/asset/art/gif/c02_盒子猫/frames.tres index 67aed58f..44cc45cd 100644 --- a/asset/art/gif/c02_盒子猫/frames.tres +++ b/asset/art/gif/c02_盒子猫/frames.tres @@ -58,15 +58,15 @@ [ext_resource type="Texture2D" uid="uid://bgn8o0eal45rq" path="res://asset/art/gif/c02_盒子猫/猫钻进盒子/23.png" id="56_d08hu"] [ext_resource type="Texture2D" uid="uid://cgnn3ohqr52uf" path="res://asset/art/gif/c02_盒子猫/盒子猫呼吸/0.png" id="57_jiyar"] [ext_resource type="Texture2D" uid="uid://bn1v0rbsayjuf" path="res://asset/art/gif/c02_盒子猫/盒子猫呼吸/1.png" id="58_n50tg"] -[ext_resource type="Texture2D" uid="uid://b3piexlfdu7cc" path="res://asset/art/gif/c02_盒子猫/盒子猫敲门_r/0.png" id="59_rmfur"] -[ext_resource type="Texture2D" uid="uid://bedsecuscfsu7" path="res://asset/art/gif/c02_盒子猫/盒子猫敲门_r/1.png" id="60_6o7i3"] -[ext_resource type="Texture2D" uid="uid://1mtlgg1y5530" path="res://asset/art/gif/c02_盒子猫/盒子猫敲门_r/2.png" id="61_op3lx"] -[ext_resource type="Texture2D" uid="uid://dqmjk8do1yyao" path="res://asset/art/gif/c02_盒子猫/盒子猫敲门_r/3.png" id="62_ipxgr"] -[ext_resource type="Texture2D" uid="uid://dnfn5wd7wxem7" path="res://asset/art/gif/c02_盒子猫/盒子猫敲门_r/4.png" id="63_7w3n4"] -[ext_resource type="Texture2D" uid="uid://baalnucyg2nv7" path="res://asset/art/gif/c02_盒子猫/盒子猫敲门_r/5.png" id="64_dtscl"] -[ext_resource type="Texture2D" uid="uid://b157f8j4mct6i" path="res://asset/art/gif/c02_盒子猫/盒子猫敲门_r/6.png" id="65_0y53w"] -[ext_resource type="Texture2D" uid="uid://e4t0p0wklkge" path="res://asset/art/gif/c02_盒子猫/盒子猫敲门_r/7.png" id="66_cgxom"] -[ext_resource type="Texture2D" uid="uid://dx4ip6ln68xmn" path="res://asset/art/gif/c02_盒子猫/盒子猫敲门_r/8.png" id="67_4rdjd"] +[ext_resource type="Texture2D" path="res://asset/art/gif/c02_盒子猫/盒子猫敲门/0.png" id="59_cgxom"] +[ext_resource type="Texture2D" path="res://asset/art/gif/c02_盒子猫/盒子猫敲门/1.png" id="60_4rdjd"] +[ext_resource type="Texture2D" path="res://asset/art/gif/c02_盒子猫/盒子猫敲门/2.png" id="61_k62q3"] +[ext_resource type="Texture2D" path="res://asset/art/gif/c02_盒子猫/盒子猫敲门/3.png" id="62_arpr7"] +[ext_resource type="Texture2D" path="res://asset/art/gif/c02_盒子猫/盒子猫敲门/4.png" id="63_gruke"] +[ext_resource type="Texture2D" path="res://asset/art/gif/c02_盒子猫/盒子猫敲门/5.png" id="64_d08hu"] +[ext_resource type="Texture2D" path="res://asset/art/gif/c02_盒子猫/盒子猫敲门/6.png" id="65_a8b84"] +[ext_resource type="Texture2D" path="res://asset/art/gif/c02_盒子猫/盒子猫敲门/7.png" id="66_2juxf"] +[ext_resource type="Texture2D" path="res://asset/art/gif/c02_盒子猫/盒子猫敲门/8.png" id="67_a2nci"] [ext_resource type="Texture2D" uid="uid://55rmstkju630" path="res://asset/art/gif/c02_盒子猫/盒子猫走路/0.png" id="68_cgxom"] [ext_resource type="Texture2D" uid="uid://b2dt0032711li" path="res://asset/art/gif/c02_盒子猫/盒子猫走路/1.png" id="69_4rdjd"] [ext_resource type="Texture2D" uid="uid://b7ewg60u7s2d" path="res://asset/art/gif/c02_盒子猫/盒子猫走路/2.png" id="70_k62q3"] @@ -278,31 +278,31 @@ animations = [{ }, { "frames": [{ "duration": 30.0, -"texture": ExtResource("59_rmfur") +"texture": ExtResource("59_cgxom") }, { "duration": 6.0, -"texture": ExtResource("60_6o7i3") +"texture": ExtResource("60_4rdjd") }, { "duration": 15.0, -"texture": ExtResource("61_op3lx") +"texture": ExtResource("61_k62q3") }, { "duration": 15.0, -"texture": ExtResource("62_ipxgr") +"texture": ExtResource("62_arpr7") }, { "duration": 15.0, -"texture": ExtResource("63_7w3n4") +"texture": ExtResource("63_gruke") }, { "duration": 15.0, -"texture": ExtResource("64_dtscl") +"texture": ExtResource("64_d08hu") }, { "duration": 15.0, -"texture": ExtResource("65_0y53w") +"texture": ExtResource("65_a8b84") }, { "duration": 15.0, -"texture": ExtResource("66_cgxom") +"texture": ExtResource("66_2juxf") }, { "duration": 30.0, -"texture": ExtResource("67_4rdjd") +"texture": ExtResource("67_a2nci") }], "loop": true, "name": &"盒子猫敲门", diff --git a/asset/art/gif/c02_盒子猫/盒子猫敲门/0.png b/asset/art/gif/c02_盒子猫/盒子猫敲门/0.png new file mode 100644 index 00000000..1e0686d0 Binary files /dev/null and b/asset/art/gif/c02_盒子猫/盒子猫敲门/0.png differ diff --git a/asset/art/gif/c02_盒子猫/盒子猫敲门/0.png.import b/asset/art/gif/c02_盒子猫/盒子猫敲门/0.png.import new file mode 100644 index 00000000..d35311ad --- /dev/null +++ b/asset/art/gif/c02_盒子猫/盒子猫敲门/0.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c1x6liekb0xvr" +path="res://.godot/imported/0.png-e788aceb172b8511efb38adce3ac2669.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/gif/c02_盒子猫/盒子猫敲门/0.png" +dest_files=["res://.godot/imported/0.png-e788aceb172b8511efb38adce3ac2669.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/c02_盒子猫/盒子猫敲门/1.png b/asset/art/gif/c02_盒子猫/盒子猫敲门/1.png new file mode 100644 index 00000000..db663de5 Binary files /dev/null and b/asset/art/gif/c02_盒子猫/盒子猫敲门/1.png differ diff --git a/asset/art/gif/c02_盒子猫/盒子猫敲门/1.png.import b/asset/art/gif/c02_盒子猫/盒子猫敲门/1.png.import new file mode 100644 index 00000000..65fd1bda --- /dev/null +++ b/asset/art/gif/c02_盒子猫/盒子猫敲门/1.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dv4bhy4er3gxe" +path="res://.godot/imported/1.png-e6b2e43faa33f502dbfd8c0989650ba9.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/gif/c02_盒子猫/盒子猫敲门/1.png" +dest_files=["res://.godot/imported/1.png-e6b2e43faa33f502dbfd8c0989650ba9.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/c02_盒子猫/盒子猫敲门/2.png b/asset/art/gif/c02_盒子猫/盒子猫敲门/2.png new file mode 100644 index 00000000..81472058 Binary files /dev/null and b/asset/art/gif/c02_盒子猫/盒子猫敲门/2.png differ diff --git a/asset/art/gif/c02_盒子猫/盒子猫敲门/2.png.import b/asset/art/gif/c02_盒子猫/盒子猫敲门/2.png.import new file mode 100644 index 00000000..92c05539 --- /dev/null +++ b/asset/art/gif/c02_盒子猫/盒子猫敲门/2.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://2t2nb8pyvy1j" +path="res://.godot/imported/2.png-8fe4f05e0e1b9656f88c29e193d4d6c1.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/gif/c02_盒子猫/盒子猫敲门/2.png" +dest_files=["res://.godot/imported/2.png-8fe4f05e0e1b9656f88c29e193d4d6c1.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/c02_盒子猫/盒子猫敲门/3.png b/asset/art/gif/c02_盒子猫/盒子猫敲门/3.png new file mode 100644 index 00000000..3c1fd20d Binary files /dev/null and b/asset/art/gif/c02_盒子猫/盒子猫敲门/3.png differ diff --git a/asset/art/gif/c02_盒子猫/盒子猫敲门/3.png.import b/asset/art/gif/c02_盒子猫/盒子猫敲门/3.png.import new file mode 100644 index 00000000..bcdace91 --- /dev/null +++ b/asset/art/gif/c02_盒子猫/盒子猫敲门/3.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cwohcgp8ubcoa" +path="res://.godot/imported/3.png-05d5bdc388e3301b367d60199210f41b.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/gif/c02_盒子猫/盒子猫敲门/3.png" +dest_files=["res://.godot/imported/3.png-05d5bdc388e3301b367d60199210f41b.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/c02_盒子猫/盒子猫敲门/4.png b/asset/art/gif/c02_盒子猫/盒子猫敲门/4.png new file mode 100644 index 00000000..d211585a Binary files /dev/null and b/asset/art/gif/c02_盒子猫/盒子猫敲门/4.png differ diff --git a/asset/art/gif/c02_盒子猫/盒子猫敲门/4.png.import b/asset/art/gif/c02_盒子猫/盒子猫敲门/4.png.import new file mode 100644 index 00000000..26d547fb --- /dev/null +++ b/asset/art/gif/c02_盒子猫/盒子猫敲门/4.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://blmilkq5fjgub" +path="res://.godot/imported/4.png-b9850da5826c73bb460f5c286f75097d.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/gif/c02_盒子猫/盒子猫敲门/4.png" +dest_files=["res://.godot/imported/4.png-b9850da5826c73bb460f5c286f75097d.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/c02_盒子猫/盒子猫敲门/5.png b/asset/art/gif/c02_盒子猫/盒子猫敲门/5.png new file mode 100644 index 00000000..3c1fd20d Binary files /dev/null and b/asset/art/gif/c02_盒子猫/盒子猫敲门/5.png differ diff --git a/asset/art/gif/c02_盒子猫/盒子猫敲门/5.png.import b/asset/art/gif/c02_盒子猫/盒子猫敲门/5.png.import new file mode 100644 index 00000000..5af1033e --- /dev/null +++ b/asset/art/gif/c02_盒子猫/盒子猫敲门/5.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://t2v0x0rig3mc" +path="res://.godot/imported/5.png-5a110813011dce2c0da232cab25821ae.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/gif/c02_盒子猫/盒子猫敲门/5.png" +dest_files=["res://.godot/imported/5.png-5a110813011dce2c0da232cab25821ae.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/c02_盒子猫/盒子猫敲门/6.png b/asset/art/gif/c02_盒子猫/盒子猫敲门/6.png new file mode 100644 index 00000000..d211585a Binary files /dev/null and b/asset/art/gif/c02_盒子猫/盒子猫敲门/6.png differ diff --git a/asset/art/gif/c02_盒子猫/盒子猫敲门/6.png.import b/asset/art/gif/c02_盒子猫/盒子猫敲门/6.png.import new file mode 100644 index 00000000..59214795 --- /dev/null +++ b/asset/art/gif/c02_盒子猫/盒子猫敲门/6.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cexxs4gk8hc3h" +path="res://.godot/imported/6.png-0729d42645d62856d291568400feedce.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/gif/c02_盒子猫/盒子猫敲门/6.png" +dest_files=["res://.godot/imported/6.png-0729d42645d62856d291568400feedce.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/c02_盒子猫/盒子猫敲门/7.png b/asset/art/gif/c02_盒子猫/盒子猫敲门/7.png new file mode 100644 index 00000000..3c1fd20d Binary files /dev/null and b/asset/art/gif/c02_盒子猫/盒子猫敲门/7.png differ diff --git a/asset/art/gif/c02_盒子猫/盒子猫敲门/7.png.import b/asset/art/gif/c02_盒子猫/盒子猫敲门/7.png.import new file mode 100644 index 00000000..a81eb00d --- /dev/null +++ b/asset/art/gif/c02_盒子猫/盒子猫敲门/7.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://u74kcr4q4n10" +path="res://.godot/imported/7.png-581521c3ef78226e7df134bd975f5737.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/gif/c02_盒子猫/盒子猫敲门/7.png" +dest_files=["res://.godot/imported/7.png-581521c3ef78226e7df134bd975f5737.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/c02_盒子猫/盒子猫敲门/8.png b/asset/art/gif/c02_盒子猫/盒子猫敲门/8.png new file mode 100644 index 00000000..81472058 Binary files /dev/null and b/asset/art/gif/c02_盒子猫/盒子猫敲门/8.png differ diff --git a/asset/art/gif/c02_盒子猫/盒子猫敲门/8.png.import b/asset/art/gif/c02_盒子猫/盒子猫敲门/8.png.import new file mode 100644 index 00000000..a488e5ee --- /dev/null +++ b/asset/art/gif/c02_盒子猫/盒子猫敲门/8.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b2yu0ipxwwvpb" +path="res://.godot/imported/8.png-c69e217e9a3840c8b2930751602790e8.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/gif/c02_盒子猫/盒子猫敲门/8.png" +dest_files=["res://.godot/imported/8.png-c69e217e9a3840c8b2930751602790e8.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/dialogue/c01.dialogue.import b/asset/dialogue/c01.dialogue.import index 80a07403..b46bf0c1 100644 --- a/asset/dialogue/c01.dialogue.import +++ b/asset/dialogue/c01.dialogue.import @@ -1,6 +1,7 @@ [remap] -importer="dialogue_manager_compiler_14" +importer="dialogue_manager" +importer_version=15 type="Resource" uid="uid://ckaq073w1lsom" path="res://.godot/imported/c01.dialogue-b05ed36dc2d9792d1c47ce77d6a9f318.tres" diff --git a/asset/dialogue/c03.dialogue.import b/asset/dialogue/c03.dialogue.import index fcac44a0..8d345601 100644 --- a/asset/dialogue/c03.dialogue.import +++ b/asset/dialogue/c03.dialogue.import @@ -1,6 +1,7 @@ [remap] -importer="dialogue_manager_compiler_14" +importer="dialogue_manager" +importer_version=15 type="Resource" uid="uid://b66v5hsf3tdox" path="res://.godot/imported/c03.dialogue-c0384ecbb52edd7836345e985eb72b38.tres" diff --git a/asset/dialogue/c04.dialogue.import b/asset/dialogue/c04.dialogue.import index 0ee524d6..3cfe4502 100644 --- a/asset/dialogue/c04.dialogue.import +++ b/asset/dialogue/c04.dialogue.import @@ -1,6 +1,7 @@ [remap] -importer="dialogue_manager_compiler_14" +importer="dialogue_manager" +importer_version=15 type="Resource" uid="uid://cthsrdkrseijb" path="res://.godot/imported/c04.dialogue-c094c22b3c3a3667c042516fadd04a57.tres" diff --git a/asset/dialogue/c05.dialogue.import b/asset/dialogue/c05.dialogue.import index 7ab3d23b..84120672 100644 --- a/asset/dialogue/c05.dialogue.import +++ b/asset/dialogue/c05.dialogue.import @@ -1,6 +1,7 @@ [remap] -importer="dialogue_manager_compiler_14" +importer="dialogue_manager" +importer_version=15 type="Resource" uid="uid://c2em7wb623pd7" path="res://.godot/imported/c05.dialogue-de8e66d65fcfff540deb26ce3c92b0a4.tres" diff --git a/asset/dialogue/c06.dialogue.import b/asset/dialogue/c06.dialogue.import index 742b1f22..77bd9fec 100644 --- a/asset/dialogue/c06.dialogue.import +++ b/asset/dialogue/c06.dialogue.import @@ -1,6 +1,7 @@ [remap] -importer="dialogue_manager_compiler_14" +importer="dialogue_manager" +importer_version=15 type="Resource" uid="uid://c1bkhblw88ls0" path="res://.godot/imported/c06.dialogue-f47fb4a55575ee069ed7231cadcef83f.tres" diff --git a/asset/dialogue/inspect_content.dialogue.import b/asset/dialogue/inspect_content.dialogue.import index a0407ef5..a8aaa9aa 100644 --- a/asset/dialogue/inspect_content.dialogue.import +++ b/asset/dialogue/inspect_content.dialogue.import @@ -1,6 +1,7 @@ [remap] -importer="dialogue_manager_compiler_14" +importer="dialogue_manager" +importer_version=15 type="Resource" uid="uid://dwykrbeikrpw1" path="res://.godot/imported/inspect_content.dialogue-09f657f194b4dd194c6513cd424f3654.tres" diff --git a/asset/dialogue/npc.dialogue.import b/asset/dialogue/npc.dialogue.import index ef9dad5c..e9d976e7 100644 --- a/asset/dialogue/npc.dialogue.import +++ b/asset/dialogue/npc.dialogue.import @@ -1,6 +1,7 @@ [remap] -importer="dialogue_manager_compiler_14" +importer="dialogue_manager" +importer_version=15 type="Resource" uid="uid://cni46vt7glkes" path="res://.godot/imported/npc.dialogue-359f1bec844cb0f204bacb54e674f48b.tres" diff --git a/manager/event_manager/event_manager.gd b/manager/event_manager/event_manager.gd index 51f05b4f..5315d13b 100644 --- a/manager/event_manager/event_manager.gd +++ b/manager/event_manager/event_manager.gd @@ -42,5 +42,5 @@ extends Node # pass -func prop_interacted(name, prop_key, interacted_times) -> void: - print("Event: %s interacted with %s. total times: %s" % [name, prop_key, interacted_times]) +func prop_interacted(e_name, prop_key, interacted_times) -> void: + print("Event: %s interacted with %s. total times: %s" % [e_name, prop_key, interacted_times]) diff --git a/scene/entity/interactable.gd b/scene/entity/interactable.gd index 17d36c1e..eab943d5 100644 --- a/scene/entity/interactable.gd +++ b/scene/entity/interactable.gd @@ -87,7 +87,7 @@ func _reset_sign_testure_to_prop(): # 根据当前 prop，调整 sign 所显示的 texture -func _set_sign_texture_to_prop(key): +func _set_sign_texture_to_prop(_key): if tried_times == 0: # 首次交互前 unrevealed sign_mark.sprite2d.texture = unrevealed_sign_texture diff --git a/scene/entity/portal.gd b/scene/entity/portal.gd index 0baa79ac..64389527 100644 --- a/scene/entity/portal.gd +++ b/scene/entity/portal.gd @@ -202,7 +202,7 @@ func _reset(_body): # 根据当前 prop，调整 sign 所显示的 texture -func _set_sign_texture_to_prop(key): +func _set_sign_texture_to_prop(_key): # if not prop_key or prop_key == key: # sign_mark.sprite2d.texture = matched_sign_texture # else: diff --git a/scene/ground/ground.gd b/scene/ground/ground.gd index d12e16a7..5b4daaca 100644 --- a/scene/ground/ground.gd +++ b/scene/ground/ground.gd @@ -29,6 +29,8 @@ var footstep_type: String = "硬地面": if is_node_ready(): _load_footstep_audio() +# var main_scene := preload("res://scene/main.tscn") as PackedScene + @onready var player_line = %PlayerLine2D as Line2D @onready var player = %MainPlayer as MainPlayer @onready var directional_light := %DirectionalLight2D as DirectionalLight2D @@ -96,7 +98,8 @@ func _restart_from_main(): ArchiveManager.load_config() ArchiveManager.archive.current_scene = scene_name ArchiveManager.archive.entrance_portal = default_portal - get_tree().change_scene_to_packed.call_deferred(preload("res://scene/main.tscn")) + # get_tree().change_scene_to_packed.call_deferred(main_scene) + get_tree().change_scene_to_file.call_deferred("res://scene/main.tscn") func _reset_player_y(): diff --git a/scene/ground/ground.tscn b/scene/ground/ground.tscn index 277ac327..f8903600 100644 --- a/scene/ground/ground.tscn +++ b/scene/ground/ground.tscn @@ -1,6 +1,7 @@ -[gd_scene load_steps=9 format=3 uid="uid://dayyx4jerj7io"] +[gd_scene load_steps=10 format=3 uid="uid://dayyx4jerj7io"] [ext_resource type="Script" uid="uid://bee4ot74k4wg2" path="res://scene/ground/ground.gd" id="1_0vrlo"] +[ext_resource type="PackedScene" uid="uid://dygvcmykn02n8" path="res://scene/main.tscn" id="2_6ggqv"] [ext_resource type="PackedScene" uid="uid://cjhw5ecygrqty" path="res://scene/player/main_player.tscn" id="3_atha7"] [ext_resource type="PackedScene" uid="uid://61pis75a8fdq" path="res://scene/entity/portal.tscn" id="3_t73yw"] [ext_resource type="PackedScene" uid="uid://cqkeegrcdjyg4" path="res://scene/ground/camera/camera_focus_marker.tscn" id="4_mgk0a"] @@ -23,6 +24,7 @@ height = 500 [node name="Ground" type="Node2D"] script = ExtResource("1_0vrlo") +main_scene = ExtResource("2_6ggqv") [node name="AnimationPlayer" type="AnimationPlayer" parent="."] diff --git a/scene/ground/ground_loader.gd b/scene/ground/ground_loader.gd index 30f222c4..5d3e2aa3 100644 --- a/scene/ground/ground_loader.gd +++ b/scene/ground/ground_loader.gd @@ -1,4 +1,3 @@ -@tool class_name GroundLoader extends Node2D @export_group("Scene") diff --git a/scene/ground/scene/c01/s05_院长房间.tscn b/scene/ground/scene/c01/s05_院长房间.tscn index a4d6d59e..a56046a1 100644 --- a/scene/ground/scene/c01/s05_院长房间.tscn +++ b/scene/ground/scene/c01/s05_院长房间.tscn @@ -640,6 +640,7 @@ metadata/_edit_vertical_guides_ = [-45.0] [node name="Ground" parent="." instance=ExtResource("1_ff4yb")] position = Vector2(1, 0) scene_name = "c01_s05" +main_scene = null [node name="AnimationPlayer" parent="Ground" index="0"] libraries = { diff --git a/scene/ground/scene/c01/s06_孤儿院长廊围墙.tscn b/scene/ground/scene/c01/s06_孤儿院长廊围墙.tscn index d422e879..a73023d5 100644 --- a/scene/ground/scene/c01/s06_孤儿院长廊围墙.tscn +++ b/scene/ground/scene/c01/s06_孤儿院长廊围墙.tscn @@ -116,6 +116,7 @@ metadata/_edit_horizontal_guides_ = [158.0, 91.0, 81.0] [node name="Ground" parent="." instance=ExtResource("1_bitx7")] scene_name = "c01_s06" player_y = 67 +main_scene = null [node name="AnimationPlayer" parent="Ground" index="0"] libraries = { diff --git a/scene/ground/scene/c01/s07_书店外.tscn b/scene/ground/scene/c01/s07_书店外.tscn index 6c006821..867dd1b5 100644 --- a/scene/ground/scene/c01/s07_书店外.tscn +++ b/scene/ground/scene/c01/s07_书店外.tscn @@ -65,6 +65,7 @@ size = Vector2(25, 130) [node name="Ground" parent="." instance=ExtResource("1_2vqpo")] scene_name = "c01_s07" player_y = 55 +main_scene = null [node name="AnimationPlayer" parent="Ground" index="0"] script = ExtResource("2_dhaq4") diff --git a/scene/ground/scene/c01/s08_书店.tscn b/scene/ground/scene/c01/s08_书店.tscn index d885c27f..27cdd930 100644 --- a/scene/ground/scene/c01/s08_书店.tscn +++ b/scene/ground/scene/c01/s08_书店.tscn @@ -52,6 +52,7 @@ position = Vector2(1, 0) [node name="Ground" parent="." instance=ExtResource("1_b3cca")] scene_name = "c01_s08" player_y = 60 +main_scene = null [node name="AnimationPlayer" parent="Ground" index="0"] libraries = { @@ -73,6 +74,7 @@ metadata/_custom_type_script = "uid://rq6w1vuhuq1m" [node name="诡异环境音" type="AudioStreamPlayer" parent="Ground/AnimationPlayer" index="1"] stream = ExtResource("5_eerhd") +autoplay = true bus = &"game_sfx" script = ExtResource("4_p6k3c") mode = "场景背景音" diff --git a/scene/ground/scene/c01/s09_公寓楼外.tscn b/scene/ground/scene/c01/s09_公寓楼外.tscn index f536251f..f13f4306 100644 --- a/scene/ground/scene/c01/s09_公寓楼外.tscn +++ b/scene/ground/scene/c01/s09_公寓楼外.tscn @@ -59,6 +59,7 @@ metadata/_edit_horizontal_guides_ = [120.0, -120.0] [node name="Ground" parent="." instance=ExtResource("1_mrwu5")] scene_name = "c01_s09" player_y = 55 +main_scene = null [node name="AnimationPlayer" parent="Ground" index="0"] script = ExtResource("2_u053j") diff --git a/scene/ground/scene/c01/s10_公寓楼道.tscn b/scene/ground/scene/c01/s10_公寓楼道.tscn index 1fa3a773..2ba0a4af 100644 --- a/scene/ground/scene/c01/s10_公寓楼道.tscn +++ b/scene/ground/scene/c01/s10_公寓楼道.tscn @@ -14,6 +14,7 @@ [node name="Ground" parent="." instance=ExtResource("1_hhs2q")] scene_name = "c01_s10" +main_scene = null [node name="AnimationPlayer" parent="Ground" index="0"] script = ExtResource("2_4kx83") diff --git a/scene/ground/scene/c01/s11_黄包车演出.tscn b/scene/ground/scene/c01/s11_黄包车演出.tscn index d3ca7b3b..e1fc3b82 100644 --- a/scene/ground/scene/c01/s11_黄包车演出.tscn +++ b/scene/ground/scene/c01/s11_黄包车演出.tscn @@ -147,6 +147,7 @@ metadata/_edit_horizontal_guides_ = [120.0] [node name="Ground" parent="." instance=ExtResource("1_1sveo")] scene_name = "c01_s11" player_y = 40 +main_scene = null [node name="AnimationPlayer" parent="Ground" index="0"] libraries = { diff --git a/scene/ground/scene/c01/s12_书店外_诡异版.tscn b/scene/ground/scene/c01/s12_书店外_诡异版.tscn index e1a58ca1..f853e895 100644 --- a/scene/ground/scene/c01/s12_书店外_诡异版.tscn +++ b/scene/ground/scene/c01/s12_书店外_诡异版.tscn @@ -84,6 +84,7 @@ metadata/_edit_horizontal_guides_ = [88.0] [node name="Ground" parent="." instance=ExtResource("1_llw14")] scene_name = "c01_s12" player_y = 60 +main_scene = null [node name="AnimationPlayer" parent="Ground" index="0"] libraries = { diff --git a/scene/ground/scene/c02/s04_保卫科.tscn b/scene/ground/scene/c02/s04_保卫科.tscn index d71a3d8a..8469475d 100644 --- a/scene/ground/scene/c02/s04_保卫科.tscn +++ b/scene/ground/scene/c02/s04_保卫科.tscn @@ -28,6 +28,7 @@ size = Vector2(5, 70) scene_name = "c02_s04" default_portal = "right" player_y = 60 +main_scene = null [node name="AnimationPlayer" parent="Ground" index="0"] script = ExtResource("2_jyere") diff --git a/scene/ground/scene/c02/s05_一楼内侧楼道.tscn b/scene/ground/scene/c02/s05_一楼内侧楼道.tscn index 4238e7a5..e9092737 100644 --- a/scene/ground/scene/c02/s05_一楼内侧楼道.tscn +++ b/scene/ground/scene/c02/s05_一楼内侧楼道.tscn @@ -56,6 +56,7 @@ fill_from = Vector2(0.5, 0.5) [node name="Ground" parent="." instance=ExtResource("1_6w6et")] scene_name = "c02_s05" player_y = 60 +main_scene = null [node name="AnimationPlayer" parent="Ground" index="0"] libraries = { diff --git a/scene/ground/scene/c02/s06_二楼.tscn b/scene/ground/scene/c02/s06_二楼.tscn index da9caad4..298674c6 100644 --- a/scene/ground/scene/c02/s06_二楼.tscn +++ b/scene/ground/scene/c02/s06_二楼.tscn @@ -313,6 +313,7 @@ fill_to = Vector2(1, 1) [node name="Ground" parent="." instance=ExtResource("1_qkymk")] scene_name = "c02_s06" player_y = 60 +main_scene = null [node name="AnimationPlayer" parent="Ground" index="0"] libraries = { diff --git a/scene/ground/scene/c02/s07_二楼内侧楼道.tscn b/scene/ground/scene/c02/s07_二楼内侧楼道.tscn index 0da2a433..05dac9e3 100644 --- a/scene/ground/scene/c02/s07_二楼内侧楼道.tscn +++ b/scene/ground/scene/c02/s07_二楼内侧楼道.tscn @@ -19,6 +19,7 @@ [node name="Ground" parent="." instance=ExtResource("1_oao56")] scene_name = "c02_s07" player_y = 60 +main_scene = null [node name="AnimationPlayer" parent="Ground" index="0"] script = ExtResource("2_t0s64") diff --git a/scene/ground/scene/c02/s08_瞎子卧室.tscn b/scene/ground/scene/c02/s08_瞎子卧室.tscn index 225756d7..7d92836e 100644 --- a/scene/ground/scene/c02/s08_瞎子卧室.tscn +++ b/scene/ground/scene/c02/s08_瞎子卧室.tscn @@ -89,6 +89,7 @@ polygon = PackedVector2Array(541, 57, 540, 119, 717, 118, 717, 114, 545, 115) scene_name = "c02_s08" default_portal = "right" footstep_type = "crawling" +main_scene = null [node name="AnimationPlayer" parent="Ground" index="0"] libraries = { diff --git a/scene/ground/scene/c02/s09_裂缝.tscn b/scene/ground/scene/c02/s09_裂缝.tscn index 7d14dabe..a8f816b0 100644 --- a/scene/ground/scene/c02/s09_裂缝.tscn +++ b/scene/ground/scene/c02/s09_裂缝.tscn @@ -139,6 +139,7 @@ fill_to = Vector2(1, 1) scene_name = "c02_s09" default_portal = "right" footstep_type = "crawling" +main_scene = null [node name="AnimationPlayer" parent="Ground" index="0"] script = ExtResource("2_34a6f") diff --git a/scene/ground/scene/c02/s10_空房间.tscn b/scene/ground/scene/c02/s10_空房间.tscn index 80cb497b..0478ff9c 100644 --- a/scene/ground/scene/c02/s10_空房间.tscn +++ b/scene/ground/scene/c02/s10_空房间.tscn @@ -73,6 +73,7 @@ metadata/_edit_horizontal_guides_ = [87.0, 86.0] scene_name = "c02_s10" default_portal = "1" player_y = 60 +main_scene = null [node name="AnimationPlayer" parent="Ground" index="0"] script = ExtResource("2_egtqi") diff --git a/scene/ground/scene/c02/s12_盒子猫.tscn b/scene/ground/scene/c02/s12_盒子猫.tscn index d1aab52e..a99a4031 100644 --- a/scene/ground/scene/c02/s12_盒子猫.tscn +++ b/scene/ground/scene/c02/s12_盒子猫.tscn @@ -12,6 +12,7 @@ scene_name = "c02_s12" player_y = 85 footstep_type = "盒子猫" +main_scene = null [node name="AnimationPlayer" parent="Ground" index="0"] script = ExtResource("2_7ah3n") diff --git a/scene/ground/scene/c02/s13_盒子猫二楼.tscn b/scene/ground/scene/c02/s13_盒子猫二楼.tscn index 2451f46c..ca60c756 100644 --- a/scene/ground/scene/c02/s13_盒子猫二楼.tscn +++ b/scene/ground/scene/c02/s13_盒子猫二楼.tscn @@ -14,6 +14,7 @@ [node name="Ground" parent="." instance=ExtResource("1_71lma")] scene_name = "c02_s13" footstep_type = "盒子猫" +main_scene = null [node name="AnimationPlayer" parent="Ground" index="0"] script = ExtResource("2_w5nqu") diff --git a/scene/ground/scene/c02/s14_盒子猫二楼内侧.tscn b/scene/ground/scene/c02/s14_盒子猫二楼内侧.tscn index fdbab516..17109fe9 100644 --- a/scene/ground/scene/c02/s14_盒子猫二楼内侧.tscn +++ b/scene/ground/scene/c02/s14_盒子猫二楼内侧.tscn @@ -12,6 +12,7 @@ [node name="Ground" parent="." instance=ExtResource("1_cr1hi")] scene_name = "c02_s14" footstep_type = "盒子猫" +main_scene = null [node name="AnimationPlayer" parent="Ground" index="0"] script = ExtResource("2_o47bv") diff --git a/scene/ground/scene/c02/s15_盒子猫一楼内侧.tscn b/scene/ground/scene/c02/s15_盒子猫一楼内侧.tscn index eecfa9fe..66100fad 100644 --- a/scene/ground/scene/c02/s15_盒子猫一楼内侧.tscn +++ b/scene/ground/scene/c02/s15_盒子猫一楼内侧.tscn @@ -13,6 +13,7 @@ scene_name = "c02_s15" player_y = 60 footstep_type = "盒子猫" +main_scene = null [node name="AnimationPlayer" parent="Ground" index="0"] script = ExtResource("2_etqjj") diff --git a/scene/ground/scene/c02/s16_盒子猫三楼内侧.tscn b/scene/ground/scene/c02/s16_盒子猫三楼内侧.tscn index 7cef977a..0bc779e6 100644 --- a/scene/ground/scene/c02/s16_盒子猫三楼内侧.tscn +++ b/scene/ground/scene/c02/s16_盒子猫三楼内侧.tscn @@ -13,6 +13,7 @@ scene_name = "c02_s16" player_y = 85 footstep_type = "盒子猫" +main_scene = null [node name="AnimationPlayer" parent="Ground" index="0"] script = ExtResource("2_tmnwc") diff --git a/scene/ground/scene/c02/s17_盒子猫三楼.tscn b/scene/ground/scene/c02/s17_盒子猫三楼.tscn index 6501bad8..066b4e1c 100644 --- a/scene/ground/scene/c02/s17_盒子猫三楼.tscn +++ b/scene/ground/scene/c02/s17_盒子猫三楼.tscn @@ -12,6 +12,7 @@ scene_name = "c02_s17" player_y = 85 footstep_type = "盒子猫" +main_scene = null [node name="AnimationPlayer" parent="Ground" index="0"] script = ExtResource("2_e436a") diff --git a/scene/index_page.gd b/scene/index_page.gd index 816fb46e..c5840b92 100644 --- a/scene/index_page.gd +++ b/scene/index_page.gd @@ -1,5 +1,7 @@ extends Control +# var main_scene := preload("res://scene/main.tscn") as PackedScene + @onready var settings = $Settings @onready var animation_player = $AnimationPlayer as AnimationPlayer @onready var animation_root = $AnimationRoot as Control @@ -8,7 +10,6 @@ extends Control @onready var resume_btn = %Resume as Button @onready var quit_btn = %Quit as Button -var main_scene = preload("res://scene/main.tscn") var animation_finished = false @@ -61,7 +62,8 @@ func _on_resume_pressed(): func _enter_main_scene(): - get_tree().change_scene_to_packed(main_scene) + # get_tree().change_scene_to_packed.call_deferred(main_scene) + get_tree().change_scene_to_file.call_deferred("res://scene/main.tscn") func _on_quit_pressed(): diff --git a/scene/little_game/八音盒/八音盒.gd b/scene/little_game/八音盒/八音盒.gd index cc22a339..b6c926de 100644 --- a/scene/little_game/八音盒/八音盒.gd +++ b/scene/little_game/八音盒/八音盒.gd @@ -308,6 +308,7 @@ func _settle_plug_positions(): func _unhandled_input(event: InputEvent) -> void: if event.is_action_pressed("interact") and stage == 2: + get_viewport().set_input_as_handled() # 尝试使用道具 var hud = SceneManager.get_prop_hud() as PropHud var key = SceneManager.get_current_prop(false) @@ -317,3 +318,6 @@ func _unhandled_input(event: InputEvent) -> void: else: # hud 无效shaking hud.on_toggle_invalid_prop() + elif event.is_action_pressed("escape"): + get_viewport().set_input_as_handled() + exit.emit(false)