diff --git a/asset/art/scene/c03/s06_胖子卧室/衣柜后的墙洞/符纸纸条道具.png b/asset/art/prop/c03/ux_符纸纸条.png similarity index 100% rename from asset/art/scene/c03/s06_胖子卧室/衣柜后的墙洞/符纸纸条道具.png rename to asset/art/prop/c03/ux_符纸纸条.png diff --git a/asset/art/prop/c03/ux_符纸纸条.png.import b/asset/art/prop/c03/ux_符纸纸条.png.import new file mode 100644 index 00000000..a791f622 --- /dev/null +++ b/asset/art/prop/c03/ux_符纸纸条.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c4qm2sn5jctq" +path="res://.godot/imported/ux_符纸纸条.png-49d8aa159356b1cac253d947e76a1a3c.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/prop/c03/ux_符纸纸条.png" +dest_files=["res://.godot/imported/ux_符纸纸条.png-49d8aa159356b1cac253d947e76a1a3c.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/asset/art/prop/c03/符纸纸条.png b/asset/art/prop/c03/符纸纸条.png new file mode 100644 index 00000000..e393fb68 Binary files /dev/null and b/asset/art/prop/c03/符纸纸条.png differ diff --git a/asset/art/scene/c03/s06_胖子卧室/衣柜后的墙洞/符纸纸条道具.png.import b/asset/art/prop/c03/符纸纸条.png.import similarity index 65% rename from asset/art/scene/c03/s06_胖子卧室/衣柜后的墙洞/符纸纸条道具.png.import rename to asset/art/prop/c03/符纸纸条.png.import index 3dc5737d..83b96d77 100644 --- a/asset/art/scene/c03/s06_胖子卧室/衣柜后的墙洞/符纸纸条道具.png.import +++ b/asset/art/prop/c03/符纸纸条.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://hafu2hdw3jok" -path="res://.godot/imported/符纸纸条道具.png-c932ec563cf962124f7318be93043720.ctex" +path="res://.godot/imported/符纸纸条.png-c4d0670098f249ec7744f062feaf204f.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://asset/art/scene/c03/s06_胖子卧室/衣柜后的墙洞/符纸纸条道具.png" -dest_files=["res://.godot/imported/符纸纸条道具.png-c932ec563cf962124f7318be93043720.ctex"] +source_file="res://asset/art/prop/c03/符纸纸条.png" +dest_files=["res://.godot/imported/符纸纸条.png-c4d0670098f249ec7744f062feaf204f.ctex"] [params] diff --git a/asset/art/scene/c03/s06_胖子卧室/衣柜后的墙洞/符纸纸条场景.png b/asset/art/scene/c03/s06_胖子卧室/衣柜后的墙洞/符纸纸条场景.png index 70acf5c3..35c38ebb 100644 Binary files a/asset/art/scene/c03/s06_胖子卧室/衣柜后的墙洞/符纸纸条场景.png and b/asset/art/scene/c03/s06_胖子卧室/衣柜后的墙洞/符纸纸条场景.png differ diff --git a/asset/dialogue/item_description.csv b/asset/dialogue/item_description.csv index e7cc86b6..4dfbacb9 100644 --- a/asset/dialogue/item_description.csv +++ b/asset/dialogue/item_description.csv @@ -1,7 +1,5 @@ keys,zh_CN,_character,_notes,_tags,zh_SH,en prop_下半部的舌头,下半部的舌头,,,[#texture=c03/ux_下半部的舌头.png],, -prop_2013钥匙,2013钥匙,,,[#texture=c03/2013钥匙.png],, -prop_2013钥匙_说明,看起来较新的钥匙,标着「2013」的房间号码,,,,, index_新游戏,新游戏,,,,,New Game index_继续游戏,继续游戏,,,,,Continue index_退出游戏,退出游戏,,,,,Exit Game @@ -133,10 +131,12 @@ prop_1015钥匙,1015钥匙,,,[#texture=c03/1015钥匙.png],, prop_1015钥匙_说明,铜制钥匙,上面刻着「1015」的数字,,,,, prop_3012钥匙,3012钥匙,,,[#texture=c03/3012钥匙.png],, prop_3012钥匙_说明,3012钥匙说明,,,,, -prop_胖子的钥匙,胖子的钥匙,,,[#texture=c03/胖子的钥匙.png],, -prop_胖子的钥匙_说明,一把普通的房门钥匙,钥匙环上还挂着个小铃铛,,,,, +prop_2013钥匙,2013钥匙,,,[#texture=c03/胖子的钥匙.png],, +prop_2013钥匙_说明,一把普通的房门钥匙,钥匙环上还挂着个小铃铛,,,,, prop_药方,药方,,,[#texture=c03/药方.png][#inspect=c03/ux_药方.png],, prop_药方_说明,发黄的纸张上写着密密麻麻的药名,字迹工整却略显潦草,,,,, +prop_符纸,符纸,,,[#texture=c03/符纸纸条.png][#inspect=c03/ux_符纸纸条.png],, +prop_符纸_说明,符纸说明,,,,, prop_院长的信,院长的信,,,[#texture=c01/院长的信物品.png][#inspect=c01/院长的信.png],,Director's Letter prop_院长的信_说明,小萍:{br}你现下境况如何?{br}你虽离开浦育院已久,但我始终没有忘记为你祈祷。{br}愿上帝保佑你走向真正光明的道路。我相信这也是当年你父亲将你托付给我时的殷切愿景。{br}你既已成人,无论你的父母出于何种理由选择与你分离,你都应当拥有知晓真相的权利,所以我将公寓地址附在了信后,除此之外,我亦知之甚少。{br}若有闲暇,欢迎你回浦育院看看。{br}院长童玉君{br}民国二十一年十月十五日{br}公寓地址 芦昌路26弄3号,,,,,"Xiao Ping:{br}How are you faring now?{br}Though you left Puyu Orphanage long ago, I have never forgotten to pray for you.{br}May God bless you to walk the path of true enlightenment. I believe this was also your father's earnest wish when he entrusted you to my care.{br}Now that you are grown, regardless of whatever reasons your parents had for separating from you, you deserve the right to know the truth. I have attached the apartment address to this letter, though I know little beyond this.{br}If you have time, you are welcome to visit Puyu Orphanage.{br}Director Tong Yujun{br}October 15th, Year 21 of the Republic{br}Apartment Address: No. 3, Lane 26, Luchang Road" prop_船票,船票,,,[#texture=c02/船票.png],,Boat Ticket @@ -256,3 +256,4 @@ c03_s03_演出结束,?演出结束,刚刚他们?,,,,, c03_药车须知,抓药需足数三文,另需药方与药引,,,,, c03_抓药铜钱不足,钱还没准备够...牌子上讲需要三文,,,,, c03_药方内容,生姜两片{br}竹叶十片去尖{br}经霜三年的甘蔗{br}蟋蟀一对 注:要原配,即本在一窠中者{br}金钱鼠尾辫一副 注:生剪 烧成灰兑水送服,,,,, +c03_s06_没贴的寻人启事,没贴的寻人启事,,,,, diff --git a/asset/dialogue/item_description.dialogue b/asset/dialogue/item_description.dialogue index 8fe7f82e..16e1ab7a 100644 --- a/asset/dialogue/item_description.dialogue +++ b/asset/dialogue/item_description.dialogue @@ -156,11 +156,12 @@ 铜制钥匙,上面刻着「1015」的数字 [ID:prop_1015钥匙_说明] 3012钥匙 [#texture=c03/3012钥匙.png] [ID:prop_3012钥匙] 3012钥匙说明 [ID:prop_3012钥匙_说明] -# 2013 -胖子的钥匙 [#texture=c03/胖子的钥匙.png] [ID:prop_胖子的钥匙] -一把普通的房门钥匙,钥匙环上还挂着个小铃铛 [ID:prop_胖子的钥匙_说明] +2013钥匙 [#texture=c03/胖子的钥匙.png] [ID:prop_2013钥匙] +一把普通的房门钥匙,钥匙环上还挂着个小铃铛 [ID:prop_2013钥匙_说明] 药方 [#texture=c03/药方.png][#inspect=c03/ux_药方.png] [ID:prop_药方] 发黄的纸张上写着密密麻麻的药名,字迹工整却略显潦草 [ID:prop_药方_说明] +符纸 [#texture=c03/符纸纸条.png][#inspect=c03/ux_符纸纸条.png] [ID:prop_符纸] +符纸说明 [ID:prop_符纸_说明] # 旧版 @@ -345,6 +346,7 @@ # s04 李癞房间 # s05 肉铺 # s06 胖子卧室 +没贴的寻人启事 [ID:c03_s06_没贴的寻人启事] # s07 屠宰间 # s08 囚室 # s09 棺材房 diff --git a/config/animation/entity_sprite_frames.tres b/config/animation/entity_sprite_frames.tres index 6d8652a5..bfc0f0bb 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=1004 format=3 uid="uid://b7fhheih1hbvf"] +[gd_resource type="SpriteFrames" load_steps=1006 format=3 uid="uid://b7fhheih1hbvf"] [ext_resource type="Texture2D" uid="uid://dvq64espa37lx" path="res://asset/art/animation/c00_吕萍_idle_left/zhhx1.png" id="1_ekv0l"] [ext_resource type="Texture2D" uid="uid://dcp4gk5lib4bl" path="res://asset/art/animation/c00_吕萍_idle_left/zhhx2.png" id="2_fq076"] @@ -125,8 +125,10 @@ [ext_resource type="Texture2D" uid="uid://cx3jt47s57mni" path="res://asset/art/gif/c02_空房间/吕萍拉箱子_镜像/1.png" id="67_j75wl"] [ext_resource type="Texture2D" uid="uid://i7dovyyeqaf4" path="res://asset/art/animation/c01_捡球男孩_关键帧/13.png" id="67_o6wn5"] [ext_resource type="Texture2D" uid="uid://bd55sposeojxy" path="res://asset/art/animation/c01_捡球男孩_关键帧/14.png" id="68_f6wuu"] +[ext_resource type="Texture2D" uid="uid://d2a8v65x8u64h" path="res://asset/art/animation/c00_吕萍_拉大柜子呼吸/0.png" id="68_fl27i"] [ext_resource type="Texture2D" uid="uid://cx3h3tej4vdpn" path="res://asset/art/gif/c02_空房间/吕萍拉箱子_镜像/0.png" id="68_xdik1"] [ext_resource type="Texture2D" uid="uid://b8a58e62c0ss1" path="res://asset/art/animation/c01_捡球男孩_关键帧/15.png" id="69_6m37t"] +[ext_resource type="Texture2D" uid="uid://6cxyqj3wwx21" path="res://asset/art/animation/c00_吕萍_拉大柜子呼吸/1.png" id="69_t8y7y"] [ext_resource type="Texture2D" uid="uid://cl7txwflrn4h0" path="res://asset/art/animation/c01_捡球男孩_关键帧/16.png" id="70_dytci"] [ext_resource type="Texture2D" uid="uid://u7grwk05xxjs" path="res://asset/art/animation/c01_捡球男孩_关键帧/17.png" id="71_37fel"] [ext_resource type="Texture2D" uid="uid://cao7wo6ao4fs2" path="res://asset/art/animation/c01_捡球男孩_关键帧/18.png" id="72_vx6at"] @@ -1264,10 +1266,10 @@ animations = [{ }, { "frames": [{ "duration": 1.0, -"texture": ExtResource("63_u41rl") +"texture": ExtResource("68_fl27i") }, { "duration": 1.0, -"texture": ExtResource("64_6rp57") +"texture": ExtResource("69_t8y7y") }], "loop": true, "name": &"c00_吕萍_拉大柜子呼吸", diff --git a/manager/event_manager/event_binder.gd b/manager/event_manager/event_binder.gd index 2cf02be0..65e1eb6c 100644 --- a/manager/event_manager/event_binder.gd +++ b/manager/event_manager/event_binder.gd @@ -87,7 +87,7 @@ func _ready() -> void: parent.connect(trigger_mode, _on_happened) -func _on_happened(_arg = null) -> void: +func _on_happened(_arg1 = null, _arg2 = null) -> void: if trigger_set_stage_if_greater: var updated = EventManager.set_stage_if_greater(trigger_event, trigger_stage) if not updated: diff --git a/scene/ground/scene/c02/s06_二楼.tscn b/scene/ground/scene/c02/s06_二楼.tscn index 9b13cd0d..003bbf50 100644 --- a/scene/ground/scene/c02/s06_二楼.tscn +++ b/scene/ground/scene/c02/s06_二楼.tscn @@ -979,7 +979,7 @@ portal_name = "4" target_scene = "c03_s06" target_portal = "left" status = "locked" -prop_key = "prop_胖子的钥匙" +prop_key = "prop_2013钥匙" [node name="EventBinder" type="Node" parent="Ground/DeployLayer/portal_4"] script = ExtResource("10_e5pbx") diff --git a/scene/ground/scene/c03/s04_李癞房间.tscn b/scene/ground/scene/c03/s04_李癞房间.tscn index af53c2ec..9d8a169d 100644 --- a/scene/ground/scene/c03/s04_李癞房间.tscn +++ b/scene/ground/scene/c03/s04_李癞房间.tscn @@ -85,7 +85,7 @@ enabled = false [node name="Pickable胖子钥匙" parent="Ground/DeployLayer" index="5" instance=ExtResource("9_m8bf2")] position = Vector2(537, 55) -prop_key = "prop_胖子的钥匙" +prop_key = "prop_2013钥匙" [node name="Event2D香炉" type="Node2D" parent="Ground/DeployLayer" index="6"] script = ExtResource("12_0jb1q") @@ -116,6 +116,12 @@ texture = ExtResource("16_4umel") [node name="床上死人" type="Sprite2D" parent="Ground/DeployLayer/Event2D香炉"] position = Vector2(145, 48) +[node name="Label" type="Label" parent="Ground/DeployLayer/Event2D香炉/床上死人"] +offset_left = -49.0 +offset_right = 51.0 +offset_bottom = 14.0 +text = "【此处应有弟弟尸体】" + [node name="Closeup李氏纸人" parent="Ground/DeployLayer" index="7" instance=ExtResource("6_dbkw8")] unique_name_in_owner = true position = Vector2(372, 40) diff --git a/scene/ground/scene/c03/s06_胖子卧室.tscn b/scene/ground/scene/c03/s06_胖子卧室.tscn index 572210d0..e6bef9f2 100644 --- a/scene/ground/scene/c03/s06_胖子卧室.tscn +++ b/scene/ground/scene/c03/s06_胖子卧室.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=12 format=3 uid="uid://cxacrp8mrrbry"] +[gd_scene load_steps=13 format=3 uid="uid://cxacrp8mrrbry"] [ext_resource type="PackedScene" uid="uid://dayyx4jerj7io" path="res://scene/ground/ground.tscn" id="1_h8p4n"] [ext_resource type="Script" uid="uid://cxgeon4qs1klv" path="res://scene/ground/scene/c03/s06_胖子卧室.gd" id="2_f527l"] @@ -10,6 +10,7 @@ [ext_resource type="Texture2D" uid="uid://coaugvwesap35" path="res://asset/art/scene/c03/s06_胖子卧室/胖子卧室柜子.png" id="6_wsqdn"] [ext_resource type="PackedScene" uid="uid://dqkxiqbq83cmq" path="res://scene/entity/closeup.tscn" id="7_wsqdn"] [ext_resource type="PackedScene" uid="uid://5uqi3c3f4va1" path="res://scene/ground/script/c03/s06_closeup柜子后的洞.tscn" id="8_1qtud"] +[ext_resource type="PackedScene" uid="uid://jr1yd46wm5je" path="res://scene/entity/note.tscn" id="10_481tl"] [sub_resource type="AnimationLibrary" id="AnimationLibrary_k01ve"] @@ -65,6 +66,11 @@ packed_scene = ExtResource("8_1qtud") quit_closeup_on_cancel = false enabled = false +[node name="Note没贴的寻人启事" parent="Ground/DeployLayer" index="5" instance=ExtResource("10_481tl")] +position = Vector2(163, 17) +title_filter = "c03" +note_key = "c03_s06_没贴的寻人启事" + [node name="MainPlayer" parent="Ground" index="5"] position = Vector2(418, 98) catty_light_energy = 0.5 diff --git a/scene/ground/scene/c03/s08_囚室.tscn b/scene/ground/scene/c03/s08_囚室.tscn index b42f0ed4..72c0414c 100644 --- a/scene/ground/scene/c03/s08_囚室.tscn +++ b/scene/ground/scene/c03/s08_囚室.tscn @@ -1,12 +1,13 @@ -[gd_scene load_steps=10 format=3 uid="uid://bixdbbyhroepi"] +[gd_scene load_steps=11 format=3 uid="uid://bixdbbyhroepi"] [ext_resource type="PackedScene" uid="uid://dayyx4jerj7io" path="res://scene/ground/ground.tscn" id="1_fusj3"] [ext_resource type="Script" path="res://scene/ground/scene/c03/s08_囚室.gd" id="2_fusj3"] -[ext_resource type="AudioStream" uid="uid://b2mudqvq1dmng" path="res://asset/audio/sfx/环境音/白噪音/白噪声房间里1.ogg" id="3_jua84"] +[ext_resource type="AudioStream" uid="uid://d0ef0felylt8d" path="res://asset/audio/sfx/环境音/第一章/氛围不受欢迎的存在.ogg" id="3_dovfj"] [ext_resource type="Script" uid="uid://rq6w1vuhuq1m" path="res://scene/entity/audio/sfx.gd" id="4_2jtaw"] [ext_resource type="Texture2D" uid="uid://c53e7kxlfj8kw" path="res://asset/art/scene/c03/s08_囚室/bg_囚室背景.png" id="4_fusj3"] [ext_resource type="Texture2D" uid="uid://dfsqs13fm7urb" path="res://asset/art/scene/c03/s08_囚室/fg_囚室前景.png" id="5_i2s3v"] [ext_resource type="PackedScene" uid="uid://dqkxiqbq83cmq" path="res://scene/entity/closeup.tscn" id="5_jua84"] +[ext_resource type="PackedScene" uid="uid://61pis75a8fdq" path="res://scene/entity/portal.tscn" id="6_dovfj"] [ext_resource type="PackedScene" uid="uid://qbd8plj1cjyc" path="res://scene/ground/script/c03/s08_closeup囚室墙洞.tscn" id="7_2jtaw"] [sub_resource type="AnimationLibrary" id="AnimationLibrary_k01ve"] @@ -25,7 +26,7 @@ libraries = { script = ExtResource("2_fusj3") [node name="Sfx背景音" type="AudioStreamPlayer" parent="Ground/AnimationPlayer" index="0"] -stream = ExtResource("3_jua84") +stream = ExtResource("3_dovfj") volume_db = -5.0 autoplay = true bus = &"game_sfx" @@ -49,7 +50,12 @@ target_portal = "1" [node name="portal_right" parent="Ground/DeployLayer" index="1"] position = Vector2(533, 26) -[node name="Closeup囚室墙洞" parent="Ground/DeployLayer" index="2" instance=ExtResource("5_jua84")] +[node name="portal_1" parent="Ground/DeployLayer" index="2" instance=ExtResource("6_dovfj")] +position = Vector2(467, 39) +debug_note = "被打晕后传送点" +portal_name = "1" + +[node name="Closeup囚室墙洞" parent="Ground/DeployLayer" index="3" instance=ExtResource("5_jua84")] position = Vector2(274, -5) packed_scene = ExtResource("7_2jtaw") diff --git a/scene/ground/script/c03/s04_closeup李氏纸人.gd b/scene/ground/script/c03/s04_closeup李氏纸人.gd index ac920915..4c964f39 100644 --- a/scene/ground/script/c03/s04_closeup李氏纸人.gd +++ b/scene/ground/script/c03/s04_closeup李氏纸人.gd @@ -61,13 +61,13 @@ func _unhandled_input(event: InputEvent) -> void: elif current_stage == 2: if prop == "prop_药包": holding = true - # 给药 -> 2013 钥匙 (prop_胖子的钥匙) + # 给药 -> 2013 钥匙 (prop_2013钥匙) $"Sfx使用药包".play() animation_player.play("give_key") await animation_player.animation_finished current_stage = 3 EventManager.set_stage_if_greater("c03_li_paperwoman", 3) - SceneManager.enable_prop_item("prop_胖子的钥匙") + SceneManager.enable_prop_item("prop_2013钥匙") animation_player.play("RESET") # 交互完成,退出 exit.emit(true) diff --git a/scene/ground/script/c03/s04_closeup李氏纸人.tscn b/scene/ground/script/c03/s04_closeup李氏纸人.tscn index d50ecc01..fd744626 100644 --- a/scene/ground/script/c03/s04_closeup李氏纸人.tscn +++ b/scene/ground/script/c03/s04_closeup李氏纸人.tscn @@ -17,38 +17,6 @@ [ext_resource type="Texture2D" uid="uid://dyaknn88pri7g" path="res://asset/art/scene/c03/s04_李癞房间/李氏特写/断舌头涂胶水.png" id="11_klpdo"] [ext_resource type="Texture2D" uid="uid://cquvr5fjd3vlu" path="res://asset/art/scene/c03/s04_李癞房间/李氏特写/胶水(合并).png" id="12_022we"] -[sub_resource type="Animation" id="Animation_klpdo"] -resource_name = "give_key" -length = 2.0 -tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("给钥匙的手:position") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/keys = { -"times": PackedFloat32Array(0, 1), -"transitions": PackedFloat32Array(1, 1), -"update": 0, -"values": [Vector2(126, 405), Vector2(103, 212)] -} - -[sub_resource type="Animation" id="Animation_022we"] -resource_name = "give_coin" -length = 2.0 -tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("给纸钱的手:position") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/keys = { -"times": PackedFloat32Array(0, 1), -"transitions": PackedFloat32Array(1, 1), -"update": 0, -"values": [Vector2(425, 379), Vector2(423, 247)] -} - [sub_resource type="Animation" id="Animation_2nb82"] length = 0.001 tracks/0/type = "value" @@ -76,6 +44,38 @@ tracks/1/keys = { "values": [Vector2(126, 405)] } +[sub_resource type="Animation" id="Animation_022we"] +resource_name = "give_coin" +length = 2.0 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("给纸钱的手:position") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0, 1), +"transitions": PackedFloat32Array(1, 1), +"update": 0, +"values": [Vector2(425, 379), Vector2(423, 247)] +} + +[sub_resource type="Animation" id="Animation_klpdo"] +resource_name = "give_key" +length = 2.0 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("给钥匙的手:position") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0, 1), +"transitions": PackedFloat32Array(1, 1), +"update": 0, +"values": [Vector2(126, 405), Vector2(103, 212)] +} + [sub_resource type="AnimationLibrary" id="AnimationLibrary_dwx4w"] _data = { &"RESET": SubResource("Animation_2nb82"), diff --git a/scene/ground/script/c03/s06_closeup柜子后的洞.gd b/scene/ground/script/c03/s06_closeup柜子后的洞.gd index d6d3afcc..7d7fa18d 100644 --- a/scene/ground/script/c03/s06_closeup柜子后的洞.gd +++ b/scene/ground/script/c03/s06_closeup柜子后的洞.gd @@ -3,28 +3,46 @@ extends CanvasLayer @warning_ignore("unused_signal") signal exit(arg) +@onready var sfx_newspaper = $"Sfx折起报纸" as Sfx +@onready var hover_key = %"HoverLight钥匙" as HoverLightClickArea +@onready var hover_handle = %"HoverLight刀柄" as HoverLightClickArea +@onready var drag_newspaper = %"报纸展开" as Draggable2D +@onready var drag_wizardpaper = %"符纸" as Draggable2D + func _ready() -> void: - $"BG折起来/HoverLight钥匙".interacted.connect(_on_prop_picked.bind("prop_2013钥匙")) - $"BG折起来/HoverLight刀柄".interacted.connect(_on_prop_picked.bind("prop_刀把")) layer = GlobalConfig.CANVAS_LAYER_LITTLE_GAME - $"BG展开/报纸展开".picked.connect(_on_newspaper_picked) - - -func _on_newspaper_picked(_node) -> void: - $"BG展开".hide() - $"BG折起来".show() + drag_wizardpaper.picked.connect(func(_a): + SceneManager.enable_prop_item("prop_符纸") + ) + drag_newspaper.picked.connect(func(_a): + sfx_newspaper.play() + drag_newspaper.hide() + ) + # 使用 event binder 控制道具状态 + hover_key.interacted.connect(func(): + _on_prop_picked("prop_2013钥匙") + ) + hover_handle.interacted.connect(func(): + _on_prop_picked("prop_刀把") + ) func _on_prop_picked(prop_key: String) -> void: SceneManager.enable_prop_item(prop_key) + # 当两个道具都拿到时,触发被胖子打晕演出 if ( (prop_key == "prop_2013钥匙" and EventManager.get_stage(&"c03_s06_hole_knife_handle") > 0) or (prop_key == "prop_刀把" and EventManager.get_stage(&"c03_s06_hole_key") > 0) ): await SceneManager.get_inspector().quit_and_hidden # TODO - SceneManager.pop_debug_dialog_info("美术&音效", "背后响起画外音(偷东西?)") + SceneManager.pop_debug_dialog_info("美术&音效", "背后响起画外音「偷东西?」; 被胖子打晕演出") + await Util.wait(0.5) + Util.shake_layer(self, 2.0, 0.5, 4.0) + await Util.wait(3.0) # 画面抖动变红,玩家被打晕,画面变黑 - await Util.wait(2.0) - exit.emit() + $AnimationPlayer.play("bleeding_red") + Util.shake_layer(self, 1.0) + await Util.wait(1.0) + SceneManager.get_ground_loader().transition_to_scene("c03_s08", "1") diff --git a/scene/ground/script/c03/s06_closeup柜子后的洞.tscn b/scene/ground/script/c03/s06_closeup柜子后的洞.tscn index ebacd78c..7391370c 100644 --- a/scene/ground/script/c03/s06_closeup柜子后的洞.tscn +++ b/scene/ground/script/c03/s06_closeup柜子后的洞.tscn @@ -1,81 +1,106 @@ -[gd_scene load_steps=17 format=3 uid="uid://5uqi3c3f4va1"] +[gd_scene load_steps=21 format=3 uid="uid://5uqi3c3f4va1"] [ext_resource type="Script" uid="uid://vkpp7mrdnh0s" path="res://scene/ground/script/c03/s06_closeup柜子后的洞.gd" id="1_84xhv"] [ext_resource type="Texture2D" uid="uid://by4ybfs7oi63f" path="res://asset/art/scene/c03/s06_胖子卧室/衣柜后的墙洞/报纸正常背景.png" id="2_84xhv"] +[ext_resource type="AudioStream" uid="uid://c3qonrtdjnmau" path="res://asset/audio/sfx/UI/纸声.ogg" id="2_651rf"] +[ext_resource type="Script" uid="uid://rq6w1vuhuq1m" path="res://scene/entity/audio/sfx.gd" id="2_ur3qk"] [ext_resource type="Texture2D" uid="uid://cbql1i4hblmt1" path="res://asset/art/ui/遮罩/inspect特写通用遮罩.png" id="2_wpl64"] [ext_resource type="PackedScene" uid="uid://bg7oictr1wgex" path="res://scene/little_game/general/draggable.tscn" id="3_65bkn"] [ext_resource type="PackedScene" uid="uid://bkk1rxx36ghrl" path="res://scene/entity/ux/hover_light_click_area.tscn" id="3_ko8md"] [ext_resource type="Texture2D" uid="uid://bv4wg362asw3f" path="res://asset/art/scene/c03/s06_胖子卧室/衣柜后的墙洞/报纸.png" id="3_mcv7n"] -[ext_resource type="PackedScene" uid="uid://dmysq4sxx8iqh" path="res://scene/entity/ux/content_inspector.tscn" id="3_mkmvg"] [ext_resource type="Texture2D" uid="uid://b0nndec3m6b73" path="res://asset/art/scene/c03/s06_胖子卧室/衣柜后的墙洞/报纸折起来背景.png" id="4_65bkn"] [ext_resource type="Texture2D" uid="uid://b8f54mbw7ftnm" path="res://asset/art/scene/c03/s06_胖子卧室/衣柜后的墙洞/钥匙.png" id="5_6ncw3"] -[ext_resource type="Texture2D" uid="uid://f186lvt5y2ql" path="res://asset/art/ui/遮罩/inspect背景遮罩.png" id="5_65bkn"] [ext_resource type="Texture2D" uid="uid://dbntx57uox7e0" path="res://asset/art/scene/c03/s06_胖子卧室/衣柜后的墙洞/报纸折起来.png" id="5_mbut7"] [ext_resource type="Texture2D" uid="uid://clxdv18v8rr0r" path="res://asset/art/scene/c03/s06_胖子卧室/衣柜后的墙洞/l_刀柄.png" id="5_ur3qk"] [ext_resource type="Script" uid="uid://0wjaho6qkg6s" path="res://manager/event_manager/event_binder.gd" id="6_aen5b"] [ext_resource type="Texture2D" uid="uid://dnntuxrmsmv86" path="res://asset/art/scene/c03/s06_胖子卧室/衣柜后的墙洞/刀柄.png" id="6_ko8md"] -[ext_resource type="Script" uid="uid://dpocj5al0rvai" path="res://ui/text_helper.gd" id="6_mbut7"] [ext_resource type="Texture2D" uid="uid://cudou52tmnc0u" path="res://asset/art/scene/c03/s06_胖子卧室/衣柜后的墙洞/l_钥匙.png" id="7_aen5b"] +[ext_resource type="Texture2D" uid="uid://cu8qewv1sp28l" path="res://asset/art/scene/c03/s06_胖子卧室/衣柜后的墙洞/符纸纸条场景.png" id="13_651rf"] + +[sub_resource type="Animation" id="Animation_aen5b"] +resource_name = "bleeding_red" +length = 1.5 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("DirectionalLight2D:energy") +tracks/0/interp = 2 +tracks/0/loop_wrap = false +tracks/0/keys = { +"times": PackedFloat32Array(0, 0.1, 0.166667, 0.233333, 0.3, 0.833333, 1.5), +"transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1, 1), +"update": 0, +"values": [0.0, 1.0, 0.5, 1.5, 1.0, 0.570217, 0.2] +} + +[sub_resource type="Animation" id="Animation_651rf"] +length = 0.001 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("DirectionalLight2D:energy") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [0.0] +} + +[sub_resource type="AnimationLibrary" id="AnimationLibrary_6qnaw"] +_data = { +&"RESET": SubResource("Animation_651rf"), +&"bleeding_red": SubResource("Animation_aen5b") +} + +[sub_resource type="RectangleShape2D" id="RectangleShape2D_651rf"] +size = Vector2(37.75, 30.87) [node name="Closeup柜子后的洞" type="CanvasLayer"] script = ExtResource("1_84xhv") +[node name="Sfx折起报纸" type="AudioStreamPlayer" parent="."] +stream = ExtResource("2_651rf") +bus = &"game_sfx" +script = ExtResource("2_ur3qk") +metadata/_custom_type_script = "uid://rq6w1vuhuq1m" + +[node name="AnimationPlayer" type="AnimationPlayer" parent="."] +libraries = { +&"": SubResource("AnimationLibrary_6qnaw") +} + [node name="BG折起来" type="TextureRect" parent="."] -visible = false anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 -mouse_filter = 2 texture = ExtResource("4_65bkn") -[node name="HoverLight钥匙" parent="BG折起来" instance=ExtResource("3_ko8md")] -position = Vector2(294, 155.5) -rotation = -2.67388 - -[node name="Sprite2D" type="Sprite2D" parent="BG折起来/HoverLight钥匙"] -light_mask = 5 -texture = ExtResource("5_6ncw3") - -[node name="PointLight2D" type="PointLight2D" parent="BG折起来/HoverLight钥匙"] -range_layer_max = 10 -range_item_cull_mask = 4 -texture = ExtResource("7_aen5b") - -[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="BG折起来/HoverLight钥匙"] -polygon = PackedVector2Array(13.5, -10, 4, -10, -1.5, -7.8, -4, -9, -11.6, -9, -13.5, -6.2, -13.5, 10, -1.1, 10, 3.5, 3.6, 3.5, 2.2, 13.1, -3) - -[node name="EventBinder" type="Node" parent="BG折起来/HoverLight钥匙"] -script = ExtResource("6_aen5b") -updater_event = &"c03_s06_hole_key" -updater_mode = "shower" -updater_ease_duration = 0.0 -updater_stages = Array[int]([0]) -trigger_event = &"c03_s06_hole_key" -trigger_mode = "interacted" -metadata/_custom_type_script = "uid://0wjaho6qkg6s" - -[node name="HoverLight刀柄" parent="BG折起来" instance=ExtResource("3_ko8md")] -position = Vector2(270, 177.5) +[node name="HoverLight刀柄" parent="." instance=ExtResource("3_ko8md")] +unique_name_in_owner = true +position = Vector2(270, 170) rotation = -0.487515 +scale = Vector2(1, 1) -[node name="Sprite2D" type="Sprite2D" parent="BG折起来/HoverLight刀柄"] +[node name="Sprite2D" type="Sprite2D" parent="HoverLight刀柄"] light_mask = 5 position = Vector2(-6, -1) texture = ExtResource("6_ko8md") -[node name="PointLight2D" type="PointLight2D" parent="BG折起来/HoverLight刀柄"] +[node name="PointLight2D" type="PointLight2D" parent="HoverLight刀柄"] position = Vector2(0.038147, -1.73529) range_layer_max = 10 range_item_cull_mask = 4 texture = ExtResource("5_ur3qk") -[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="BG折起来/HoverLight刀柄"] +[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="HoverLight刀柄"] position = Vector2(-6, -1) polygon = PackedVector2Array(-17.6, -11.5, -30.9, -6.5, -31.5, -6.5, -31.5, 9.9, -30.5, 10.6, -30.5, 11.5, 23.7, 11.5, 31.1, 7.5, 31.5, -10.3, 30.5, -11.3) -[node name="EventBinder" type="Node" parent="BG折起来/HoverLight刀柄"] +[node name="EventBinder" type="Node" parent="HoverLight刀柄"] script = ExtResource("6_aen5b") updater_event = &"c03_s06_hole_knife_handle" updater_mode = "shower" @@ -85,26 +110,86 @@ trigger_event = &"c03_s06_hole_knife_handle" trigger_mode = "interacted" metadata/_custom_type_script = "uid://0wjaho6qkg6s" -[node name="报纸折起来" type="Sprite2D" parent="BG折起来"] +[node name="报纸折起来" type="Sprite2D" parent="."] light_mask = 0 -position = Vector2(240, 152.5) +position = Vector2(234, 152) +scale = Vector2(1, 1) texture = ExtResource("5_mbut7") -[node name="BG展开" type="TextureRect" parent="."] +[node name="报纸展开" parent="." instance=ExtResource("3_65bkn")] +unique_name_in_owner = true +position = Vector2(238, 171) +act_as_button = true +texture = ExtResource("3_mcv7n") + +[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="报纸展开"] +polygon = PackedVector2Array(21.2, -38, 1.2, -43, -5.4, -43, -9.4, -39, -11.4, -39, -21, -30.4, -21, -29.7, -24, -28.7, -24, -26.6, -25.2, -26, -28.4, -26, -31, -23.4, -31, -22.6, -32.2, -22, -34.3, -22, -43, -15.5, -43, -14.6, -50.2, -11, -53.3, -11, -57.3, -8, -59.4, -8, -63.4, -4, -66.5, -4, -68, -1.8, -68, 3, -63.1, 4, -57.2, 4, -56, 4.6, -56, 5.8, -51.1, 7, -47.2, 7, -41.2, 10, -37.4, 10, -37, 10.4, -37, 11.6, -24.2, 18, -22.3, 18, -19, 20.5, -19, 21.6, -16.2, 23, -14.4, 23, -14, 23.4, -14, 24.6, -3, 30.6, -3, 31.6, -0.199997, 33, 2.6, 33, 3, 33.4, 3, 34.7, 8, 36.6, 8, 37.6, 19, 42.6, 23.1, 43, 26, 37.2, 26, 34.4, 26.4, 34, 27.7, 34, 29, 30.2, 29, 29, 30.5, 29, 36.5, 22, 38, 22, 38, 19.4, 43.4, 14, 45, 14, 45, 11.4, 46.4, 10, 48, 10, 48, 8, 50, 8, 50, 6, 52, 6, 52, 4, 53.6, 4, 55, 1.2, 55, -0.599998, 58.4, -4, 59.6, -4, 67.6, -20, 68, -43, 67.1, -43, 25.9, -38) + +[node name="BG展开" type="TextureRect" parent="报纸展开"] +unique_name_in_owner = true +show_behind_parent = true anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 +offset_left = -244.0 +offset_top = -171.5 +offset_right = 332.0 +offset_bottom = 145.5 grow_horizontal = 2 grow_vertical = 2 texture = ExtResource("2_84xhv") -[node name="报纸展开" parent="BG展开" instance=ExtResource("3_65bkn")] -position = Vector2(244, 171.5) -act_as_button = true -texture = ExtResource("3_mcv7n") +[node name="HoverLight钥匙" parent="." instance=ExtResource("3_ko8md")] +unique_name_in_owner = true +position = Vector2(318, 200) +rotation = -5.25058 -[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="BG展开/报纸展开"] -polygon = PackedVector2Array(21.2, -38, 1.2, -43, -5.4, -43, -9.4, -39, -11.4, -39, -21, -30.4, -21, -29.7, -24, -28.7, -24, -26.6, -25.2, -26, -28.4, -26, -31, -23.4, -31, -22.6, -32.2, -22, -34.3, -22, -43, -15.5, -43, -14.6, -50.2, -11, -53.3, -11, -57.3, -8, -59.4, -8, -63.4, -4, -66.5, -4, -68, -1.8, -68, 3, -63.1, 4, -57.2, 4, -56, 4.6, -56, 5.8, -51.1, 7, -47.2, 7, -41.2, 10, -37.4, 10, -37, 10.4, -37, 11.6, -24.2, 18, -22.3, 18, -19, 20.5, -19, 21.6, -16.2, 23, -14.4, 23, -14, 23.4, -14, 24.6, -3, 30.6, -3, 31.6, -0.199997, 33, 2.6, 33, 3, 33.4, 3, 34.7, 8, 36.6, 8, 37.6, 19, 42.6, 23.1, 43, 26, 37.2, 26, 34.4, 26.4, 34, 27.7, 34, 29, 30.2, 29, 29, 30.5, 29, 36.5, 22, 38, 22, 38, 19.4, 43.4, 14, 45, 14, 45, 11.4, 46.4, 10, 48, 10, 48, 8, 50, 8, 50, 6, 52, 6, 52, 4, 53.6, 4, 55, 1.2, 55, -0.599998, 58.4, -4, 59.6, -4, 67.6, -20, 68, -43, 67.1, -43, 25.9, -38) +[node name="Sprite2D" type="Sprite2D" parent="HoverLight钥匙"] +light_mask = 5 +texture = ExtResource("5_6ncw3") + +[node name="PointLight2D" type="PointLight2D" parent="HoverLight钥匙"] +range_layer_max = 10 +range_item_cull_mask = 4 +texture = ExtResource("7_aen5b") + +[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="HoverLight钥匙"] +polygon = PackedVector2Array(13.5, -10, 4, -10, -1.5, -7.8, -4, -9, -11.6, -9, -13.5, -6.2, -13.5, 10, -1.1, 10, 3.5, 3.6, 3.5, 2.2, 13.1, -3) + +[node name="EventBinder" type="Node" parent="HoverLight钥匙"] +script = ExtResource("6_aen5b") +updater_event = &"c03_s06_hole_key" +updater_mode = "shower" +updater_ease_duration = 0.0 +updater_stages = Array[int]([0]) +trigger_event = &"c03_s06_hole_key" +trigger_mode = "interacted" +metadata/_custom_type_script = "uid://0wjaho6qkg6s" + +[node name="符纸" parent="." instance=ExtResource("3_65bkn")] +unique_name_in_owner = true +position = Vector2(323, 197) +act_as_button = true +texture = ExtResource("13_651rf") + +[node name="CollisionShape2D" type="CollisionShape2D" parent="符纸"] +shape = SubResource("RectangleShape2D_651rf") + +[node name="EventBinder" type="Node" parent="符纸"] +script = ExtResource("6_aen5b") +updater_event = &"c03_s06_hole_wizardpaper" +updater_mode = "shower" +updater_ease_duration = 0.0 +updater_stages = Array[int]([0]) +trigger_event = &"c03_s06_hole_wizardpaper" +trigger_mode = "picked" +metadata/_custom_type_script = "uid://0wjaho6qkg6s" + +[node name="DirectionalLight2D" type="DirectionalLight2D" parent="."] +color = Color(1, 0, 0, 1) +energy = 0.0 +blend_mode = 2 +range_layer_max = 10 [node name="遮罩" type="TextureRect" parent="."] anchors_preset = 15 @@ -114,34 +199,3 @@ grow_horizontal = 2 grow_vertical = 2 mouse_filter = 2 texture = ExtResource("2_wpl64") - -[node name="ContentInspector" parent="." instance=ExtResource("3_mkmvg")] -visible = false - -[node name="遮罩" type="TextureRect" parent="ContentInspector"] -layout_mode = 1 -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 -mouse_filter = 2 -texture = ExtResource("5_65bkn") - -[node name="Label" type="Label" parent="ContentInspector/遮罩"] -custom_minimum_size = Vector2(180, 0) -layout_mode = 1 -anchors_preset = 8 -anchor_left = 0.5 -anchor_top = 0.5 -anchor_right = 0.5 -anchor_bottom = 0.5 -offset_left = -60.0 -offset_top = -15.5 -offset_right = 60.0 -offset_bottom = 15.5 -grow_horizontal = 2 -grow_vertical = 2 -vertical_alignment = 1 -autowrap_mode = 3 -script = ExtResource("6_mbut7")