Fixed merge errors

2026-01-19 10:41:03 -07:00
parent 9e0eed66c3
commit 985a975577
50 changed files with 1622 additions and 81 deletions
--- a/Assets/Scenes/MenusAndLevels/Credits.tscn
+++ b/Assets/Scenes/MenusAndLevels/Credits.tscn
@@ -0,0 +1,30 @@
+[gd_scene load_steps=3 format=3 uid="uid://bvjmefswaveya"]
+
+[ext_resource type="Script" path="res://Assets/Scripts/CommonScripts/UISelector.cs" id="2_66bl7"]
+[ext_resource type="Script" uid="uid://b28bv2l2asbpy" path="res://Assets/Scripts/CommonScripts/ChangeMenuInitiator.cs" id="4_gp05m"]
+
+[node name="Htp" type="Node2D"]
+
+[node name="UISelector" type="Node2D" parent="."]
+script = ExtResource("2_66bl7")
+
+[node name="BackButton" type="Sprite2D" parent="UISelector"]
+z_index = 1
+position = Vector2(0, 65)
+script = ExtResource("4_gp05m")
+metadata/TargetMenu = "MainMenu"
+metadata/TransitionType = "FAST"
+
+[node name="SelectionIndicator" type="Sprite2D" parent="UISelector"]
+z_index = 1
+
+[node name="RichTextLabel" type="RichTextLabel" parent="."]
+offset_left = -154.0
+offset_top = -84.0
+offset_right = 154.0
+offset_bottom = 52.0
+text = "Created by ...
+"
+scroll_active = false
+horizontal_alignment = 1
+vertical_alignment = 1
--- a/Assets/Scenes/MenusAndLevels/EnemyTestLevel.tscn
+++ b/Assets/Scenes/MenusAndLevels/EnemyTestLevel.tscn
@@ -1,3 +0,0 @@
-[gd_scene format=3 uid="uid://bbngncnb2xeov"]
-
-[node name="EnemyTestLevel" type="Node2D"]
--- a/Assets/Scenes/MenusAndLevels/HTP.tscn
+++ b/Assets/Scenes/MenusAndLevels/HTP.tscn
@@ -0,0 +1,29 @@
+[gd_scene load_steps=3 format=3 uid="uid://bl0eanc4ptrip"]
+
+[ext_resource type="Script" path="res://Assets/Scripts/CommonScripts/UISelector.cs" id="2_htcbc"]
+[ext_resource type="Script" uid="uid://b28bv2l2asbpy" path="res://Assets/Scripts/CommonScripts/ChangeMenuInitiator.cs" id="4_htcbc"]
+
+[node name="Htp" type="Node2D"]
+
+[node name="UISelector" type="Node2D" parent="."]
+script = ExtResource("2_htcbc")
+
+[node name="BackButton" type="Sprite2D" parent="UISelector"]
+z_index = 1
+position = Vector2(0, 65)
+script = ExtResource("4_htcbc")
+metadata/TargetMenu = "MainMenu"
+metadata/TransitionType = "FAST"
+
+[node name="SelectionIndicator" type="Sprite2D" parent="UISelector"]
+z_index = 1
+
+[node name="RichTextLabel" type="RichTextLabel" parent="."]
+offset_left = -154.0
+offset_top = -84.0
+offset_right = 154.0
+offset_bottom = 52.0
+text = "No quema cuh"
+scroll_active = false
+horizontal_alignment = 1
+vertical_alignment = 1
--- a/Assets/Scenes/MenusAndLevels/Level1.tscn
+++ b/Assets/Scenes/MenusAndLevels/Level1.tscn
--- a/Assets/Scenes/MenusAndLevels/LevelSelectionMenu.tscn
+++ b/Assets/Scenes/MenusAndLevels/LevelSelectionMenu.tscn
@@ -0,0 +1,83 @@
+[gd_scene load_steps=5 format=3 uid="uid://dk1egdpjl31r"]
+
+[ext_resource type="Script" path="res://Assets/Scripts/CommonScripts/LevelSelectionManager.cs" id="1_4n03f"]
+[ext_resource type="PackedScene" uid="uid://bffiqliomwkmo" path="res://Assets/Scenes/Persistant/Camera.tscn" id="1_j4u47"]
+[ext_resource type="Script" path="res://Assets/Scripts/CommonScripts/UISelector.cs" id="2_xaene"]
+[ext_resource type="Script" uid="uid://b28bv2l2asbpy" path="res://Assets/Scripts/CommonScripts/ChangeMenuInitiator.cs" id="4_xaene"]
+
+[node name="LevelSelectionMenu" type="Node2D"]
+script = ExtResource("1_4n03f")
+
+[node name="Camera" parent="." instance=ExtResource("1_j4u47")]
+
+[node name="UISelector" type="Node2D" parent="."]
+script = ExtResource("2_xaene")
+
+[node name="Level1" type="Sprite2D" parent="UISelector"]
+position = Vector2(-79, -40)
+script = ExtResource("4_xaene")
+metadata/TargetMenu = "Level1"
+metadata/TransitionType = "SLOW"
+
+[node name="Level2" type="Sprite2D" parent="UISelector"]
+visible = false
+position = Vector2(0, -40)
+script = ExtResource("4_xaene")
+metadata/TargetMenu = "Level2"
+metadata/TransitionType = "SLOW"
+
+[node name="Level3" type="Sprite2D" parent="UISelector"]
+visible = false
+position = Vector2(80, -40)
+script = ExtResource("4_xaene")
+metadata/TargetMenu = "Level3"
+metadata/TransitionType = "SLOW"
+
+[node name="Level4" type="Sprite2D" parent="UISelector"]
+visible = false
+position = Vector2(-40, 40)
+script = ExtResource("4_xaene")
+metadata/TargetMenu = "Level4"
+metadata/TransitionType = "SLOW"
+
+[node name="Level5" type="Sprite2D" parent="UISelector"]
+visible = false
+position = Vector2(40, 40)
+script = ExtResource("4_xaene")
+metadata/TargetMenu = "Level5"
+metadata/TransitionType = "SLOW"
+
+[node name="BackButton" type="Sprite2D" parent="UISelector"]
+position = Vector2(127, 65)
+script = ExtResource("4_xaene")
+metadata/TargetMenu = "MainMenu"
+metadata/TransitionType = "FAST"
+
+[node name="SelectionIndicator" type="Sprite2D" parent="UISelector"]
+z_index = 1
+
+[node name="FakeButtons" type="Node2D" parent="."]
+
+[node name="Level2" type="Sprite2D" parent="FakeButtons"]
+position = Vector2(0, -40)
+
+[node name="LockIcon" type="Sprite2D" parent="FakeButtons/Level2"]
+self_modulate = Color(1, 1, 1, 0.47058824)
+
+[node name="Level3" type="Sprite2D" parent="FakeButtons"]
+position = Vector2(80, -40)
+
+[node name="LockIcon" type="Sprite2D" parent="FakeButtons/Level3"]
+self_modulate = Color(1, 1, 1, 0.47058824)
+
+[node name="Level4" type="Sprite2D" parent="FakeButtons"]
+position = Vector2(-40, 40)
+
+[node name="LockIcon" type="Sprite2D" parent="FakeButtons/Level4"]
+self_modulate = Color(1, 1, 1, 0.47058824)
+
+[node name="Level5" type="Sprite2D" parent="FakeButtons"]
+position = Vector2(40, 40)
+
+[node name="LockIcon" type="Sprite2D" parent="FakeButtons/Level5"]
+self_modulate = Color(1, 1, 1, 0.47058824)
--- a/Assets/Scenes/MenusAndLevels/MainMenu.tscn
+++ b/Assets/Scenes/MenusAndLevels/MainMenu.tscn
@@ -1,31 +1,20 @@
-[gd_scene format=3 uid="uid://c8bxl0uohy535"]
+[gd_scene load_steps=3 format=3 uid="uid://c8bxl0uohy535"]
+
+[ext_resource type="Texture2D" uid="uid://hqp23lmk336m" path="res://icon.svg" id="1_rmvno"]
+[ext_resource type="Script" uid="uid://c8ibbithifum2" path="res://Assets/Scripts/CommonScripts/SceneChangeButton.cs" id="2_u3d4d"]

 [node name="MainMenu" type="Node2D"]

