Merge remote-tracking branch 'origin/main'
This commit is contained in:
commit
f8c0fe4778
53
core.tscn
53
core.tscn
|
@ -1,53 +0,0 @@
|
|||
[gd_scene load_steps=10 format=3 uid="uid://df6xmsx4rav7n"]
|
||||
|
||||
[ext_resource type="Script" uid="uid://enxayokme5rs" path="res://core.gd" id="1_6sogb"]
|
||||
[ext_resource type="Texture2D" uid="uid://c54p5kdrt1r71" path="res://levelFinal/core/coreSprites/planetCore_0001.png" id="1_macrm"]
|
||||
[ext_resource type="Texture2D" uid="uid://b6qm6xu5ojpww" path="res://levelFinal/core/coreSprites/planetCore_0002.png" id="2_6sogb"]
|
||||
[ext_resource type="Texture2D" uid="uid://bbt2g8bk7kke8" path="res://levelFinal/core/coreSprites/planetCore_0003.png" id="3_fpp5w"]
|
||||
[ext_resource type="Texture2D" uid="uid://ch6720bqxcsmf" path="res://levelFinal/core/coreSprites/planetCore_0004.png" id="4_c0dob"]
|
||||
[ext_resource type="Texture2D" uid="uid://cd3n7wtnkho61" path="res://levelFinal/core/coreSprites/planetCore_0005.png" id="5_v2s1a"]
|
||||
[ext_resource type="Texture2D" uid="uid://bykh05626og5c" path="res://levelFinal/core/coreSprites/planetCore_0006.png" id="6_in0ky"]
|
||||
|
||||
[sub_resource type="SpriteFrames" id="SpriteFrames_macrm"]
|
||||
animations = [{
|
||||
"frames": [{
|
||||
"duration": 1.0,
|
||||
"texture": ExtResource("1_macrm")
|
||||
}, {
|
||||
"duration": 1.0,
|
||||
"texture": ExtResource("2_6sogb")
|
||||
}, {
|
||||
"duration": 1.0,
|
||||
"texture": ExtResource("3_fpp5w")
|
||||
}, {
|
||||
"duration": 1.0,
|
||||
"texture": ExtResource("4_c0dob")
|
||||
}, {
|
||||
"duration": 1.0,
|
||||
"texture": ExtResource("5_v2s1a")
|
||||
}, {
|
||||
"duration": 1.0,
|
||||
"texture": ExtResource("6_in0ky")
|
||||
}],
|
||||
"loop": true,
|
||||
"name": &"default",
|
||||
"speed": 10.0
|
||||
}]
|
||||
|
||||
[sub_resource type="CircleShape2D" id="CircleShape2D_a5wrw"]
|
||||
radius = 112.0
|
||||
|
||||
[node name="core" type="Area2D"]
|
||||
collision_layer = 3
|
||||
collision_mask = 3
|
||||
script = ExtResource("1_6sogb")
|
||||
|
||||
[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."]
|
||||
position = Vector2(-7, 0)
|
||||
sprite_frames = SubResource("SpriteFrames_macrm")
|
||||
|
||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
|
||||
position = Vector2(0, -1)
|
||||
shape = SubResource("CircleShape2D_a5wrw")
|
||||
|
||||
[connection signal="body_entered" from="." to="." method="_on_body_entered"]
|
|
@ -1,48 +1,54 @@
|
|||
[gd_scene load_steps=9 format=3 uid="uid://bdd6q3m06bnn3"]
|
||||
[gd_scene load_steps=10 format=3 uid="uid://df6xmsx4rav7n"]
|
||||
|
||||
[ext_resource type="Texture2D" uid="uid://c54p5kdrt1r71" path="res://levelFinal/core/coreSprites/planetCore_0001.png" id="1_7742g"]
|
||||
[ext_resource type="Texture2D" uid="uid://b6qm6xu5ojpww" path="res://levelFinal/core/coreSprites/planetCore_0002.png" id="2_q2rkh"]
|
||||
[ext_resource type="Texture2D" uid="uid://bbt2g8bk7kke8" path="res://levelFinal/core/coreSprites/planetCore_0003.png" id="3_76tls"]
|
||||
[ext_resource type="Texture2D" uid="uid://ch6720bqxcsmf" path="res://levelFinal/core/coreSprites/planetCore_0004.png" id="4_je86y"]
|
||||
[ext_resource type="Texture2D" uid="uid://cd3n7wtnkho61" path="res://levelFinal/core/coreSprites/planetCore_0005.png" id="5_y7wp5"]
|
||||
[ext_resource type="Texture2D" uid="uid://bykh05626og5c" path="res://levelFinal/core/coreSprites/planetCore_0006.png" id="6_70t1t"]
|
||||
[ext_resource type="Script" uid="uid://enxayokme5rs" path="res://levelFinal/core/core.gd" id="1_6sogb"]
|
||||
[ext_resource type="Texture2D" uid="uid://c54p5kdrt1r71" path="res://levelFinal/core/coreSprites/planetCore_0001.png" id="1_macrm"]
|
||||
[ext_resource type="Texture2D" uid="uid://b6qm6xu5ojpww" path="res://levelFinal/core/coreSprites/planetCore_0002.png" id="2_6sogb"]
|
||||
[ext_resource type="Texture2D" uid="uid://bbt2g8bk7kke8" path="res://levelFinal/core/coreSprites/planetCore_0003.png" id="3_fpp5w"]
|
||||
[ext_resource type="Texture2D" uid="uid://ch6720bqxcsmf" path="res://levelFinal/core/coreSprites/planetCore_0004.png" id="4_c0dob"]
|
||||
[ext_resource type="Texture2D" uid="uid://cd3n7wtnkho61" path="res://levelFinal/core/coreSprites/planetCore_0005.png" id="5_v2s1a"]
|
||||
[ext_resource type="Texture2D" uid="uid://bykh05626og5c" path="res://levelFinal/core/coreSprites/planetCore_0006.png" id="6_in0ky"]
|
||||
|
||||
[sub_resource type="SpriteFrames" id="SpriteFrames_poonc"]
|
||||
[sub_resource type="SpriteFrames" id="SpriteFrames_macrm"]
|
||||
animations = [{
|
||||
"frames": [{
|
||||
"duration": 1.0,
|
||||
"texture": ExtResource("1_7742g")
|
||||
"texture": ExtResource("1_macrm")
|
||||
}, {
|
||||
"duration": 1.0,
|
||||
"texture": ExtResource("2_q2rkh")
|
||||
"texture": ExtResource("2_6sogb")
|
||||
}, {
|
||||
"duration": 1.0,
|
||||
"texture": ExtResource("3_76tls")
|
||||
"texture": ExtResource("3_fpp5w")
|
||||
}, {
|
||||
"duration": 1.0,
|
||||
"texture": ExtResource("4_je86y")
|
||||
"texture": ExtResource("4_c0dob")
|
||||
}, {
|
||||
"duration": 1.0,
|
||||
"texture": ExtResource("5_y7wp5")
|
||||
"texture": ExtResource("5_v2s1a")
|
||||
}, {
|
||||
"duration": 1.0,
|
||||
"texture": ExtResource("6_70t1t")
|
||||
"texture": ExtResource("6_in0ky")
|
||||
}],
|
||||
"loop": true,
|
||||
"name": &"default",
|
||||
"speed": 10.0
|
||||
}]
|
||||
|
||||
[sub_resource type="CircleShape2D" id="CircleShape2D_h80fj"]
|
||||
radius = 109.018
|
||||
[sub_resource type="CircleShape2D" id="CircleShape2D_a5wrw"]
|
||||
radius = 112.0
|
||||
|
||||
[node name="core" type="Node2D"]
|
||||
[node name="core" type="Area2D"]
|
||||
collision_layer = 3
|
||||
collision_mask = 3
|
||||
script = ExtResource("1_6sogb")
|
||||
|
||||
[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."]
|
||||
position = Vector2(-7, 0)
|
||||
sprite_frames = SubResource("SpriteFrames_poonc")
|
||||
sprite_frames = SubResource("SpriteFrames_macrm")
|
||||
autoplay = "default"
|
||||
|
||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
|
||||
position = Vector2(0, -1)
|
||||
shape = SubResource("CircleShape2D_h80fj")
|
||||
shape = SubResource("CircleShape2D_a5wrw")
|
||||
|
||||
[connection signal="body_entered" from="." to="." method="_on_body_entered"]
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
[ext_resource type="TileSet" uid="uid://cfq716af1nhqm" path="res://levelFinal/tileSet/coreTiles.tres" id="1_sp6x8"]
|
||||
[ext_resource type="PackedScene" uid="uid://c1xy5bf2p6vmh" path="res://player/smallPlayer/player.tscn" id="2_js4h8"]
|
||||
[ext_resource type="PackedScene" uid="uid://bdd6q3m06bnn3" path="res://levelFinal/core/core.tscn" id="3_vttxq"]
|
||||
[ext_resource type="PackedScene" uid="uid://df6xmsx4rav7n" path="res://levelFinal/core/core.tscn" id="3_vttxq"]
|
||||
|
||||
[node name="finalLevel" type="Node2D"]
|
||||
|
||||
|
@ -19,4 +19,4 @@ tile_set = ExtResource("1_sp6x8")
|
|||
position = Vector2(276, 17)
|
||||
|
||||
[node name="core" parent="." instance=ExtResource("3_vttxq")]
|
||||
position = Vector2(273, 1299)
|
||||
position = Vector2(274, 1294)
|
||||
|
|
Loading…
Reference in New Issue
Block a user