Proyecto-Titulo/alai
2
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

feature/Coin #32

Merged
cromer merged 22 commits from feature/Coin into develop 2022-08-27 22:39:01 -04:00
Conversation 0 Commits 22 Files Changed 30 +12 -5
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a079d8aa37 - Show all commits

10
godot/Collectables/Coin/Coin.tscn
View File

@ -1,6 +1,7 @@
[gd_scene load_steps=6 format=2] [gd_scene load_steps=7 format=2]
[ext_resource path="res://assets/coin.png" type="Texture" id=1] [ext_resource path="res://assets/coin.png" type="Texture" id=1]
[ext_resource path="res://Collectables/Coin/Coin.gd" type="Script" id=2]
[sub_resource type="CircleShape2D" id=1] [sub_resource type="CircleShape2D" id=1]
radius = 6.0 radius = 6.0
@ -22,10 +23,17 @@ animations = [ {
} ] } ]
[node name="coin" type="Area2D"] [node name="coin" type="Area2D"]
collision_layer = 4
script = ExtResource( 2 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="."] [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
position = Vector2( 9, 9 )
shape = SubResource( 1 ) shape = SubResource( 1 )
[node name="AnimatedSprite" type="AnimatedSprite" parent="."] [node name="AnimatedSprite" type="AnimatedSprite" parent="."]
frames = SubResource( 4 ) frames = SubResource( 4 )
frame = 1
playing = true playing = true
centered = false
[connection signal="body_entered" from="." to="." method="_on_coin_body_entered"]

2
godot/characters/player/Player.tscn
View File

@ -12,7 +12,7 @@
extents = Vector2( 7, 12 ) extents = Vector2( 7, 12 )
[node name="Player" type="KinematicBody2D"] [node name="Player" type="KinematicBody2D"]
collision_mask = 2 collision_mask = 6
script = ExtResource( 5 ) script = ExtResource( 5 )
[node name="AnimatedSprite" type="AnimatedSprite" parent="."] [node name="AnimatedSprite" type="AnimatedSprite" parent="."]

5
godot/levels/Prototype.tscn
View File

@ -10,7 +10,6 @@
[node name="Player" parent="." instance=ExtResource( 2 )] [node name="Player" parent="." instance=ExtResource( 2 )]
collision_layer = 5 collision_layer = 5
collision_mask = 6
[node name="Camera2D" type="Camera2D" parent="Player"] [node name="Camera2D" type="Camera2D" parent="Player"]
current = true current = true
@ -44,7 +43,7 @@ centered = false
script = ExtResource( 1 ) script = ExtResource( 1 )
[node name="coin" parent="." instance=ExtResource( 5 )] [node name="coin" parent="." instance=ExtResource( 5 )]
position = Vector2( 72, 456 ) position = Vector2( 72, 450 )
[node name="coin2" parent="." instance=ExtResource( 5 )] [node name="coin2" parent="." instance=ExtResource( 5 )]
position = Vector2( 240, 456 ) position = Vector2( 234, 450 )