-[node name="RichTextLabel" type="RichTextLabel" parent="."]
-offset_left = -65.0
-offset_top = -21.0
-offset_right = 64.0
-offset_bottom = 19.0
-text = "Main Menu"
-scroll_active = false
-autowrap_trim_flags = 0
-horizontal_alignment = 1
-vertical_alignment = 1
+[node name="Delete" type="Sprite2D" parent="."]
+rotation = 0.7296006
+texture = ExtResource("1_rmvno")

-[node name="ExampleButton1" type="Button" parent="."]
-offset_top = 47.0
-offset_right = 8.0
-offset_bottom = 55.0
+[node name="Button" type="Button" parent="."]
+offset_left = -126.0
+offset_top = 113.0
+offset_right = -25.0
+offset_bottom = 144.0
+scale = Vector2(2.5243824, 2.5243824)
+script = ExtResource("2_u3d4d")

-[node name="ExampleButton2" type="Button" parent="."]
-offset_left = 77.0
-offset_top = 47.0
-offset_right = 85.0
-offset_bottom = 55.0
-
-[node name="ExampleButton3" type="Button" parent="."]
-offset_left = -65.0
-offset_top = 47.0
-offset_right = -57.0
-offset_bottom = 55.0
+[connection signal="pressed" from="Button" to="Button" method="_on_pressed"]
--- a/Assets/Scenes/MenusAndLevels/MenuChangeManager.tscn
+++ b/Assets/Scenes/MenusAndLevels/MenuChangeManager.tscn
@@ -0,0 +1,251 @@
+[gd_scene load_steps=18 format=3 uid="uid://r24ppggva18y"]
+
+[ext_resource type="Script" uid="uid://dedv5j5tvb2gk" path="res://Assets/Scripts/CommonScripts/MenuChangeManager.cs" id="1_uevlq"]
+[ext_resource type="Texture2D" path="res://Assets/Sprites/Blueberry-sheet.png" id="2_3tdrs"]
+[ext_resource type="Script" uid="uid://cugofqkikepb2" path="res://Assets/Scripts/CommonScripts/TipManager.cs" id="3_ei4c6"]
+[ext_resource type="FontFile" path="res://Assets/MedodicaRegular.otf" id="3_jtn6d"]
+
+[sub_resource type="Animation" id="Animation_uktqf"]
+resource_name = "LoadingAnimation"
+length = 3.5
+tracks/0/type = "value"
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/path = NodePath("BlackBG:color")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/keys = {
+"times": PackedFloat32Array(0, 1.0066667),
+"transitions": PackedFloat32Array(1, 1),
+"update": 0,
+"values": [Color(0, 0, 0, 0), Color(0, 0, 0, 1)]
+}
+tracks/1/type = "value"
+tracks/1/imported = false
+tracks/1/enabled = true
+tracks/1/path = NodePath("BlackBG/LoadingIcon:self_modulate")
+tracks/1/interp = 1
+tracks/1/loop_wrap = true
+tracks/1/keys = {
+"times": PackedFloat32Array(0.41, 1),
+"transitions": PackedFloat32Array(1, 1),
+"update": 0,
+"values": [Color(1, 1, 1, 0), Color(1, 1, 1, 1)]
+}
+tracks/2/type = "value"
+tracks/2/imported = false
+tracks/2/enabled = true
+tracks/2/path = NodePath("BlackBG/TipManager:self_modulate")
+tracks/2/interp = 1
+tracks/2/loop_wrap = true
+tracks/2/keys = {
+"times": PackedFloat32Array(0.42, 1),
+"transitions": PackedFloat32Array(1, 1),
+"update": 0,
+"values": [Color(1, 1, 1, 0), Color(1, 1, 1, 1)]
+}
+
+[sub_resource type="Animation" id="Animation_3tdrs"]
+resource_name = "LoadOut"
+tracks/0/type = "value"
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/path = NodePath("BlackBG:color")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/keys = {
+"times": PackedFloat32Array(0, 1),
+"transitions": PackedFloat32Array(1, 1),
+"update": 0,
+"values": [Color(0, 0, 0, 1), Color(0, 0, 0, 0)]
+}
+tracks/1/type = "value"
+tracks/1/imported = false
+tracks/1/enabled = true
+tracks/1/path = NodePath("BlackBG/LoadingIcon:self_modulate")
+tracks/1/interp = 1
+tracks/1/loop_wrap = true
+tracks/1/keys = {
+"times": PackedFloat32Array(0, 0.67),
+"transitions": PackedFloat32Array(1, 1),
+"update": 0,
+"values": [Color(1, 1, 1, 1), Color(1, 1, 1, 0)]
+}
+tracks/2/type = "value"
+tracks/2/imported = false
+tracks/2/enabled = true
+tracks/2/path = NodePath("BlackBG/TipManager:self_modulate")
+tracks/2/interp = 1
+tracks/2/loop_wrap = true
+tracks/2/keys = {
+"times": PackedFloat32Array(0, 0.66),
+"transitions": PackedFloat32Array(1, 1),
+"update": 0,
+"values": [Color(1, 1, 1, 1), Color(1, 1, 1, 0)]
+}
+
+[sub_resource type="Animation" id="Animation_btj4p"]
+length = 0.001
+tracks/0/type = "value"
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/path = NodePath("../BlackBG:position")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/keys = {
+"times": PackedFloat32Array(0),
+"transitions": PackedFloat32Array(1),
+"update": 0,
+"values": [Vector2(-320, -180)]
+}
+tracks/1/type = "value"
+tracks/1/imported = false
+tracks/1/enabled = true
+tracks/1/path = NodePath("BlackBG:color")
+tracks/1/interp = 1
+tracks/1/loop_wrap = true
+tracks/1/keys = {
+"times": PackedFloat32Array(0),
+"transitions": PackedFloat32Array(1),
+"update": 0,
+"values": [Color(0, 0, 0, 0)]
+}
+tracks/2/type = "value"
+tracks/2/imported = false
+tracks/2/enabled = true
+tracks/2/path = NodePath("BlackBG/LoadingIcon:self_modulate")
+tracks/2/interp = 1
+tracks/2/loop_wrap = true
+tracks/2/keys = {
+"times": PackedFloat32Array(0),
+"transitions": PackedFloat32Array(1),
+"update": 0,
+"values": [Color(1, 1, 1, 1)]
+}
+tracks/3/type = "value"
+tracks/3/imported = false
+tracks/3/enabled = true
+tracks/3/path = NodePath("BlackBG/TipManager:self_modulate")
+tracks/3/interp = 1
+tracks/3/loop_wrap = true
+tracks/3/keys = {
+"times": PackedFloat32Array(0),
+"transitions": PackedFloat32Array(1),
+"update": 0,
+"values": [Color(1, 1, 1, 1)]
+}
+
+[sub_resource type="AnimationLibrary" id="AnimationLibrary_rvq0g"]
+_data = {
+&"LoadIn": SubResource("Animation_uktqf"),
+&"LoadOut": SubResource("Animation_3tdrs"),
+&"RESET": SubResource("Animation_btj4p")
+}
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_ei4c6"]
+atlas = ExtResource("2_3tdrs")
+region = Rect2(0, 0, 16, 16)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_jtn6d"]
+atlas = ExtResource("2_3tdrs")
+region = Rect2(16, 0, 16, 16)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_uktqf"]
+atlas = ExtResource("2_3tdrs")
+region = Rect2(32, 0, 16, 16)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_btj4p"]
+atlas = ExtResource("2_3tdrs")
+region = Rect2(48, 0, 16, 16)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_rvq0g"]
+atlas = ExtResource("2_3tdrs")
+region = Rect2(64, 0, 16, 16)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_wg4yt"]
+atlas = ExtResource("2_3tdrs")
+region = Rect2(80, 0, 16, 16)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_meiur"]
+atlas = ExtResource("2_3tdrs")
+region = Rect2(96, 0, 16, 16)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_0xegj"]
+atlas = ExtResource("2_3tdrs")
+region = Rect2(112, 0, 16, 16)
+
+[sub_resource type="SpriteFrames" id="SpriteFrames_n7wom"]
+animations = [{
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_ei4c6")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_jtn6d")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_uktqf")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_btj4p")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_rvq0g")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_wg4yt")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_meiur")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_0xegj")
+}],
+"loop": true,
+"name": &"default",
+"speed": 8.0
+}]
+
+[node name="MenuChangeManager" type="Node2D"]
+z_index = 1000
+
+[node name="MenuChangeManager" type="Node" parent="."]
+script = ExtResource("1_uevlq")
+
+[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
+libraries = {
+&"": SubResource("AnimationLibrary_rvq0g")
+}
+autoplay = "LoadIn"
+
+[node name="BlackBG" type="ColorRect" parent="."]
+self_modulate = Color(0, 0, 0, 1)
+z_index = 1000
+z_as_relative = false
+offset_left = -320.0
+offset_top = -180.0
+offset_right = 320.0
+offset_bottom = 180.0
+color = Color(0, 0, 0, 0)
+
+[node name="LoadingIcon" type="AnimatedSprite2D" parent="BlackBG"]
+position = Vector2(465, 256)
+sprite_frames = SubResource("SpriteFrames_n7wom")
+autoplay = "default"
+frame = 3
+frame_progress = 0.5269981
+
+[node name="TipManager" type="RichTextLabel" parent="BlackBG"]
+layout_mode = 0
+offset_left = 170.00002
+offset_top = 101.0
+offset_right = 475.95636
+offset_bottom = 244.97948
+scale = Vector2(1.0001426, 1.0001426)
+theme_override_fonts/normal_font = ExtResource("3_jtn6d")
+text = "Tip: Example"
+scroll_active = false
+autowrap_mode = 2
+horizontal_alignment = 1
+vertical_alignment = 1
+script = ExtResource("3_ei4c6")