Merge branch 'main' of http://47.99.99.211:3000/ReedZhu/godot-plateformer

_game/GameMain.tscn

@@ -1,11 +1,12 @@
-[gd_scene load_steps=7 format=3 uid="uid://3vc8ojbiyy5w"]
+[gd_scene load_steps=8 format=3 uid="uid://3vc8ojbiyy5w"]
 
 [ext_resource type="Script" uid="uid://crgac4manhoud" path="res://_game/game.gd" id="1_yksyv"]
 [ext_resource type="PackedScene" uid="uid://cvqehvdjpoar4" path="res://_player/player_controller.tscn" id="2_x2i0j"]
 [ext_resource type="PackedScene" uid="uid://cd88ydqhdo28" path="res://_scene/level1/l1_s1.tscn" id="4_m1t3p"]
 [ext_resource type="PackedScene" uid="uid://djs1eg5y008cs" path="res://_scene/level1/l1_s2.tscn" id="5_5s0xe"]
 [ext_resource type="PackedScene" uid="uid://dh43kt0l28qd5" path="res://_scene/level1/l1_s3.tscn" id="6_ktxjv"]
-[ext_resource type="PackedScene" uid="uid://br46ftt4v3bwm" path="res://_scene/level1/l1_s4_Es.tscn" id="7_x2i0j"]
+[ext_resource type="PackedScene" uid="uid://byepspl7xlhhk" path="res://_scene/level1/l1_s5.tscn" id="7_4ifj7"]
+[ext_resource type="PackedScene" uid="uid://br46ftt4v3bwm" path="res://_scene/level1/l1_s4.tscn" id="7_x2i0j"]
 
 [node name="Game" type="Node2D" groups=["PLAYER_RESPAWN"]]
 script = ExtResource("1_yksyv")
@@ -18,5 +19,6 @@ script = ExtResource("1_yksyv")
 
 [node name="L1_S3" parent="." instance=ExtResource("6_ktxjv")]
 
-[node name="L1_S4_Es" parent="." instance=ExtResource("7_x2i0j")]
+[node name="L1_S4" parent="." instance=ExtResource("7_x2i0j")]
-position = Vector2(0, -15)
+
+[node name="L1_S5" parent="." instance=ExtResource("7_4ifj7")]

_game/game.gd

@@ -1,6 +1,9 @@
 extends Node2D
 
 func _ready() -> void:
-	$L1_S1.switch_act_by_id(1)
+	#$L1_S1.switch_act_by_id(1)
-	
+	#$L1_S2.switch_act_by_id(1)
+	#$L1_S3.switch_act_by_id(1)
+	$L1_S4.switch_act_by_id(1)
+	#$L1_S5.switch_act_by_id(1)
 	get_tree().call_group(&"PLAYER_RESPAWN",&"respawn_avatar")

_scene/level1/l1_s1.tscn

@@ -28,23 +28,21 @@
 [ext_resource type="PackedScene" uid="uid://csdxpv8gefpec" path="res://_props/_prefabs/plateform/movable_plateform.tscn" id="25_ctwrc"]
 [ext_resource type="Texture2D" uid="uid://c673bap4b12fx" path="res://icon.svg" id="26_0u6xi"]
 
-[sub_resource type="Resource" id="Resource_c0430"]
-script = ExtResource("6_r0e2c")
-
-[sub_resource type="Resource" id="Resource_6lvvf"]
-script = ExtResource("6_r0e2c")
-state_id = 1
-
 [sub_resource type="Resource" id="Resource_hd3du"]
 script = ExtResource("6_r0e2c")
-metadata/_custom_type_script = "uid://baqgorvlumyju"
 
-[sub_resource type="Resource" id="Resource_7p20c"]
+[sub_resource type="Resource" id="Resource_rpkwp"]
+script = ExtResource("6_r0e2c")
+
+[sub_resource type="Resource" id="Resource_c5n0b"]
+script = ExtResource("6_r0e2c")
+
+[sub_resource type="Resource" id="Resource_viktm"]
 script = ExtResource("5_ubvm0")
 prop_state_map = Dictionary[int, ExtResource("6_r0e2c")]({
-0: SubResource("Resource_c0430"),
+0: SubResource("Resource_hd3du"),
-1: SubResource("Resource_6lvvf"),
+1: SubResource("Resource_rpkwp"),
-2: SubResource("Resource_hd3du")
+2: SubResource("Resource_c5n0b")
 })
 
 [sub_resource type="Resource" id="Resource_4ake0"]
@@ -124,7 +122,7 @@ quick_trigger = Array[ExtResource("4_wkfms")]([ExtResource("5_rlimy"), ExtResour
 [node name="ActManager" type="Node" parent="."]
 script = ExtResource("4_bq6n3")
 prop_state_map = Dictionary[int, ExtResource("5_ubvm0")]({
-0: SubResource("Resource_7p20c"),
+0: SubResource("Resource_viktm"),
 1: SubResource("Resource_a1vfv")
 })
 init_act_id = 0

_tileset/test.tres

@@ -1,7 +1,10 @@
-[gd_resource type="TileSet" load_steps=3 format=3 uid="uid://doepkfp83k0lb"]
+[gd_resource type="TileSet" load_steps=4 format=3 uid="uid://doepkfp83k0lb"]
 
 [ext_resource type="Texture2D" uid="uid://doxhsab56pe50" path="res://_asset/all.png" id="1_26tvm"]
 
+[sub_resource type="TileMapPattern" id="TileMapPattern_26tvm"]
+tile_data = PackedInt32Array(0, 0, 0, 65536, 0, 0, 131072, 0, 0, 1, 0, 0, 131073, 0, 0, 2, 0, 0, 131074, 0, 0, 3, 0, 0, 65539, 0, 0, 131075, 0, 0)
+
 [sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_s5wqu"]
 texture = ExtResource("1_26tvm")
 0:0/0 = 0
@@ -28,3 +31,4 @@ physics_layer_1/collision_mask = 0
 physics_layer_2/collision_layer = 32
 physics_layer_2/collision_mask = 0
 sources/0 = SubResource("TileSetAtlasSource_s5wqu")
+pattern_0 = SubResource("TileMapPattern_26tvm")