Skip to content

Commit 4822221

Browse files
committed
updeate UI
1 parent 8694700 commit 4822221

File tree

4 files changed

+50
-44
lines changed

4 files changed

+50
-44
lines changed

enums.gd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
extends Node
22

33
const APP_VER:String = "0.1.0"
4-
const APP_BLD:String = "2040510"
4+
const APP_BLD:String = "20240510"
55
const TWEEN_TIME:float = 0.25
66
const EXPLODE_DELAY:int = 1
77
const SRPITE_POS:Vector2 = Vector2(64,64)

game.tscn

Lines changed: 33 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
[gd_scene load_steps=17 format=3 uid="uid://b5bfm2244ywxk"]
1+
[gd_scene load_steps=18 format=3 uid="uid://b5bfm2244ywxk"]
22

33
[ext_resource type="Script" path="res://game.gd" id="1_ewnxx"]
44
[ext_resource type="Texture2D" uid="uid://cnlqirgwr8d4" path="res://assets/bkgd/Background.png" id="1_h8otn"]
55
[ext_resource type="PackedScene" uid="uid://x4qq2j3l7nvb" path="res://game_board/board.tscn" id="2_2ltbx"]
66
[ext_resource type="Texture2D" uid="uid://b8biy2iputyhe" path="res://assets/gems/characters_0002.png" id="3_qywvx"]
77
[ext_resource type="Texture2D" uid="uid://duau66qew6757" path="res://assets/gems/characters_0001.png" id="3_sh4xh"]
88
[ext_resource type="Texture2D" uid="uid://vu6oui2n7024" path="res://assets/gems/characters_0003.png" id="4_2reex"]
9+
[ext_resource type="Theme" uid="uid://1cdmnqyil8gy" path="res://game_stats_label_theme.tres" id="4_xf0vf"]
910
[ext_resource type="Texture2D" uid="uid://byliae6aa6ki2" path="res://assets/gems/characters_0005.png" id="5_g428h"]
1011
[ext_resource type="Texture2D" uid="uid://2vrsevjv4w43" path="res://assets/gems/characters_0007.png" id="6_ot4tf"]
1112
[ext_resource type="Texture2D" uid="uid://b1o34xq1pq82y" path="res://assets/gems/characters_0006.png" id="7_o4d3d"]
@@ -43,19 +44,19 @@ grow_horizontal = 2
4344
grow_vertical = 2
4445
theme_override_styles/panel = SubResource("StyleBoxFlat_103kv")
4546

46-
[node name="VboxBkgd" type="Panel" parent="."]
47-
offset_left = 50.0
48-
offset_top = 75.0
49-
offset_right = 450.0
50-
offset_bottom = 1175.0
47+
[node name="GameStatsBkgd" type="Panel" parent="."]
48+
offset_left = 75.0
49+
offset_top = 150.0
50+
offset_right = 425.0
51+
offset_bottom = 1174.0
5152
theme_override_styles/panel = SubResource("StyleBoxFlat_k3sk6")
5253

5354
[node name="GameStats" type="VBoxContainer" parent="."]
54-
offset_left = 80.0
55-
offset_top = 85.0
56-
offset_right = 405.0
57-
offset_bottom = 1185.0
58-
theme_override_constants/separation = 20
55+
offset_left = 100.0
56+
offset_top = 175.0
57+
offset_right = 425.0
58+
offset_bottom = 1199.0
59+
theme_override_constants/separation = 40
5960

6061
[node name="HBoxContainer1" type="HBoxContainer" parent="GameStats"]
6162
layout_mode = 2
@@ -73,7 +74,7 @@ centered = false
7374
[node name="Label" type="Label" parent="GameStats/HBoxContainer1"]
7475
layout_mode = 2
7576
size_flags_horizontal = 3
76-
theme_override_colors/font_color = Color(0.945098, 0.945098, 0.945098, 1)
77+
theme = ExtResource("4_xf0vf")
7778
theme_override_font_sizes/font_size = 96
7879
text = "0"
7980

@@ -93,6 +94,7 @@ centered = false
9394
[node name="Label" type="Label" parent="GameStats/HBoxContainer2"]
9495
layout_mode = 2
9596
size_flags_horizontal = 3
97+
theme = ExtResource("4_xf0vf")
9698
theme_override_colors/font_color = Color(0.945098, 0.945098, 0.945098, 1)
9799
theme_override_font_sizes/font_size = 96
98100
text = "0"
@@ -113,6 +115,7 @@ centered = false
113115
[node name="Label" type="Label" parent="GameStats/HBoxContainer3"]
114116
layout_mode = 2
115117
size_flags_horizontal = 3
118+
theme = ExtResource("4_xf0vf")
116119
theme_override_colors/font_color = Color(0.945098, 0.945098, 0.945098, 1)
117120
theme_override_font_sizes/font_size = 96
118121
text = "0"
@@ -133,6 +136,7 @@ centered = false
133136
[node name="Label" type="Label" parent="GameStats/HBoxContainer4"]
134137
layout_mode = 2
135138
size_flags_horizontal = 3
139+
theme = ExtResource("4_xf0vf")
136140
theme_override_colors/font_color = Color(0.945098, 0.945098, 0.945098, 1)
137141
theme_override_font_sizes/font_size = 96
138142
text = "0"
@@ -153,6 +157,7 @@ centered = false
153157
[node name="Label" type="Label" parent="GameStats/HBoxContainer5"]
154158
layout_mode = 2
155159
size_flags_horizontal = 3
160+
theme = ExtResource("4_xf0vf")
156161
theme_override_colors/font_color = Color(0.945098, 0.945098, 0.945098, 1)
157162
theme_override_font_sizes/font_size = 96
158163
text = "0"
@@ -173,20 +178,21 @@ centered = false
173178
[node name="Label" type="Label" parent="GameStats/HBoxContainer6"]
174179
layout_mode = 2
175180
size_flags_horizontal = 3
181+
theme = ExtResource("4_xf0vf")
176182
theme_override_colors/font_color = Color(0.945098, 0.945098, 0.945098, 1)
177183
theme_override_font_sizes/font_size = 96
178184
text = "0"
179185

180186
[node name="BoardTextRect" type="Panel" parent="."]
181187
visible = false
182188
offset_left = 500.0
183-
offset_top = 70.0
189+
offset_top = 150.0
184190
offset_right = 1524.0
185-
offset_bottom = 1094.0
191+
offset_bottom = 1174.0
186192
theme_override_styles/panel = SubResource("StyleBoxFlat_103kv")
187193

188194
[node name="Board" parent="." instance=ExtResource("2_2ltbx")]
189-
position = Vector2(500, 70)
195+
position = Vector2(500, 150)
190196

191197
[node name="Panel" type="Panel" parent="."]
192198
visible = false
@@ -207,10 +213,10 @@ theme_override_styles/panel = SubResource("StyleBoxFlat_imdoc")
207213
stream = ExtResource("8_7jpwb")
208214

209215
[node name="BtnNewGame" type="TextureButton" parent="."]
210-
offset_left = 1596.0
211-
offset_top = 74.0
212-
offset_right = 2755.0
213-
offset_bottom = 432.0
216+
offset_left = 1617.0
217+
offset_top = 293.0
218+
offset_right = 2776.0
219+
offset_bottom = 651.0
214220
scale = Vector2(0.3, 0.3)
215221
texture_normal = ExtResource("10_qtl06")
216222

@@ -227,10 +233,10 @@ horizontal_alignment = 1
227233
vertical_alignment = 1
228234

229235
[node name="BtnClearDebugLabels" type="TextureButton" parent="."]
230-
offset_left = 1656.0
231-
offset_top = 829.0
232-
offset_right = 2815.0
233-
offset_bottom = 1187.0
236+
offset_left = 1668.0
237+
offset_top = 554.0
238+
offset_right = 2827.0
239+
offset_bottom = 912.0
234240
scale = Vector2(0.25, 0.25)
235241
texture_normal = ExtResource("11_bw3je")
236242

@@ -247,10 +253,10 @@ horizontal_alignment = 1
247253
vertical_alignment = 1
248254

249255
[node name="BtnMatchCol" type="TextureButton" parent="."]
250-
offset_left = 1657.0
251-
offset_top = 990.0
252-
offset_right = 2816.0
253-
offset_bottom = 1348.0
256+
offset_left = 1667.0
257+
offset_top = 680.0
258+
offset_right = 2826.0
259+
offset_bottom = 1038.0
254260
scale = Vector2(0.25, 0.25)
255261
texture_normal = ExtResource("12_4fgvl")
256262

game_board/gem_cell.tscn

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[ext_resource type="Texture2D" uid="uid://dacjcttesccxk" path="res://assets/effects/explode-06.png" id="4_qqixd"]
77
[ext_resource type="FontFile" uid="uid://dlhwrp5jwkrll" path="res://assets/fonts/Acme-Regular.ttf" id="5_lb5dp"]
88
[ext_resource type="Theme" uid="uid://hahh0mrfx2q1" path="res://debug_label_theme.tres" id="6_hn3w3"]
9-
[ext_resource type="AudioStream" uid="uid://ds53xomd2ha1b" path="res://assets/audio/Abstract2.ogg" id="7_guo7s"]
9+
[ext_resource type="AudioStream" uid="uid://ca0jp78fn0bi1" path="res://assets/audio/bfh1_glass_breaking_02.ogg" id="7_50xdd"]
1010

