Compare commits

..

2 Commits

Author SHA1 Message Date
Es 51b3734ae2 冲突解决L1S7 2026-01-10 17:16:46 +08:00
Es 7005c0ef34 解决冲突L1S7 2026-01-10 17:09:47 +08:00
6 changed files with 17 additions and 14 deletions

File diff suppressed because one or more lines are too long

View File

@ -138,7 +138,7 @@ init_act_id = 0
script = ExtResource("9_c10nq")
[node name="CameraAnchor" parent="Props" instance=ExtResource("10_xrx0u")]
position = Vector2(592, -976)
position = Vector2(626.39, -976)
[node name="[Prop_0000]" type="Node" parent="Props/CameraAnchor"]
script = ExtResource("11_q6hv2")
@ -163,7 +163,7 @@ position = Vector2(544, -992)
[node name="CollisionShape2D" type="CollisionShape2D" parent="Props/PlayerTriggerVolumn"]
position = Vector2(88, 16)
shape = SubResource("RectangleShape2D_nvw5u")
debug_color = Color(0.8421533, 0.3004572, 0.5825285, 0.41960785)
debug_color = Color(0.56150323, 0.53096247, 0.47467488, 0.41960785)
[node name="[Prop_0001]" type="Node" parent="Props/PlayerTriggerVolumn"]
script = ExtResource("11_q6hv2")

View File

@ -139,7 +139,6 @@ script = ExtResource("9_v8ejv")
[node name="CameraAnchor" parent="Props" instance=ExtResource("10_fwa5x")]
position = Vector2(104, -1008)
zoom = Vector2(0.7, 0.7)
follow_player = true
[node name="[Prop_0000]" type="Node" parent="Props/CameraAnchor"]
@ -165,7 +164,7 @@ position = Vector2(112, -1000)
[node name="CollisionShape2D" type="CollisionShape2D" parent="Props/PlayerTriggerVolumn"]
position = Vector2(0, -8)
shape = SubResource("RectangleShape2D_nvw5u")
debug_color = Color(0.8421533, 0.3004572, 0.5825285, 0.41960785)
debug_color = Color(0.35784134, 0.6138294, 0.16072327, 0.41960785)
[node name="[Prop_0001]" type="Node" parent="Props/PlayerTriggerVolumn"]
script = ExtResource("11_mlg0v")

View File

@ -248,9 +248,11 @@ shape = SubResource("RectangleShape2D_5ha8p")
scale = Vector2(0.96, 0.7679998)
curve = SubResource("Curve2D_2q2em")
[node name="PathDriveMovePlateform3" parent="." node_paths=PackedStringArray("path2d", "plateform", "player_trigger") instance=ExtResource("24_mxp7a")]
[node name="PathDriveMovePlateform3" parent="." node_paths=PackedStringArray("plateform", "player_trigger") instance=ExtResource("24_mxp7a")]
position = Vector2(-520, -1336)
path2d = NodePath("Path2D")
plateform = NodePath("MovablePlateform")
player_trigger = NodePath("MovablePlateform/PlayerTriggerVolumn")
move_speed = 300.0

View File

@ -90,3 +90,7 @@ func _on_trigger_fired(trigger: SceneTrigger, signal_args: Array) -> void:
_act_manager.switch_act_with_id(target_act_id,trans_overwrite)
func _on_player_trigger_volumn_player_entered(body: CharacterBody2D) -> void:
pass # Replace with function body.