s10左右关卡测试调整

_game/game.gd

@@ -17,6 +17,8 @@ func _ready() -> void:
 	#$L1_S10_R3.switch_act_by_id(1)
 	#$L1_S10_R4.switch_act_by_id(1)
 	#$L1_S10_L1.switch_act_by_id(1)
+	#$L1_S10_L2.switch_act_by_id(1)
+	$L1_S10_L3.switch_act_by_id(1)
 	
 	GlobalEvent.player_follow_camera()
 	await get_tree().process_frame

_props/dark_material_ball/dark_material_ball.gd

@@ -2,6 +2,7 @@ extends CharacterBody2D
 
 @onready var player_collectable_volumn: PlayerTriggerVolumn = %PlayerCollectableVolumn
 @onready var hook_attract_volumn: Area2D = %HookAttractVolumn
+@export var respawn_time: float = 2.0
 
 enum State {
 	IDLE,
@@ -10,6 +11,7 @@ enum State {
 }
 
 var _current_state: State = State.IDLE
+var _spawn_position: Vector2
 
 ## 拉回速度
 @export var pull_speed: float = 800.0
@@ -17,6 +19,7 @@ var _current_state: State = State.IDLE
 var _pull_target: Node2D
 
 func _ready() -> void:
+	_spawn_position = global_position
 	player_collectable_volumn.player_entered.connect(_on_player_collected)
 
 ##状态管理函数
@@ -42,7 +45,7 @@ func change_state(in_state: State) -> void:
 		State.PULLED_BY_HOOK:
 			pass
 		State.COLLECTED:
-			queue_free()
+			_on_collected_enter()
 
 ## 钩爪击中时调用（hit_pos 是击中点，hook 是钩爪实例）
 func on_hook_hit(hit_pos: Vector2, hook: Hook) -> void:
@@ -68,3 +71,41 @@ func _on_player_collected(body:CharacterBody2D) -> void:
 	if body is Player:
 		body.hsm.dispatch(&"trigger_external_dash")
 	change_state(State.COLLECTED)
+
+func _on_collected_enter() -> void:
+	velocity = Vector2.ZERO
+
+	# 隐藏
+	visible = false
+	set_physics_process(false)
+
+	# 关闭碰撞
+	if has_node("CollisionShape2D"):
+		$CollisionShape2D.disabled = true
+
+	player_collectable_volumn.monitoring = false
+	player_collectable_volumn.monitorable = false
+	hook_attract_volumn.monitoring = false
+	hook_attract_volumn.monitorable = false
+
+	# 启动重生流程
+	_respawn_after_delay()
+	
+func _respawn_after_delay() -> void:
+	await get_tree().create_timer(respawn_time).timeout
+	
+	global_position = _spawn_position
+	
+	visible = true
+	set_physics_process(true)
+
+	if has_node("CollisionShape2D"):
+		$CollisionShape2D.disabled = false
+
+	player_collectable_volumn.monitoring = true
+	player_collectable_volumn.monitorable = true
+	hook_attract_volumn.monitoring = true
+	hook_attract_volumn.monitorable = true
+
+	change_state(State.IDLE)
+	

_props/trigger_fall_rock_hazard/trigger_fall_rock_hazard.tscn

@@ -15,7 +15,7 @@ size = Vector2(52, 108.5)
 scale = Vector2(0.9, 0.9)
 script = ExtResource("1_2ms0f")
 
-[node name="rock" parent="." unique_id=1315018512 instance=ExtResource("2_ww3ib")]
+[node name="rock" parent="." unique_id=1315018512 groups=["ROCK_BREAK"] instance=ExtResource("2_ww3ib")]
 position = Vector2(0, -82)
 falling_gravity = 600.0
 max_fall_speed = 1000.0

_scene/level1/l1_s10_derivative/l1_s10_L1.tscn

@@ -210,6 +210,7 @@ tile_set = ExtResource("23_wpd7o")
 
 [node name="VineSpring" parent="." unique_id=1779509136 instance=ExtResource("24_khkdu")]
 position = Vector2(896, -1912)
+jump_speed = 1400.0
 
 [node name="CollectionPrefab" parent="." unique_id=647938263 instance=ExtResource("25_3wkk1")]
 position = Vector2(640, -1952)
@@ -233,19 +234,27 @@ curve = SubResource("Curve2D_xt22h")
 
 [node name="DarkMaterialBall" parent="." unique_id=134327825 instance=ExtResource("28_o4f8j")]
 position = Vector2(512, -2048)
+pull_speed = 800.0
 
 [node name="DarkMaterialBall2" parent="." unique_id=652321487 instance=ExtResource("28_o4f8j")]
 position = Vector2(192, -2408)
+pull_speed = 800.0
 
 [node name="DarkMaterialBall3" parent="." unique_id=440222229 instance=ExtResource("28_o4f8j")]
 position = Vector2(192, -2528)
+pull_speed = 800.0
 
 [node name="DarkMaterialBall4" parent="." unique_id=917699340 instance=ExtResource("28_o4f8j")]
 position = Vector2(192, -2656)
+pull_speed = 800.0
 
 [node name="CollectionPrefab2" parent="." unique_id=1044349509 instance=ExtResource("25_3wkk1")]
 position = Vector2(192, -2712)
 
+[node name="DarkMaterialBall5" parent="." unique_id=1891948877 instance=ExtResource("28_o4f8j")]
+position = Vector2(816, -2095)
+pull_speed = 800.0
+
 [connection signal="player_entered" from="Props/PlayerTriggerVolumn" to="SceneManager" method="_on_player_trigger_volumn_player_entered"]
 
 [editable path="PathDriveMovePlateform"]

_scene/level1/l1_s10_derivative/l1_s10_L2.tscn

@@ -186,7 +186,7 @@ state_id = 1
 effects = Array[ExtResource("14_0cw2b")]([ExtResource("19_8ngi8")])
 
 [node name="PlayerRespawnPoint" parent="Props" unique_id=924964703 instance=ExtResource("20_yk74x")]
-position = Vector2(1032, -2258)
+position = Vector2(768, -2240)
 
 [node name="[Prop_0002]" type="Node" parent="Props/PlayerRespawnPoint" unique_id=339110471]
 script = ExtResource("11_i7s82")
@@ -237,6 +237,7 @@ position = Vector2(711, -2339)
 
 [node name="DarkMaterialBall" parent="." unique_id=1908240213 instance=ExtResource("30_x8g3a")]
 position = Vector2(600, -2464)
+pull_speed = 800.0
 
 [node name="VineSpring2" parent="." unique_id=201325714 instance=ExtResource("26_2b8eq")]
 position = Vector2(464, -2360)

_scene/level1/l1_s10_derivative/l1_s10_R1.tscn

@@ -29,7 +29,6 @@
 [ext_resource type="PackedScene" uid="uid://iv8w7iisdqm0" path="res://_props/fragile_rock/fragile_rock.tscn" id="27_o0rls"]
 [ext_resource type="PackedScene" uid="uid://cpbaoqfc2kq80" path="res://_props/move_plateform/path_drive_move_plateform/PathDriveMovePlateform.tscn" id="27_yempu"]
 [ext_resource type="PackedScene" uid="uid://dfwups0m7a5m4" path="res://_props/_prefabs/vine_platform/vine_platform.tscn" id="28_a3a7b"]
-[ext_resource type="PackedScene" uid="uid://b188rk1rmyb2h" path="res://_props/vine_spring/vine_spring.tscn" id="30_0m01g"]
 
 [sub_resource type="Resource" id="Resource_6bhoi"]
 script = ExtResource("8_ouk7k")
@@ -215,14 +214,16 @@ position = Vector2(2009, -1272)
 
 [node name="DarkMaterialBall1" parent="." unique_id=812084052 instance=ExtResource("26_ixcpk")]
 position = Vector2(1873, -1194)
+pull_speed = 800.0
 
 [node name="DarkMaterialBall2" parent="." unique_id=1222947168 instance=ExtResource("26_ixcpk")]
 position = Vector2(2144, -1236)
+pull_speed = 800.0
 
 [node name="PathDriveMovePlateform" parent="." unique_id=690648473 instance=ExtResource("27_yempu")]
 position = Vector2(1727, -1378)
-move_speed = 300.0
+move_speed = 500.0
-returning_speed = 100.0
+returning_speed = 200.0
 acceleration = 1000.0
 
 [node name="MovablePlateform" parent="PathDriveMovePlateform" index="0"]
@@ -235,6 +236,7 @@ curve = SubResource("Curve2D_7cppx")
 [node name="spring" parent="." unique_id=1715172330 instance=ExtResource("24_4m155")]
 position = Vector2(2008, -984)
 scale = Vector2(4.94, 0.98)
+jump_speed = 1200.0
 
 [node name="FragileRock" parent="." unique_id=630713971 instance=ExtResource("27_o0rls")]
 position = Vector2(2328, -1608)
@@ -290,9 +292,6 @@ position = Vector2(2191, -1480)
 [node name="VinePlatform17" parent="." unique_id=1989137791 instance=ExtResource("28_a3a7b")]
 position = Vector2(2223, -1480)
 
-[node name="VineSpring" parent="." unique_id=2020688858 instance=ExtResource("30_0m01g")]
-position = Vector2(1755, -1508)
-
 [connection signal="player_entered" from="Props/PlayerTriggerVolumn" to="SceneManager" method="_on_player_trigger_volumn_player_entered"]
 
 [editable path="PathDriveMovePlateform"]

_scene/level1/l1_s10_derivative/l1_s10_R2.tscn

@@ -216,18 +216,23 @@ tile_set = ExtResource("23_b2ii1")
 
 [node name="DarkMaterialBall1" parent="." unique_id=1366886022 instance=ExtResource("24_1ybqj")]
 position = Vector2(3001, -1636)
+pull_speed = 800.0
 
 [node name="DarkMaterialBall2" parent="." unique_id=1688973548 instance=ExtResource("24_1ybqj")]
 position = Vector2(3067, -1725)
+pull_speed = 800.0
 
 [node name="DarkMaterialBall3" parent="." unique_id=1929432413 instance=ExtResource("24_1ybqj")]
 position = Vector2(3278, -1685)
+pull_speed = 800.0
 
 [node name="DarkMaterialBall4" parent="." unique_id=1118438140 instance=ExtResource("24_1ybqj")]
 position = Vector2(3043, -1926)
+pull_speed = 800.0
 
 [node name="DarkMaterialBall5" parent="." unique_id=1271673399 instance=ExtResource("24_1ybqj")]
 position = Vector2(2848, -2164)
+pull_speed = 800.0
 
 [node name="spring1" parent="." unique_id=557723365 instance=ExtResource("25_6lr1v")]
 position = Vector2(3264, -1496)
@@ -237,13 +242,13 @@ scale = Vector2(3.935, 0.98)
 position = Vector2(2744, -1824)
 rotation = 1.5707964
 scale = Vector2(2, 1)
-jump_speed = 600.0
+jump_speed = 800.0
 
 [node name="spring3" parent="." unique_id=1366613268 instance=ExtResource("25_6lr1v")]
 position = Vector2(2776, -1936)
 rotation = 1.5707964
 scale = Vector2(2, 1)
-jump_speed = 600.0
+jump_speed = 500.0
 
 [node name="PathDriveMovePlateform1" parent="." unique_id=253627846 instance=ExtResource("26_xgojf")]
 position = Vector2(3280, -1872)

_scene/level1/l1_s10_derivative/l1_s10_R3.tscn

@@ -126,7 +126,7 @@ init_act_id = 0
 script = ExtResource("9_hdxte")
 
 [node name="CameraAnchor" parent="Props" unique_id=1432307822 instance=ExtResource("10_l5cyl")]
-position = Vector2(2381, -2254)
+position = Vector2(2383, -2259)
 zoom = Vector2(1, 1)
 limit_top = -185
 limit_bottom = 185
@@ -201,18 +201,23 @@ tile_set = ExtResource("23_fspkf")
 
 [node name="DarkMaterialBall1" parent="." unique_id=511506039 instance=ExtResource("24_6s0jn")]
 position = Vector2(2132, -2384)
+pull_speed = 800.0
 
 [node name="DarkMaterialBall5" parent="." unique_id=2006068258 instance=ExtResource("24_6s0jn")]
 position = Vector2(2523, -2201)
+pull_speed = 800.0
 
 [node name="DarkMaterialBall2" parent="." unique_id=700248836 instance=ExtResource("24_6s0jn")]
 position = Vector2(2047, -2178)
+pull_speed = 800.0
 
 [node name="DarkMaterialBall3" parent="." unique_id=1037923870 instance=ExtResource("24_6s0jn")]
 position = Vector2(1836, -2327)
+pull_speed = 800.0
 
 [node name="DarkMaterialBall4" parent="." unique_id=30036966 instance=ExtResource("24_6s0jn")]
 position = Vector2(2373, -2339)
+pull_speed = 800.0
 
 [node name="CollectionPrefab" parent="." unique_id=647938263 instance=ExtResource("25_v7gsl")]
 position = Vector2(2096, -2287)

_scene/level1/l1_s10_derivative/l1_s10_R4.tscn

@@ -25,7 +25,6 @@
 [ext_resource type="TileSet" uid="uid://doepkfp83k0lb" path="res://_tileset/test.tres" id="23_di7tg"]
 [ext_resource type="PackedScene" uid="uid://degt1t2y08udg" path="res://_props/dark_material_ball/dark_material_ball.tscn" id="24_xfvof"]
 [ext_resource type="PackedScene" uid="uid://bju8jr1w4d60m" path="res://_props/spring/spring.tscn" id="25_mvmeo"]
-[ext_resource type="PackedScene" uid="uid://cpbaoqfc2kq80" path="res://_props/move_plateform/path_drive_move_plateform/PathDriveMovePlateform.tscn" id="26_cp6k1"]
 [ext_resource type="PackedScene" uid="uid://iv8w7iisdqm0" path="res://_props/fragile_rock/fragile_rock.tscn" id="27_84s01"]
 [ext_resource type="PackedScene" uid="uid://knrcnoedxvm6" path="res://_props/trigger_fall_rock_hazard/trigger_fall_rock_hazard.tscn" id="28_2f3k5"]
 
@@ -75,7 +74,7 @@ prop_state_map = Dictionary[int, ExtResource("8_42yu5")]({
 metadata/_custom_type_script = "uid://fxpk2ot6otfh"
 
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_nvw5u"]
-size = Vector2(745, 470.73492)
+size = Vector2(745, 463.00003)
 
 [sub_resource type="Resource" id="Resource_ctwrc"]
 script = ExtResource("21_hsocq")
@@ -105,18 +104,6 @@ effect_target_type = SubResource("Resource_o2v7x")
 effect_apply_type = SubResource("Resource_hatj6")
 metadata/_custom_type_script = "uid://cdvgq0xqdbagk"
 
-[sub_resource type="Curve2D" id="Curve2D_mnuxl"]
-_data = {
-"points": PackedVector2Array(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -615.515)
-}
-point_count = 2
-
-[sub_resource type="Curve2D" id="Curve2D_e364f"]
-_data = {
-"points": PackedVector2Array(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -286.44092, -112.76587)
-}
-point_count = 2
-
 [node name="L1_S10_R4" type="Node2D" unique_id=1598546581]
 editor_description = "右侧落石触发后击中龟裂岩层，形成两条通路：向上前往l1_s10_3；向下打通l1_s10_1的路"
 script = ExtResource("1_coo21")
@@ -169,7 +156,7 @@ effects = Array[ExtResource("14_jsj1s")]([ExtResource("16_1fy8b")])
 position = Vector2(2173, -1994)
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="Props/PlayerTriggerVolumn" unique_id=1008103022]
-position = Vector2(-132.5, 144.63257)
+position = Vector2(-132.5, 148.5)
 shape = SubResource("RectangleShape2D_nvw5u")
 debug_color = Color(0.56463546, 0.55446386, 0.07705598, 0.41960785)
 
@@ -191,7 +178,7 @@ state_id = 1
 effects = Array[ExtResource("14_jsj1s")]([ExtResource("19_5kmvp")])
 
 [node name="PlayerRespawnPoint" parent="Props" unique_id=924964703 instance=ExtResource("20_hxde8")]
-position = Vector2(2683, -2158)
+position = Vector2(1694, -1875)
 
 [node name="[Prop_0002]" type="Node" parent="Props/PlayerRespawnPoint" unique_id=339110471]
 script = ExtResource("11_61kn0")
@@ -216,90 +203,26 @@ tile_set = ExtResource("23_di7tg")
 
 [node name="DarkMaterialBall1" parent="." unique_id=1756169681 instance=ExtResource("24_xfvof")]
 position = Vector2(1873, -1889)
-
+pull_speed = 800.0
-[node name="DarkMaterialBall5" parent="." unique_id=1292156008 instance=ExtResource("24_xfvof")]
-position = Vector2(3067, -1725)
 
 [node name="DarkMaterialBall2" parent="." unique_id=1467718736 instance=ExtResource("24_xfvof")]
 position = Vector2(2081, -1888)
-
+pull_speed = 800.0
-[node name="DarkMaterialBall3" parent="." unique_id=1921790574 instance=ExtResource("24_xfvof")]
-position = Vector2(3043, -1926)
 
 [node name="spring1" parent="." unique_id=256634506 instance=ExtResource("25_mvmeo")]
 position = Vector2(2376, -1736)
 scale = Vector2(2.99, 0.98)
 
-[node name="spring2" parent="." unique_id=1912786554 instance=ExtResource("25_mvmeo")]
+[node name="FragileRock1" parent="." unique_id=1741835581 instance=ExtResource("27_84s01")]
-position = Vector2(2744, -1824)
-rotation = 1.5707964
-scale = Vector2(2, 1)
-jump_speed = 600.0
-
-[node name="spring3" parent="." unique_id=1328404229 instance=ExtResource("25_mvmeo")]
-position = Vector2(2776, -1936)
-rotation = 1.5707964
-scale = Vector2(2, 1)
-jump_speed = 600.0
-
-[node name="PathDriveMovePlateform1" parent="." unique_id=806243363 instance=ExtResource("26_cp6k1")]
-position = Vector2(3280, -1872)
-move_speed = 300.0
-returning_speed = 100.0
-acceleration = 1000.0
-
-[node name="MovablePlateform" parent="PathDriveMovePlateform1" index="0"]
-scale = Vector2(0.5, 0.5)
-
-[node name="Path2D" parent="PathDriveMovePlateform1" index="1"]
-scale = Vector2(1.1618448, 0.8050002)
-curve = SubResource("Curve2D_mnuxl")
-
-[node name="PathDriveMovePlateform2" parent="." unique_id=658045679 instance=ExtResource("26_cp6k1")]
-position = Vector2(3200, -2048)
-move_speed = 300.0
-returning_speed = 100.0
-acceleration = 1000.0
-
-[node name="MovablePlateform" parent="PathDriveMovePlateform2" index="0"]
-scale = Vector2(0.5, 0.5)
-
-[node name="Path2D" parent="PathDriveMovePlateform2" index="1"]
-scale = Vector2(0.59000033, 0.9399998)
-curve = SubResource("Curve2D_e364f")
-
-[node name="FragileRock1" parent="." unique_id=2033500670 instance=ExtResource("27_84s01")]
-position = Vector2(3280, -1936)
-scale = Vector2(1.33, 1.33)
-
-[node name="FragileRock2" parent="." unique_id=1907887394 instance=ExtResource("27_84s01")]
-position = Vector2(3280, -2001)
-scale = Vector2(1.33, 1.33)
-
-[node name="FragileRock3" parent="." unique_id=2018915423 instance=ExtResource("27_84s01")]
-position = Vector2(3280, -2065)
-scale = Vector2(1.33, 1.33)
-
-[node name="FragileRock4" parent="." unique_id=1677529292 instance=ExtResource("27_84s01")]
-position = Vector2(3280, -2129)
-scale = Vector2(1.33, 1.33)
-
-[node name="FragileRock5" parent="." unique_id=1741835581 instance=ExtResource("27_84s01")]
 position = Vector2(2328, -1655)
 
-[node name="FragileRock6" parent="." unique_id=1101793386 instance=ExtResource("27_84s01")]
+[node name="FragileRock2" parent="." unique_id=1101793386 instance=ExtResource("27_84s01")]
 position = Vector2(2328, -1704)
 
-[node name="TriggerFallRock_Hazard" parent="." unique_id=891552479 instance=ExtResource("28_2f3k5")]
+[node name="TriggerFallRock_Hazard1" parent="." unique_id=891552479 instance=ExtResource("28_2f3k5")]
 position = Vector2(2328, -1930.0001)
-scale = Vector2(0.9, 0.9)
-metadata/_edit_group_ = true
 
 [node name="TriggerFallRock_Hazard2" parent="." unique_id=1768473998 instance=ExtResource("28_2f3k5")]
 position = Vector2(2184, -1950)
-scale = Vector2(0.9, 0.9)
 
 [connection signal="player_entered" from="Props/PlayerTriggerVolumn" to="SceneManager" method="_on_player_trigger_volumn_player_entered"]
-
-[editable path="PathDriveMovePlateform1"]
-[editable path="PathDriveMovePlateform2"]

addons/reedcamera/scripts/camera_tools/CameraFollowController.gd

@@ -9,7 +9,7 @@ const _DEBUG_TOOL := preload("res://addons/reedcamera/scripts/camera_tools/DeadZ
 
 @export_group("Follow") 
 @export var enabled_follow: bool = true 
-@export var follow_speed: float = 600.0   # 世界单位 / 秒
+@export var follow_speed: float = 10000.0   # 世界单位 / 秒
 @export var follow_lerp := 0.12 # 0~1，越大越“跟手”，越小越“蔚蓝感”的滞后
 @export_subgroup("Follow Dynamic Speed")
 @export var min_speed_scale := 0.4   # 贴近死区时