diff --git a/asset/dialogue/item_description.csv b/asset/dialogue/item_description.csv index 84c60f52..ca54b525 100644 --- a/asset/dialogue/item_description.csv +++ b/asset/dialogue/item_description.csv @@ -41,26 +41,27 @@ prop_信碎片1,信碎片(一),,,[#texture=c01/信件左上.png] prop_信碎片2,信碎片(二),,,[#texture=c01/信件右上.png] prop_银元,银元,,,[#texture=c01/银元.png] prop_院长的信,院长的信,,,[#texture=c01/院长的信物品.png][#inspect=c01/院长的信.png] -prop_重要物品示例,重要物品示例,,,[#texture=c01/银元.png] -prop_令牌,令牌,,,[#texture=c01/令牌物品.png][#inspect=c01/令牌.png] -prop_装有灵魂的令牌,装有灵魂的令牌,,,[#texture=c01/装有灵魂的令牌物品.png][#inspect=c01/装有灵魂的令牌.png] prop_火柴,火柴,,,[#texture=c02/火柴.png] prop_小猫玩具的脑袋,小猫玩具的脑袋,,,[#texture=c02/小猫玩具脑袋物品.png][#inspect=c02/小猫玩具脑袋.png] prop_无头小猫玩具,无头小猫玩具,,,[#texture=c02/小猫玩具身体.png] prop_撕下的照片上,撕下的照片(上),,,[#texture=c02/照片_上.png] prop_小猫玩具完整,小猫玩具,,,[#texture=c02/小猫玩具完整物品.png][#inspect=c02/小猫玩具完整.png] -prop_绳子,绳子,,,[#texture=c02/绳子物品.png][#inspect=c02/绳子.png] -prop_1012钥匙,1012钥匙,,,[#texture=c02/1012钥匙物品.png][#inspect=c02/1012钥匙.png] prop_老虎钳,老虎钳,,,[#texture=c02/老虎钳物品.png][#inspect=c02/老虎钳.png] -prop_3014旋转锁钥匙,3014旋转锁钥匙,,,[#texture=c02/3014旋转锁钥匙物品.png][#inspect=c02/3014旋转锁钥匙.png] prop_锡箔元宝,锡箔元宝,,,[#texture=c02/锡箔元宝.png] -prop_一把香,一把香,,,[#texture=c02/一把香.png] prop_小鞋子1,小鞋子1,,,[#texture=c02/小鞋子.png] prop_小鞋子2,小鞋子2,,,[#texture=c02/小鞋子.png] prop_麻将,麻将,,,[#texture=c02/麻将.png] prop_新鲜的肉,新鲜的肉,,,[#texture=c02/新鲜的肉.png] prop_弹珠,弹珠,,,[#texture=c02/弹珠.png] prop_木头人偶,木头人偶,,,[#texture=c02/小蝉人偶.png] +prop_2014钥匙,2014钥匙,,,[#texture=c02/1012钥匙物品.png] +prop_一把香,一把香,,,[#texture=c02/一把香.png] +prop_重要物品示例,重要物品示例,,,[#texture=c01/银元.png] +prop_1012钥匙,1012钥匙,,,[#texture=c02/1012钥匙物品.png][#inspect=c02/1012钥匙.png] +prop_绳子,绳子,,,[#texture=c02/绳子物品.png][#inspect=c02/绳子.png] +prop_3014旋转锁钥匙,3014旋转锁钥匙,,,[#texture=c02/3014旋转锁钥匙物品.png][#inspect=c02/3014旋转锁钥匙.png] +prop_令牌,令牌,,,[#texture=c01/令牌物品.png][#inspect=c01/令牌.png] +prop_装有灵魂的令牌,装有灵魂的令牌,,,[#texture=c01/装有灵魂的令牌物品.png][#inspect=c01/装有灵魂的令牌.png] prop_信碎片1_说明,浦育院院长秦阳,民国21年,11月20日,,ID格式: prop_xx_说明, prop_银元_说明,一枚“袁大头”银元,中華民國十年造。,,, prop_院长的信_说明,"院长的信... diff --git a/asset/dialogue/item_description.dialogue b/asset/dialogue/item_description.dialogue index 17c69b12..4724f0f5 100644 --- a/asset/dialogue/item_description.dialogue +++ b/asset/dialogue/item_description.dialogue @@ -50,28 +50,37 @@ 信碎片(二) [#texture=c01/信件右上.png] [ID:prop_信碎片2] 银元 [#texture=c01/银元.png] [ID:prop_银元] 院长的信 [#texture=c01/院长的信物品.png][#inspect=c01/院长的信.png] [ID:prop_院长的信] -重要物品示例 [#texture=c01/银元.png] [ID:prop_重要物品示例] -令牌 [#texture=c01/令牌物品.png][#inspect=c01/令牌.png] [ID:prop_令牌] -装有灵魂的令牌 [#texture=c01/装有灵魂的令牌物品.png][#inspect=c01/装有灵魂的令牌.png] [ID:prop_装有灵魂的令牌] # c02 火柴 [#texture=c02/火柴.png] [ID:prop_火柴] 小猫玩具的脑袋 [#texture=c02/小猫玩具脑袋物品.png][#inspect=c02/小猫玩具脑袋.png] [ID:prop_小猫玩具的脑袋] 无头小猫玩具 [#texture=c02/小猫玩具身体.png] [ID:prop_无头小猫玩具] 撕下的照片(上) [#texture=c02/照片_上.png] [ID:prop_撕下的照片上] 小猫玩具 [#texture=c02/小猫玩具完整物品.png][#inspect=c02/小猫玩具完整.png] [ID:prop_小猫玩具完整] -绳子 [#texture=c02/绳子物品.png][#inspect=c02/绳子.png] [ID:prop_绳子] -1012钥匙 [#texture=c02/1012钥匙物品.png][#inspect=c02/1012钥匙.png] [ID:prop_1012钥匙] 老虎钳 [#texture=c02/老虎钳物品.png][#inspect=c02/老虎钳.png] [ID:prop_老虎钳] -3014旋转锁钥匙 [#texture=c02/3014旋转锁钥匙物品.png][#inspect=c02/3014旋转锁钥匙.png] [ID:prop_3014旋转锁钥匙] 锡箔元宝 [#texture=c02/锡箔元宝.png] [ID:prop_锡箔元宝] -一把香 [#texture=c02/一把香.png] [ID:prop_一把香] 小鞋子1 [#texture=c02/小鞋子.png] [ID:prop_小鞋子1] 小鞋子2 [#texture=c02/小鞋子.png] [ID:prop_小鞋子2] 麻将 [#texture=c02/麻将.png] [ID:prop_麻将] 新鲜的肉 [#texture=c02/新鲜的肉.png] [ID:prop_新鲜的肉] 弹珠 [#texture=c02/弹珠.png] [ID:prop_弹珠] 木头人偶 [#texture=c02/小蝉人偶.png] [ID:prop_木头人偶] + +2014钥匙 [#texture=c02/1012钥匙物品.png] [ID:prop_2014钥匙] + +# 未使用 +一把香 [#texture=c02/一把香.png] [ID:prop_一把香] + +# 无效 +重要物品示例 [#texture=c01/银元.png] [ID:prop_重要物品示例] + +# 旧版 +1012钥匙 [#texture=c02/1012钥匙物品.png][#inspect=c02/1012钥匙.png] [ID:prop_1012钥匙] +绳子 [#texture=c02/绳子物品.png][#inspect=c02/绳子.png] [ID:prop_绳子] +3014旋转锁钥匙 [#texture=c02/3014旋转锁钥匙物品.png][#inspect=c02/3014旋转锁钥匙.png] [ID:prop_3014旋转锁钥匙] +令牌 [#texture=c01/令牌物品.png][#inspect=c01/令牌.png] [ID:prop_令牌] +装有灵魂的令牌 [#texture=c01/装有灵魂的令牌物品.png][#inspect=c01/装有灵魂的令牌.png] [ID:prop_装有灵魂的令牌] + => END #~ prop说明 diff --git a/scene/ground/ground_loader.gd b/scene/ground/ground_loader.gd index 4c1413a1..5f1c5893 100644 --- a/scene/ground/ground_loader.gd +++ b/scene/ground/ground_loader.gd @@ -43,10 +43,10 @@ static var GROUND_SCENE_PATH_DICT = { "c02_s09": "res://scene/ground/scene/c02/s09_裂缝.tscn", "c02_s10": "res://scene/ground/scene/c02/s10_空房间.tscn", "c02_s11": "res://scene/ground/scene/c02/s11_一楼火灾.tscn", - "c02_s12": "res://scene/ground/scene/c02/s12_1014诡异版.tscn", - "c02_s13": "res://scene/ground/scene/c02/s13_院子诡异版.tscn", - "c02_s14": "res://scene/ground/scene/c02/s14_过道诡异版.tscn", - "c02_s15": "res://scene/ground/scene/c02/s15_1014家具版.tscn", + # "c02_s12": "res://scene/ground/scene/c02/s12_1014诡异版.tscn", + # "c02_s13": "res://scene/ground/scene/c02/s13_院子诡异版.tscn", + # "c02_s14": "res://scene/ground/scene/c02/s14_过道诡异版.tscn", + # "c02_s15": "res://scene/ground/scene/c02/s15_1014家具版.tscn", } func _ready() -> void: diff --git a/scene/ground/scene/c02/s02_过道.tscn b/scene/ground/scene/c02/s02_过道.tscn index eb9bff34..45128834 100644 --- a/scene/ground/scene/c02/s02_过道.tscn +++ b/scene/ground/scene/c02/s02_过道.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=27 format=3 uid="uid://brck77w81fhvc"] +[gd_scene load_steps=28 format=3 uid="uid://brck77w81fhvc"] [ext_resource type="PackedScene" uid="uid://dayyx4jerj7io" path="res://scene/ground/ground.tscn" id="1_wrr6r"] [ext_resource type="Script" uid="uid://bfrgnmde3hjn0" path="res://scene/ground/scene/c02/s02_animation.gd" id="2_5p8ev"] @@ -21,6 +21,7 @@ [ext_resource type="Texture2D" uid="uid://b343nvvbtpglb" path="res://asset/art/ui/互动提示符/ui 像素版_纯白.png" id="18_8cg1n"] [ext_resource type="PackedScene" uid="uid://dqkxiqbq83cmq" path="res://scene/entity/closeup.tscn" id="19_6wwyd"] [ext_resource type="SpriteFrames" uid="uid://blij4obvhb1vf" path="res://asset/art/gif/c02_公寓过道/frames.tres" id="19_q0axc"] +[ext_resource type="Texture2D" uid="uid://6x6mmg2hig5j" path="res://asset/art/scene/c02/s02_大门过道/e-八音盒(场景中).png" id="22_jg8g0"] [sub_resource type="Animation" id="Animation_abofy"] resource_name = "oneshot_天冷" @@ -191,9 +192,14 @@ matched_sign_texture = SubResource("AtlasTexture_q0axc") mute_when_interacted = true [node name="Closeup八音盒" parent="Ground/DeployLayer" index="15" instance=ExtResource("19_6wwyd")] -position = Vector2(534, 65) +position = Vector2(542, 68) packed_scene = ExtResource("10_ifae7") +[node name="Sprite2D" type="Sprite2D" parent="Ground/DeployLayer/Closeup八音盒"] +show_behind_parent = true +position = Vector2(0, 11) +texture = ExtResource("22_jg8g0") + [node name="MainPlayer" parent="Ground" index="5"] position = Vector2(53, 98) diff --git a/scene/ground/scene/c02/s03_animation.gd b/scene/ground/scene/c02/s03_animation.gd index 558f51b5..4df7a433 100644 --- a/scene/ground/scene/c02/s03_animation.gd +++ b/scene/ground/scene/c02/s03_animation.gd @@ -34,7 +34,9 @@ func _on_ground_ready() -> void: counter.interacted.connect(_on_counter_interacted) if ArchiveManager.get_global_value("c02_counter_pushed_out"): counter.visible = true - counter.enabled = true + # 火灾开始后,便无需 enable + if not ArchiveManager.get_global_value("c02_burning"): + counter.enabled = true madman_ambush = $"../DeployLayer/Ambush井边疯子" # c02_madman_hitwall 之后, ball_game_stage==2(游戏结束) 之前 diff --git a/scene/ground/scene/c02/s03_院子.tscn b/scene/ground/scene/c02/s03_院子.tscn index 701a0c5f..3406a07e 100644 --- a/scene/ground/scene/c02/s03_院子.tscn +++ b/scene/ground/scene/c02/s03_院子.tscn @@ -290,7 +290,7 @@ texture = ExtResource("3_sqv8l") [node name="无头小蝶" type="AnimatedSprite2D" parent="Ground/BGSprite2D" index="0"] show_behind_parent = true -position = Vector2(852, -69) +position = Vector2(851, -26) sprite_frames = ExtResource("4_gd6xp") animation = &"一楼二楼外侧楼道拼接-晃脚动画" autoplay = "一楼二楼外侧楼道拼接-晃脚动画" @@ -406,6 +406,7 @@ position = Vector2(466, 3) packed_scene = ExtResource("24_0o4rt") [node name="Closeup井" parent="Ground/DeployLayer" index="16" instance=ExtResource("23_81juy")] +z_index = 6 position = Vector2(2072, 47) packed_scene = ExtResource("26_yy4fp") diff --git a/scene/ground/scene/c02/s06_animation.gd b/scene/ground/scene/c02/s06_animation.gd index 54e348d7..f9897762 100644 --- a/scene/ground/scene/c02/s06_animation.gd +++ b/scene/ground/scene/c02/s06_animation.gd @@ -85,7 +85,7 @@ func boys_ball_game() -> void: SceneManager.freeze_player(0) if SceneManager.get_current_prop(false) != "prop_弹珠": DialogueManager.show_dialogue_balloon(dialogue_c02, "c02_s05_三男孩弹珠游戏3") - var hud = SceneManager.get_hud() as PropHud + var hud = SceneManager.get_prop_hud() as PropHud hud.on_toggle_invalid_prop() else: # 开始弹珠游戏 diff --git a/scene/ground/scene/c02/s06_二楼.tscn b/scene/ground/scene/c02/s06_二楼.tscn index 6e2e4238..dcc98739 100644 --- a/scene/ground/scene/c02/s06_二楼.tscn +++ b/scene/ground/scene/c02/s06_二楼.tscn @@ -291,7 +291,7 @@ portal_name = "1" target_scene = "c02_s08" target_portal = "left" status = "locked" -prop_key = "prop_1012钥匙" +prop_key = "prop_2014钥匙" [node name="煤油灯" parent="Ground/DeployLayer" index="3" instance=ExtResource("5_3p5ta")] position = Vector2(616, -14) @@ -344,6 +344,7 @@ position = Vector2(1260, 2) packed_scene = ExtResource("12_intre") [node name="Ambush三男孩" parent="Ground/DeployLayer" index="10" instance=ExtResource("14_k01ve")] +visible = false position = Vector2(167, 38) enabled = false trigger_mode = "interact" diff --git a/scene/ground/scene/c02/s10_animation.gd b/scene/ground/scene/c02/s10_animation.gd index 1ef66ae4..8e59ddeb 100644 --- a/scene/ground/scene/c02/s10_animation.gd +++ b/scene/ground/scene/c02/s10_animation.gd @@ -50,6 +50,11 @@ func _on_ground_ready() -> void: counter.enabled = false xiao_chan_interactable.interacted.connect(_on_xiao_chan_interacted) + if catty_head.played: + catty_head.visible = false + # 捡起猫头后启用传送门 + portal.enabled = true + if ArchiveManager.get_global_value("c02_counter_pushed_out"): counter.visible = false counter.enabled = false