[POST-MERGE]
This commit is contained in:
commit
dcc2a258c0
@ -1,14 +1,13 @@
|
||||
[gd_scene load_steps=3 format=2]
|
||||
|
||||
[ext_resource path="res://Scripts/Clopinette.gd" type="Script" id=1]
|
||||
[ext_resource path="res://Assets/Placeholder.png" type="Texture" id=2]
|
||||
[ext_resource path="res://Placeholder.png" type="Texture" id=1]
|
||||
[ext_resource path="res://Scripts/Clopinette.gd" type="Script" id=2]
|
||||
|
||||
[node name="Clopinette" type="Node2D"]
|
||||
position = Vector2( 458.947, 226.316 )
|
||||
script = ExtResource( 1 )
|
||||
script = ExtResource( 2 )
|
||||
|
||||
[node name="Sprite" type="Sprite" parent="."]
|
||||
texture = ExtResource( 2 )
|
||||
texture = ExtResource( 1 )
|
||||
|
||||
[node name="Area2D" type="Area2D" parent="."]
|
||||
|
||||
|
||||
3
Scene/HUD.tscn
Normal file
3
Scene/HUD.tscn
Normal file
@ -0,0 +1,3 @@
|
||||
[gd_scene format=2]
|
||||
|
||||
[node name="Node2D" type="Node2D"]
|
||||
@ -1,17 +1,16 @@
|
||||
[gd_scene load_steps=4 format=2]
|
||||
|
||||
[ext_resource path="res://Assets/Placeholder.png" type="Texture" id=1]
|
||||
[ext_resource path="res://Placeholder.png" type="Texture" id=1]
|
||||
[ext_resource path="res://Scripts/Player.gd" type="Script" id=2]
|
||||
|
||||
[sub_resource type="RectangleShape2D" id=1]
|
||||
extents = Vector2( 16.1674, 5.57349 )
|
||||
extents = Vector2( 17.014, 16.4616 )
|
||||
|
||||
[node name="KinematicBody2D" type="KinematicBody2D"]
|
||||
[node name="Player" type="KinematicBody2D"]
|
||||
script = ExtResource( 2 )
|
||||
|
||||
[node name="Sprite" type="Sprite" parent="."]
|
||||
texture = ExtResource( 1 )
|
||||
|
||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
|
||||
position = Vector2( 0, 10.3147 )
|
||||
shape = SubResource( 1 )
|
||||
|
||||
@ -1,27 +1,22 @@
|
||||
[gd_scene load_steps=4 format=2]
|
||||
[gd_scene load_steps=3 format=2]
|
||||
|
||||
[ext_resource path="res://Scene/Player.tscn" type="PackedScene" id=1]
|
||||
[ext_resource path="res://Assets/Placeholder.png" type="Texture" id=2]
|
||||
|
||||
[sub_resource type="RectangleShape2D" id=1]
|
||||
extents = Vector2( 15.6178, 15.7669 )
|
||||
[ext_resource path="res://Scene/Clopinette.tscn" type="PackedScene" id=2]
|
||||
|
||||
[node name="World" type="Node2D"]
|
||||
|
||||
[node name="Player1" parent="." instance=ExtResource( 1 )]
|
||||
position = Vector2( 119.977, 88.9695 )
|
||||
[node name="KinematicBody2D" parent="." instance=ExtResource( 1 )]
|
||||
position = Vector2( 121.087, 85.6409 )
|
||||
|
||||
[node name="obstacle" type="StaticBody2D" parent="."]
|
||||
position = Vector2( 57.697, 87.6551 )
|
||||
__meta__ = {
|
||||
"_edit_group_": true
|
||||
}
|
||||
[node name="Clopinette" parent="." instance=ExtResource( 2 )]
|
||||
position = Vector2( 128.363, 287.853 )
|
||||
|
||||
[node name="Sprite" type="Sprite" parent="obstacle"]
|
||||
texture = ExtResource( 2 )
|
||||
[node name="Clopinette2" parent="." instance=ExtResource( 2 )]
|
||||
position = Vector2( 419.87, 371.785 )
|
||||
|
||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="obstacle"]
|
||||
shape = SubResource( 1 )
|
||||
[node name="Clopinette3" parent="." instance=ExtResource( 2 )]
|
||||
position = Vector2( 364.818, 208.433 )
|
||||
|
||||
[node name="Clopinette4" parent="." instance=ExtResource( 2 )]
|
||||
position = Vector2( 476.728, 110.06 )
|
||||
|
||||
[node name="Player2" parent="." instance=ExtResource( 1 )]
|
||||
position = Vector2( 221.278, 126.847 )
|
||||
|
||||
@ -9,7 +9,7 @@ func _ready():
|
||||
sprite = get_node("Sprite")
|
||||
area = get_node("Area2D")
|
||||
area.connect("body_entered", self, "onBodyEntered")
|
||||
|
||||
|
||||
func onBodyEntered(body : PhysicsBody2D):
|
||||
queue_free()
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user