From 27dcd5b8e6be11eb8542fed39edb37317b700967 Mon Sep 17 00:00:00 2001 From: RedisTKey Date: Wed, 7 Jan 2026 22:13:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _game/GameMain.tscn | 3 +-- _scene/level1/l1_s1.tscn | 5 +++-- _scene/level1/l1_s4_Es.tscn | 9 +++++---- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/_game/GameMain.tscn b/_game/GameMain.tscn index 928e1fa..c7a485e 100644 --- a/_game/GameMain.tscn +++ b/_game/GameMain.tscn @@ -15,7 +15,7 @@ script = ExtResource("1_yksyv") auto_controlled_avatar = NodePath("../Avatar") [node name="Avatar" parent="." instance=ExtResource("3_4ifj7")] -position = Vector2(1000, -450) +position = Vector2(1642, -548) collision_mask = 4 [node name="L1_S1" parent="." instance=ExtResource("4_m1t3p")] @@ -26,4 +26,3 @@ collision_mask = 4 [node name="L1_S4_Es" parent="." instance=ExtResource("7_x2i0j")] position = Vector2(0, -15) -metadata/_edit_group_ = true diff --git a/_scene/level1/l1_s1.tscn b/_scene/level1/l1_s1.tscn index 7b7db17..819d13c 100644 --- a/_scene/level1/l1_s1.tscn +++ b/_scene/level1/l1_s1.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=28 format=4 uid="uid://cd88ydqhdo28"] +[gd_scene load_steps=29 format=4 uid="uid://cd88ydqhdo28"] [ext_resource type="Script" uid="uid://5e157vdk6175" path="res://addons/reedscene/scene/ReedScene.gd" id="1_20208"] [ext_resource type="Script" uid="uid://bh066o84byplh" path="res://addons/reedscene/scene/ReedSceneID.gd" id="2_wkfms"] @@ -7,6 +7,7 @@ [ext_resource type="Script" uid="uid://ons77en82uls" path="res://addons/reedscene/scene/SceneTrigger.gd" id="4_wkfms"] [ext_resource type="Resource" uid="uid://gmaitie4ys4h" path="res://_shared/QuickTriggerConfig/player_entered_act_1.tres" id="5_rlimy"] [ext_resource type="Script" uid="uid://fxpk2ot6otfh" path="res://addons/reedscene/act/Act.gd" id="5_ubvm0"] +[ext_resource type="Resource" uid="uid://cstjpy2eh8mck" path="res://_shared/QuickTriggerConfig/prop1_player_entered_act_1.tres" id="6_bq6n3"] [ext_resource type="Script" uid="uid://baqgorvlumyju" path="res://addons/reedscene/act/SingleAct.gd" id="6_r0e2c"] [ext_resource type="Script" uid="uid://pxjf5vst08eo" path="res://addons/reedscene/prop/PropManager.gd" id="7_hd3du"] [ext_resource type="PackedScene" uid="uid://bflwr7cryd2l0" path="res://_shared/camera/CameraAnchor.tscn" id="8_vjpkl"] @@ -64,7 +65,7 @@ script = ExtResource("2_wkfms") [node name="SceneManager" type="Node" parent="."] script = ExtResource("3_rlimy") -quick_trigger = Array[ExtResource("4_wkfms")]([ExtResource("5_rlimy")]) +quick_trigger = Array[ExtResource("4_wkfms")]([ExtResource("5_rlimy"), ExtResource("6_bq6n3")]) [node name="ActManager" type="Node" parent="."] script = ExtResource("4_bq6n3") diff --git a/_scene/level1/l1_s4_Es.tscn b/_scene/level1/l1_s4_Es.tscn index 4ba90fc..acb3063 100644 --- a/_scene/level1/l1_s4_Es.tscn +++ b/_scene/level1/l1_s4_Es.tscn @@ -27,6 +27,7 @@ metadata/_custom_type_script = "uid://baqgorvlumyju" [sub_resource type="Resource" id="Resource_0dl6r"] script = ExtResource("6_qtvqv") +state_id = 1 metadata/_custom_type_script = "uid://baqgorvlumyju" [sub_resource type="Resource" id="Resource_sv1n5"] @@ -39,6 +40,7 @@ metadata/_custom_type_script = "uid://fxpk2ot6otfh" [sub_resource type="Resource" id="Resource_rvnvs"] script = ExtResource("6_qtvqv") +state_id = 1 metadata/_custom_type_script = "uid://baqgorvlumyju" [sub_resource type="Resource" id="Resource_3jyxx"] @@ -79,7 +81,7 @@ init_act_id = 0 script = ExtResource("5_qtvqv") [node name="CameraAnchor" parent="Props" instance=ExtResource("8_6bhoi")] -position = Vector2(1337, -447) +position = Vector2(1277, -906) [node name="[Prop_0000]" type="Node" parent="Props/CameraAnchor"] script = ExtResource("9_0dl6r") @@ -99,10 +101,9 @@ state_id = 1 effects = Array[ExtResource("12_3jyxx")]([ExtResource("14_chfvl")]) [node name="PlayerTriggerVolumn" parent="Props" instance=ExtResource("15_va12w")] -position = Vector2(1389, -480) +position = Vector2(1278, -937) [node name="CollisionShape2D" type="CollisionShape2D" parent="Props/PlayerTriggerVolumn"] -position = Vector2(-92.75, -393) shape = SubResource("RectangleShape2D_nvw5u") debug_color = Color(0.8478524, 0.3433138, 0.36450645, 0.41960785) @@ -123,7 +124,7 @@ script = ExtResource("11_rvnvs") state_id = 1 effects = Array[ExtResource("12_3jyxx")]([ExtResource("17_xflbg")]) -[node name="TileMapLayer" type="TileMapLayer" parent="."] +[node name="TileMapLayer" type="TileMapLayer" parent="." groups=["GRAPABLE"]] tile_map_data = PackedByteArray("AAA9AND/AAAAAAAAAAA9ANH/AAAAAAAAAAA9ANL/AAAAAAAAAAA+AND/AAAAAAAAAAA+ANH/AAAAAAAAAAA+ANL/AAAAAAAAAAA/AND/AAAAAAAAAAA/ANH/AAAAAAAAAAA/ANL/AAAAAAAAAABAAND/AAAAAAAAAABAANH/AAAAAAAAAABAANL/AAAAAAAAAABBAND/AAAAAAAAAABBANH/AAAAAAAAAABBANL/AAAAAAAAAABCAND/AAAAAAAAAABCANH/AAAAAAAAAABCANL/AAAAAAAAAABDAND/AAAAAAAAAABDANH/AAAAAAAAAABDANL/AAAAAAAAAABEAND/AAAAAAAAAABEANH/AAAAAAAAAABEANL/AAAAAAAAAABFAND/AAAAAAAAAABFANH/AAAAAAAAAABFANL/AAAAAAAAAABGAND/AAAAAAAAAABGANH/AAAAAAAAAABGANL/AAAAAAAAAABHAND/AAAAAAAAAABHANH/AAAAAAAAAABHANL/AAAAAAAAAABIAND/AAAAAAAAAABIANH/AAAAAAAAAABIANL/AAAAAAAAAABJAND/AAAAAAAAAABJANH/AAAAAAAAAABJANL/AAAAAAAAAABKAND/AAAAAAAAAABKANH/AAAAAAAAAABKANL/AAAAAAAAAABLAND/AAAAAAAAAABLANH/AAAAAAAAAABLANL/AAAAAAAAAABMAND/AAAAAAAAAABMANH/AAAAAAAAAABMANL/AAAAAAAAAABNAND/AAAAAAAAAABNANH/AAAAAAAAAABNANL/AAAAAAAAAABOAND/AAAAAAAAAABOANH/AAAAAAAAAABOANL/AAAAAAAAAABPAND/AAAAAAAAAABPANH/AAAAAAAAAABPANL/AAAAAAAAAABQAND/AAAAAAAAAABQANH/AAAAAAAAAABQANL/AAAAAAAAAABRAND/AAAAAAAAAABRANH/AAAAAAAAAABRANL/AAAAAAAAAABSAND/AAAAAAAAAABSANH/AAAAAAAAAABSANL/AAAAAAAAAABTAND/AAAAAAAAAABTANH/AAAAAAAAAABTANL/AAAAAAAAAABUAND/AAAAAAAAAABUANH/AAAAAAAAAABUANL/AAAAAAAAAABVAND/AAAAAAAAAABVANH/AAAAAAAAAABVANL/AAAAAAAAAABWAND/AAAAAAAAAABWANH/AAAAAAAAAABWANL/AAAAAAAAAABXAND/AAAAAAAAAABXANH/AAAAAAAAAABXANL/AAAAAAAAAABYANH/AAAAAAAAAABYANL/AAAAAAAAAABZANH/AAAAAAAAAABZANL/AAAAAAAAAABgAND/AAAAAAAAAABgANH/AAAAAAAAAABhAND/AAAAAAAAAABhANH/AAAAAAAAAABhANL/AAAAAAAAAABiAND/AAAAAAAAAABiANH/AAAAAAAAAABiANL/AAAAAAAAAABjAND/AAAAAAAAAABjANH/AAAAAAAAAABjANL/AAAAAAAAAABkALz/AAAAAAAAAABkAL3/AAAAAAAAAABkAL7/AAAAAAAAAABkAL//AAAAAAAAAABkAMD/AAAAAAAAAABkAMH/AAAAAAAAAABkAML/AAAAAAAAAABkAMP/AAAAAAAAAABkAMT/AAAAAAAAAABkAMX/AAAAAAAAAABkAMb/AAAAAAAAAABkAMf/AAAAAAAAAABkAMj/AAAAAAAAAABkAMn/AAAAAAAAAABkAMr/AAAAAAAAAABkAMv/AAAAAAAAAABkAMz/AAAAAAAAAABkAM3/AAAAAAAAAABkAM7/AAAAAAAAAABkAM//AAAAAAAAAABkAND/AAAAAAAAAABkANH/AAAAAAAAAABkANL/AAAAAAAAAABgANL/AAAAAAAAAAA7ALz/AAAAAAAAAAA7AL3/AAAAAAAAAAA7AL7/AAAAAAAAAAA7AL//AAAAAAAAAAA7AMb/AAAAAAAAAAA7AMf/AAAAAAAAAAA7AMj/AAAAAAAAAAA7AMn/AAAAAAAAAAA7AM7/AAAAAAAAAAA7AM//AAAAAAAAAAA7AND/AAAAAAAAAAA7ANH/AAAAAAAAAAA7ANL/AAAAAAAAAAA8ANL/AAAAAAAAAAA7ALv/AAAAAAAAAAA7ALr/AAAAAAAAAAA7ALn/AAAAAAAAAAA7ALj/AAAAAAAAAAA8ALj/AAAAAAAAAAA9ALj/AAAAAAAAAAA+ALj/AAAAAAAAAAA/ALj/AAAAAAAAAABAALj/AAAAAAAAAABBALj/AAAAAAAAAABCALj/AAAAAAAAAABDALj/AAAAAAAAAABEALj/AAAAAAAAAABFALj/AAAAAAAAAABGALj/AAAAAAAAAABHALj/AAAAAAAAAABIALj/AAAAAAAAAABJALj/AAAAAAAAAABKALj/AAAAAAAAAABLALj/AAAAAAAAAABMALj/AAAAAAAAAABNALj/AAAAAAAAAABOALj/AAAAAAAAAABPALj/AAAAAAAAAABQALj/AAAAAAAAAABRALj/AAAAAAAAAABSALj/AAAAAAAAAABTALj/AAAAAAAAAABUALj/AAAAAAAAAABVALj/AAAAAAAAAABWALj/AAAAAAAAAABXALj/AAAAAAAAAABYALj/AAAAAAAAAABZALj/AAAAAAAAAABaALj/AAAAAAAAAABbALj/AAAAAAAAAABcALj/AAAAAAAAAABdALj/AAAAAAAAAABeALj/AAAAAAAAAABfALj/AAAAAAAAAABgALj/AAAAAAAAAABkALj/AAAAAAAAAABkALn/AAAAAAAAAABkALr/AAAAAAAAAABkALv/AAAAAAAAAABhALj/AAAAAAAAAABiALj/AAAAAAAAAABjALj/AAAAAAAAAAA8ANH/AAAAAAAAAAA8AND/AAAAAAAAAABjALn/AAAAAAAAAABiALn/AAAAAAAAAABhALn/AAAAAAAAAABgALn/AAAAAAAAAABfALn/AAAAAAAAAABeALn/AAAAAAAAAABUALn/AAAAAAAAAABVALn/AAAAAAAAAABWALn/AAAAAAAAAABXALn/AAAAAAAAAABYALn/AAAAAAAAAABZALn/AAAAAAAAAABaALn/AAAAAAAAAABbALn/AAAAAAAAAABcALn/AAAAAAAAAABdALn/AAAAAAAAAABQALn/AAAAAAAAAABRALn/AAAAAAAAAABSALn/AAAAAAAAAABTALn/AAAAAAAAAABPALn/AAAAAAAAAABOALn/AAAAAAAAAABNALn/AAAAAAAAAABMALn/AAAAAAAAAABLALn/AAAAAAAAAABKALn/AAAAAAAAAABJALn/AAAAAAAAAABIALn/AAAAAAAAAABHALn/AAAAAAAAAABGALn/AAAAAAAAAABFALn/AAAAAAAAAABEALn/AAAAAAAAAABDALn/AAAAAAAAAABCALn/AAAAAAAAAABBALn/AAAAAAAAAABAALn/AAAAAAAAAAA/ALn/AAAAAAAAAAA+ALn/AAAAAAAAAAA9ALn/AAAAAAAAAAA7AM3/AAAAAAAAAAA7AMz/AAAAAAAAAAA7AMv/AAAAAAAAAAA7AMr/AAAAAAAAAAA/ALv/AAAAAAAAAABAALv/AAAAAAAAAABAALz/AAAAAAAAAABBALz/AAAAAAAAAAA/AL3/AAAAAAAAAABFALv/AAAAAAAAAABHALv/AAAAAAAAAABMALv/AAAAAAAAAABNALv/AAAAAAAAAABPALv/AAAAAAAAAABQALv/AAAAAAAAAABZALv/AAAAAAAAAABaALr/AAAAAAAAAABWALv/AAAAAAAAAABUALr/AAAAAAAAAABXALr/AAAAAAAAAABYALr/AAAAAAAAAABbALr/AAAAAAAAAABcALr/AAAAAAAAAABdALr/AAAAAAAAAABeALr/AAAAAAAAAABgALv/AAAAAAAAAABEALv/AAAAAAAAAABDALr/AAAAAAAAAABBALr/AAAAAAAAAABKALr/AAAAAAAAAABLALr/AAAAAAAAAABMALr/AAAAAAAAAABNALr/AAAAAAAAAABbALv/AAAAAAAAAABeALv/AAAAAAAAAABhALv/AAAAAAAAAABjAL3/AAAAAAAAAABjAL7/AAAAAAAAAAA6ALj/AAAAAAAAAAA6ALr/AAAAAAAAAAA6ALn/AAAAAAAAAAA6ALv/AAAAAAAAAAA6AL7/AAAAAAAAAAA6ALz/AAAAAAAAAAA6AL//AAAAAAAAAAA6AL3/AAAAAAAAAAA6AMn/AAAAAAAAAAA6AMz/AAAAAAAAAAA6ANH/AAAAAAAAAAA6ANL/AAAAAAAAAAA6AND/AAAAAAAAAAA6AM//AAAAAAAAAAA6AM7/AAAAAAAAAAA6AM3/AAAAAAAAAAA6AMv/AAAAAAAAAAA6AMr/AAAAAAAAAAA6AMj/AAAAAAAAAAA6AMf/AAAAAAAAAAA6AMb/AAAAAAAAAAA6AMX/AAAAAAAAAAA7AMX/AAAAAAAAAAA8AMX/AAAAAAAAAAA9AMX/AAAAAAAAAAA+AMX/AAAAAAAAAAA/AMX/AAAAAAAAAAA+AMb/AAAAAAAAAAA9AMb/AAAAAAAAAAA8AMb/AAAAAAAAAABLAMn/AAAAAAAAAABLAMj/AAAAAAAAAABLAMf/AAAAAAAAAABKAMf/AAAAAAAAAABKAMb/AAAAAAAAAABKAMX/AAAAAAAAAABKAMT/AAAAAAAAAABKAMP/AAAAAAAAAABLAMP/AAAAAAAAAABLAMT/AAAAAAAAAABLAMX/AAAAAAAAAABLAMb/AAAAAAAAAABMAMb/AAAAAAAAAABMAMf/AAAAAAAAAABMAMj/AAAAAAAAAABMAMn/AAAAAAAAAABUALv/AAAAAAAAAABUALz/AAAAAAAAAABUAL3/AAAAAAAAAABUAL7/AAAAAAAAAABUAL//AAAAAAAAAABVAL//AAAAAAAAAABWAL//AAAAAAAAAABWAL7/AAAAAAAAAABWAL3/AAAAAAAAAABWALz/AAAAAAAAAABVALz/AAAAAAAAAABVAL3/AAAAAAAAAABVAL7/AAAAAAAAAABVALv/AAAAAAAAAABVALr/AAAAAAAAAABWALr/AAAAAAAAAABXALz/AAABAAAAAABXAL3/AAABAAAAAABXAL7/AAABAAAAAABXAL//AAABAAAAAABXALv/AAABAAAAAABSAM//AAABAAAAAABTAM//AAABAAAAAABUAM//AAABAAAAAABVAM//AAABAAAAAABWAM//AAABAAAAAABXAM//AAABAAAAAAA=") tile_set = ExtResource("8_wofhb")