diff --git a/scene/ground/scene/c02/s13_animation.gd b/scene/ground/scene/c02/s13_animation.gd index 0cc6cd2b..d0b2b417 100644 --- a/scene/ground/scene/c02/s13_animation.gd +++ b/scene/ground/scene/c02/s13_animation.gd @@ -23,7 +23,7 @@ func knock_light_door(): # 一直循环下去 for _i in range(100): AudioManager.play_sfx(knock_stream) - SceneManager.freeze_player(1.5, 6, true) + SceneManager.freeze_player(0, 6) await get_tree().create_timer(0.5).timeout # 被抓时打断 if not player.visible or player.hide_sprite: diff --git a/scene/ground/scene/c02/s13_盒子猫二楼.tscn b/scene/ground/scene/c02/s13_盒子猫二楼.tscn index b86bd8ad..d02b195f 100644 --- a/scene/ground/scene/c02/s13_盒子猫二楼.tscn +++ b/scene/ground/scene/c02/s13_盒子猫二楼.tscn @@ -103,6 +103,7 @@ scale = Vector2(1.05, 1.05) points = PackedVector2Array(37, 150, 870, 150) [node name="DirectionalLight2D" parent="Ground" index="8"] +visible = false blend_mode = 1 [node name="盒子猫CanvasLayer" parent="Ground" instance=ExtResource("7_u2fv1")] diff --git a/scene/ground/scene/c02/s15_盒子猫一楼内侧.tscn b/scene/ground/scene/c02/s15_盒子猫一楼内侧.tscn index cdc8c638..fcdc7404 100644 --- a/scene/ground/scene/c02/s15_盒子猫一楼内侧.tscn +++ b/scene/ground/scene/c02/s15_盒子猫一楼内侧.tscn @@ -47,6 +47,7 @@ position = Vector2(-1, -15) points = PackedVector2Array(125, 150, 660, 150) [node name="DirectionalLight2D" parent="Ground" index="8"] +visible = false blend_mode = 1 [node name="盒子猫CanvasLayer" parent="Ground" instance=ExtResource("5_isic3")] diff --git a/scene/ground/scene/c02/s16_盒子猫三楼内侧.tscn b/scene/ground/scene/c02/s16_盒子猫三楼内侧.tscn index f0c996f0..1160a84f 100644 --- a/scene/ground/scene/c02/s16_盒子猫三楼内侧.tscn +++ b/scene/ground/scene/c02/s16_盒子猫三楼内侧.tscn @@ -59,6 +59,7 @@ position = Vector2(3584, -7) points = PackedVector2Array(37, 150, 655, 150) [node name="DirectionalLight2D" parent="Ground" index="8"] +visible = false blend_mode = 1 [node name="盒子猫CanvasLayer" parent="Ground" instance=ExtResource("5_tmnwc")] diff --git a/scene/ground/scene/c02/s17_盒子猫三楼.tscn b/scene/ground/scene/c02/s17_盒子猫三楼.tscn index c60db54c..d1f1e114 100644 --- a/scene/ground/scene/c02/s17_盒子猫三楼.tscn +++ b/scene/ground/scene/c02/s17_盒子猫三楼.tscn @@ -39,22 +39,16 @@ position = Vector2(662, 57) debug_note = "出来就不能回来了" portal_name = "1" target_scene = "c02_s12" +target_portal = "left" -[node name="Ambush猫咪敲门互动" parent="Ground/DeployLayer" index="3" instance=ExtResource("8_m6dyn")] -position = Vector2(661, 7) -trigger_mode = "interact" -one_shot = false -freeze_time = 1.5 -global_method = "c02_cat_play_with_door" - -[node name="Ambush猫咪敲门互动2" parent="Ground/DeployLayer" index="4" instance=ExtResource("8_m6dyn")] +[node name="Ambush猫咪敲门互动2" parent="Ground/DeployLayer" index="3" instance=ExtResource("8_m6dyn")] position = Vector2(106, 6) trigger_mode = "interact" one_shot = false freeze_time = 1.5 global_method = "c02_cat_play_with_door" -[node name="追猫猪头怪" parent="Ground/DeployLayer" index="5" instance=ExtResource("6_pfgbg")] +[node name="追猫猪头怪" parent="Ground/DeployLayer" index="4" instance=ExtResource("6_pfgbg")] [node name="MainPlayer" parent="Ground" index="4"] position = Vector2(235, 73) @@ -68,6 +62,7 @@ position = Vector2(3584, -7) points = PackedVector2Array(37, 150, 860, 150) [node name="DirectionalLight2D" parent="Ground" index="8"] +visible = false blend_mode = 1 [node name="盒子猫CanvasLayer" parent="Ground" instance=ExtResource("4_n3bxc")] diff --git a/scene/ground/scene/c02/s18_盒子猫一楼.tscn b/scene/ground/scene/c02/s18_盒子猫一楼.tscn index 166d24d4..5a12be14 100644 --- a/scene/ground/scene/c02/s18_盒子猫一楼.tscn +++ b/scene/ground/scene/c02/s18_盒子猫一楼.tscn @@ -40,14 +40,28 @@ one_shot = false freeze_time = 1.5 global_method = "c02_cat_play_with_door" -[node name="Ambush猫咪敲门互动2" parent="Ground/DeployLayer" index="3" instance=ExtResource("5_emyx1")] +[node name="Ambush猫咪敲门互动3" parent="Ground/DeployLayer" index="3" instance=ExtResource("5_emyx1")] +position = Vector2(538, 6) +trigger_mode = "interact" +one_shot = false +freeze_time = 1.5 +global_method = "c02_cat_play_with_door" + +[node name="Ambush猫咪敲门互动2" parent="Ground/DeployLayer" index="4" instance=ExtResource("5_emyx1")] position = Vector2(104, 6) trigger_mode = "interact" one_shot = false freeze_time = 1.5 global_method = "c02_cat_play_with_door" -[node name="追猫猪头怪" parent="Ground/DeployLayer" index="4" instance=ExtResource("6_xoyld")] +[node name="Ambush猫咪敲门互动4" parent="Ground/DeployLayer" index="5" instance=ExtResource("5_emyx1")] +position = Vector2(219, 6) +trigger_mode = "interact" +one_shot = false +freeze_time = 1.5 +global_method = "c02_cat_play_with_door" + +[node name="追猫猪头怪" parent="Ground/DeployLayer" index="6" instance=ExtResource("6_xoyld")] position = Vector2(-18, 74) [node name="MainPlayer" parent="Ground" index="4"] @@ -62,6 +76,7 @@ position = Vector2(3584, -7) points = PackedVector2Array(37, 150, 860, 150) [node name="DirectionalLight2D" parent="Ground" index="8"] +visible = false blend_mode = 1 [node name="盒子猫CanvasLayer" parent="Ground" instance=ExtResource("7_8eo7o")]