YourWishes/Dawn-Godot
1
0
Fork 0
Code Issues 28 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Fixed UI system

Browse Source
This commit is contained in:
Dominic Masters
2025-05-06 16:08:46 -05:00
parent b0d9106772
commit 85a7ed99bf
44 changed files with 158 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scenes/Entities/Rosa.tscn
View File

@@ -1,7 +1,7 @@
[gd_scene load_steps=8 format=3 uid="uid://yhtpoum3eek7"]
[ext_resource type="Script" uid="uid://ixwikdguyhf0" path="res://scripts/Entities/RosaController.gd" id="1_3g383"]
[ext_resource type="Script" uid="uid://jd50n00bo05y" path="res://scripts/Entities/RosaCamera.gd" id="2_tr66j"]
[ext_resource type="Script" uid="uid://ixwikdguyhf0" path="res://scripts/Entity/RosaController.gd" id="1_3g383"]
[ext_resource type="Script" uid="uid://jd50n00bo05y" path="res://scripts/Entity/RosaCamera.gd" id="2_tr66j"]
[ext_resource type="Shader" uid="uid://7h2axb2tsh17" path="res://shaders/NPC Shader.gdshader" id="3_j5vis"]
[ext_resource type="Texture2D" uid="uid://cofrgefp8e617" path="res://textures/human.png" id="4_rvn3n"]

2
scenes/Entities/TestNPC.tscn
View File

@@ -1,6 +1,6 @@
[gd_scene load_steps=7 format=3 uid="uid://dr4b2pmsknuhc"]
[ext_resource type="Script" uid="uid://d23qg1ovkbxst" path="res://scripts/Entities/BasicNPCEntity.gd" id="1_1muh7"]
[ext_resource type="Script" uid="uid://d23qg1ovkbxst" path="res://scripts/Entity/BasicNPCEntity.gd" id="1_1muh7"]
[ext_resource type="Shader" uid="uid://7h2axb2tsh17" path="res://shaders/NPC Shader.gdshader" id="1_xgcv1"]
[ext_resource type="Texture2D" uid="uid://cofrgefp8e617" path="res://textures/human.png" id="4_vo0ku"]

26
scenes/MainMenu.tscn
View File

@@ -1,29 +1,25 @@
[gd_scene format=3 uid="uid://w1q5eoiejmy3"]
[gd_scene load_steps=2 format=3 uid="uid://w1q5eoiejmy3"]
[node name="MainMenu" type="Node3D"]
[ext_resource type="PackedScene" uid="uid://bimrljk1rn7af" path="res://scenes/UI/SubsceneUI.tscn" id="1_yqorp"]
[node name="UI" type="Control" parent="."]
layout_mode = 3
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
[node name="MainMenu" type="Node"]
[node name="Label" type="Label" parent="UI"]
[node name="SubsceneUI" parent="." instance=ExtResource("1_yqorp")]
[node name="Label" type="Label" parent="SubsceneUI"]
layout_mode = 1
anchors_preset = 8
anchor_left = 0.5
anchor_top = 0.5
anchor_right = 0.5
anchor_bottom = 0.5
offset_left = -68.0
offset_top = -11.5
offset_right = 68.0
offset_bottom = 11.5
offset_left = -133.5
offset_top = -37.5
offset_right = 133.5
offset_bottom = 37.5
grow_horizontal = 2
grow_vertical = 2
text = "Thyme and Magic
text = "Thyme and Magic - Prototype
Press tab to bring up debug menu."
horizontal_alignment = 1

4
scenes/Maps/TestMap/TestMap.tscn
View File

