From f8165d91cbfc970f5b7c54df651a76a3e7b29879 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerard=20Gasc=C3=B3n?= <52170489+GerardGascon@users.noreply.github.com> Date: Tue, 22 Apr 2025 22:52:18 +0200 Subject: [PATCH] feat: ui buttons --- .../ui/buttons/add-dragon-highlight.png | Bin 0 -> 554 bytes .../buttons/add-dragon-highlight.png.import | 34 ++++++++ .../sprites/ui/buttons/add-dragon-press.png | Bin 0 -> 532 bytes .../ui/buttons/add-dragon-press.png.import | 34 ++++++++ assets/sprites/ui/buttons/add-dragon.png | Bin 0 -> 534 bytes .../sprites/ui/buttons/add-dragon.png.import | 34 ++++++++ .../ui/buttons/close-game-highlight.png | Bin 0 -> 552 bytes .../buttons/close-game-highlight.png.import | 34 ++++++++ assets/sprites/ui/buttons/close-game.png | Bin 0 -> 534 bytes .../sprites/ui/buttons/close-game.png.import | 34 ++++++++ .../ui/buttons/dragon-list-highlight.png | Bin 0 -> 543 bytes .../buttons/dragon-list-highlight.png.import | 34 ++++++++ assets/sprites/ui/buttons/dragon-list.png | Bin 0 -> 523 bytes .../sprites/ui/buttons/dragon-list.png.import | 34 ++++++++ scenes/create_button.gd | 2 +- scenes/list_button.gd | 2 +- scenes/main.tscn | 78 +++++++++--------- 17 files changed, 281 insertions(+), 39 deletions(-) create mode 100644 assets/sprites/ui/buttons/add-dragon-highlight.png create mode 100644 assets/sprites/ui/buttons/add-dragon-highlight.png.import create mode 100644 assets/sprites/ui/buttons/add-dragon-press.png create mode 100644 assets/sprites/ui/buttons/add-dragon-press.png.import create mode 100644 assets/sprites/ui/buttons/add-dragon.png create mode 100644 assets/sprites/ui/buttons/add-dragon.png.import create mode 100644 assets/sprites/ui/buttons/close-game-highlight.png create mode 100644 assets/sprites/ui/buttons/close-game-highlight.png.import create mode 100644 assets/sprites/ui/buttons/close-game.png create mode 100644 assets/sprites/ui/buttons/close-game.png.import create mode 100644 assets/sprites/ui/buttons/dragon-list-highlight.png create mode 100644 assets/sprites/ui/buttons/dragon-list-highlight.png.import create mode 100644 assets/sprites/ui/buttons/dragon-list.png create mode 100644 assets/sprites/ui/buttons/dragon-list.png.import diff --git a/assets/sprites/ui/buttons/add-dragon-highlight.png b/assets/sprites/ui/buttons/add-dragon-highlight.png new file mode 100644 index 0000000000000000000000000000000000000000..22fec4ccabf4a0b39f775e6963115bad774f7775 GIT binary patch literal 554 zcmV+_0@eMAP)Px$QIKorNnS33w!Qm1wmySWHO+`0s;F7_XA)Wt=d9Q+H!#igsG z2)c-Zi<^kz;-Od?H@QTJ3=_)6Pl@o`~~F*(;!ZcwgBQ+Z*JF z3Uqk9u*Uu$EG?OH%&+hr(;e}1D%ClFukY+Jb}`t!oHh0JnwT?*VJoIJ=FT98IArSZN$-}d*@^pS7ZIl~0D!G}&G6N1NK@h}2bK}NjiYTnH9}qRd#WPx$&PhZ;R9J=Wm@!KOF&KuQtBQgS-RdA%aVQizxeG3WKfoX0ASj4nXGbT83RSS1 zi<_IHi*UP>AUKE?T)K6rR1rCc^Sd@Nxwf{47xA5%FS#T<`SK>I7X$%mROYuQVAHt# z@I24fCMl%G0c8c#Pt2eI;OJmS4L+YK<)^zD0P@9_QtqXy-;k9sl1nWyPu8?6#}rbR z$LEO*Tq;ZgQ1u(pT)=@G>n3I-b@MtF--CRg$!OvD&Ac@A0emMH1c3)BCT880LaLq3 zD)IOF0{|2Ai^jMvy|v9H>g#F}{9K{as?iDsll|ji;8_|HKB> z&^Z=4yl-m}f2NAhfqK7lhuH1?8vxsduzXrKp9K9nxJ`$fYk>XTnp$Gkm-tF9ypzkj zuU{>!u7{m`ot>Q=QYECW8_j4g;MhxCuT#j4S~{s{P?w2`{{KfMVX{hOY9Rb W#IcY1H@PqX0000Px$&`Cr=R9J=Wm@!MkKoo$#R0ly2q)v4eySWHO+`1H6T`V{|>f$0!4*mjhamnf^ zf-a)q;wGZFxLI7Qi@_oY4$?S;m*&n~+S(R#(r;>BF1hP>ukY^a_`XjX$^7*IOpMA0 z$8k(;2BkE%Lz%(!8;ijQczZfig3X6D<@)wA3qYadDc9{NyEU1KSaYd0=E$5za!fI` zyR<%#jw{7+0LpGH91B>GV^L$VrjFl}(lGK3Gb38OnfTo5#24_>obUS%q}Z5IhnQ;Q zrj_{T{WSn%^NX=@9lc%n{^vRX6+{2_7?V2H$mNx|7?B*DoLN@x>-A2McDlLNOuWWE zXOA%*-IN&hPJ#-bt$IqlU)W^3Mji=Vw zaA4iibB=`--ZiyIUQ?ycfx5r5$JqJR2LPwV;Ce+{GlfnoxQUme9l(5UO|3EGNqjRO z?8)Wa*C`9z`#@{$Y~_%Om^yf@hhqWDPU8AK#azG9O@*D>Y)lybqZp-=%5PLTNK$L; Y8-OUUS7LGwX#fBK07*qoM6N<$f+yquE&u=k literal 0 HcmV?d00001 diff --git a/assets/sprites/ui/buttons/add-dragon.png.import b/assets/sprites/ui/buttons/add-dragon.png.import new file mode 100644 index 0000000..aae71fa --- /dev/null +++ b/assets/sprites/ui/buttons/add-dragon.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bbd3p787bmg3m" +path="res://.godot/imported/add-dragon.png-82a36ce738cebfeaa5078dd6de9b9710.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/sprites/ui/buttons/add-dragon.png" +dest_files=["res://.godot/imported/add-dragon.png-82a36ce738cebfeaa5078dd6de9b9710.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/assets/sprites/ui/buttons/close-game-highlight.png b/assets/sprites/ui/buttons/close-game-highlight.png new file mode 100644 index 0000000000000000000000000000000000000000..d716a004dfb121405b946079c9cb9eb9372ad5a4 GIT binary patch literal 552 zcmV+@0@wYCP)Px$;z>k7R9J=Gm?2LCF%-xD9TQ7XWT;^YI1C9PxET@#2EG6i3=T5{*(bov%p%DW zFa#0|4gta7MzDZkVId(w?GU#=cP)KuH@4);&s}@FclqtT*Irc=MF0S$6l_GiVZ2e>&IZyARvi_3c#=0I;;$)~;Rf`I5QJ8dIsF zvzj_w-x*8bN_i3hu-15tgD3ByfD9YU!(poVAr>xxRNu)>7~|dkk*_}i0GGRSNXKW+ zW!jh(n(CBhydLy*e**w0EUtLn-+Xxn091teaE!4}bxQMne@H`wxj8kvp^ZxhlYipP zIv*!92CPx$&`Cr=R9J=Gn7>QIKp2MKREL5fNS*2`baN3z+`0&@E(*?$PHrxBkp2ZOS-Lt( zK^JjwadS{y+*(}K#bPN44$^aoZ{l6^CD&qY&S$$H>7`G;@4HJpr4#_b^E_k$-cN4A z_aQQEF-MJQ?Zijqq%j2mZ;uyRXa8YWYu{cK001lN9j%>4rP1b-h&7j4V_r;FYNn1h z_QtYswLAj=s5IK)y#Nkm~6`Za($`X06}qX#J)^zZKM}I_ypx zChi!sJx>wFjBiwa#$;~k@pF literal 0 HcmV?d00001 diff --git a/assets/sprites/ui/buttons/close-game.png.import b/assets/sprites/ui/buttons/close-game.png.import new file mode 100644 index 0000000..31c2673 --- /dev/null +++ b/assets/sprites/ui/buttons/close-game.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://ci7cb3kgavax4" +path="res://.godot/imported/close-game.png-618d96e50398df2aacb8d97f2ab8cd43.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/sprites/ui/buttons/close-game.png" +dest_files=["res://.godot/imported/close-game.png-618d96e50398df2aacb8d97f2ab8cd43.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/assets/sprites/ui/buttons/dragon-list-highlight.png b/assets/sprites/ui/buttons/dragon-list-highlight.png new file mode 100644 index 0000000000000000000000000000000000000000..416d9de77ff33dabdab3c10052c92f2fe881c538 GIT binary patch literal 543 zcmV+)0^t3LP)Px$*-1n}R9J=Wn6XO(F%-tXoE-!w(W$OtHy5FZTNlCF#lN7VE-vDtgSfefOP8*W zBIqItE^Z=iq9-0Dv;{y*tDxPqp#|qXCg>p4sIqZ~hnnFgaTR z5Rwc3i4U`#)$ISE{##BGk>V-=m+_0J8vCQ<4zZ|OcXzl2Agqlfy*;elA=drn57S12 z#qA@d9T{T-l5~gID8?dWoySO{7>jE_=d}HUw$jg$p;`%4jN@Iqx@H%5VSgoSVst8~ z(K&3#d`|1tV0Q-hiIIB9#kAAK#h^RHE`M(?=cS;%#?(xXfUO!Qy8!rmYo>__!1THk z>^dT6E2<1s5yBW!MWkxa!EMQzo4C+l6m@c&1>1ZTPdX`j?Q!o#QCfN0FN%skUG5Mg h>Ex0YM~akLVm}d{zeyYWn27)Y002ovPDHLkV1ltG_y+(0 literal 0 HcmV?d00001 diff --git a/assets/sprites/ui/buttons/dragon-list-highlight.png.import b/assets/sprites/ui/buttons/dragon-list-highlight.png.import new file mode 100644 index 0000000..55a9fb7 --- /dev/null +++ b/assets/sprites/ui/buttons/dragon-list-highlight.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://emm3gwb5fuqo" +path="res://.godot/imported/dragon-list-highlight.png-94c8866c0da9b8252b4e4bead07f7b0a.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/sprites/ui/buttons/dragon-list-highlight.png" +dest_files=["res://.godot/imported/dragon-list-highlight.png-94c8866c0da9b8252b4e4bead07f7b0a.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/assets/sprites/ui/buttons/dragon-list.png b/assets/sprites/ui/buttons/dragon-list.png new file mode 100644 index 0000000000000000000000000000000000000000..f703d3e1efbfed22c636180d2f697eccb43b4725 GIT binary patch literal 523 zcmV+m0`&cfP)Px$#Ysd#R9J=Wm@h~JQ5?rVHw}Uyh^AQun?)F6TM;%_4CY0XMJyV`W)aKEs!;?j zVzAgm6pPJaofd~f5Ef)-7{5E;?Y-UGblW}HxBcF`-@V^`-k;z5o#*>L0G{WO1W7!p zA;)3VxWzMmpT_PuMNSg)0X|+XmB!{%QL*o@X8_2o))YHVxpGBjLQ5{O#5~QeR7mZw zZT4m0e0CCmT)7g&0uJoT-^8?}&OSSD+~5mSW0Ce|N574!Z=ju=@B1Dkn3xfVkgBKW zwEd08+pY$hSXxov|5^ngZ+PAvVscK^(+gS$AyqrKJFilUCjd;(7l4plI1}%BKdZM7 zK{mM(2uYbTf$7B0P}H`^$sJ;Gx$f?08whiwC~E&z?hp&U{9#t>u)K4u*s*J@N0ROk z8?CVzS)XH~(HiU4LGEb>hYh9OL`HHY6tw+;UpeB}ZD50vH8Hsrl;j?^tG}nUtGAlL zePW_Ea$WjGWm<#o5WBkh0^lOsveykc(?q~lZ>M{Jxo%A?F=HjZwb0siQuoZiWB= N002ovPDHLkV1mGR@A&`# literal 0 HcmV?d00001 diff --git a/assets/sprites/ui/buttons/dragon-list.png.import b/assets/sprites/ui/buttons/dragon-list.png.import new file mode 100644 index 0000000..05fda57 --- /dev/null +++ b/assets/sprites/ui/buttons/dragon-list.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cpdhhhdmh5n58" +path="res://.godot/imported/dragon-list.png-95bf8cf726fb5913cfced32d642f1f0b.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/sprites/ui/buttons/dragon-list.png" +dest_files=["res://.godot/imported/dragon-list.png-95bf8cf726fb5913cfced32d642f1f0b.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/scenes/create_button.gd b/scenes/create_button.gd index d8c14f4..e326adc 100644 --- a/scenes/create_button.gd +++ b/scenes/create_button.gd @@ -1,4 +1,4 @@ -extends Button +extends TextureButton @export var dragon_editor: PackedScene diff --git a/scenes/list_button.gd b/scenes/list_button.gd index 0d9a274..5cfd162 100644 --- a/scenes/list_button.gd +++ b/scenes/list_button.gd @@ -1,4 +1,4 @@ -extends Button +extends TextureButton @export var dragon_list: PackedScene diff --git a/scenes/main.tscn b/scenes/main.tscn index eef2283..de79da9 100644 --- a/scenes/main.tscn +++ b/scenes/main.tscn @@ -1,13 +1,20 @@ -[gd_scene load_steps=13 format=3 uid="uid://ctytpqaed0yqx"] +[gd_scene load_steps=20 format=3 uid="uid://ctytpqaed0yqx"] [ext_resource type="Script" uid="uid://3kyt3shje5r1" path="res://scenes/main.gd" id="1_sugp2"] [ext_resource type="PackedScene" uid="uid://c7nfcgjxqeg7l" path="res://scenes/window/dragon_popup.tscn" id="2_jyhfs"] [ext_resource type="PackedScene" uid="uid://miutbdsgccd1" path="res://scenes/dragons/dragon.tscn" id="4_jyhfs"] [ext_resource type="Script" uid="uid://cj4l3a6a8ro0r" path="res://scenes/create_button.gd" id="4_tbgi4"] [ext_resource type="PackedScene" uid="uid://cdlipr8l1k38a" path="res://scenes/name_setter/name_setter.tscn" id="4_trceg"] +[ext_resource type="Texture2D" uid="uid://bbd3p787bmg3m" path="res://assets/sprites/ui/buttons/add-dragon.png" id="5_jkv2x"] [ext_resource type="PackedScene" uid="uid://fut42ruut302" path="res://scenes/dragon_editor/dragon_editor.tscn" id="5_tefeu"] +[ext_resource type="Texture2D" uid="uid://d1k808702cbcw" path="res://assets/sprites/ui/buttons/add-dragon-press.png" id="6_muem4"] +[ext_resource type="Texture2D" uid="uid://75txlqcp2ucn" path="res://assets/sprites/ui/buttons/add-dragon-highlight.png" id="7_dp3eg"] +[ext_resource type="Texture2D" uid="uid://ci7cb3kgavax4" path="res://assets/sprites/ui/buttons/close-game.png" id="8_jbj1t"] [ext_resource type="Script" uid="uid://oc6mw86npbii" path="res://scenes/list_button.gd" id="9_choun"] +[ext_resource type="Texture2D" uid="uid://cpdhhhdmh5n58" path="res://assets/sprites/ui/buttons/dragon-list.png" id="9_muem4"] [ext_resource type="PackedScene" uid="uid://tubxrqxjic6r" path="res://scenes/dragon_list/dragon_list.tscn" id="10_ya4ey"] +[ext_resource type="Texture2D" uid="uid://emm3gwb5fuqo" path="res://assets/sprites/ui/buttons/dragon-list-highlight.png" id="12_dp3eg"] +[ext_resource type="Texture2D" uid="uid://bawbgis3cgdtu" path="res://assets/sprites/ui/buttons/close-game-highlight.png" id="15_0ld40"] [ext_resource type="Texture2D" uid="uid://bc2lykc3gwykh" path="res://assets/sprites/environment/castle/DP_castle_back.png" id="15_muem4"] [ext_resource type="Texture2D" uid="uid://o1e8lge2vuqu" path="res://assets/sprites/environment/castle/DP_castle_mid.png" id="16_dp3eg"] [ext_resource type="Texture2D" uid="uid://b1w6y1qvetsaw" path="res://assets/sprites/environment/castle/DP_castle_front.png" id="17_0ld40"] @@ -29,46 +36,43 @@ max_dragon_instantiation_time = 600.0 [node name="CanvasLayer" type="CanvasLayer" parent="."] -[node name="Create" type="Button" parent="CanvasLayer"] -anchors_preset = 1 -anchor_left = 1.0 -anchor_right = 1.0 -offset_left = -585.0 -offset_top = 11.0 -offset_right = -543.0 -offset_bottom = 42.0 -grow_horizontal = 0 -focus_mode = 0 -text = "crea" +[node name="Create" type="TextureButton" parent="CanvasLayer"] +offset_left = 535.0 +offset_top = 42.0 +offset_right = 575.0 +offset_bottom = 82.0 +texture_normal = ExtResource("5_jkv2x") +texture_pressed = ExtResource("7_dp3eg") +texture_hover = ExtResource("7_dp3eg") +texture_disabled = ExtResource("6_muem4") +texture_focused = ExtResource("5_jkv2x") script = ExtResource("4_tbgi4") dragon_editor = ExtResource("5_tefeu") -[node name="Close" type="Button" parent="CanvasLayer"] -anchors_preset = 1 -anchor_left = 1.0 -anchor_right = 1.0 -offset_left = -525.0 -offset_top = 12.0 -offset_right = -474.0 -offset_bottom = 43.0 -grow_horizontal = 0 -focus_mode = 0 -text = "tanca" - -[node name="List" type="Button" parent="CanvasLayer"] -anchors_preset = 1 -anchor_left = 1.0 -anchor_right = 1.0 -offset_left = -456.0 -offset_top = 14.0 -offset_right = -411.0 -offset_bottom = 45.0 -grow_horizontal = 0 -focus_mode = 0 -text = "llista" +[node name="List" type="TextureButton" parent="CanvasLayer"] +offset_left = 535.0 +offset_top = 82.0 +offset_right = 575.0 +offset_bottom = 122.0 +texture_normal = ExtResource("9_muem4") +texture_pressed = ExtResource("12_dp3eg") +texture_hover = ExtResource("12_dp3eg") +texture_disabled = ExtResource("9_muem4") +texture_focused = ExtResource("9_muem4") script = ExtResource("9_choun") dragon_list = ExtResource("10_ya4ey") +[node name="Close" type="TextureButton" parent="CanvasLayer"] +offset_left = 535.0 +offset_top = 122.0 +offset_right = 575.0 +offset_bottom = 162.0 +texture_normal = ExtResource("8_jbj1t") +texture_pressed = ExtResource("15_0ld40") +texture_hover = ExtResource("15_0ld40") +texture_disabled = ExtResource("8_jbj1t") +texture_focused = ExtResource("8_jbj1t") + [node name="Castle" type="Node2D" parent="."] [node name="DpCastleBack" type="Sprite2D" parent="Castle"] @@ -109,6 +113,6 @@ script = ExtResource("17_muem4") [connection signal="tree_entered" from="." to="." method="_on_tree_entered"] [connection signal="tree_exiting" from="." to="." method="_on_tree_exiting"] -[connection signal="button_up" from="CanvasLayer/Create" to="CanvasLayer/Create" method="_on_button_up"] -[connection signal="pressed" from="CanvasLayer/Close" to="." method="_on_close_pressed"] +[connection signal="pressed" from="CanvasLayer/Create" to="CanvasLayer/Create" method="_on_button_up"] [connection signal="pressed" from="CanvasLayer/List" to="CanvasLayer/List" method="_on_pressed"] +[connection signal="pressed" from="CanvasLayer/Close" to="." method="_on_close_pressed"]