1111
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_lpbyf"]
1212
bg_color = Color(0, 0, 0, 0.533333)
@@ -23,7 +23,7 @@ tracks/0/keys = {
2323
"times": PackedFloat32Array(0, 1),
2424
"transitions": PackedFloat32Array(1, 1),
2525
"update": 0,
26-
"values": [Vector2(0.25, 0.25), Vector2(0, 0)]
26+
"values": [Vector2(0.5, 0.5), Vector2(0, 0)]
2727
}
2828

2929
[sub_resource type="Animation" id="Animation_xkhqk"]
@@ -33,13 +33,13 @@ tracks/0/type = "value"
3333
tracks/0/imported = false
3434
tracks/0/enabled = true
3535
tracks/0/path = NodePath("Sprite2D:scale")
36-
tracks/0/interp = 1
36+
tracks/0/interp = 2
3737
tracks/0/loop_wrap = true
3838
tracks/0/keys = {
3939
"times": PackedFloat32Array(0, 0.5, 1),
4040
"transitions": PackedFloat32Array(1, 1, 1),
4141
"update": 0,
42-
"values": [Vector2(0.25, 0.25), Vector2(0.225, 0.225), Vector2(0.275, 0.275)]
42+
"values": [Vector2(0.5, 0.5), Vector2(0.4, 0.4), Vector2(0.55, 0.55)]
4343
}
4444
tracks/1/type = "value"
4545
tracks/1/imported = false
@@ -172,14 +172,12 @@ offset_right = 64.0
172172
offset_bottom = 64.0
173173
script = ExtResource("1_rhspx")
174174

175-
[node name="Panel" type="Panel" parent="."]
175+
[node name="BKGD" type="Panel" parent="."]
176176
visible = false
177177
layout_mode = 1
178178
anchors_preset = 15
179179
anchor_right = 1.0
180180
anchor_bottom = 1.0
181-
offset_right = 64.0
182-
offset_bottom = 64.0
183181
grow_horizontal = 2
184182
grow_vertical = 2
185183
theme_override_styles/panel = SubResource("StyleBoxFlat_lpbyf")
@@ -194,8 +192,6 @@ layout_mode = 1
194192
anchors_preset = 15
195193
anchor_right = 1.0
196194
anchor_bottom = 1.0
197-
offset_right = 64.0
198-
offset_bottom = 64.0
199195
grow_horizontal = 2
200196
grow_vertical = 2
201197
script = ExtResource("3_sh1nc")
@@ -207,8 +203,8 @@ libraries = {
207203

208204
[node name="AnimSpriteExplode" type="AnimatedSprite2D" parent="."]
209205
visible = false
210-
position = Vector2(32, 32)
211-
scale = Vector2(1.8125, 1.8125)
206+
position = Vector2(65, 64)
207+
scale = Vector2(3.5, 3.5)
212208
sprite_frames = SubResource("SpriteFrames_tvpu7")
213209
autoplay = "default"
214210

@@ -218,8 +214,6 @@ layout_mode = 1
218214
anchors_preset = 15
219215
anchor_right = 1.0
220216
anchor_bottom = 1.0
221-
offset_right = 64.0
222-
offset_bottom = 64.0
223217
grow_horizontal = 2
224218
grow_vertical = 2
225219
theme_override_colors/font_color = Color(0, 0, 0, 1)
@@ -239,8 +233,6 @@ layout_mode = 1
239233
anchors_preset = 15
240234
anchor_right = 1.0
241235
anchor_bottom = 1.0
242-
offset_right = 64.0
243-
offset_bottom = 64.0
244236
grow_horizontal = 2
245237
grow_vertical = 2
246238
theme_override_styles/panel = SubResource("StyleBoxFlat_lpbyf")
@@ -280,4 +272,4 @@ text = "321"
280272
horizontal_alignment = 2
281273

282274
[node name="AudioGemExplode" type="AudioStreamPlayer" parent="."]
283-
stream = ExtResource("7_guo7s")
275+
stream = ExtResource("7_50xdd")

game_stats_label_theme.tres

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
[gd_resource type="Theme" load_steps=2 format=3 uid="uid://1cdmnqyil8gy"]
2+
3+
[ext_resource type="FontFile" uid="uid://bylgyjavx5yts" path="res://assets/fonts/Quicksand-Regular.ttf" id="1_mun42"]
4+
5+
[resource]
6+
default_font = ExtResource("1_mun42")
7+
default_font_size = 96
8+
Label/colors/font_color = Color(0.901961, 0.901961, 0.901961, 1)

0 commit comments

Comments
 (0)