@@ -4,8 +4,8 @@
[ext_resource type="PackedScene" uid="uid://dr4b2pmsknuhc" path="res://scenes/Entities/TestNPC.tscn" id="2_cg1ph"]
[ext_resource type="PackedScene" uid="uid://lh713g04d3bg" path="res://scenes/Maps/TestMap/TestMapGround.tscn" id="3_gxq5o"]
[ext_resource type="PackedScene" uid="uid://boj5o4fx41rv8" path="res://scenes/Maps/TestMap/TestMapBuilding.tscn" id="4_brp0k"]
[ext_resource type="Script" uid="uid://tkfc88q8m86f" path="res://scripts/Events/EventConversation.gd" id="5_cg1ph"]
[ext_resource type="Script" uid="uid://y7ckj1tn5cro" path="res://scripts/Events/EventTextbox.gd" id="6_gxq5o"]
[ext_resource type="Script" uid="uid://tkfc88q8m86f" path="res://scripts/Event/EventConversation.gd" id="5_cg1ph"]
[ext_resource type="Script" uid="uid://y7ckj1tn5cro" path="res://scripts/Event/EventTextbox.gd" id="6_gxq5o"]
[sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_e1h75"]
sky_horizon_color = Color(0.59625, 0.6135, 0.6375, 1)

18
scenes/Singletons/Debug.tscn
View File

@@ -1,21 +1,19 @@
[gd_scene load_steps=3 format=3 uid="uid://klfo3l0dxlht"]
[gd_scene load_steps=4 format=3 uid="uid://klfo3l0dxlht"]
[ext_resource type="Script" uid="uid://d36d3fnpi8y30" path="res://scripts/Singletons/Debug.gd" id="1_5spvt"]
[ext_resource type="PackedScene" uid="uid://bimrljk1rn7af" path="res://scenes/UI/SubsceneUI.tscn" id="2_5o7yr"]
[ext_resource type="PackedScene" uid="uid://verg13jtqwvh" path="res://scenes/UI/DebugMenu.tscn" id="2_c2xgb"]
[node name="Debug" type="Node2D"]
[node name="Debug" type="Node"]
script = ExtResource("1_5spvt")
[node name="UI" type="Control" parent="."]
layout_mode = 3
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
[node name="SubsceneUI" parent="." instance=ExtResource("2_5o7yr")]
layer = 3
[node name="DebugMenu" parent="UI" instance=ExtResource("2_c2xgb")]
[node name="DebugMenu" parent="SubsceneUI" instance=ExtResource("2_c2xgb")]
layout_mode = 0
anchors_preset = 0
anchor_bottom = 0.0
offset_right = 207.0
offset_bottom = 206.0
grow_vertical = 1

6
scenes/Singletons/Quest.tscn Normal file
View File

@@ -0,0 +1,6 @@
[gd_scene load_steps=2 format=3 uid="uid://cs3kmmd0rfm8w"]
[ext_resource type="Script" uid="uid://d0060jeyftia7" path="res://scripts/Singletons/Quest.gd" id="1_v2h4q"]
[node name="Quest" type="Node"]
script = ExtResource("1_v2h4q")

37
scenes/Singletons/UI.tscn Normal file
View File

@@ -0,0 +1,37 @@
[gd_scene load_steps=2 format=3 uid="uid://b5bwpsh0gcicf"]
[ext_resource type="Script" uid="uid://dahhuhiu8u88b" path="res://scripts/Singletons/UI.gd" id="1_g3au4"]
[node name="UI" type="Control"]
layout_mode = 3
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
script = ExtResource("1_g3au4")
metadata/_custom_type_script = "uid://dahhuhiu8u88b"
[node name="LayerGame" type="Control" parent="."]
layout_mode = 1
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
[node name="LayerVN" type="Control" parent="."]
layout_mode = 1
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
[node name="LayerDebug" type="Control" parent="."]
layout_mode = 1
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2

14
scenes/Singletons/VN.tscn
View File

@@ -1,18 +1,14 @@
[gd_scene load_steps=3 format=3 uid="uid://b6pl1cq5y05ad"]
[gd_scene load_steps=4 format=3 uid="uid://b6pl1cq5y05ad"]
[ext_resource type="Script" uid="uid://benvf7v4p4i2l" path="res://scripts/Singletons/VN.gd" id="1_01fad"]
[ext_resource type="PackedScene" uid="uid://bkx3l0kckf4a8" path="res://scenes/UI/VNTextbox.tscn" id="2_adm0d"]
[ext_resource type="PackedScene" uid="uid://bimrljk1rn7af" path="res://scenes/UI/SubsceneUI.tscn" id="2_hxsm8"]
[node name="VN" type="Node"]
script = ExtResource("1_01fad")
[node name="UI" type="Control" parent="."]
layout_mode = 3
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
[node name="SubsceneUI" parent="." instance=ExtResource("2_hxsm8")]
layer = 1
[node name="VNTextbox" parent="UI" instance=ExtResource("2_adm0d")]
[node name="VNTextbox" parent="SubsceneUI" instance=ExtResource("2_adm0d")]
layout_mode = 1

13
scenes/UI/SubsceneUI.tscn Normal file
View File

@@ -0,0 +1,13 @@
[gd_scene load_steps=2 format=3 uid="uid://bimrljk1rn7af"]
[ext_resource type="Script" uid="uid://x3cc7wsnn0xd" path="res://scripts/UI/SubsceneUI.gd" id="1_m23s2"]
[node name="SubsceneUI" type="Control"]
layout_mode = 3
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
script = ExtResource("1_m23s2")
metadata/_custom_type_script = "uid://x3cc7wsnn0xd"