Fixed merge errors

This commit is contained in:
Jojackman1
2026-01-19 10:41:03 -07:00
parent 9e0eed66c3
commit 985a975577
50 changed files with 1622 additions and 81 deletions

View File

@@ -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"]