diff --git a/asset/art/gif/c03_胖子游戏/c03_棺材怪合并素材/c03_棺材怪合并素材_frames.tres b/asset/art/gif/c03_胖子游戏/c03_棺材怪合并素材/c03_棺材怪合并素材_frames.tres index 38a1aa01..85292312 100644 --- a/asset/art/gif/c03_胖子游戏/c03_棺材怪合并素材/c03_棺材怪合并素材_frames.tres +++ b/asset/art/gif/c03_胖子游戏/c03_棺材怪合并素材/c03_棺材怪合并素材_frames.tres @@ -1,4 +1,4 @@ -[gd_resource type="SpriteFrames" load_steps=42 format=3 uid="uid://wki5e7qtniyn"] +[gd_resource type="SpriteFrames" load_steps=40 format=3 uid="uid://wki5e7qtniyn"] [ext_resource type="Texture2D" uid="uid://d1p1kwylx2qum" path="res://asset/art/gif/c03_胖子游戏/c03_棺材怪合并素材/棺材怪移动效果/0.png" id="1_1bfo3"] [ext_resource type="Texture2D" uid="uid://drbxkois8npto" path="res://asset/art/gif/c03_胖子游戏/c03_棺材怪合并素材/棺材怪移动/0.png" id="1_3sag0"] @@ -19,7 +19,6 @@ [ext_resource type="Texture2D" uid="uid://bvikkw0s2v3ix" path="res://asset/art/gif/c03_胖子游戏/c03_棺材怪合并素材/棺材怪移动效果/3.png" id="4_gocnt"] [ext_resource type="Texture2D" uid="uid://bqpvlq4jg2ffm" path="res://asset/art/gif/c03_胖子游戏/c03_棺材怪DIY素材/砍下来_效果.png" id="4_gyx2o"] [ext_resource type="Texture2D" uid="uid://bg68iws3xgtbv" path="res://asset/art/gif/c03_胖子游戏/c03_棺材怪DIY素材/腿右2.png" id="4_kg0cu"] -[ext_resource type="Texture2D" uid="uid://cvn7pmlb5kms" path="res://asset/art/gif/c03_胖子游戏/c03_棺材怪合并素材/棺材怪右砍-记得加手/3.png" id="4_s55rn"] [ext_resource type="Texture2D" uid="uid://br7ofgnk2vuw7" path="res://asset/art/gif/c03_胖子游戏/c03_棺材怪合并素材/棺材怪砍-记得加手/0.png" id="5_2j3c0"] [ext_resource type="Texture2D" uid="uid://buyjk08qfj0xj" path="res://asset/art/gif/c03_胖子游戏/c03_棺材怪合并素材/棺材整体效果/4.png" id="5_063np"] [ext_resource type="Texture2D" uid="uid://dm7t7narhskbp" path="res://asset/art/gif/c03_胖子游戏/c03_棺材怪合并素材/棺材怪移动效果/4.png" id="5_rgpbq"] @@ -29,7 +28,6 @@ [ext_resource type="Texture2D" uid="uid://cr2vblkghkw64" path="res://asset/art/gif/c03_胖子游戏/c03_棺材怪合并素材/棺材整体效果/6.png" id="7_po16o"] [ext_resource type="Texture2D" uid="uid://316w7fr5mthx" path="res://asset/art/gif/c03_胖子游戏/c03_棺材怪DIY素材/腿左1.png" id="7_sjehm"] [ext_resource type="Texture2D" uid="uid://s5ugx2mxh1ma" path="res://asset/art/gif/c03_胖子游戏/c03_棺材怪合并素材/棺材整体效果/7.png" id="8_3pxk2"] -[ext_resource type="Texture2D" uid="uid://dyfb7ay3fklw1" path="res://asset/art/gif/c03_胖子游戏/c03_棺材怪合并素材/棺材怪砍-记得加手/3.png" id="8_g0hd4"] [ext_resource type="Texture2D" uid="uid://bv5qruqsbvmt2" path="res://asset/art/gif/c03_胖子游戏/c03_棺材怪DIY素材/腿左2.png" id="8_lhvv0"] [ext_resource type="Texture2D" uid="uid://de3huc21uj486" path="res://asset/art/gif/c03_胖子游戏/c03_棺材怪合并素材/棺材怪砍人效果/0.png" id="9_3gq86"] [ext_resource type="Texture2D" uid="uid://hfpqbxycm557" path="res://asset/art/gif/c03_胖子游戏/c03_棺材怪合并素材/棺材怪砍人效果/1.png" id="10_j3hcn"] @@ -96,37 +94,37 @@ animations = [{ }, { "frames": [{ "duration": 1.0, -"texture": ExtResource("1_ddjd1") -}, { -"duration": 1.0, "texture": ExtResource("2_1bfo3") }, { "duration": 1.0, "texture": ExtResource("3_j1ego") }, { "duration": 1.0, -"texture": ExtResource("4_s55rn") +"texture": ExtResource("2_1bfo3") +}, { +"duration": 1.0, +"texture": ExtResource("1_ddjd1") }], "loop": false, "name": &"棺材怪右砍", -"speed": 5.0 +"speed": 4.0 }, { "frames": [{ "duration": 1.0, -"texture": ExtResource("5_2j3c0") -}, { -"duration": 1.0, "texture": ExtResource("6_nysf7") }, { "duration": 1.0, "texture": ExtResource("7_0vrf3") }, { "duration": 1.0, -"texture": ExtResource("8_g0hd4") +"texture": ExtResource("6_nysf7") +}, { +"duration": 1.0, +"texture": ExtResource("5_2j3c0") }], "loop": false, "name": &"棺材怪左砍", -"speed": 5.0 +"speed": 4.0 }, { "frames": [{ "duration": 6.0, diff --git a/scene/ground/scene/c03/s01_三楼.tscn b/scene/ground/scene/c03/s01_三楼.tscn index 2092af68..af39f822 100644 --- a/scene/ground/scene/c03/s01_三楼.tscn +++ b/scene/ground/scene/c03/s01_三楼.tscn @@ -116,7 +116,6 @@ portal_name = "1" target_scene = "c04_s01" target_portal = "left" status = "locked" -prop_key = "prop_3012钥匙" [node name="Note治病木牌" parent="Ground/DeployLayer" index="3" instance=ExtResource("18_0xq6i")] position = Vector2(456, 47) diff --git a/scene/ground/scene/c04/s08_三楼III.gd b/scene/ground/scene/c04/s08_三楼III.gd index 9f575ca9..5cdef8ae 100644 --- a/scene/ground/scene/c04/s08_三楼III.gd +++ b/scene/ground/scene/c04/s08_三楼III.gd @@ -22,7 +22,9 @@ var interactable家门: Interactable2D func _setup_node_reference() -> void: interactable家门 = $"../DeployLayer/Interactable家门" interactable家门.interacted.connect(_on_door_interacted) - + if interactable家门.interacted_times > 0: + # 交互后，prop_key 置空 + interactable家门.prop_key = "" func _on_ground_ready() -> void: var trap_stage = EventManager.get_stage("c04_ghost_trapped") @@ -41,6 +43,8 @@ func _on_ground_ready() -> void: func _on_door_interacted() -> void: + # 交互后，prop_key 置空 + interactable家门.prop_key = "" SceneManager.lock_player() # c04_ghost_trapped: 0:初始化 1:第一次开门 2:进入鬼打墙场景 3:鬼打墙结束 4:排队纸人歪头 var trap_stage = EventManager.get_stage("c04_ghost_trapped") diff --git a/scene/ground/scene/c04/s08_三楼III.tscn b/scene/ground/scene/c04/s08_三楼III.tscn index 02573e57..e0e053b8 100644 --- a/scene/ground/scene/c04/s08_三楼III.tscn +++ b/scene/ground/scene/c04/s08_三楼III.tscn @@ -157,6 +157,8 @@ position = Vector2(515, -31) first_interact_os_key = "c04_鬼打墙_首次开门" matched_sign_texture = ExtResource("7_7u3rr") one_shot = false +disable_prop_after_interacted = true +prop_key = "prop_3012钥匙" [node name="Note治病木牌" parent="Ground/DeployLayer" index="4" instance=ExtResource("7_acpio")] position = Vector2(456, 47) diff --git a/scene/ground/script/c02/s03_event第三章开幕.gd b/scene/ground/script/c02/s03_event第三章开幕.gd index b79c4ef6..ca1744db 100644 --- a/scene/ground/script/c02/s03_event第三章开幕.gd +++ b/scene/ground/script/c02/s03_event第三章开幕.gd @@ -53,7 +53,7 @@ func intro_c04() -> void: camera.apply_limits(default_limit) SceneManager.unlock_player() EventManager.set_stage("c03_intro_c04", 1) - ArchiveManager.set_chapter_if_greater(4) + # ArchiveManager.set_chapter_if_greater(4) func start_conversation() -> void: