From 11252d504ee6c77b970479fbc9fbc22e01abf9e2 Mon Sep 17 00:00:00 2001 From: Streamfire Date: Mon, 20 Apr 2020 23:20:11 +0200 Subject: [PATCH] Buttttons --- .../SelectUpgradeUI/SelectUpgradeUI.tscn | 29 ++++++-- src/Menus/SelectUpgradeUI/button.png | Bin 0 -> 289 bytes src/Menus/SelectUpgradeUI/button.png.import | 34 +++++++++ src/Menus/Startup/startup.png.import | 34 +++++++++ src/World.tscn | 69 +++++------------- 5 files changed, 109 insertions(+), 57 deletions(-) create mode 100644 src/Menus/SelectUpgradeUI/button.png create mode 100644 src/Menus/SelectUpgradeUI/button.png.import create mode 100644 src/Menus/Startup/startup.png.import diff --git a/src/Menus/SelectUpgradeUI/SelectUpgradeUI.tscn b/src/Menus/SelectUpgradeUI/SelectUpgradeUI.tscn index 4dcb31e..c6a3951 100644 --- a/src/Menus/SelectUpgradeUI/SelectUpgradeUI.tscn +++ b/src/Menus/SelectUpgradeUI/SelectUpgradeUI.tscn @@ -1,6 +1,7 @@ -[gd_scene load_steps=2 format=2] +[gd_scene load_steps=3 format=2] [ext_resource path="res://Menus/SelectUpgradeUI/SelectUpgradeUI.gd" type="Script" id=1] +[ext_resource path="res://Menus/SelectUpgradeUI/button.png" type="Texture" id=2] [node name="SelectUpgradeUI" type="Control"] anchor_right = 1.0 @@ -12,19 +13,31 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="Button" type="Button" parent="."] +[node name="Button" type="TextureButton" parent="."] anchor_left = 1.0 anchor_top = 1.0 anchor_right = 1.0 anchor_bottom = 1.0 -margin_left = 349.105 -margin_top = 249.473 -margin_right = 482.105 -margin_bottom = 269.473 -text = "Continue" +margin_left = 346.675 +margin_top = 249.693 +margin_right = 479.675 +margin_bottom = 269.693 +texture_normal = ExtResource( 2 ) +expand = true __meta__ = { -"_edit_use_anchors_": false +"_edit_group_": true } +[node name="Label" type="Label" parent="Button"] +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_left = -28.5 +margin_top = -7.0 +margin_right = 28.5 +margin_bottom = 7.0 +text = "Continue" + [node name="Cards" type="Node" parent="."] [connection signal="pressed" from="Button" to="." method="_on_Button_pressed"] diff --git a/src/Menus/SelectUpgradeUI/button.png b/src/Menus/SelectUpgradeUI/button.png new file mode 100644 index 0000000000000000000000000000000000000000..f7e714fc9aaebf56fe3b0ec2cc304c43dcb6d855 GIT binary patch literal 289 zcmeAS@N?(olHy`uVBq!ia0vp^2|z5#!3-pSX5R);jKx9jP7LeL$-D$|N&|dCT!n?i zYz!Q;;_IgNtUGex^8f$;*QtcQ49Wl0+4f`O^6B=bR};KGE-3hS=g`$6jeE1r-d@Q5 z@pYq8Q?lB@h|m`adwxuDp1Iig#J1vR=a&BZC~ep+UwmA8!=t3TpR(n%Yn0YZ4Sln8 z!7rEa;E1}k{Jo}I?pOeAJTJua7w7=>k|4ie2B4KhfXEgNkdM?oT^vI^I+GKY8YU!! sF4mOTnsB8lklRfc&R8&u)r5^9^@{7FnVlb8fLa(lUHx3vIVCg!0Jb@bV*mgE literal 0 HcmV?d00001 diff --git a/src/Menus/SelectUpgradeUI/button.png.import b/src/Menus/SelectUpgradeUI/button.png.import new file mode 100644 index 0000000..364aa47 --- /dev/null +++ b/src/Menus/SelectUpgradeUI/button.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/button.png-451076353ad81c95d3e36c204a87928b.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Menus/SelectUpgradeUI/button.png" +dest_files=[ "res://.import/button.png-451076353ad81c95d3e36c204a87928b.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/src/Menus/Startup/startup.png.import b/src/Menus/Startup/startup.png.import new file mode 100644 index 0000000..ad4c7ea --- /dev/null +++ b/src/Menus/Startup/startup.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/startup.png-76e14ec0aaa4c2e98ec185835a468bad.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Menus/Startup/startup.png" +dest_files=[ "res://.import/startup.png-76e14ec0aaa4c2e98ec185835a468bad.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/src/World.tscn b/src/World.tscn index 355c217..9c0dc3a 100644 --- a/src/World.tscn +++ b/src/World.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=24 format=2] +[gd_scene load_steps=25 format=2] [ext_resource path="res://Player/Player.tscn" type="PackedScene" id=1] [ext_resource path="res://World.gd" type="Script" id=2] @@ -13,6 +13,7 @@ [ext_resource path="res://Debug/BossStateDisplay.gd" type="Script" id=11] [ext_resource path="res://Maps/Tilesets/Edge/tileset_edge.png" type="Texture" id=12] [ext_resource path="res://Boss/Minion.tscn" type="PackedScene" id=13] +[ext_resource path="res://Menus/SelectUpgradeUI/button.png" type="Texture" id=14] [ext_resource path="res://Maps/Grid.tscn" type="PackedScene" id=18] [sub_resource type="ConvexPolygonShape2D" id=1] @@ -57,10 +58,6 @@ points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 ) 1/autotile/z_index_map = [ ] 1/occluder_offset = Vector2( 0, 0 ) 1/navigation_offset = Vector2( 0, 0 ) -1/shape_offset = Vector2( 0, 0 ) -1/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) -1/shape_one_way = false -1/shape_one_way_margin = 0.0 1/shapes = [ ] 1/z_index = 0 2/name = "tileset_edge.png 2" @@ -71,11 +68,6 @@ points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 ) 2/tile_mode = 0 2/occluder_offset = Vector2( 0, 0 ) 2/navigation_offset = Vector2( 0, 0 ) -2/shape_offset = Vector2( 0, 0 ) -2/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) -2/shape = SubResource( 1 ) -2/shape_one_way = false -2/shape_one_way_margin = 1.0 2/shapes = [ { "autotile_coord": Vector2( 0, 0 ), "one_way": false, @@ -92,11 +84,6 @@ points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 ) 3/tile_mode = 0 3/occluder_offset = Vector2( 0, 0 ) 3/navigation_offset = Vector2( 0, 0 ) -3/shape_offset = Vector2( 0, 0 ) -3/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) -3/shape = SubResource( 2 ) -3/shape_one_way = false -3/shape_one_way_margin = 1.0 3/shapes = [ { "autotile_coord": Vector2( 0, 0 ), "one_way": false, @@ -113,11 +100,6 @@ points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 ) 4/tile_mode = 0 4/occluder_offset = Vector2( 0, 0 ) 4/navigation_offset = Vector2( 0, 0 ) -4/shape_offset = Vector2( 0, 0 ) -4/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) -4/shape = SubResource( 3 ) -4/shape_one_way = false -4/shape_one_way_margin = 1.0 4/shapes = [ { "autotile_coord": Vector2( 0, 0 ), "one_way": false, @@ -134,11 +116,6 @@ points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 ) 5/tile_mode = 0 5/occluder_offset = Vector2( 0, 0 ) 5/navigation_offset = Vector2( 0, 0 ) -5/shape_offset = Vector2( 0, 0 ) -5/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) -5/shape = SubResource( 4 ) -5/shape_one_way = false -5/shape_one_way_margin = 1.0 5/shapes = [ { "autotile_coord": Vector2( 0, 0 ), "one_way": false, @@ -155,11 +132,6 @@ points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 ) 6/tile_mode = 0 6/occluder_offset = Vector2( 0, 0 ) 6/navigation_offset = Vector2( 0, 0 ) -6/shape_offset = Vector2( 0, 0 ) -6/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) -6/shape = SubResource( 5 ) -6/shape_one_way = false -6/shape_one_way_margin = 1.0 6/shapes = [ { "autotile_coord": Vector2( 0, 0 ), "one_way": false, @@ -176,11 +148,6 @@ points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 ) 7/tile_mode = 0 7/occluder_offset = Vector2( 0, 0 ) 7/navigation_offset = Vector2( 0, 0 ) -7/shape_offset = Vector2( 0, 0 ) -7/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) -7/shape = SubResource( 6 ) -7/shape_one_way = false -7/shape_one_way_margin = 1.0 7/shapes = [ { "autotile_coord": Vector2( 0, 0 ), "one_way": false, @@ -197,11 +164,6 @@ points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 ) 8/tile_mode = 0 8/occluder_offset = Vector2( 0, 0 ) 8/navigation_offset = Vector2( 0, 0 ) -8/shape_offset = Vector2( 0, 0 ) -8/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) -8/shape = SubResource( 7 ) -8/shape_one_way = false -8/shape_one_way_margin = 1.0 8/shapes = [ { "autotile_coord": Vector2( 0, 0 ), "one_way": false, @@ -218,11 +180,6 @@ points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 ) 9/tile_mode = 0 9/occluder_offset = Vector2( 0, 0 ) 9/navigation_offset = Vector2( 0, 0 ) -9/shape_offset = Vector2( 0, 0 ) -9/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) -9/shape = SubResource( 8 ) -9/shape_one_way = false -9/shape_one_way_margin = 1.0 9/shapes = [ { "autotile_coord": Vector2( 0, 0 ), "one_way": false, @@ -338,13 +295,27 @@ margin_bottom = 0.463318 [node name="SelectUpgradeUI" parent="CanvasLayer" instance=ExtResource( 4 )] visible = false -[node name="Win" type="Button" parent="CanvasLayer"] +[node name="Win" type="TextureButton" parent="CanvasLayer"] visible = false anchor_left = 1.0 anchor_right = 1.0 -margin_left = -42.0 -margin_bottom = 24.0 -text = "Win" +margin_left = -96.0 +margin_bottom = 25.0 +texture_normal = ExtResource( 14 ) +__meta__ = { +"_edit_group_": true +} + +[node name="Label" type="Label" parent="CanvasLayer/Win"] +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_left = -28.5 +margin_top = -7.0 +margin_right = 28.5 +margin_bottom = 7.0 +text = "Win Now" [connection signal="phase_changed" from="YSort/SlimeBoss" to="CanvasLayer/DebugLabel/BossStateDisplay" method="_on_SlimeBoss_phase_changed"] [connection signal="state_changed" from="YSort/SlimeBoss" to="CanvasLayer/DebugLabel/BossStateDisplay" method="_on_SlimeBoss_state_changed"] [connection signal="pressed" from="CanvasLayer/Win" to="." method="_on_Win_pressed"]