diff --git a/Zennysoft.Game.Ma/project.godot b/Zennysoft.Game.Ma/project.godot index a6011191..6c617e93 100644 --- a/Zennysoft.Game.Ma/project.godot +++ b/Zennysoft.Game.Ma/project.godot @@ -30,8 +30,8 @@ runtime/advanced/uses_dotnet=true [display] -window/size/viewport_width=1280 -window/size/viewport_height=720 +window/size/viewport_width=1920 +window/size/viewport_height=1080 [dotnet] diff --git a/Zennysoft.Game.Ma/src/ui/in_game_ui/InGameUI.tscn b/Zennysoft.Game.Ma/src/ui/in_game_ui/InGameUI.tscn index d63896f1..33121902 100644 --- a/Zennysoft.Game.Ma/src/ui/in_game_ui/InGameUI.tscn +++ b/Zennysoft.Game.Ma/src/ui/in_game_ui/InGameUI.tscn @@ -10,47 +10,84 @@ [node name="InGameUI" type="Control"] process_mode = 3 -custom_minimum_size = Vector2(1280, 960) +custom_minimum_size = Vector2(1920, 1080) layout_mode = 3 anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 +offset_right = 8.0 grow_horizontal = 2 grow_vertical = 2 -size_flags_horizontal = 3 -size_flags_vertical = 3 script = ExtResource("1_sc13i") -[node name="PlayerInfoUI" parent="." instance=ExtResource("4_46s5l")] -unique_name_in_owner = true -custom_minimum_size = Vector2(1280, 720) +[node name="HBoxContainer" type="HBoxContainer" parent="."] +custom_minimum_size = Vector2(1920, 1080) layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +offset_right = 20.0 +grow_horizontal = 2 +grow_vertical = 2 +theme_override_constants/separation = 0 -[node name="MiniMap" parent="." instance=ExtResource("2_6sfje")] +[node name="ColorRect" type="ColorRect" parent="HBoxContainer"] +custom_minimum_size = Vector2(260, 0) +layout_mode = 2 +color = Color(0.172833, 0.172833, 0.172833, 1) + +[node name="SubViewportContainer" type="SubViewportContainer" parent="HBoxContainer"] +layout_mode = 2 + +[node name="SubViewport" type="SubViewport" parent="HBoxContainer/SubViewportContainer"] +transparent_bg = true +handle_input_locally = false +size = Vector2i(1400, 1080) +render_target_update_mode = 4 + +[node name="CenterContainer" type="CenterContainer" parent="HBoxContainer/SubViewportContainer/SubViewport"] +custom_minimum_size = Vector2(1440, 1080) +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +offset_right = 8.0 +grow_horizontal = 2 +grow_vertical = 2 + +[node name="PlayerInfoUI" parent="HBoxContainer/SubViewportContainer/SubViewport/CenterContainer" instance=ExtResource("4_46s5l")] +unique_name_in_owner = true +custom_minimum_size = Vector2(1440, 1080) +layout_mode = 2 + +[node name="MiniMap" parent="HBoxContainer/SubViewportContainer/SubViewport/CenterContainer" instance=ExtResource("2_6sfje")] unique_name_in_owner = true visible = false -layout_mode = 1 +custom_minimum_size = Vector2(1440, 1080) +layout_mode = 2 -[node name="InventoryMenu" parent="." instance=ExtResource("3_4vcdl")] +[node name="InventoryMenu" parent="HBoxContainer/SubViewportContainer/SubViewport/CenterContainer" instance=ExtResource("3_4vcdl")] unique_name_in_owner = true process_mode = 3 visible = false -layout_mode = 1 +layout_mode = 2 -[node name="UseTeleportPrompt" parent="." instance=ExtResource("5_h1hgq")] +[node name="UseTeleportPrompt" parent="HBoxContainer/SubViewportContainer/SubViewport/CenterContainer" instance=ExtResource("5_h1hgq")] unique_name_in_owner = true -layout_mode = 1 +custom_minimum_size = Vector2(1440, 1080) +layout_mode = 2 -[node name="Label" type="Label" parent="."] -layout_mode = 1 -anchors_preset = -1 -anchor_right = 0.021 -anchor_bottom = 0.021 -offset_right = -0.320004 -offset_bottom = 0.319998 +[node name="Label" type="Label" parent="HBoxContainer/SubViewportContainer/SubViewport/CenterContainer"] +custom_minimum_size = Vector2(1440, 1080) +layout_mode = 2 script = ExtResource("7_c6o8j") -[node name="DebugMenu" parent="." instance=ExtResource("7_llomk")] +[node name="DebugMenu" parent="HBoxContainer/SubViewportContainer/SubViewport/CenterContainer" instance=ExtResource("7_llomk")] unique_name_in_owner = true visible = false -layout_mode = 1 +custom_minimum_size = Vector2(1440, 1080) +layout_mode = 2 + +[node name="ColorRect2" type="ColorRect" parent="HBoxContainer"] +custom_minimum_size = Vector2(260, 0) +layout_mode = 2 +color = Color(0.172549, 0.172549, 0.172549, 1) diff --git a/Zennysoft.Game.Ma/src/ui/inventory_menu/InventoryMenu.cs b/Zennysoft.Game.Ma/src/ui/inventory_menu/InventoryMenu.cs index 2c21bd58..cb655a92 100644 --- a/Zennysoft.Game.Ma/src/ui/inventory_menu/InventoryMenu.cs +++ b/Zennysoft.Game.Ma/src/ui/inventory_menu/InventoryMenu.cs @@ -34,7 +34,7 @@ public partial class InventoryMenu : Control, IInventoryMenu private InventoryPageNumber _currentPageNumber = InventoryPageNumber.FirstPage; - private string ITEM_SLOT_SCENE = "res://src/inventory_menu/ItemSlot.tscn"; + private string ITEM_SLOT_SCENE = "res://src/ui/inventory_menu/ItemSlot.tscn"; private const int _itemsPerPage = 10; diff --git a/Zennysoft.Game.Ma/src/ui/inventory_menu/InventoryMenu.tscn b/Zennysoft.Game.Ma/src/ui/inventory_menu/InventoryMenu.tscn index 6acd4db5..9a24501d 100644 --- a/Zennysoft.Game.Ma/src/ui/inventory_menu/InventoryMenu.tscn +++ b/Zennysoft.Game.Ma/src/ui/inventory_menu/InventoryMenu.tscn @@ -26,6 +26,16 @@ shader_parameter/speed3 = 0.1 [sub_resource type="PlaceholderTexture2D" id="PlaceholderTexture2D_3ynpe"] +[sub_resource type="LabelSettings" id="LabelSettings_x4aj3"] +font = ExtResource("3_lm4o1") +font_size = 80 +font_color = Color(0.737255, 0.705882, 0.690196, 1) + +[sub_resource type="LabelSettings" id="LabelSettings_31kc7"] +font = ExtResource("3_lm4o1") +font_size = 80 +font_color = Color(0.737255, 0.705882, 0.690196, 1) + [sub_resource type="LabelSettings" id="LabelSettings_q0afw"] font = ExtResource("3_lm4o1") font_size = 48 @@ -91,16 +101,6 @@ font_color = Color(0.737255, 0.705882, 0.690196, 1) [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_ct6ql"] -[sub_resource type="LabelSettings" id="LabelSettings_x4aj3"] -font = ExtResource("3_lm4o1") -font_size = 80 -font_color = Color(0.737255, 0.705882, 0.690196, 1) - -[sub_resource type="LabelSettings" id="LabelSettings_31kc7"] -font = ExtResource("3_lm4o1") -font_size = 80 -font_color = Color(0.737255, 0.705882, 0.690196, 1) - [sub_resource type="Animation" id="Animation_dg155"] length = 0.001 tracks/0/type = "value" @@ -163,12 +163,11 @@ _data = { } [node name="InventoryMenu" type="Control"] +custom_minimum_size = Vector2(1440, 1080) layout_mode = 3 -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 +anchors_preset = 0 +offset_right = 1440.0 +offset_bottom = 1080.0 size_flags_horizontal = 3 size_flags_vertical = 3 script = ExtResource("1_l64wl") @@ -185,6 +184,7 @@ texture = SubResource("PlaceholderTexture2D_3ynpe") expand_mode = 2 [node name="InventoryInfo" type="MarginContainer" parent="."] +custom_minimum_size = Vector2(1440, 1080) layout_mode = 0 offset_right = 1359.0 offset_bottom = 958.0 @@ -193,11 +193,62 @@ theme_override_constants/margin_top = 100 [node name="HBoxContainer" type="HBoxContainer" parent="InventoryInfo"] layout_mode = 2 +[node name="ItemInfo" type="VBoxContainer" parent="InventoryInfo/HBoxContainer"] +custom_minimum_size = Vector2(720, 0) +layout_mode = 2 +theme_override_constants/separation = 20 + +[node name="ItemTitleContainer" type="MarginContainer" parent="InventoryInfo/HBoxContainer/ItemInfo"] +custom_minimum_size = Vector2(300, 125) +layout_mode = 2 +size_flags_horizontal = 4 + +[node name="BackArrow" type="Label" parent="InventoryInfo/HBoxContainer/ItemInfo/ItemTitleContainer"] +unique_name_in_owner = true +visible = false +custom_minimum_size = Vector2(100, 0) +layout_mode = 2 +text = "◄" +label_settings = SubResource("LabelSettings_x4aj3") + +[node name="ItemsTitle" type="Label" parent="InventoryInfo/HBoxContainer/ItemInfo/ItemTitleContainer"] +custom_minimum_size = Vector2(450, 0) +layout_mode = 2 +size_flags_horizontal = 3 +size_flags_vertical = 1 +text = " ITEMS" +label_settings = SubResource("LabelSettings_31kc7") +horizontal_alignment = 1 +vertical_alignment = 1 + +[node name="ForwardArrow" type="Label" parent="InventoryInfo/HBoxContainer/ItemInfo/ItemTitleContainer"] +unique_name_in_owner = true +visible = false +custom_minimum_size = Vector2(300, 0) +layout_mode = 2 +size_flags_horizontal = 3 +size_flags_vertical = 1 +text = "►" +label_settings = SubResource("LabelSettings_x4aj3") +horizontal_alignment = 2 + +[node name="ItemsPage" type="VBoxContainer" parent="InventoryInfo/HBoxContainer/ItemInfo"] +unique_name_in_owner = true +layout_mode = 2 +size_flags_vertical = 0 +theme_override_constants/separation = 15 +alignment = 1 + +[node name="ReferenceRect3" type="ReferenceRect" parent="InventoryInfo/HBoxContainer/ItemInfo/ItemsPage"] +custom_minimum_size = Vector2(0, 14) +layout_mode = 2 + [node name="PlayerInfo" type="VBoxContainer" parent="InventoryInfo/HBoxContainer"] layout_mode = 2 theme_override_constants/separation = 20 [node name="FloorBox" type="HBoxContainer" parent="InventoryInfo/HBoxContainer/PlayerInfo"] +visible = false layout_mode = 2 [node name="ReferenceRect2" type="ReferenceRect" parent="InventoryInfo/HBoxContainer/PlayerInfo/FloorBox"] @@ -211,6 +262,7 @@ text = "FLOOR 00" label_settings = SubResource("LabelSettings_q0afw") [node name="LevelBox" type="HBoxContainer" parent="InventoryInfo/HBoxContainer/PlayerInfo"] +visible = false layout_mode = 2 [node name="ReferenceRect2" type="ReferenceRect" parent="InventoryInfo/HBoxContainer/PlayerInfo/LevelBox"] @@ -228,6 +280,7 @@ custom_minimum_size = Vector2(0, 12) layout_mode = 2 [node name="EXPBox" type="HBoxContainer" parent="InventoryInfo/HBoxContainer/PlayerInfo"] +visible = false layout_mode = 2 [node name="ReferenceRect2" type="ReferenceRect" parent="InventoryInfo/HBoxContainer/PlayerInfo/EXPBox"] @@ -251,6 +304,7 @@ text = "444/888" label_settings = SubResource("LabelSettings_biilt") [node name="HPBox" type="HBoxContainer" parent="InventoryInfo/HBoxContainer/PlayerInfo"] +visible = false layout_mode = 2 [node name="ReferenceRect2" type="ReferenceRect" parent="InventoryInfo/HBoxContainer/PlayerInfo/HPBox"] @@ -285,6 +339,7 @@ text = "..." label_settings = ExtResource("6_tmdno") [node name="VTBox" type="HBoxContainer" parent="InventoryInfo/HBoxContainer/PlayerInfo"] +visible = false layout_mode = 2 [node name="ReferenceRect2" type="ReferenceRect" parent="InventoryInfo/HBoxContainer/PlayerInfo/VTBox"] @@ -319,6 +374,7 @@ text = "..." label_settings = ExtResource("6_tmdno") [node name="ATKBox" type="HBoxContainer" parent="InventoryInfo/HBoxContainer/PlayerInfo"] +visible = false layout_mode = 2 [node name="ReferenceRect2" type="ReferenceRect" parent="InventoryInfo/HBoxContainer/PlayerInfo/ATKBox"] @@ -353,6 +409,7 @@ text = "..." label_settings = ExtResource("6_tmdno") [node name="DEFBox" type="HBoxContainer" parent="InventoryInfo/HBoxContainer/PlayerInfo"] +visible = false layout_mode = 2 [node name="ReferenceRect2" type="ReferenceRect" parent="InventoryInfo/HBoxContainer/PlayerInfo/DEFBox"] @@ -388,7 +445,7 @@ text = "..." label_settings = ExtResource("6_tmdno") [node name="ReferenceRect3" type="ReferenceRect" parent="InventoryInfo/HBoxContainer/PlayerInfo"] -custom_minimum_size = Vector2(0, 25) +custom_minimum_size = Vector2(0, 600) layout_mode = 2 [node name="HBoxContainer" type="HBoxContainer" parent="InventoryInfo/HBoxContainer/PlayerInfo"] @@ -499,56 +556,6 @@ button_mask = 0 text = "Drop" alignment = 0 -[node name="ItemInfo" type="VBoxContainer" parent="InventoryInfo/HBoxContainer"] -custom_minimum_size = Vector2(700, 0) -layout_mode = 2 -theme_override_constants/separation = 20 - -[node name="ItemTitleContainer" type="MarginContainer" parent="InventoryInfo/HBoxContainer/ItemInfo"] -custom_minimum_size = Vector2(300, 125) -layout_mode = 2 -size_flags_horizontal = 4 - -[node name="BackArrow" type="Label" parent="InventoryInfo/HBoxContainer/ItemInfo/ItemTitleContainer"] -unique_name_in_owner = true -visible = false -custom_minimum_size = Vector2(100, 0) -layout_mode = 2 -text = "◄" -label_settings = SubResource("LabelSettings_x4aj3") - -[node name="ItemsTitle" type="Label" parent="InventoryInfo/HBoxContainer/ItemInfo/ItemTitleContainer"] -custom_minimum_size = Vector2(450, 0) -layout_mode = 2 -size_flags_horizontal = 3 -size_flags_vertical = 1 -text = " ITEMS" -label_settings = SubResource("LabelSettings_31kc7") -horizontal_alignment = 1 -vertical_alignment = 1 - -[node name="ForwardArrow" type="Label" parent="InventoryInfo/HBoxContainer/ItemInfo/ItemTitleContainer"] -unique_name_in_owner = true -visible = false -custom_minimum_size = Vector2(300, 0) -layout_mode = 2 -size_flags_horizontal = 3 -size_flags_vertical = 1 -text = "►" -label_settings = SubResource("LabelSettings_x4aj3") -horizontal_alignment = 2 - -[node name="ItemsPage" type="VBoxContainer" parent="InventoryInfo/HBoxContainer/ItemInfo"] -unique_name_in_owner = true -layout_mode = 2 -size_flags_vertical = 0 -theme_override_constants/separation = 15 -alignment = 1 - -[node name="ReferenceRect3" type="ReferenceRect" parent="InventoryInfo/HBoxContainer/ItemInfo/ItemsPage"] -custom_minimum_size = Vector2(0, 14) -layout_mode = 2 - [node name="AnimationPlayer" type="AnimationPlayer" parent="."] unique_name_in_owner = true libraries = {