Skip to content

Commit 22ef9b8

Browse files
LifeHckrLifeHckr
authored
Merge branch 'milestone-3' into numbersBalancing
2 parents 04333ef + 81dcf8e commit 22ef9b8

3 files changed

Lines changed: 106 additions & 96 deletions

File tree

‎Scenes/BattleDirector/Tutorial/Toriel.tscn‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
process_mode = 3
1111
layer = 0
1212
script = ExtResource("1_mf0nq")
13-
_dialogueLabel = NodePath("Control/CenterContainer/VBoxContainer/NinePatchRect/MarginContainer/TextLabel")
13+
_dialogueLabel = NodePath("Control/CenterContainer/VBoxContainer/MarginContainer/MarginContainer/TextLabel")
1414
_dialogueBox = NodePath("Control")
1515
_nextButton = NodePath("Control/CenterContainer/VBoxContainer/MarginContainer2/NextButton")
1616
_inputSprites = [NodePath("Up"), NodePath("Down"), NodePath("Left"), NodePath("Right")]
@@ -42,7 +42,16 @@ mouse_filter = 2
4242
[node name="VBoxContainer" type="VBoxContainer" parent="Control/CenterContainer"]
4343
layout_mode = 2
4444

45-
[node name="NinePatchRect" type="NinePatchRect" parent="Control/CenterContainer/VBoxContainer"]
45+
[node name="MarginContainer" type="MarginContainer" parent="Control/CenterContainer/VBoxContainer"]
46+
layout_mode = 2
47+
size_flags_vertical = 3
48+
mouse_filter = 2
49+
theme_override_constants/margin_left = 6
50+
theme_override_constants/margin_top = 6
51+
theme_override_constants/margin_right = 6
52+
theme_override_constants/margin_bottom = 6
53+
54+
[node name="NinePatchRect" type="NinePatchRect" parent="Control/CenterContainer/VBoxContainer/MarginContainer"]
4655
custom_minimum_size = Vector2(250, 150)
4756
layout_mode = 2
4857
texture = ExtResource("2_3a4m1")
@@ -51,26 +60,17 @@ patch_margin_top = 8
5160
patch_margin_right = 8
5261
patch_margin_bottom = 8
5362

54-
[node name="MarginContainer" type="MarginContainer" parent="Control/CenterContainer/VBoxContainer/NinePatchRect"]
55-
layout_mode = 1
56-
anchors_preset = 15
57-
anchor_right = 1.0
58-
anchor_bottom = 1.0
59-
grow_horizontal = 2
60-
grow_vertical = 2
61-
size_flags_vertical = 3
62-
mouse_filter = 2
63-
theme_override_constants/margin_left = 6
64-
theme_override_constants/margin_top = 6
65-
theme_override_constants/margin_right = 6
66-
theme_override_constants/margin_bottom = 6
63+
[node name="MarginContainer" type="MarginContainer" parent="Control/CenterContainer/VBoxContainer/MarginContainer"]
64+
layout_mode = 2
65+
theme_override_constants/margin_left = 4
66+
theme_override_constants/margin_top = 4
67+
theme_override_constants/margin_right = 4
68+
theme_override_constants/margin_bottom = 4
6769

68-
[node name="TextLabel" type="Label" parent="Control/CenterContainer/VBoxContainer/NinePatchRect/MarginContainer"]
70+
[node name="TextLabel" type="Label" parent="Control/CenterContainer/VBoxContainer/MarginContainer/MarginContainer"]
6971
layout_mode = 2
7072
size_flags_vertical = 1
71-
autowrap_mode = 2
72-
clip_text = true
73-
text_overrun_behavior = 4
73+
autowrap_mode = 3
7474

7575
[node name="MarginContainer2" type="MarginContainer" parent="Control/CenterContainer/VBoxContainer"]
7676
process_mode = 3

‎Scenes/ShopScene/Scripts/ShopScene.cs‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,14 @@ public override void _Input(InputEvent @event)
103103
GetViewport().SetInputAsHandled();
104104
}
105105
}
106+
if (@event is InputEventKey eventKey && eventKey.Pressed && !eventKey.Echo)
107+
{
108+
if (eventKey.Keycode == Key.Key0)
109+
{
110+
StageProducer.PlayerStats.Money += 999;
111+
UpdateMoneyLabel();
112+
}
113+
}
106114
}
107115

