diff --git a/asset/art/scene/c02/s10_空房间/bg_空房间.png b/asset/art/scene/c02/s10_空房间/bg_空房间.png index c7ff9901..60095978 100644 Binary files a/asset/art/scene/c02/s10_空房间/bg_空房间.png and b/asset/art/scene/c02/s10_空房间/bg_空房间.png differ diff --git a/asset/art/scene/c02/s10_空房间/bg_空房间_ 填充洞口.png b/asset/art/scene/c02/s10_空房间/bg_空房间_ 填充洞口.png new file mode 100644 index 00000000..a7e65bb6 Binary files /dev/null and b/asset/art/scene/c02/s10_空房间/bg_空房间_ 填充洞口.png differ diff --git a/asset/art/scene/c02/s10_空房间/bg_空房间_ 填充洞口.png.import b/asset/art/scene/c02/s10_空房间/bg_空房间_ 填充洞口.png.import new file mode 100644 index 00000000..13f76c1a --- /dev/null +++ b/asset/art/scene/c02/s10_空房间/bg_空房间_ 填充洞口.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://ba57knu57jp3u" +path="res://.godot/imported/bg_空房间_ 填充洞口.png-f9230f4cea98bd9d9c666eb3b9c64200.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/scene/c02/s10_空房间/bg_空房间_ 填充洞口.png" +dest_files=["res://.godot/imported/bg_空房间_ 填充洞口.png-f9230f4cea98bd9d9c666eb3b9c64200.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/s10_空房间/空房间 填充洞口版.png b/asset/art/scene/c02/s10_空房间/空房间 填充洞口版.png deleted file mode 100644 index e5be6715..00000000 Binary files a/asset/art/scene/c02/s10_空房间/空房间 填充洞口版.png and /dev/null differ diff --git a/config/2D_no_navigation.build b/config/2D_no_navigation.build new file mode 100644 index 00000000..5eb7a1dc --- /dev/null +++ b/config/2D_no_navigation.build @@ -0,0 +1,20 @@ +{ + "disabled_build_options": { + "disable_3d": true, + "disable_3d_physics": true, + "disable_navigation": true, + "openxr": false + }, + "disabled_classes": [ + "BaseMaterial3D", + "Curve3D", + "NavigationMeshSourceGeometryData3D", + "Node3D", + "Occluder3D", + "Shape3D", + "Texture3D", + "VisualShaderNodeSample3D", + "World3D" + ], + "type": "build_profile" +} \ No newline at end of file diff --git a/config/animation/entity_sprite_frames.tres b/config/animation/entity_sprite_frames.tres index 0e4f9169..95893803 100644 --- a/config/animation/entity_sprite_frames.tres +++ b/config/animation/entity_sprite_frames.tres @@ -1,4 +1,4 @@ -[gd_resource type="SpriteFrames" load_steps=708 format=3 uid="uid://b7fhheih1hbvf"] +[gd_resource type="SpriteFrames" load_steps=732 format=3 uid="uid://b7fhheih1hbvf"] [ext_resource type="Texture2D" uid="uid://bpqrd6vo3j17m" path="res://asset/art/animation/c00_吕萍_记笔记_right/吕萍-拿本子记录1.png" id="1_6sdvl"] [ext_resource type="Texture2D" uid="uid://dvq64espa37lx" path="res://asset/art/animation/c00_吕萍_idle_left/zhhx1.png" id="1_ekv0l"] @@ -179,61 +179,85 @@ [ext_resource type="Texture2D" uid="uid://caoucs2ygvxuy" path="res://asset/art/animation/c01_捡球男孩_关键帧/45.png" id="99_4a6ae"] [ext_resource type="Texture2D" uid="uid://c7nk4qphjwgpf" path="res://asset/art/gif/c02_公寓过道/中位点火/11.png" id="99_x7vnl"] [ext_resource type="Texture2D" uid="uid://dny3lq6y28j4w" path="res://asset/art/animation/c01_捡球男孩_关键帧/46.png" id="100_jwrjp"] +[ext_resource type="Texture2D" uid="uid://7afxbriyr4ci" path="res://asset/art/gif/c02_保卫科/吕萍被吓倒/0.png" id="100_o6b0r"] +[ext_resource type="Texture2D" uid="uid://xyep86irn1vy" path="res://asset/art/gif/c02_保卫科/吕萍被吓倒/1.png" id="101_c35ms"] [ext_resource type="Texture2D" uid="uid://bue2a7n1v7ajy" path="res://asset/art/animation/c01_捡球男孩_关键帧/47.png" id="101_jilmi"] +[ext_resource type="Texture2D" uid="uid://c6qu2ddn4mmnp" path="res://asset/art/gif/c02_保卫科/吕萍被吓倒/2.png" id="102_7kegf"] [ext_resource type="Texture2D" uid="uid://d18p6cdp0oy1x" path="res://asset/art/animation/c01_捡球男孩_关键帧/48.png" id="102_eckkp"] [ext_resource type="Texture2D" uid="uid://c3udm8t24dvs" path="res://asset/art/animation/c01_捡球男孩_关键帧/49.png" id="103_alpsk"] +[ext_resource type="Texture2D" uid="uid://cm11d5cyi1oke" path="res://asset/art/gif/c02_保卫科/吕萍被吓倒/3.png" id="103_dnl1u"] [ext_resource type="Texture2D" uid="uid://dsg4jpe3n6lsx" path="res://asset/art/animation/c01_小小蝶_idle/1.png" id="103_jh6js"] [ext_resource type="Texture2D" uid="uid://crs1n2aqio70j" path="res://asset/art/animation/c01_小小蝶_idle_l/1.png" id="103_mgc15"] [ext_resource type="Texture2D" uid="uid://b61p12sf2hs7t" path="res://asset/art/animation/c01_小小蝶_idle/2.png" id="104_0kljh"] +[ext_resource type="Texture2D" uid="uid://8rxt2bbs0whq" path="res://asset/art/gif/c02_保卫科/吕萍被吓倒/4.png" id="104_cerh8"] [ext_resource type="Texture2D" uid="uid://doxyf81as417k" path="res://asset/art/animation/c01_捡球男孩_关键帧/50.png" id="104_hsxc4"] [ext_resource type="Texture2D" uid="uid://blcw6mk15h10e" path="res://asset/art/animation/c01_小小蝶_idle_l/2.png" id="104_rybgq"] [ext_resource type="Texture2D" uid="uid://bpylxro1y5tvn" path="res://asset/art/animation/c01_捡球男孩_关键帧/51.png" id="105_ge2kx"] [ext_resource type="Texture2D" uid="uid://8nw3yj1lpi6q" path="res://asset/art/animation/c01_小小蝶_idle_l/3.png" id="105_m6ugl"] +[ext_resource type="Texture2D" uid="uid://dogke52ylv4h2" path="res://asset/art/gif/c02_保卫科/吕萍被吓倒/5.png" id="105_qrnvl"] [ext_resource type="Texture2D" uid="uid://bhe1qean0twob" path="res://asset/art/animation/c01_小小蝶_idle/3.png" id="105_woi41"] +[ext_resource type="Texture2D" uid="uid://bpc7bvy34frs" path="res://asset/art/gif/c02_保卫科/吕萍被吓倒/6.png" id="106_flj6x"] [ext_resource type="Texture2D" uid="uid://cvwjqmt5w5r6f" path="res://asset/art/animation/c01_捡球男孩_关键帧/52.png" id="106_ieprr"] [ext_resource type="Texture2D" uid="uid://b8ok81gitqwvy" path="res://asset/art/animation/c01_小小蝶_running/1.png" id="106_uovoh"] +[ext_resource type="Texture2D" uid="uid://df3o6se6rx0ti" path="res://asset/art/gif/c02_保卫科/吕萍被吓倒/7.png" id="107_g5rsp"] [ext_resource type="Texture2D" uid="uid://lvse3t7ckgym" path="res://asset/art/animation/c01_小小蝶_running/2.png" id="107_me4cf"] [ext_resource type="Texture2D" uid="uid://fpnwvmw2ur1b" path="res://asset/art/animation/c01_捡球男孩_关键帧/53.png" id="107_n01ce"] +[ext_resource type="Texture2D" uid="uid://dv5xm4f08s0nx" path="res://asset/art/gif/c02_保卫科/吕萍被吓倒/8.png" id="108_bdbue"] [ext_resource type="Texture2D" uid="uid://c35kkly3pmrfa" path="res://asset/art/animation/c01_小小蝶_running/3.png" id="108_dd7up"] [ext_resource type="Texture2D" uid="uid://c7qu1u2lcw3x5" path="res://asset/art/animation/c01_捡球男孩_关键帧/54.png" id="108_xgcy0"] [ext_resource type="Texture2D" uid="uid://bjha12tnp4oet" path="res://asset/art/animation/c01_小小蝶_running/4.png" id="109_4nuyr"] [ext_resource type="Texture2D" uid="uid://bcy5hxrwf648t" path="res://asset/art/animation/c01_捡球男孩_关键帧/55.png" id="109_5ckmq"] +[ext_resource type="Texture2D" uid="uid://bte0qlblh8f7d" path="res://asset/art/gif/c02_保卫科/吕萍被吓倒/9.png" id="109_44oos"] [ext_resource type="Texture2D" uid="uid://u14jgyf7bfyg" path="res://asset/art/animation/c01_小小蝶_running_l/1.png" id="109_v6eyj"] [ext_resource type="Texture2D" uid="uid://bplvkgfag6832" path="res://asset/art/animation/c01_捡球男孩_关键帧/56.png" id="110_0dcoe"] [ext_resource type="Texture2D" uid="uid://dph0ltwx82t36" path="res://asset/art/animation/c01_小小蝶_running/5.png" id="110_noni0"] [ext_resource type="Texture2D" uid="uid://1mgx0pl2aa0s" path="res://asset/art/animation/c01_小小蝶_running_l/2.png" id="110_nrq01"] +[ext_resource type="Texture2D" uid="uid://clvp012ioo5pp" path="res://asset/art/gif/c02_保卫科/吕萍被吓倒/10.png" id="110_orc8c"] [ext_resource type="Texture2D" uid="uid://dfy0ppvpvak0f" path="res://asset/art/animation/c01_小小蝶_running/6.png" id="111_8kydk"] [ext_resource type="Texture2D" uid="uid://bmg7jg3y2i55y" path="res://asset/art/animation/c01_小小蝶_running_l/3.png" id="111_arwxu"] +[ext_resource type="Texture2D" uid="uid://c0cli7n4q5og6" path="res://asset/art/gif/c02_保卫科/吕萍被吓倒/11.png" id="111_h2j62"] [ext_resource type="Texture2D" uid="uid://sglkhyuaccig" path="res://asset/art/animation/c01_捡球男孩_关键帧/57.png" id="111_p15br"] +[ext_resource type="Texture2D" uid="uid://vl43jce7oolv" path="res://asset/art/gif/c02_保卫科/吕萍被吓倒/12.png" id="112_6a88i"] [ext_resource type="Texture2D" uid="uid://t4n0jti3t10h" path="res://asset/art/animation/c01_小小蝶_running/7.png" id="112_m4xei"] [ext_resource type="Texture2D" uid="uid://blfpodgbieypt" path="res://asset/art/animation/c01_小小蝶_running_l/4.png" id="112_q7dxw"] [ext_resource type="Texture2D" uid="uid://bi0b2gccwjcef" path="res://asset/art/animation/c01_捡球男孩_关键帧/58.png" id="112_r2dja"] [ext_resource type="Texture2D" uid="uid://btycx3g5vjicq" path="res://asset/art/animation/c01_小小蝶_walking/1.png" id="113_1lrkx"] [ext_resource type="Texture2D" uid="uid://clvlsxtbc7aia" path="res://asset/art/animation/c01_小小蝶_running_l/5.png" id="113_36gw6"] [ext_resource type="Texture2D" uid="uid://byormpqai8ugc" path="res://asset/art/animation/c01_捡球男孩_关键帧/59.png" id="113_a8pao"] +[ext_resource type="Texture2D" uid="uid://d4co8pt8ittaq" path="res://asset/art/gif/c02_保卫科/吕萍被吓倒/13.png" id="113_dt0ta"] [ext_resource type="Texture2D" uid="uid://cuwduag0vjtwe" path="res://asset/art/animation/c01_捡球男孩_关键帧/60.png" id="114_2m6mm"] [ext_resource type="Texture2D" uid="uid://c6tiksw8552bs" path="res://asset/art/animation/c01_小小蝶_running_l/6.png" id="114_7cu0w"] [ext_resource type="Texture2D" uid="uid://cn1o5gf3evo4a" path="res://asset/art/animation/c01_小小蝶_walking/2.png" id="114_i8ndl"] +[ext_resource type="Texture2D" uid="uid://bxk6l3b2yleqq" path="res://asset/art/gif/c02_保卫科/吕萍被吓倒/14.png" id="114_oq26j"] +[ext_resource type="Texture2D" uid="uid://cjcrb4lt1x6yw" path="res://asset/art/gif/c02_保卫科/吕萍被吓倒/15.png" id="115_ca8s5"] [ext_resource type="Texture2D" uid="uid://di1c4xqcj820" path="res://asset/art/animation/c01_捡球男孩_关键帧/61.png" id="115_ct7bj"] [ext_resource type="Texture2D" uid="uid://kxdbmy38b6p8" path="res://asset/art/animation/c01_小小蝶_walking/3.png" id="115_gfdtf"] [ext_resource type="Texture2D" uid="uid://c0kxv1ffcgbv" path="res://asset/art/animation/c01_小小蝶_running_l/7.png" id="115_ink27"] [ext_resource type="Texture2D" uid="uid://cqbf4xy8l4i4e" path="res://asset/art/animation/c01_红光鬼差_idle/1.png" id="116_4yqm5"] [ext_resource type="Texture2D" uid="uid://bjjy1tr14buvt" path="res://asset/art/animation/c01_小小蝶_walking/4.png" id="116_ql6a7"] +[ext_resource type="Texture2D" uid="uid://b5mf38gpodk48" path="res://asset/art/gif/c02_保卫科/吕萍被吓倒/16.png" id="116_vrcrs"] [ext_resource type="Texture2D" uid="uid://bgdhacvhlcyeo" path="res://asset/art/animation/c01_小小蝶_walking/5.png" id="117_1a4yh"] [ext_resource type="Texture2D" uid="uid://vw20785ra024" path="res://asset/art/animation/c01_红光鬼差_idle/2.png" id="117_sve2i"] +[ext_resource type="Texture2D" uid="uid://bhb0wjmh13tgv" path="res://asset/art/gif/c02_保卫科/吕萍被吓倒/17.png" id="117_uroo7"] [ext_resource type="Texture2D" uid="uid://dmr3yvekm84ro" path="res://asset/art/animation/c01_小小蝶_walking/6.png" id="118_2n8cs"] [ext_resource type="Texture2D" uid="uid://bj3t0eww30nxo" path="res://asset/art/animation/c01_红光鬼差_idle/3.png" id="118_3t3jm"] +[ext_resource type="Texture2D" uid="uid://csniqutfl3mo8" path="res://asset/art/gif/c02_保卫科/吕萍被吓倒/18.png" id="118_neg2b"] [ext_resource type="Texture2D" uid="uid://b3m2emk6200e4" path="res://asset/art/animation/c01_红光鬼差_idle/4.png" id="119_c788p"] [ext_resource type="Texture2D" uid="uid://bm3ujtla2cda6" path="res://asset/art/animation/c01_小小蝶_抬头/1.png" id="119_gj714"] +[ext_resource type="Texture2D" uid="uid://d254dtqi5w18a" path="res://asset/art/gif/c02_保卫科/吕萍被吓倒/19.png" id="119_rneg4"] [ext_resource type="Texture2D" uid="uid://bkitf7aeqaukm" path="res://asset/art/animation/c01_红光鬼差_walking/1.png" id="120_8xd4v"] [ext_resource type="Texture2D" uid="uid://c80io8x164uj5" path="res://asset/art/animation/c01_小小蝶_抬头/2.png" id="120_ibyv5"] +[ext_resource type="Texture2D" uid="uid://c10k7l0qnoiu2" path="res://asset/art/gif/c02_保卫科/吕萍被吓倒/20.png" id="120_pwgpx"] [ext_resource type="Texture2D" uid="uid://mpno04id8lrn" path="res://asset/art/animation/c01_红光鬼差_walking/2.png" id="121_82k8o"] [ext_resource type="Texture2D" uid="uid://dgu5e2infy68w" path="res://asset/art/animation/c01_小小蝶_抬头/3.png" id="121_y4tby"] +[ext_resource type="Texture2D" uid="uid://bt2k560dcwe8b" path="res://asset/art/gif/c02_保卫科/吕萍被吓倒/21.png" id="121_y13bn"] +[ext_resource type="Texture2D" uid="uid://76s6xq20e7b4" path="res://asset/art/gif/c02_保卫科/吕萍被吓倒/22.png" id="122_cs3vs"] [ext_resource type="Texture2D" uid="uid://l0py275mlyhc" path="res://asset/art/animation/c01_红光鬼差_walking/3.png" id="122_rmksf"] [ext_resource type="Texture2D" uid="uid://drevimrar2ss5" path="res://asset/art/animation/c01_小小蝶_抬头/4.png" id="122_wi84v"] [ext_resource type="Texture2D" uid="uid://bug0ummiipg6d" path="res://asset/art/animation/c01_小小蝶_walking （8帧-317px高）/1.png" id="123_1rifq"] [ext_resource type="Texture2D" uid="uid://i4hylmfdrjmh" path="res://asset/art/animation/c01_红光鬼差_walking/4.png" id="123_4v81v"] [ext_resource type="Texture2D" uid="uid://b8biat4ueevh" path="res://asset/art/animation/c01_小小蝶_抬头/5.png" id="123_aidva"] +[ext_resource type="Texture2D" uid="uid://dne8xs5ssscmo" path="res://asset/art/gif/c02_保卫科/吕萍被吓倒/23.png" id="123_wm8vb"] [ext_resource type="Texture2D" uid="uid://k86qjq6auc85" path="res://asset/art/animation/c01_车夫_idle/1.png" id="124_ddngu"] [ext_resource type="Texture2D" uid="uid://dy8xixgytw3fc" path="res://asset/art/animation/c01_小小蝶_walking （8帧-317px高）/2.png" id="124_f05ht"] [ext_resource type="Texture2D" uid="uid://dcss70cml36cx" path="res://asset/art/animation/c01_小小蝶_抬头/6.png" id="124_ndtdx"] @@ -1095,6 +1119,83 @@ animations = [{ "speed": 30.0 }, { "frames": [{ +"duration": 5.5, +"texture": ExtResource("100_o6b0r") +}, { +"duration": 5.5, +"texture": ExtResource("101_c35ms") +}, { +"duration": 5.5, +"texture": ExtResource("102_7kegf") +}, { +"duration": 5.5, +"texture": ExtResource("103_dnl1u") +}, { +"duration": 5.5, +"texture": ExtResource("104_cerh8") +}, { +"duration": 5.5, +"texture": ExtResource("105_qrnvl") +}, { +"duration": 5.5, +"texture": ExtResource("106_flj6x") +}, { +"duration": 5.5, +"texture": ExtResource("107_g5rsp") +}, { +"duration": 5.5, +"texture": ExtResource("108_bdbue") +}, { +"duration": 5.5, +"texture": ExtResource("109_44oos") +}, { +"duration": 5.5, +"texture": ExtResource("110_orc8c") +}, { +"duration": 5.5, +"texture": ExtResource("111_h2j62") +}, { +"duration": 5.5, +"texture": ExtResource("112_6a88i") +}, { +"duration": 5.5, +"texture": ExtResource("113_dt0ta") +}, { +"duration": 5.5, +"texture": ExtResource("114_oq26j") +}, { +"duration": 5.5, +"texture": ExtResource("115_ca8s5") +}, { +"duration": 5.5, +"texture": ExtResource("116_vrcrs") +}, { +"duration": 5.5, +"texture": ExtResource("117_uroo7") +}, { +"duration": 5.5, +"texture": ExtResource("118_neg2b") +}, { +"duration": 5.5, +"texture": ExtResource("119_rneg4") +}, { +"duration": 5.5, +"texture": ExtResource("120_pwgpx") +}, { +"duration": 5.5, +"texture": ExtResource("121_y13bn") +}, { +"duration": 5.5, +"texture": ExtResource("122_cs3vs") +}, { +"duration": 5.5, +"texture": ExtResource("123_wm8vb") +}], +"loop": false, +"name": &"c00_吕萍_背向吓倒", +"speed": 30.0 +}, { +"frames": [{ "duration": 1.0, "texture": ExtResource("1_6sdvl") }, { diff --git a/scene/entity/ux/sign.tscn b/scene/entity/ux/sign.tscn index 89b7be5d..39f1bf7c 100644 --- a/scene/entity/ux/sign.tscn +++ b/scene/entity/ux/sign.tscn @@ -6,7 +6,7 @@ [node name="Sign" type="Control"] layout_mode = 3 anchors_preset = 0 -scale = Vector2(0.15, 0.15) +scale = Vector2(0.1, 0.1) size_flags_horizontal = 4 size_flags_vertical = 4 mouse_filter = 2 diff --git a/scene/ground/scene/c02/s03_院子.tscn b/scene/ground/scene/c02/s03_院子.tscn index 80852a80..34901573 100644 --- a/scene/ground/scene/c02/s03_院子.tscn +++ b/scene/ground/scene/c02/s03_院子.tscn @@ -400,42 +400,36 @@ frame = 4 [node name="煤油灯" parent="Ground/DeployLayer" index="10" instance=ExtResource("10_jme4f")] position = Vector2(290, 1) mute_when_interacted = false -interacted_texture = null [node name="煤油灯2" parent="Ground/DeployLayer" index="11" instance=ExtResource("10_jme4f")] position = Vector2(610, 1) gaslight_texture = ExtResource("11_g0qhj") ground_light_texture = ExtResource("12_ni5ro") mute_when_interacted = false -interacted_texture = null [node name="煤油灯3" parent="Ground/DeployLayer" index="12" instance=ExtResource("10_jme4f")] position = Vector2(857, 1) gaslight_texture = ExtResource("13_hw832") ground_light_texture = ExtResource("14_7pq5y") mute_when_interacted = false -interacted_texture = null [node name="煤油灯4" parent="Ground/DeployLayer" index="13" instance=ExtResource("10_jme4f")] position = Vector2(1644, -1) gaslight_texture = ExtResource("15_pcpki") ground_light_texture = ExtResource("16_4n8vm") mute_when_interacted = false -interacted_texture = null [node name="煤油灯5" parent="Ground/DeployLayer" index="14" instance=ExtResource("10_jme4f")] position = Vector2(1887, 0) gaslight_texture = ExtResource("17_hw832") ground_light_texture = ExtResource("18_7pq5y") mute_when_interacted = false -interacted_texture = null [node name="煤油灯6" parent="Ground/DeployLayer" index="15" instance=ExtResource("10_jme4f")] position = Vector2(2059, 1) gaslight_texture = ExtResource("19_pcpki") ground_light_texture = ExtResource("20_4n8vm") mute_when_interacted = false -interacted_texture = null [node name="井" type="Sprite2D" parent="Ground/DeployLayer" index="16"] light_mask = 5 diff --git a/scene/ground/scene/c02/s04_animation.gd b/scene/ground/scene/c02/s04_animation.gd index 5cbd593e..80b279e0 100644 --- a/scene/ground/scene/c02/s04_animation.gd +++ b/scene/ground/scene/c02/s04_animation.gd @@ -15,12 +15,28 @@ func _ready() -> void: return var closeup_tin_coin +var little_hand + func _on_ground_ready() -> void: closeup_tin_coin = $"../DeployLayer/Closeup折锡纸" as Closeup2D if data.tin_coin_collected: closeup_tin_coin.enabled = false else: closeup_tin_coin.exit.connect(_on_closeup_tin_coin_exited) + + little_hand = $"../DeployLayer/小手讨东西" + if little_hand.tried_times == 0: + little_hand.interacted.connect(_on_little_hand_first_interacted, CONNECT_ONE_SHOT) + +func _on_little_hand_first_interacted() -> void: + # 9 小手交互，吓摔倒 + little_hand.enabled = false + var duration = 3.0 + SceneManager.freeze_player(duration, 9) + await get_tree().create_timer(duration).timeout + SceneManager.release_player() + + little_hand.enabled = true func _on_closeup_tin_coin_exited(arg = null): if arg == true: diff --git a/scene/ground/scene/c02/s04_保卫科.tscn b/scene/ground/scene/c02/s04_保卫科.tscn index 4f8c6534..5efd4ac6 100644 --- a/scene/ground/scene/c02/s04_保卫科.tscn +++ b/scene/ground/scene/c02/s04_保卫科.tscn @@ -88,7 +88,7 @@ texture = ExtResource("6_tio43") points = PackedVector2Array(70, 150, 495, 150) [node name="DirectionalLight2D" parent="Ground" index="9"] -energy = 0.7 +energy = 0.9 blend_mode = 1 [editable path="Ground"] diff --git a/scene/ground/scene/c02/s05_一楼内侧楼道.tscn b/scene/ground/scene/c02/s05_一楼内侧楼道.tscn index 6f906e80..a1c8c9f7 100644 --- a/scene/ground/scene/c02/s05_一楼内侧楼道.tscn +++ b/scene/ground/scene/c02/s05_一楼内侧楼道.tscn @@ -170,7 +170,7 @@ texture = ExtResource("8_tueh3") points = PackedVector2Array(37, 150, 700, 150) [node name="DirectionalLight2D" parent="Ground" index="9"] -energy = 0.85 +energy = 0.9 blend_mode = 1 [editable path="Ground"] diff --git a/scene/ground/scene/c02/s06_二楼.tscn b/scene/ground/scene/c02/s06_二楼.tscn index 92582112..94ee15f1 100644 --- a/scene/ground/scene/c02/s06_二楼.tscn +++ b/scene/ground/scene/c02/s06_二楼.tscn @@ -354,7 +354,7 @@ texture = ExtResource("5_26mqt") points = PackedVector2Array(37, 150, 900, 150) [node name="DirectionalLight2D" parent="Ground" index="9"] -energy = 0.8 +energy = 0.9 blend_mode = 1 [editable path="Ground"] diff --git a/scene/ground/scene/c02/s07_animation.gd b/scene/ground/scene/c02/s07_animation.gd index 2d7c6908..fe2445cc 100644 --- a/scene/ground/scene/c02/s07_animation.gd +++ b/scene/ground/scene/c02/s07_animation.gd @@ -22,10 +22,18 @@ func _on_ground_ready() -> void: take_off_flyer(true) -func take_off_flyer(mute = false): +func take_off_flyer(immediatelly = false): flyer.enabled = false - flyer.visible = false - $"../DeployLayer/小手讨东西".enabled = true - if not mute: + if not immediatelly: #TODO SceneManager.pop_debug_dialog_info("美术&音效", "撕下海报") + var tween = create_tween() + tween.tween_property(flyer, "modulate:a", 0.0, 1.0) + await tween.finished + else: + flyer.visible = false + var hand = $"../DeployLayer/小手讨东西" + hand.enabled = true + if hand.tried_times == 0: + hand.tried_times += 1 + hand.do_first_interact(immediatelly) diff --git a/scene/ground/scene/c02/s07_二楼内侧楼道.tscn b/scene/ground/scene/c02/s07_二楼内侧楼道.tscn index af6af831..047b5748 100644 --- a/scene/ground/scene/c02/s07_二楼内侧楼道.tscn +++ b/scene/ground/scene/c02/s07_二楼内侧楼道.tscn @@ -72,7 +72,7 @@ texture = null points = PackedVector2Array(37, 150, 610, 150) [node name="DirectionalLight2D" parent="Ground" index="9"] -energy = 0.85 +energy = 0.9 blend_mode = 1 [editable path="Ground"] diff --git a/scene/ground/scene/c02/s10_animation.gd b/scene/ground/scene/c02/s10_animation.gd index 5880bb4a..2c2dc1ec 100644 --- a/scene/ground/scene/c02/s10_animation.gd +++ b/scene/ground/scene/c02/s10_animation.gd @@ -26,8 +26,6 @@ var wood_puppet: Pickable2D var catty_head: Pickable2D var door: Portal2D var portal: Portal2D -var portal_block: Sprite2D - func _on_ground_ready() -> void: xiao_chan_sprite = $"../DeployLayer/大头小蝉" @@ -37,10 +35,11 @@ func _on_ground_ready() -> void: catty_head = $"../DeployLayer/Pickable小猫玩具脑袋" door = $"../DeployLayer/portal_left" portal = $"../DeployLayer/portal_1" - portal_block = $"../DeployLayer/墙壁封住" - #TODO 更新贴图 进过瞎子卧室后，通道关闭 - portal_block.visible = ArchiveManager.get_global_value("c02_the_blind_room_entered", false) + # 进过瞎子卧室后，通道关闭 + if ArchiveManager.get_global_value("c02_the_blind_room_entered"): + # 遮挡的空房间 + $"../BGSprite2D".texture = preload("uid://ba57knu57jp3u") door.before_pre_transport_wait.connect(_on_leave_room) diff --git a/scene/ground/scene/c02/s10_空房间.tscn b/scene/ground/scene/c02/s10_空房间.tscn index 87d769f6..de673761 100644 --- a/scene/ground/scene/c02/s10_空房间.tscn +++ b/scene/ground/scene/c02/s10_空房间.tscn @@ -1,10 +1,9 @@ -[gd_scene load_steps=27 format=3 uid="uid://dny21yhtuteap"] +[gd_scene load_steps=26 format=3 uid="uid://dny21yhtuteap"] [ext_resource type="PackedScene" uid="uid://dayyx4jerj7io" path="res://scene/ground/ground.tscn" id="1_w7j0m"] [ext_resource type="Script" uid="uid://dkkey7qillk15" path="res://scene/ground/scene/c02/s10_animation.gd" id="2_egtqi"] [ext_resource type="Texture2D" uid="uid://molvyfyy63ik" path="res://asset/art/scene/c02/s10_空房间/bg_空房间.png" id="3_ox8et"] [ext_resource type="PackedScene" uid="uid://61pis75a8fdq" path="res://scene/entity/portal.tscn" id="4_pde4i"] -[ext_resource type="Texture2D" uid="uid://dfrna7s54j3or" path="res://asset/art/scene/c02/s10_空房间/填充洞口.png" id="5_2j5dr"] [ext_resource type="PackedScene" uid="uid://cw3q5pvciumil" path="res://scene/entity/interactable.tscn" id="5_ylhfc"] [ext_resource type="PackedScene" uid="uid://dsa6frlw6e6gg" path="res://scene/entity/pickable.tscn" id="6_27dvh"] [ext_resource type="Texture2D" uid="uid://cuno8okh8ytw2" path="res://asset/art/scene/c02/s10_空房间/柜子.png" id="6_mty8e"] @@ -211,18 +210,14 @@ target_scene = "c02_s09" target_portal = "right" matched_sign_texture = null -[node name="墙壁封住" type="Sprite2D" parent="Ground/DeployLayer" index="3"] -position = Vector2(356, 35.9719) -texture = ExtResource("5_2j5dr") - -[node name="血脚印" type="AnimatedSprite2D" parent="Ground/DeployLayer" index="4"] -position = Vector2(268, 21.6907) +[node name="血脚印" type="AnimatedSprite2D" parent="Ground/DeployLayer" index="3"] +position = Vector2(269, 34.5079) sprite_frames = ExtResource("15_2j5dr") animation = &"空房间血脚印" frame = 8 -[node name="Pickable小猫玩具脑袋" parent="Ground/DeployLayer" index="5" instance=ExtResource("6_27dvh")] -position = Vector2(364, 66.058) +[node name="Pickable小猫玩具脑袋" parent="Ground/DeployLayer" index="4" instance=ExtResource("6_27dvh")] +position = Vector2(364, 70.9877) enabled = false visible_follow_enabled = false prop_key = "prop_小猫玩具的脑袋" @@ -234,28 +229,28 @@ rotation = -1.51912 scale = Vector2(0.478293, 0.562214) texture = ExtResource("8_3ftnp") -[node name="Interactable柜子" parent="Ground/DeployLayer" index="6" instance=ExtResource("5_ylhfc")] +[node name="Interactable柜子" parent="Ground/DeployLayer" index="5" instance=ExtResource("5_ylhfc")] position = Vector2(364, 44.3673) texture = ExtResource("6_mty8e") enabled = false mute_when_interacted = true one_shot = false -[node name="大头小蝉" type="AnimatedSprite2D" parent="Ground/DeployLayer" index="7"] +[node name="大头小蝉" type="AnimatedSprite2D" parent="Ground/DeployLayer" index="6"] self_modulate = Color(0.80687, 0.80687, 0.80687, 1) -position = Vector2(351, 19.7188) +position = Vector2(351, 24.6485) scale = Vector2(0.9, 0.9) sprite_frames = ExtResource("15_2j5dr") animation = &"坐箱子小婵丢人偶" -[node name="Interactable小蝉" parent="Ground/DeployLayer" index="8" instance=ExtResource("5_ylhfc")] -position = Vector2(349, 13.8032) +[node name="Interactable小蝉" parent="Ground/DeployLayer" index="7" instance=ExtResource("5_ylhfc")] +position = Vector2(349, 18.7329) mute_when_interacted = true disable_prop_after_interacted = true prop_key = "prop_木头人偶" -[node name="Pickable木头人偶" parent="Ground/DeployLayer" index="9" instance=ExtResource("6_27dvh")] -position = Vector2(423, 87.7487) +[node name="Pickable木头人偶" parent="Ground/DeployLayer" index="8" instance=ExtResource("6_27dvh")] +position = Vector2(423, 92.6784) enabled = false prop_key = "prop_木头人偶" @@ -265,15 +260,14 @@ rotation = -1.19178 scale = Vector2(0.25, 0.25) texture = ExtResource("12_27dvh") -[node name="煤油灯" parent="Ground/DeployLayer" index="10" instance=ExtResource("13_27dvh")] -position = Vector2(373, -10.8453) +[node name="煤油灯" parent="Ground/DeployLayer" index="9" instance=ExtResource("13_27dvh")] +position = Vector2(373, -15.775) gaslight_energy = 2.0 gaslight_ground_energy = 2.0 debug_light_switch = true mute_when_interacted = false -interacted_texture = null -[node name="拼接小猫玩具" type="AnimatedSprite2D" parent="Ground/DeployLayer" index="11"] +[node name="拼接小猫玩具" type="AnimatedSprite2D" parent="Ground/DeployLayer" index="10"] visible = false light_mask = 32 z_index = 10 @@ -290,14 +284,14 @@ position = Vector2(3, -0.98594) range_item_cull_mask = 32 texture = ExtResource("15_e24j0") -[node name="Ambush首次进入血脚印" parent="Ground/DeployLayer" index="12" instance=ExtResource("14_3ftnp")] +[node name="Ambush首次进入血脚印" parent="Ground/DeployLayer" index="11" instance=ExtResource("14_3ftnp")] position = Vector2(192, 38.4517) freeze_time = 0.1 hook_method = "first_enter_ambush" -[node name="小蜡烛" type="AnimatedSprite2D" parent="Ground/DeployLayer" index="13"] +[node name="小蜡烛" type="AnimatedSprite2D" parent="Ground/DeployLayer" index="12"] self_modulate = Color(0.611765, 0.611765, 0.611765, 1) -position = Vector2(271, 64.0861) +position = Vector2(271, 72.9595) sprite_frames = SubResource("SpriteFrames_th1ek") autoplay = "default" frame_progress = 0.72851 diff --git a/scene/ground/script/c02/s00_煤油灯.tscn b/scene/ground/script/c02/s00_煤油灯.tscn index 9d22e3f4..9fe26fe5 100644 --- a/scene/ground/script/c02/s00_煤油灯.tscn +++ b/scene/ground/script/c02/s00_煤油灯.tscn @@ -75,8 +75,8 @@ texture = ExtResource("10_h0ajm") [node name="Sign" parent="." instance=ExtResource("4_w1aco")] unique_name_in_owner = true modulate = Color(1, 1, 1, 0) -offset_top = -3.0 -offset_bottom = -3.0 +offset_top = -20.0 +offset_bottom = -20.0 [node name="Sprite2D" parent="Sign/TextureContainer" index="0"] texture = SubResource("AtlasTexture_66xfe") diff --git a/scene/ground/script/c02/小手讨东西.gd b/scene/ground/script/c02/小手讨东西.gd index baa329e5..806a0678 100644 --- a/scene/ground/script/c02/小手讨东西.gd +++ b/scene/ground/script/c02/小手讨东西.gd @@ -1,6 +1,8 @@ @tool extends Sprite2D +signal interacted + # 0保卫科 1二楼内侧 @export_enum("保卫科", "二楼内侧") var id := 0 @export var enabled := true: @@ -74,6 +76,9 @@ func _ready() -> void: animated_sprite.play("小手_老虎钳_idle") elif is_holding_cup: animated_sprite.play("小手_纸杯_idle") + elif tried_times > 0: + animated_sprite.play("小手_show") + coin = get_node("Pickable元宝") tin_coin_drop = ground_archive.get_value(name, "tin_coin_drop", false) @@ -89,13 +94,10 @@ func _reset(_body = null) -> void: # 在场景中调用该方法，可以跳过小手初次交互的伸出过程 func do_first_interact(immediatelly := false): - if tried_times > 0: - return if immediatelly: animated_sprite.play("小手_idle") else: animated_sprite.play("小手_show") - await get_tree().create_timer(2).timeout _reset_sign_testure_to_prop() @@ -144,8 +146,9 @@ var communicating = false func _on_interacted() -> void: if not interact_mutex.try_lock(): return + interacted.emit() tried_times += 1 - if tried_times == 0: + if tried_times == 1: do_first_interact(false) return if holding_prop != "": diff --git a/scene/ground/script/c02/小手讨东西.tscn b/scene/ground/script/c02/小手讨东西.tscn index 8d8a8f97..c3305b04 100644 --- a/scene/ground/script/c02/小手讨东西.tscn +++ b/scene/ground/script/c02/小手讨东西.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=18 format=3 uid="uid://xovlfee503a4"] +[gd_scene load_steps=16 format=3 uid="uid://xovlfee503a4"] [ext_resource type="Texture2D" uid="uid://cawpq7rnho5px" path="res://asset/art/scene/c02/小手/洞.png" id="1_47cqy"] [ext_resource type="Script" uid="uid://my5xqi3bkka6" path="res://scene/ground/script/c02/小手讨东西.gd" id="1_n7thl"] @@ -9,7 +9,6 @@ [ext_resource type="AudioStream" uid="uid://ccng5y2fip6mc" path="res://asset/audio/sfx/ui/开锁声.mp3" id="4_brfob"] [ext_resource type="PackedScene" uid="uid://c4tipnj1cr1j3" path="res://scene/entity/ux/sign.tscn" id="5_3c204"] [ext_resource type="Texture2D" uid="uid://gui0ubwlwoi0" path="res://asset/art/ui/action_mark/UI手.png" id="5_n2hq3"] -[ext_resource type="Texture2D" uid="uid://b343nvvbtpglb" path="res://asset/art/ui/互动提示符/ui 像素版_纯白.png" id="6_r12o8"] [ext_resource type="PackedScene" uid="uid://b50n0hvs4yh75" path="res://addons/property-inspector/pro_animation_sprite2d/pro_animated_sprite.tscn" id="7_brfob"] [ext_resource type="AudioStream" uid="uid://bplhqap5ydh7v" path="res://asset/audio/BGM/摇啊摇_人声.wav" id="7_yatcw"] [ext_resource type="SpriteFrames" uid="uid://b6nvwset1hwbv" path="res://asset/art/gif/c02_小手/frames.tres" id="9_yatcw"] @@ -20,10 +19,6 @@ resource_local_to_scene = true size = Vector2(10, 70) -[sub_resource type="AtlasTexture" id="AtlasTexture_47cqy"] -atlas = ExtResource("6_r12o8") -region = Rect2(762, 468, 63, 63) - [node name="小手讨东西" type="Sprite2D"] texture = ExtResource("1_47cqy") script = ExtResource("1_n7thl") @@ -84,11 +79,12 @@ action_configs = Array[Dictionary]([{ [node name="Sign" parent="." instance=ExtResource("5_3c204")] unique_name_in_owner = true -offset_top = -9.0 -offset_bottom = -9.0 +offset_top = -11.0 +offset_bottom = -11.0 [node name="Sprite2D" parent="Sign/TextureContainer" index="0"] -texture = SubResource("AtlasTexture_47cqy") +position = Vector2(0, -33.3333) +texture = ExtResource("5_n2hq3") [node name="Pickable元宝" parent="." instance=ExtResource("12_6lwlv")] position = Vector2(44, 103) diff --git a/scene/player/player_animation_config.gd b/scene/player/player_animation_config.gd index 8e411bb4..e5225ad0 100644 --- a/scene/player/player_animation_config.gd +++ b/scene/player/player_animation_config.gd @@ -35,6 +35,8 @@ var ANIMATION_CONFIG = { 7: [&"c00_吕萍_拿纸杯", Vector2.ONE, Vector2(1, -65)], # 8 监听纸杯 8: [&"c00_吕萍_听纸杯", Vector2.ONE, Vector2(1, -65)], + # 9 小手交互，吓摔倒 + 9: [&"c00_吕萍_背向吓倒", Vector2.ONE, Vector2(3, -90)] }, "吕萍爬行": {