From cbbaf08a6f594a7f9640fca350d40aaff5dc1def Mon Sep 17 00:00:00 2001 From: HumanoidSandvichDispenser Date: Mon, 16 Sep 2024 12:24:53 -0700 Subject: [PATCH] Modify UI --- UI/Base.tscn | 9 +++------ UI/Inventory/ShopMenu.tscn | 2 +- UI/Themes/supalidl.tres | 8 ++++---- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/UI/Base.tscn b/UI/Base.tscn index d2a80fd..af5533f 100644 --- a/UI/Base.tscn +++ b/UI/Base.tscn @@ -113,9 +113,8 @@ layout_mode = 2 theme_override_constants/margin_top = 16 theme_override_constants/margin_right = 16 -[node name="Hotbar" parent="SubViewportContainer/UIViewport/MainUILayer/Main/Top/Right" node_paths=PackedStringArray("_slots") instance=ExtResource("5_mmp18")] +[node name="Hotbar" parent="SubViewportContainer/UIViewport/MainUILayer/Main/Top/Right" instance=ExtResource("5_mmp18")] layout_mode = 2 -_slots = [NodePath("InventorySlot"), NodePath("InventorySlot2"), NodePath("InventorySlot3")] [node name="BoxContainer" type="HBoxContainer" parent="SubViewportContainer/UIViewport/MainUILayer/Main"] layout_mode = 1 @@ -128,17 +127,15 @@ grow_horizontal = 0 grow_vertical = 2 alignment = 2 -[node name="ShopMenu" parent="SubViewportContainer/UIViewport/MainUILayer/Main/BoxContainer" node_paths=PackedStringArray("_inventoryGrid") instance=ExtResource("8_ep3ae")] +[node name="ShopMenu" parent="SubViewportContainer/UIViewport/MainUILayer/Main/BoxContainer" instance=ExtResource("8_ep3ae")] unique_name_in_owner = true visible = false layout_mode = 2 -_inventoryGrid = NodePath("PanelContainer/VBoxContainer/ScrollContainer/InventoryGrid") -[node name="InventoryMenu" parent="SubViewportContainer/UIViewport/MainUILayer/Main/BoxContainer" node_paths=PackedStringArray("_inventoryGrid") instance=ExtResource("10_5m8qa")] +[node name="InventoryMenu" parent="SubViewportContainer/UIViewport/MainUILayer/Main/BoxContainer" instance=ExtResource("10_5m8qa")] unique_name_in_owner = true visible = false layout_mode = 2 -_inventoryGrid = NodePath("PanelContainer/VBoxContainer/ScrollContainer/InventoryGrid") [node name="Bottom" type="HBoxContainer" parent="SubViewportContainer/UIViewport/MainUILayer/Main"] layout_mode = 1 diff --git a/UI/Inventory/ShopMenu.tscn b/UI/Inventory/ShopMenu.tscn index 8142cb4..75acd1d 100644 --- a/UI/Inventory/ShopMenu.tscn +++ b/UI/Inventory/ShopMenu.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=15 format=3 uid="uid://cyggkyqosjk36"] -[ext_resource type="StyleBox" path="res://UI/Themes/Panel.tres" id="1_2ffty"] +[ext_resource type="StyleBox" uid="uid://bqhotx2ogucye" path="res://UI/Themes/Panel.tres" id="1_2ffty"] [ext_resource type="Script" path="res://UI/Inventory/ShopMenu.cs" id="1_8c1y7"] [ext_resource type="Shader" path="res://Shaders/WipeXY.gdshader" id="2_jqery"] [ext_resource type="FontFile" uid="uid://cgwa8bjiyv534" path="res://Assets/Fonts/alagard.ttf" id="3_aj4jx"] diff --git a/UI/Themes/supalidl.tres b/UI/Themes/supalidl.tres index 8ca5c01..7c69dc8 100644 --- a/UI/Themes/supalidl.tres +++ b/UI/Themes/supalidl.tres @@ -1,11 +1,11 @@ [gd_resource type="Theme" load_steps=11 format=3 uid="uid://cksjbu3vrup5"] [ext_resource type="FontFile" uid="uid://6bvgjbmqovau" path="res://Assets/Fonts/calamity/calamity.ttf" id="1_334fe"] -[ext_resource type="StyleBox" path="res://UI/Themes/InventorySlotButtonFocus.tres" id="2_3w5h1"] +[ext_resource type="StyleBox" uid="uid://nvb4etac7ee2" path="res://UI/Themes/InventorySlotButtonFocus.tres" id="2_3w5h1"] [ext_resource type="Texture2D" uid="uid://b16461tjso0j7" path="res://Assets/Sprites/UI/hotbar-inactive.png" id="2_6sv27"] -[ext_resource type="StyleBox" path="res://UI/Themes/Panel.tres" id="2_jlgx8"] -[ext_resource type="StyleBox" path="res://UI/Themes/InventorySlotButtonNormal.tres" id="3_nuiio"] -[ext_resource type="StyleBox" path="res://UI/Themes/InventorySlotButtonPressed.tres" id="4_mllnb"] +[ext_resource type="StyleBox" uid="uid://bqhotx2ogucye" path="res://UI/Themes/Panel.tres" id="2_jlgx8"] +[ext_resource type="StyleBox" uid="uid://cfqp0ycwvwx7c" path="res://UI/Themes/InventorySlotButtonNormal.tres" id="3_nuiio"] +[ext_resource type="StyleBox" uid="uid://pqtn0115bqtp" path="res://UI/Themes/InventorySlotButtonPressed.tres" id="4_mllnb"] [sub_resource type="StyleBoxTexture" id="StyleBoxTexture_wk5ww"] content_margin_left = 4.0