Merge branch 'main' of http://47.99.99.211:3000/ReedZhu/godot-plateformer
This commit is contained in:
commit
22cbb4ba6e
|
|
@ -1,4 +1,4 @@
|
||||||
[gd_scene load_steps=9 format=3 uid="uid://3vc8ojbiyy5w"]
|
[gd_scene load_steps=11 format=3 uid="uid://3vc8ojbiyy5w"]
|
||||||
|
|
||||||
[ext_resource type="Script" uid="uid://crgac4manhoud" path="res://_game/game.gd" id="1_yksyv"]
|
[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://cvqehvdjpoar4" path="res://_player/player_controller.tscn" id="2_x2i0j"]
|
||||||
|
|
@ -8,6 +8,8 @@
|
||||||
[ext_resource type="PackedScene" uid="uid://dh43kt0l28qd5" path="res://_scene/level1/l1_s3.tscn" id="6_ktxjv"]
|
[ext_resource type="PackedScene" uid="uid://dh43kt0l28qd5" path="res://_scene/level1/l1_s3.tscn" id="6_ktxjv"]
|
||||||
[ext_resource type="PackedScene" uid="uid://byepspl7xlhhk" path="res://_scene/level1/l1_s5.tscn" id="7_4ifj7"]
|
[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"]
|
[ext_resource type="PackedScene" uid="uid://br46ftt4v3bwm" path="res://_scene/level1/l1_s4.tscn" id="7_x2i0j"]
|
||||||
|
[ext_resource type="PackedScene" uid="uid://7424nctotch0" path="res://_scene/level1/l1_s6.tscn" id="9_m1t3p"]
|
||||||
|
[ext_resource type="PackedScene" uid="uid://dr8a26hfqkh12" path="res://_scene/level1/l1_s7.tscn" id="10_5s0xe"]
|
||||||
|
|
||||||
[node name="Game" type="Node2D" groups=["PLAYER_RESPAWN"]]
|
[node name="Game" type="Node2D" groups=["PLAYER_RESPAWN"]]
|
||||||
script = ExtResource("1_yksyv")
|
script = ExtResource("1_yksyv")
|
||||||
|
|
@ -25,3 +27,7 @@ script = ExtResource("1_yksyv")
|
||||||
[node name="L1_S4" parent="." instance=ExtResource("7_x2i0j")]
|
[node name="L1_S4" parent="." instance=ExtResource("7_x2i0j")]
|
||||||
|
|
||||||
[node name="L1_S5" parent="." instance=ExtResource("7_4ifj7")]
|
[node name="L1_S5" parent="." instance=ExtResource("7_4ifj7")]
|
||||||
|
|
||||||
|
[node name="L1_S6" parent="." instance=ExtResource("9_m1t3p")]
|
||||||
|
|
||||||
|
[node name="L1_S7" parent="." instance=ExtResource("10_5s0xe")]
|
||||||
|
|
|
||||||
|
|
@ -7,4 +7,6 @@ func _ready() -> void:
|
||||||
#$L1_S3.switch_act_by_id(1)
|
#$L1_S3.switch_act_by_id(1)
|
||||||
#$L1_S4.switch_act_by_id(1)
|
#$L1_S4.switch_act_by_id(1)
|
||||||
#$L1_S5.switch_act_by_id(1)
|
#$L1_S5.switch_act_by_id(1)
|
||||||
|
#$L1_S6.switch_act_by_id(1)
|
||||||
|
$L1_S7.switch_act_by_id(1)
|
||||||
get_tree().call_group(&"PLAYER_RESPAWN",&"respawn_avatar")
|
get_tree().call_group(&"PLAYER_RESPAWN",&"respawn_avatar")
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Binary file not shown.
Loading…
Reference in New Issue