Merge branch 'Book_Falling' into dev
This commit is contained in:
commit
e6cc75091c
3 changed files with 16 additions and 13 deletions
|
@ -12,9 +12,6 @@
|
||||||
|
|
||||||
[sub_resource type="Theme" id="Theme_efdhj"]
|
[sub_resource type="Theme" id="Theme_efdhj"]
|
||||||
|
|
||||||
[sub_resource type="RectangleShape2D" id="RectangleShape2D_1vofj"]
|
|
||||||
size = Vector2(1289, 70.5)
|
|
||||||
|
|
||||||
[sub_resource type="RectangleShape2D" id="RectangleShape2D_4uh45"]
|
[sub_resource type="RectangleShape2D" id="RectangleShape2D_4uh45"]
|
||||||
size = Vector2(1281, 85.5)
|
size = Vector2(1281, 85.5)
|
||||||
|
|
||||||
|
@ -24,6 +21,9 @@ size = Vector2(63.75, 738.5)
|
||||||
[sub_resource type="RectangleShape2D" id="RectangleShape2D_h7316"]
|
[sub_resource type="RectangleShape2D" id="RectangleShape2D_h7316"]
|
||||||
size = Vector2(100, 753)
|
size = Vector2(100, 753)
|
||||||
|
|
||||||
|
[sub_resource type="RectangleShape2D" id="RectangleShape2D_1vofj"]
|
||||||
|
size = Vector2(2441, 70.5)
|
||||||
|
|
||||||
[node name="LevelBase" type="Node"]
|
[node name="LevelBase" type="Node"]
|
||||||
|
|
||||||
[node name="Player" parent="." instance=ExtResource("1_prjlb")]
|
[node name="Player" parent="." instance=ExtResource("1_prjlb")]
|
||||||
|
@ -78,10 +78,6 @@ texture_focused = ExtResource("8_r6dd1")
|
||||||
[node name="Walls" type="StaticBody2D" parent="."]
|
[node name="Walls" type="StaticBody2D" parent="."]
|
||||||
collision_mask = 6
|
collision_mask = 6
|
||||||
|
|
||||||
[node name="Ground" type="CollisionShape2D" parent="Walls"]
|
|
||||||
position = Vector2(0.5, 394.25)
|
|
||||||
shape = SubResource("RectangleShape2D_1vofj")
|
|
||||||
|
|
||||||
[node name="Ceiling" type="CollisionShape2D" parent="Walls"]
|
[node name="Ceiling" type="CollisionShape2D" parent="Walls"]
|
||||||
position = Vector2(-0.5, -402.25)
|
position = Vector2(-0.5, -402.25)
|
||||||
shape = SubResource("RectangleShape2D_4uh45")
|
shape = SubResource("RectangleShape2D_4uh45")
|
||||||
|
@ -94,6 +90,14 @@ shape = SubResource("RectangleShape2D_nnio8")
|
||||||
position = Vector2(690, -2.5)
|
position = Vector2(690, -2.5)
|
||||||
shape = SubResource("RectangleShape2D_h7316")
|
shape = SubResource("RectangleShape2D_h7316")
|
||||||
|
|
||||||
|
[node name="Blastzon" type="CharacterBody2D" parent="."]
|
||||||
|
collision_layer = 2
|
||||||
|
collision_mask = 4
|
||||||
|
|
||||||
|
[node name="Ground" type="CollisionShape2D" parent="Blastzon"]
|
||||||
|
position = Vector2(52.5, 620)
|
||||||
|
shape = SubResource("RectangleShape2D_1vofj")
|
||||||
|
|
||||||
[connection signal="pressed" from="UILayer/UI/HBoxContainer/ScaleUp" to="UILayer/UI" method="select_up"]
|
[connection signal="pressed" from="UILayer/UI/HBoxContainer/ScaleUp" to="UILayer/UI" method="select_up"]
|
||||||
[connection signal="pressed" from="UILayer/UI/HBoxContainer/ScaleDown" to="UILayer/UI" method="select_down"]
|
[connection signal="pressed" from="UILayer/UI/HBoxContainer/ScaleDown" to="UILayer/UI" method="select_down"]
|
||||||
[connection signal="pressed" from="UILayer/UI/HBoxContainer/TextureButton" to="UILayer/UI" method="select_mirror"]
|
[connection signal="pressed" from="UILayer/UI/HBoxContainer/TextureButton" to="UILayer/UI" method="select_mirror"]
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -4,4 +4,3 @@
|
||||||
|
|
||||||
[node name="BoxPushable1" instance=ExtResource("1_pnjdf")]
|
[node name="BoxPushable1" instance=ExtResource("1_pnjdf")]
|
||||||
scale = Vector2(2, 2)
|
scale = Vector2(2, 2)
|
||||||
collision_mask = 21
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue