diff --git a/resources/disciple_info_label_settings.tres b/resources/disciple_info_label_settings.tres index 1926078..b40dc9e 100644 --- a/resources/disciple_info_label_settings.tres +++ b/resources/disciple_info_label_settings.tres @@ -8,3 +8,4 @@ paragraph_spacing = 1.0 font = ExtResource("1_f7lwv") font_size = 24 font_color = Color(0, 0, 0, 1) +shadow_color = Color(0.9128214, 0.63396364, 0.6629118, 1) diff --git a/resources/manager_style_box_flat.tres b/resources/manager_style_box_flat.tres new file mode 100644 index 0000000..137610d --- /dev/null +++ b/resources/manager_style_box_flat.tres @@ -0,0 +1,9 @@ +[gd_resource type="StyleBoxFlat" format=3 uid="uid://e86yw57h4v2s"] + +[resource] +bg_color = Color(0.34372595, 0.630709, 0.8494593, 1) +border_width_left = 80 +border_width_top = 40 +border_width_right = 80 +border_width_bottom = 40 +border_color = Color(0.8, 0.8, 0.8, 0) diff --git a/src/Core/MainGame.tscn b/src/Core/MainGame.tscn index f283aed..ac9ad33 100644 --- a/src/Core/MainGame.tscn +++ b/src/Core/MainGame.tscn @@ -2,6 +2,8 @@ [ext_resource type="Script" uid="uid://cr4by5k8vgkcq" path="res://src/Core/MainGame.gd" id="1_8bu23"] [ext_resource type="PackedScene" uid="uid://d3njijtx7ws1m" path="res://src/UI/HUD/MainSceneHud.tscn" id="2_8bu23"] +[ext_resource type="StyleBox" uid="uid://e86yw57h4v2s" path="res://resources/manager_style_box_flat.tres" id="3_dl5bp"] +[ext_resource type="PackedScene" uid="uid://d1mbwdtarjqof" path="res://src/UI/Panels/Manager/Manager.tscn" id="4_58g0x"] [node name="MainGame" type="Node" unique_id=42551660] script = ExtResource("1_8bu23") @@ -10,4 +12,15 @@ script = ExtResource("1_8bu23") size_flags_horizontal = 3 size_flags_vertical = 3 +[node name="PanelContainer" type="PanelContainer" parent="." unique_id=1678471853] +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +theme_override_styles/panel = ExtResource("3_dl5bp") + +[node name="Manager" parent="PanelContainer" unique_id=360636457 instance=ExtResource("4_58g0x")] +layout_mode = 2 + [connection signal="sign_return_mainmenu" from="MainHud" to="." method="_on_top_bar_hud_sign_return_mainmenu"] diff --git a/src/UI/Panels/Manager/DisciplePanel/DiscipleInformationPanel.tscn b/src/UI/Panels/Manager/DisciplePanel/DiscipleInformationPanel.tscn index f183185..0725ea4 100644 --- a/src/UI/Panels/Manager/DisciplePanel/DiscipleInformationPanel.tscn +++ b/src/UI/Panels/Manager/DisciplePanel/DiscipleInformationPanel.tscn @@ -27,6 +27,7 @@ size_flags_horizontal = 3 size_flags_vertical = 1 text = "姓名" label_settings = ExtResource("1_abpqa") +horizontal_alignment = 1 vertical_alignment = 1 [node name="Name" type="Label" parent="VBoxContainer/HBoxContainer" unique_id=1124761822] @@ -45,6 +46,7 @@ size_flags_horizontal = 3 size_flags_vertical = 1 text = "境界" label_settings = ExtResource("1_abpqa") +horizontal_alignment = 1 vertical_alignment = 1 [node name="Level" type="Label" parent="VBoxContainer/HBoxContainer2" unique_id=913472455] @@ -63,6 +65,7 @@ size_flags_horizontal = 3 size_flags_vertical = 1 text = "属性" label_settings = ExtResource("1_abpqa") +horizontal_alignment = 1 vertical_alignment = 1 [node name="VBoxContainer2" type="VBoxContainer" parent="VBoxContainer/HBoxContainer3" unique_id=251442021] diff --git a/src/UI/Panels/Manager/DisciplePanel/DisciplePanel.tscn b/src/UI/Panels/Manager/DisciplePanel/DisciplePanel.tscn index 30374d7..01e71bc 100644 --- a/src/UI/Panels/Manager/DisciplePanel/DisciplePanel.tscn +++ b/src/UI/Panels/Manager/DisciplePanel/DisciplePanel.tscn @@ -26,145 +26,150 @@ alignment = 1 [node name="DiscipleInformationPanel" parent="ScrollContainer/HFlowContainer" unique_id=1463617991 instance=ExtResource("1_ieo5l")] custom_minimum_size = Vector2(160, 200) -custom_maximum_size = Vector2(160, 200) +custom_maximum_size = Vector2(160, 300) layout_mode = 2 -[node name="DiscipleInformationPanel2" parent="ScrollContainer/HFlowContainer" unique_id=1021323045 instance=ExtResource("1_ieo5l")] +[node name="DiscipleInformationPanel2" parent="ScrollContainer/HFlowContainer" unique_id=2024414593 instance=ExtResource("1_ieo5l")] custom_minimum_size = Vector2(160, 200) -custom_maximum_size = Vector2(160, 200) +custom_maximum_size = Vector2(160, 300) layout_mode = 2 -[node name="DiscipleInformationPanel3" parent="ScrollContainer/HFlowContainer" unique_id=1532684529 instance=ExtResource("1_ieo5l")] +[node name="DiscipleInformationPanel3" parent="ScrollContainer/HFlowContainer" unique_id=516026909 instance=ExtResource("1_ieo5l")] custom_minimum_size = Vector2(160, 200) -custom_maximum_size = Vector2(160, 200) +custom_maximum_size = Vector2(160, 300) layout_mode = 2 -[node name="DiscipleInformationPanel4" parent="ScrollContainer/HFlowContainer" unique_id=826017646 instance=ExtResource("1_ieo5l")] +[node name="DiscipleInformationPanel4" parent="ScrollContainer/HFlowContainer" unique_id=1802572182 instance=ExtResource("1_ieo5l")] custom_minimum_size = Vector2(160, 200) -custom_maximum_size = Vector2(160, 200) +custom_maximum_size = Vector2(160, 300) layout_mode = 2 -[node name="DiscipleInformationPanel5" parent="ScrollContainer/HFlowContainer" unique_id=1801973105 instance=ExtResource("1_ieo5l")] +[node name="DiscipleInformationPanel5" parent="ScrollContainer/HFlowContainer" unique_id=2080843722 instance=ExtResource("1_ieo5l")] custom_minimum_size = Vector2(160, 200) -custom_maximum_size = Vector2(160, 200) +custom_maximum_size = Vector2(160, 300) layout_mode = 2 -[node name="DiscipleInformationPanel6" parent="ScrollContainer/HFlowContainer" unique_id=26512172 instance=ExtResource("1_ieo5l")] +[node name="DiscipleInformationPanel6" parent="ScrollContainer/HFlowContainer" unique_id=1812760823 instance=ExtResource("1_ieo5l")] custom_minimum_size = Vector2(160, 200) -custom_maximum_size = Vector2(160, 200) +custom_maximum_size = Vector2(160, 300) layout_mode = 2 -[node name="DiscipleInformationPanel7" parent="ScrollContainer/HFlowContainer" unique_id=1604914915 instance=ExtResource("1_ieo5l")] +[node name="DiscipleInformationPanel7" parent="ScrollContainer/HFlowContainer" unique_id=1051594653 instance=ExtResource("1_ieo5l")] custom_minimum_size = Vector2(160, 200) -custom_maximum_size = Vector2(160, 200) +custom_maximum_size = Vector2(160, 300) layout_mode = 2 -[node name="DiscipleInformationPanel8" parent="ScrollContainer/HFlowContainer" unique_id=1175961950 instance=ExtResource("1_ieo5l")] +[node name="DiscipleInformationPanel8" parent="ScrollContainer/HFlowContainer" unique_id=105334411 instance=ExtResource("1_ieo5l")] custom_minimum_size = Vector2(160, 200) -custom_maximum_size = Vector2(160, 200) +custom_maximum_size = Vector2(160, 300) layout_mode = 2 -[node name="DiscipleInformationPanel9" parent="ScrollContainer/HFlowContainer" unique_id=1658128381 instance=ExtResource("1_ieo5l")] +[node name="DiscipleInformationPanel9" parent="ScrollContainer/HFlowContainer" unique_id=810920765 instance=ExtResource("1_ieo5l")] custom_minimum_size = Vector2(160, 200) -custom_maximum_size = Vector2(160, 200) +custom_maximum_size = Vector2(160, 300) layout_mode = 2 -[node name="DiscipleInformationPanel10" parent="ScrollContainer/HFlowContainer" unique_id=1118637884 instance=ExtResource("1_ieo5l")] +[node name="DiscipleInformationPanel10" parent="ScrollContainer/HFlowContainer" unique_id=1300672831 instance=ExtResource("1_ieo5l")] custom_minimum_size = Vector2(160, 200) -custom_maximum_size = Vector2(160, 200) +custom_maximum_size = Vector2(160, 300) layout_mode = 2 -[node name="DiscipleInformationPanel11" parent="ScrollContainer/HFlowContainer" unique_id=225536606 instance=ExtResource("1_ieo5l")] +[node name="DiscipleInformationPanel11" parent="ScrollContainer/HFlowContainer" unique_id=636817917 instance=ExtResource("1_ieo5l")] custom_minimum_size = Vector2(160, 200) -custom_maximum_size = Vector2(160, 200) +custom_maximum_size = Vector2(160, 300) layout_mode = 2 -[node name="DiscipleInformationPanel12" parent="ScrollContainer/HFlowContainer" unique_id=1224947823 instance=ExtResource("1_ieo5l")] +[node name="DiscipleInformationPanel12" parent="ScrollContainer/HFlowContainer" unique_id=1498080100 instance=ExtResource("1_ieo5l")] custom_minimum_size = Vector2(160, 200) -custom_maximum_size = Vector2(160, 200) +custom_maximum_size = Vector2(160, 300) layout_mode = 2 -[node name="DiscipleInformationPanel13" parent="ScrollContainer/HFlowContainer" unique_id=698054001 instance=ExtResource("1_ieo5l")] +[node name="DiscipleInformationPanel13" parent="ScrollContainer/HFlowContainer" unique_id=487525103 instance=ExtResource("1_ieo5l")] custom_minimum_size = Vector2(160, 200) -custom_maximum_size = Vector2(160, 200) +custom_maximum_size = Vector2(160, 300) layout_mode = 2 -[node name="DiscipleInformationPanel14" parent="ScrollContainer/HFlowContainer" unique_id=1708799158 instance=ExtResource("1_ieo5l")] +[node name="DiscipleInformationPanel14" parent="ScrollContainer/HFlowContainer" unique_id=516031866 instance=ExtResource("1_ieo5l")] custom_minimum_size = Vector2(160, 200) -custom_maximum_size = Vector2(160, 200) +custom_maximum_size = Vector2(160, 300) layout_mode = 2 -[node name="DiscipleInformationPanel15" parent="ScrollContainer/HFlowContainer" unique_id=348109606 instance=ExtResource("1_ieo5l")] +[node name="DiscipleInformationPanel15" parent="ScrollContainer/HFlowContainer" unique_id=16752904 instance=ExtResource("1_ieo5l")] custom_minimum_size = Vector2(160, 200) -custom_maximum_size = Vector2(160, 200) +custom_maximum_size = Vector2(160, 300) layout_mode = 2 -[node name="DiscipleInformationPanel16" parent="ScrollContainer/HFlowContainer" unique_id=936882381 instance=ExtResource("1_ieo5l")] +[node name="DiscipleInformationPanel16" parent="ScrollContainer/HFlowContainer" unique_id=733629863 instance=ExtResource("1_ieo5l")] custom_minimum_size = Vector2(160, 200) -custom_maximum_size = Vector2(160, 200) +custom_maximum_size = Vector2(160, 300) layout_mode = 2 -[node name="DiscipleInformationPanel17" parent="ScrollContainer/HFlowContainer" unique_id=1754732536 instance=ExtResource("1_ieo5l")] +[node name="DiscipleInformationPanel17" parent="ScrollContainer/HFlowContainer" unique_id=338414883 instance=ExtResource("1_ieo5l")] custom_minimum_size = Vector2(160, 200) -custom_maximum_size = Vector2(160, 200) +custom_maximum_size = Vector2(160, 300) layout_mode = 2 -[node name="DiscipleInformationPanel18" parent="ScrollContainer/HFlowContainer" unique_id=486904672 instance=ExtResource("1_ieo5l")] +[node name="DiscipleInformationPanel18" parent="ScrollContainer/HFlowContainer" unique_id=1710939015 instance=ExtResource("1_ieo5l")] custom_minimum_size = Vector2(160, 200) -custom_maximum_size = Vector2(160, 200) +custom_maximum_size = Vector2(160, 300) layout_mode = 2 -[node name="DiscipleInformationPanel19" parent="ScrollContainer/HFlowContainer" unique_id=863088248 instance=ExtResource("1_ieo5l")] +[node name="DiscipleInformationPanel19" parent="ScrollContainer/HFlowContainer" unique_id=1126714402 instance=ExtResource("1_ieo5l")] custom_minimum_size = Vector2(160, 200) -custom_maximum_size = Vector2(160, 200) +custom_maximum_size = Vector2(160, 300) layout_mode = 2 -[node name="DiscipleInformationPanel20" parent="ScrollContainer/HFlowContainer" unique_id=112208330 instance=ExtResource("1_ieo5l")] +[node name="DiscipleInformationPanel20" parent="ScrollContainer/HFlowContainer" unique_id=694746761 instance=ExtResource("1_ieo5l")] custom_minimum_size = Vector2(160, 200) -custom_maximum_size = Vector2(160, 200) +custom_maximum_size = Vector2(160, 300) layout_mode = 2 -[node name="DiscipleInformationPanel21" parent="ScrollContainer/HFlowContainer" unique_id=764132510 instance=ExtResource("1_ieo5l")] +[node name="DiscipleInformationPanel21" parent="ScrollContainer/HFlowContainer" unique_id=2108318846 instance=ExtResource("1_ieo5l")] custom_minimum_size = Vector2(160, 200) -custom_maximum_size = Vector2(160, 200) +custom_maximum_size = Vector2(160, 300) layout_mode = 2 -[node name="DiscipleInformationPanel22" parent="ScrollContainer/HFlowContainer" unique_id=383792042 instance=ExtResource("1_ieo5l")] +[node name="DiscipleInformationPanel22" parent="ScrollContainer/HFlowContainer" unique_id=242059688 instance=ExtResource("1_ieo5l")] custom_minimum_size = Vector2(160, 200) -custom_maximum_size = Vector2(160, 200) +custom_maximum_size = Vector2(160, 300) layout_mode = 2 -[node name="DiscipleInformationPanel23" parent="ScrollContainer/HFlowContainer" unique_id=1542342367 instance=ExtResource("1_ieo5l")] +[node name="DiscipleInformationPanel23" parent="ScrollContainer/HFlowContainer" unique_id=387470558 instance=ExtResource("1_ieo5l")] custom_minimum_size = Vector2(160, 200) -custom_maximum_size = Vector2(160, 200) +custom_maximum_size = Vector2(160, 300) layout_mode = 2 -[node name="DiscipleInformationPanel24" parent="ScrollContainer/HFlowContainer" unique_id=2011703115 instance=ExtResource("1_ieo5l")] +[node name="DiscipleInformationPanel24" parent="ScrollContainer/HFlowContainer" unique_id=697377113 instance=ExtResource("1_ieo5l")] custom_minimum_size = Vector2(160, 200) -custom_maximum_size = Vector2(160, 200) +custom_maximum_size = Vector2(160, 300) layout_mode = 2 -[node name="DiscipleInformationPanel25" parent="ScrollContainer/HFlowContainer" unique_id=773318379 instance=ExtResource("1_ieo5l")] +[node name="DiscipleInformationPanel25" parent="ScrollContainer/HFlowContainer" unique_id=1734117404 instance=ExtResource("1_ieo5l")] custom_minimum_size = Vector2(160, 200) -custom_maximum_size = Vector2(160, 200) +custom_maximum_size = Vector2(160, 300) layout_mode = 2 -[node name="DiscipleInformationPanel26" parent="ScrollContainer/HFlowContainer" unique_id=813275380 instance=ExtResource("1_ieo5l")] +[node name="DiscipleInformationPanel26" parent="ScrollContainer/HFlowContainer" unique_id=556527783 instance=ExtResource("1_ieo5l")] custom_minimum_size = Vector2(160, 200) -custom_maximum_size = Vector2(160, 200) +custom_maximum_size = Vector2(160, 300) layout_mode = 2 -[node name="DiscipleInformationPanel27" parent="ScrollContainer/HFlowContainer" unique_id=1059743893 instance=ExtResource("1_ieo5l")] +[node name="DiscipleInformationPanel27" parent="ScrollContainer/HFlowContainer" unique_id=721139875 instance=ExtResource("1_ieo5l")] custom_minimum_size = Vector2(160, 200) -custom_maximum_size = Vector2(160, 200) +custom_maximum_size = Vector2(160, 300) layout_mode = 2 -[node name="DiscipleInformationPanel28" parent="ScrollContainer/HFlowContainer" unique_id=1500396674 instance=ExtResource("1_ieo5l")] +[node name="DiscipleInformationPanel28" parent="ScrollContainer/HFlowContainer" unique_id=1429179121 instance=ExtResource("1_ieo5l")] custom_minimum_size = Vector2(160, 200) -custom_maximum_size = Vector2(160, 200) +custom_maximum_size = Vector2(160, 300) layout_mode = 2 -[node name="DiscipleInformationPanel29" parent="ScrollContainer/HFlowContainer" unique_id=175683662 instance=ExtResource("1_ieo5l")] +[node name="DiscipleInformationPanel29" parent="ScrollContainer/HFlowContainer" unique_id=947135956 instance=ExtResource("1_ieo5l")] custom_minimum_size = Vector2(160, 200) -custom_maximum_size = Vector2(160, 200) +custom_maximum_size = Vector2(160, 300) +layout_mode = 2 + +[node name="DiscipleInformationPanel30" parent="ScrollContainer/HFlowContainer" unique_id=1589601916 instance=ExtResource("1_ieo5l")] +custom_minimum_size = Vector2(160, 200) +custom_maximum_size = Vector2(160, 300) layout_mode = 2