diff --git a/src/Menus/DialogueBox/DialogueBox.tscn b/src/Menus/DialogueBox/DialogueBox.tscn index 8bff972..5f0de16 100644 --- a/src/Menus/DialogueBox/DialogueBox.tscn +++ b/src/Menus/DialogueBox/DialogueBox.tscn @@ -1,7 +1,6 @@ -[gd_scene load_steps=7 format=2] +[gd_scene load_steps=6 format=2] [ext_resource path="res://Menus/DialogueBox/box.png" type="Texture" id=1] -[ext_resource path="res://Fonts/Harmonic/Harmonic24.tres" type="DynamicFont" id=2] [ext_resource path="res://Menus/DialogueBox/DialogueBox.gd" type="Script" id=3] [ext_resource path="res://Menus/DialogueBox/Dialogues.gd" type="Script" id=4] @@ -69,6 +68,7 @@ script = ExtResource( 4 ) anchor_left = 0.5 anchor_right = 0.5 margin_left = -240.0 +margin_top = 235.0 margin_right = 240.0 margin_bottom = 31.0 __meta__ = { @@ -82,14 +82,9 @@ margin_bottom = 31.0 texture = ExtResource( 1 ) [node name="Label" type="Label" parent="CenterContainer"] -margin_left = 157.0 -margin_top = 3.0 -margin_right = 322.0 -margin_bottom = 27.0 -custom_fonts/font = ExtResource( 2 ) -text = "Hahaha, Schmock." +margin_left = 208.0 +margin_top = 8.0 +margin_right = 271.0 +margin_bottom = 22.0 +text = "Haha. Lol." align = 1 -percent_visible = 0.0 -__meta__ = { -"_edit_use_anchors_": false -} diff --git a/src/World.tscn b/src/World.tscn index e23fca5..56b0c4f 100644 --- a/src/World.tscn +++ b/src/World.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=20 format=2] +[gd_scene load_steps=21 format=2] [ext_resource path="res://Player/Player.tscn" type="PackedScene" id=1] [ext_resource path="res://World.gd" type="Script" id=2] @@ -19,6 +19,7 @@ [ext_resource path="res://Boss/Boss_template.tscn" type="PackedScene" id=17] [ext_resource path="res://Boss/SlimeBoss/SlimeBoss.tscn" type="PackedScene" id=18] [ext_resource path="res://Menus/DialogueBox/DialogueBox.tscn" type="PackedScene" id=19] +[ext_resource path="res://Menus/DragNDrop/DragNDropUI.tscn" type="PackedScene" id=20] [node name="World" type="Node2D"] script = ExtResource( 2 ) @@ -137,11 +138,10 @@ __meta__ = { [node name="DialogueBox" parent="CenterContainer" instance=ExtResource( 19 )] anchor_right = 0.0 anchor_bottom = 0.0 + [node name="CanvasLayer" type="CanvasLayer" parent="."] -[node name="DragNDropUI" parent="CanvasLayer" instance=ExtResource( 19 )] -margin_left = 0.0 -margin_right = 0.0 +[node name="DragNDropUI" parent="CanvasLayer" instance=ExtResource( 20 )] ObjectParent = NodePath("../..") [editable path="YSort/minion"]