108116
private void UpdateMoneyLabel()
@@ -168,7 +176,8 @@ private void AddShopItem(GridContainer container, IDisplayable item, int basePri
168176

169177
private int GetPrice(int basePrice)
170178
{
171-
return Math.Max(basePrice * (1 - StageProducer.PlayerStats.DiscountPercent / 100), 0); //Price can't go negative
179+
return (int)
180+
Math.Max(basePrice * (1 - (float)StageProducer.PlayerStats.DiscountPercent / 100), 0); //Price can't go negative
172181
}
173182

174183
private IDisplayable _currentItem;

‎Scenes/UI/ScoreScreen.tscn‎

Lines changed: 77 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@
1010
[node name="ScoreScreen" type="CanvasLayer" node_paths=PackedStringArray("_styleLabel", "_styleAmount", "_perfectsLabel", "_perfectsAmount", "_placedLabel", "_placedAmount", "_totalLabel", "_totalAmount", "_relicLabel", "_relicAmount", "_acceptButton")]
1111
process_mode = 3
1212
script = ExtResource("1_ma4hf")
13-
_styleLabel = NodePath("Bg/WindowMargin/PanelBg/VBoxContainer/MarginContainer/BottomPanelBg/HBoxContainer/LabelMargin/LabelVbox/StyleLabel")
14-
_styleAmount = NodePath("Bg/WindowMargin/PanelBg/VBoxContainer/MarginContainer/BottomPanelBg/HBoxContainer/ScoreMargin/LabelVbox/StyleLabel")
15-
_perfectsLabel = NodePath("Bg/WindowMargin/PanelBg/VBoxContainer/MarginContainer/BottomPanelBg/HBoxContainer/LabelMargin/LabelVbox/PerfectLabel")
16-
_perfectsAmount = NodePath("Bg/WindowMargin/PanelBg/VBoxContainer/MarginContainer/BottomPanelBg/HBoxContainer/ScoreMargin/LabelVbox/PerfectLabel")
17-
_placedLabel = NodePath("Bg/WindowMargin/PanelBg/VBoxContainer/MarginContainer/BottomPanelBg/HBoxContainer/LabelMargin/LabelVbox/PlacedLabel")
18-
_placedAmount = NodePath("Bg/WindowMargin/PanelBg/VBoxContainer/MarginContainer/BottomPanelBg/HBoxContainer/ScoreMargin/LabelVbox/PlacedLabel")
19-
_totalLabel = NodePath("Bg/WindowMargin/PanelBg/VBoxContainer/MarginContainer/BottomPanelBg/HBoxContainer/LabelMargin/LabelVbox/TotalLabel")
20-
_totalAmount = NodePath("Bg/WindowMargin/PanelBg/VBoxContainer/MarginContainer/BottomPanelBg/HBoxContainer/ScoreMargin/LabelVbox/HBoxContainer/TotalLabel")
21-
_relicLabel = NodePath("Bg/WindowMargin/PanelBg/VBoxContainer/MarginContainer/BottomPanelBg/HBoxContainer/LabelMargin/LabelVbox/RelicLabel")
22-
_relicAmount = NodePath("Bg/WindowMargin/PanelBg/VBoxContainer/MarginContainer/BottomPanelBg/HBoxContainer/ScoreMargin/LabelVbox/RelicLabel")
23-
_acceptButton = NodePath("Bg/WindowMargin/PanelBg/VBoxContainer/ButtonMargin/AcceptButton")
13+
_styleLabel = NodePath("Bg/WindowMargin/VBoxContainer/MarginContainer/HBoxContainer/LabelMargin/LabelVbox/HBoxContainer/StyleLabel")
14+
_styleAmount = NodePath("Bg/WindowMargin/VBoxContainer/MarginContainer/HBoxContainer/LabelMargin/LabelVbox/HBoxContainer/StyleLabel2")
15+
_perfectsLabel = NodePath("Bg/WindowMargin/VBoxContainer/MarginContainer/HBoxContainer/LabelMargin/LabelVbox/HBoxContainer2/PerfectLabel")
16+
_perfectsAmount = NodePath("Bg/WindowMargin/VBoxContainer/MarginContainer/HBoxContainer/LabelMargin/LabelVbox/HBoxContainer2/PerfectLabel2")
17+
_placedLabel = NodePath("Bg/WindowMargin/VBoxContainer/MarginContainer/HBoxContainer/LabelMargin/LabelVbox/HBoxContainer3/PlacedLabel")
18+
_placedAmount = NodePath("Bg/WindowMargin/VBoxContainer/MarginContainer/HBoxContainer/LabelMargin/LabelVbox/HBoxContainer3/PlacedLabel2")
19+
_totalLabel = NodePath("Bg/WindowMargin/VBoxContainer/MarginContainer/HBoxContainer/LabelMargin/LabelVbox/HBoxContainer6/TotalLabel")
20+
_totalAmount = NodePath("Bg/WindowMargin/VBoxContainer/MarginContainer/HBoxContainer/LabelMargin/LabelVbox/HBoxContainer6/HBoxContainer/TotalLabel")
21+
_relicLabel = NodePath("Bg/WindowMargin/VBoxContainer/MarginContainer/HBoxContainer/LabelMargin/LabelVbox/HBoxContainer4/RelicLabel")
22+
_relicAmount = NodePath("Bg/WindowMargin/VBoxContainer/MarginContainer/HBoxContainer/LabelMargin/LabelVbox/HBoxContainer4/RelicLabel2")
23+
_acceptButton = NodePath("Bg/WindowMargin/VBoxContainer/ButtonMargin/AcceptButton")
2424

2525
[node name="Bg" type="NinePatchRect" parent="."]
2626
self_modulate = Color(1, 1, 1, 0.75)
@@ -57,15 +57,13 @@ patch_margin_top = 10
5757
patch_margin_right = 20
5858
patch_margin_bottom = 27
5959

60-
[node name="VBoxContainer" type="VBoxContainer" parent="Bg/WindowMargin/PanelBg"]
61-
layout_mode = 1
62-
anchors_preset = 15
63-
anchor_right = 1.0
64-
anchor_bottom = 1.0
65-
grow_horizontal = 2
66-
grow_vertical = 2
60+
[node name="VBoxContainer" type="VBoxContainer" parent="Bg/WindowMargin"]
61+
layout_mode = 2
62+
63+
[node name="MarginContainer2" type="MarginContainer" parent="Bg/WindowMargin/VBoxContainer"]
64+
layout_mode = 2
6765

68-
[node name="TopPanelBg" type="NinePatchRect" parent="Bg/WindowMargin/PanelBg/VBoxContainer"]
66+
[node name="TopPanelBg" type="NinePatchRect" parent="Bg/WindowMargin/VBoxContainer/MarginContainer2"]
6967
custom_minimum_size = Vector2(0, 45)
7068
layout_mode = 2
7169
size_flags_horizontal = 3
@@ -77,32 +75,27 @@ patch_margin_top = 10
7775
patch_margin_right = 20
7876
patch_margin_bottom = 27
7977

80-
[node name="Title" type="CenterContainer" parent="Bg/WindowMargin/PanelBg/VBoxContainer/TopPanelBg"]
81-
layout_mode = 1
82-
anchors_preset = 15
83-
anchor_right = 1.0
84-
anchor_bottom = 1.0
85-
grow_horizontal = 2
86-
grow_vertical = 2
78+
[node name="Title" type="CenterContainer" parent="Bg/WindowMargin/VBoxContainer/MarginContainer2"]
79+
layout_mode = 2
8780

88-
[node name="TitleText" type="RichTextLabel" parent="Bg/WindowMargin/PanelBg/VBoxContainer/TopPanelBg/Title"]
89-
custom_minimum_size = Vector2(400, 47)
81+
[node name="TitleText" type="RichTextLabel" parent="Bg/WindowMargin/VBoxContainer/MarginContainer2/Title"]
82+
custom_minimum_size = Vector2(293, 40)
9083
layout_mode = 2
9184
theme_override_font_sizes/normal_font_size = 32
9285
bbcode_enabled = true
9386
text = "SCORING_SCENE_TITLE"
9487
horizontal_alignment = 1
9588
vertical_alignment = 1
9689

97-
[node name="MarginContainer" type="MarginContainer" parent="Bg/WindowMargin/PanelBg/VBoxContainer"]
90+
[node name="MarginContainer" type="MarginContainer" parent="Bg/WindowMargin/VBoxContainer"]
9891
layout_mode = 2
9992
size_flags_vertical = 3
10093
theme_override_constants/margin_left = 4
10194
theme_override_constants/margin_top = 0
10295
theme_override_constants/margin_right = 4
10396
theme_override_constants/margin_bottom = 4
10497

105-
[node name="BottomPanelBg" type="NinePatchRect" parent="Bg/WindowMargin/PanelBg/VBoxContainer/MarginContainer"]
98+
[node name="BottomPanelBg" type="NinePatchRect" parent="Bg/WindowMargin/VBoxContainer/MarginContainer"]
10699
custom_minimum_size = Vector2(0, 175)
107100
layout_mode = 2
108101
size_flags_horizontal = 3
@@ -113,112 +106,120 @@ patch_margin_top = 10
113106
patch_margin_right = 20
114107
patch_margin_bottom = 27
115108

116-
[node name="HBoxContainer" type="HBoxContainer" parent="Bg/WindowMargin/PanelBg/VBoxContainer/MarginContainer/BottomPanelBg"]
117-
layout_mode = 1
118-
anchors_preset = 15
119-
anchor_right = 1.0
120-
anchor_bottom = 1.0
121-
grow_horizontal = 2
122-
grow_vertical = 2
109+
[node name="HBoxContainer" type="HBoxContainer" parent="Bg/WindowMargin/VBoxContainer/MarginContainer"]
110+
layout_mode = 2
123111
size_flags_vertical = 3
124112

125-
[node name="LabelMargin" type="MarginContainer" parent="Bg/WindowMargin/PanelBg/VBoxContainer/MarginContainer/BottomPanelBg/HBoxContainer"]
113+
[node name="LabelMargin" type="MarginContainer" parent="Bg/WindowMargin/VBoxContainer/MarginContainer/HBoxContainer"]
126114
layout_mode = 2
127115
size_flags_horizontal = 3
128116
theme_override_constants/margin_left = 8
129117
theme_override_constants/margin_top = 8
130118
theme_override_constants/margin_right = 8
131119
theme_override_constants/margin_bottom = 8
132120

133-
[node name="LabelVbox" type="VBoxContainer" parent="Bg/WindowMargin/PanelBg/VBoxContainer/MarginContainer/BottomPanelBg/HBoxContainer/LabelMargin"]
121+
[node name="LabelVbox" type="VBoxContainer" parent="Bg/WindowMargin/VBoxContainer/MarginContainer/HBoxContainer/LabelMargin"]
134122
layout_mode = 2
135123
size_flags_horizontal = 3
136-
theme_override_constants/separation = 11
137124
alignment = 1
138125

139-
[node name="StyleLabel" type="Label" parent="Bg/WindowMargin/PanelBg/VBoxContainer/MarginContainer/BottomPanelBg/HBoxContainer/LabelMargin/LabelVbox"]
126+
[node name="HBoxContainer" type="HBoxContainer" parent="Bg/WindowMargin/VBoxContainer/MarginContainer/HBoxContainer/LabelMargin/LabelVbox"]
140127
layout_mode = 2
141-
text = "SCORING_STYLE"
128+
size_flags_vertical = 3
142129

143-
[node name="PerfectLabel" type="Label" parent="Bg/WindowMargin/PanelBg/VBoxContainer/MarginContainer/BottomPanelBg/HBoxContainer/LabelMargin/LabelVbox"]
130+
[node name="StyleLabel" type="Label" parent="Bg/WindowMargin/VBoxContainer/MarginContainer/HBoxContainer/LabelMargin/LabelVbox/HBoxContainer"]
144131
layout_mode = 2
145-
text = "SCORING_PERFECTS"
132+
text = "SCORING_STYLE"
146133

147-
[node name="PlacedLabel" type="Label" parent="Bg/WindowMargin/PanelBg/VBoxContainer/MarginContainer/BottomPanelBg/HBoxContainer/LabelMargin/LabelVbox"]
134+
[node name="StyleLabel2" type="Label" parent="Bg/WindowMargin/VBoxContainer/MarginContainer/HBoxContainer/LabelMargin/LabelVbox/HBoxContainer"]
148135
layout_mode = 2
149-
text = "SCORING_PLACED"
136+
size_flags_horizontal = 10
137+
text = "999"
138+
horizontal_alignment = 2
150139

151-
[node name="RelicLabel" type="Label" parent="Bg/WindowMargin/PanelBg/VBoxContainer/MarginContainer/BottomPanelBg/HBoxContainer/LabelMargin/LabelVbox"]
140+
[node name="HBoxContainer2" type="HBoxContainer" parent="Bg/WindowMargin/VBoxContainer/MarginContainer/HBoxContainer/LabelMargin/LabelVbox"]
152141
layout_mode = 2
153-
text = "SCORING_RELICS"
142+
size_flags_vertical = 3
154143

155-
[node name="Placeholder" type="Label" parent="Bg/WindowMargin/PanelBg/VBoxContainer/MarginContainer/BottomPanelBg/HBoxContainer/LabelMargin/LabelVbox"]
144+
[node name="PerfectLabel" type="Label" parent="Bg/WindowMargin/VBoxContainer/MarginContainer/HBoxContainer/LabelMargin/LabelVbox/HBoxContainer2"]
156145
layout_mode = 2
146+
text = "SCORING_PERFECTS"
157147

158-
[node name="TotalLabel" type="Label" parent="Bg/WindowMargin/PanelBg/VBoxContainer/MarginContainer/BottomPanelBg/HBoxContainer/LabelMargin/LabelVbox"]
148+
[node name="PerfectLabel2" type="Label" parent="Bg/WindowMargin/VBoxContainer/MarginContainer/HBoxContainer/LabelMargin/LabelVbox/HBoxContainer2"]
159149
layout_mode = 2
160-
text = "SCORING_TOTAL"
150+
size_flags_horizontal = 10
151+
text = "999"
152+
horizontal_alignment = 2
161153

162-
[node name="ScoreMargin" type="MarginContainer" parent="Bg/WindowMargin/PanelBg/VBoxContainer/MarginContainer/BottomPanelBg/HBoxContainer"]
154+
[node name="HBoxContainer3" type="HBoxContainer" parent="Bg/WindowMargin/VBoxContainer/MarginContainer/HBoxContainer/LabelMargin/LabelVbox"]
163155
layout_mode = 2
164-
size_flags_horizontal = 3
165-
size_flags_stretch_ratio = 0.25
166-
theme_override_constants/margin_left = 8
167-
theme_override_constants/margin_top = 8
168-
theme_override_constants/margin_right = 8
169-
theme_override_constants/margin_bottom = 8
156+
size_flags_vertical = 3
170157

171-
[node name="LabelVbox" type="VBoxContainer" parent="Bg/WindowMargin/PanelBg/VBoxContainer/MarginContainer/BottomPanelBg/HBoxContainer/ScoreMargin"]
158+
[node name="PlacedLabel" type="Label" parent="Bg/WindowMargin/VBoxContainer/MarginContainer/HBoxContainer/LabelMargin/LabelVbox/HBoxContainer3"]
172159
layout_mode = 2
173-
size_flags_horizontal = 3
174-
theme_override_constants/separation = 11
175-
alignment = 1
160+
text = "SCORING_PLACED"
176161

177-
[node name="StyleLabel" type="Label" parent="Bg/WindowMargin/PanelBg/VBoxContainer/MarginContainer/BottomPanelBg/HBoxContainer/ScoreMargin/LabelVbox"]
162+
[node name="PlacedLabel2" type="Label" parent="Bg/WindowMargin/VBoxContainer/MarginContainer/HBoxContainer/LabelMargin/LabelVbox/HBoxContainer3"]
178163
layout_mode = 2
164+
size_flags_horizontal = 10
179165
text = "999"
180166
horizontal_alignment = 2
181167

182-
[node name="PerfectLabel" type="Label" parent="Bg/WindowMargin/PanelBg/VBoxContainer/MarginContainer/BottomPanelBg/HBoxContainer/ScoreMargin/LabelVbox"]
168+
[node name="HBoxContainer4" type="HBoxContainer" parent="Bg/WindowMargin/VBoxContainer/MarginContainer/HBoxContainer/LabelMargin/LabelVbox"]
183169
layout_mode = 2
184-
text = "999"
185-
horizontal_alignment = 2
170+
size_flags_vertical = 3
186171

187-
[node name="PlacedLabel" type="Label" parent="Bg/WindowMargin/PanelBg/VBoxContainer/MarginContainer/BottomPanelBg/HBoxContainer/ScoreMargin/LabelVbox"]
172+
[node name="RelicLabel" type="Label" parent="Bg/WindowMargin/VBoxContainer/MarginContainer/HBoxContainer/LabelMargin/LabelVbox/HBoxContainer4"]
188173
layout_mode = 2
189-
text = "999"
190-
horizontal_alignment = 2
174+
text = "SCORING_RELICS"
191175

192-
[node name="RelicLabel" type="Label" parent="Bg/WindowMargin/PanelBg/VBoxContainer/MarginContainer/BottomPanelBg/HBoxContainer/ScoreMargin/LabelVbox"]
176+
[node name="RelicLabel2" type="Label" parent="Bg/WindowMargin/VBoxContainer/MarginContainer/HBoxContainer/LabelMargin/LabelVbox/HBoxContainer4"]
193177
layout_mode = 2
178+
size_flags_horizontal = 10
194179
text = "999"
195180
horizontal_alignment = 2
196181

197-
[node name="Placeholder" type="Label" parent="Bg/WindowMargin/PanelBg/VBoxContainer/MarginContainer/BottomPanelBg/HBoxContainer/ScoreMargin/LabelVbox"]
182+
[node name="HBoxContainer5" type="HBoxContainer" parent="Bg/WindowMargin/VBoxContainer/MarginContainer/HBoxContainer/LabelMargin/LabelVbox"]
183+
layout_mode = 2
184+
size_flags_vertical = 3
185+
186+
[node name="Placeholder" type="Label" parent="Bg/WindowMargin/VBoxContainer/MarginContainer/HBoxContainer/LabelMargin/LabelVbox/HBoxContainer5"]
187+
layout_mode = 2
188+
189+
[node name="Placeholder2" type="Label" parent="Bg/WindowMargin/VBoxContainer/MarginContainer/HBoxContainer/LabelMargin/LabelVbox/HBoxContainer5"]
198190
layout_mode = 2
199191
horizontal_alignment = 2
200192

201-
[node name="HBoxContainer" type="HBoxContainer" parent="Bg/WindowMargin/PanelBg/VBoxContainer/MarginContainer/BottomPanelBg/HBoxContainer/ScoreMargin/LabelVbox"]
193+
[node name="HBoxContainer6" type="HBoxContainer" parent="Bg/WindowMargin/VBoxContainer/MarginContainer/HBoxContainer/LabelMargin/LabelVbox"]
194+
layout_mode = 2
195+
size_flags_vertical = 3
196+
197+
[node name="TotalLabel" type="Label" parent="Bg/WindowMargin/VBoxContainer/MarginContainer/HBoxContainer/LabelMargin/LabelVbox/HBoxContainer6"]
202198
layout_mode = 2
199+
text = "SCORING_TOTAL"
200+
201+
[node name="HBoxContainer" type="HBoxContainer" parent="Bg/WindowMargin/VBoxContainer/MarginContainer/HBoxContainer/LabelMargin/LabelVbox/HBoxContainer6"]
202+
layout_mode = 2
203+
size_flags_horizontal = 10
203204

204-
[node name="MoneyIcon" type="TextureRect" parent="Bg/WindowMargin/PanelBg/VBoxContainer/MarginContainer/BottomPanelBg/HBoxContainer/ScoreMargin/LabelVbox/HBoxContainer"]
205+
[node name="MoneyIcon" type="TextureRect" parent="Bg/WindowMargin/VBoxContainer/MarginContainer/HBoxContainer/LabelMargin/LabelVbox/HBoxContainer6/HBoxContainer"]
205206
layout_mode = 2
206207
size_flags_horizontal = 0
207208
size_flags_vertical = 4
208209
texture = ExtResource("5_0mn6u")
209210

210-
[node name="TotalLabel" type="Label" parent="Bg/WindowMargin/PanelBg/VBoxContainer/MarginContainer/BottomPanelBg/HBoxContainer/ScoreMargin/LabelVbox/HBoxContainer"]
211+
[node name="TotalLabel" type="Label" parent="Bg/WindowMargin/VBoxContainer/MarginContainer/HBoxContainer/LabelMargin/LabelVbox/HBoxContainer6/HBoxContainer"]
211212
layout_mode = 2
212213
size_flags_horizontal = 10
213214
text = "999"
214215
horizontal_alignment = 2
215216

216-
[node name="ButtonMargin" type="MarginContainer" parent="Bg/WindowMargin/PanelBg/VBoxContainer"]
217+
[node name="ButtonMargin" type="MarginContainer" parent="Bg/WindowMargin/VBoxContainer"]
217218
layout_mode = 2
218219
theme_override_constants/margin_top = -3
219220
theme_override_constants/margin_bottom = 9
220221

221-
[node name="AcceptButton" type="Button" parent="Bg/WindowMargin/PanelBg/VBoxContainer/ButtonMargin"]
222+
[node name="AcceptButton" type="Button" parent="Bg/WindowMargin/VBoxContainer/ButtonMargin"]
222223
layout_mode = 2
223224
size_flags_horizontal = 6
224225
theme = ExtResource("4_1rsqt")

0 commit comments

Comments
 (0)