diff --git a/DungeonShooting_Art/ui/GUI/RoomUi.aseprite b/DungeonShooting_Art/ui/GUI/RoomUi.aseprite index 89ab69d..0a0ad48 100644 --- a/DungeonShooting_Art/ui/GUI/RoomUi.aseprite +++ b/DungeonShooting_Art/ui/GUI/RoomUi.aseprite Binary files differ diff --git a/DungeonShooting_Art/ui/GUI/Split/healthBar.png b/DungeonShooting_Art/ui/GUI/Split/healthBar.png index a6a317d..7df8bfc 100644 --- a/DungeonShooting_Art/ui/GUI/Split/healthBar.png +++ b/DungeonShooting_Art/ui/GUI/Split/healthBar.png Binary files differ diff --git a/DungeonShooting_Art/ui/GUI/Split/hpBar.png b/DungeonShooting_Art/ui/GUI/Split/hpBar.png index 6e7c957..c28030d 100644 --- a/DungeonShooting_Art/ui/GUI/Split/hpBar.png +++ b/DungeonShooting_Art/ui/GUI/Split/hpBar.png Binary files differ diff --git a/DungeonShooting_Art/ui/GUI/Split/hpSlot.png b/DungeonShooting_Art/ui/GUI/Split/hpSlot.png new file mode 100644 index 0000000..6f93842 --- /dev/null +++ b/DungeonShooting_Art/ui/GUI/Split/hpSlot.png Binary files differ diff --git a/DungeonShooting_Art/ui/GUI/Split/shieldBar.aseprite b/DungeonShooting_Art/ui/GUI/Split/shieldBar.aseprite deleted file mode 100644 index 27bcaa1..0000000 --- a/DungeonShooting_Art/ui/GUI/Split/shieldBar.aseprite +++ /dev/null Binary files differ diff --git a/DungeonShooting_Art/ui/GUI/Split/shieldBar.png b/DungeonShooting_Art/ui/GUI/Split/shieldBar.png index 1ddba9a..650d354 100644 --- a/DungeonShooting_Art/ui/GUI/Split/shieldBar.png +++ b/DungeonShooting_Art/ui/GUI/Split/shieldBar.png Binary files differ diff --git a/DungeonShooting_Art/ui/GUI/Split/shieldSlot.png b/DungeonShooting_Art/ui/GUI/Split/shieldSlot.png new file mode 100644 index 0000000..8486c17 --- /dev/null +++ b/DungeonShooting_Art/ui/GUI/Split/shieldSlot.png Binary files differ diff --git a/DungeonShooting_Godot/prefab/ui/RoomUI.tscn b/DungeonShooting_Godot/prefab/ui/RoomUI.tscn index b710fac..682de6a 100644 --- a/DungeonShooting_Godot/prefab/ui/RoomUI.tscn +++ b/DungeonShooting_Godot/prefab/ui/RoomUI.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=8 format=2] +[gd_scene load_steps=10 format=2] [ext_resource path="res://src/ui/RoomUI.cs" type="Script" id=1] [ext_resource path="res://resource/sprite/ui/mapBar.png" type="Texture" id=2] @@ -7,6 +7,8 @@ [ext_resource path="res://resource/sprite/gun/gun4.png" type="Texture" id=5] [ext_resource path="res://resource/sprite/ui/hpBar.png" type="Texture" id=6] [ext_resource path="res://resource/sprite/ui/shieldBar.png" type="Texture" id=7] +[ext_resource path="res://resource/sprite/ui/hpSlot.png" type="Texture" id=8] +[ext_resource path="res://resource/sprite/ui/shieldSlot.png" type="Texture" id=9] [node name="RoomUI" type="Control"] anchor_right = 1.0 @@ -31,19 +33,43 @@ margin_bottom = 14.0 texture = ExtResource( 4 ) -[node name="HpBar" type="TextureRect" parent="Control/HealthBar"] -margin_left = 14.0 -margin_top = 3.0 -margin_right = 53.0 -margin_bottom = 7.0 -texture = ExtResource( 6 ) +[node name="HpSlot" type="NinePatchRect" parent="Control/HealthBar"] +margin_left = 13.0 +margin_top = 1.0 +margin_right = 81.0 +margin_bottom = 9.0 +texture = ExtResource( 8 ) +patch_margin_left = 1 +patch_margin_top = 1 +patch_margin_right = 2 +patch_margin_bottom = 1 -[node name="ShieldBar" type="TextureRect" parent="Control/HealthBar"] -margin_left = 14.0 -margin_top = 9.0 -margin_right = 46.0 -margin_bottom = 12.0 +[node name="HpBar" type="TextureRect" parent="Control/HealthBar/HpSlot"] +margin_left = 1.0 +margin_top = 2.0 +margin_right = 66.0 +margin_bottom = 6.0 +texture = ExtResource( 6 ) +expand = true + +[node name="ShieldSlot" type="NinePatchRect" parent="Control/HealthBar"] +margin_left = 13.0 +margin_top = 8.0 +margin_right = 87.0 +margin_bottom = 13.0 +texture = ExtResource( 9 ) +patch_margin_left = 1 +patch_margin_top = 1 +patch_margin_right = 1 +patch_margin_bottom = 1 + +[node name="ShieldBar" type="TextureRect" parent="Control/HealthBar/ShieldSlot"] +margin_left = 1.0 +margin_top = 1.0 +margin_right = 73.0 +margin_bottom = 4.0 texture = ExtResource( 7 ) +expand = true [node name="MapBar" type="TextureRect" parent="Control"] anchor_left = 1.0 @@ -55,8 +81,8 @@ [node name="Control" type="Control" parent="Control"] anchor_top = 1.0 anchor_bottom = 1.0 -margin_top = -50.0 -margin_right = 50.0 +margin_top = -43.0 +margin_right = 40.0 [node name="GunBar" type="TextureRect" parent="Control/Control"] anchor_left = 0.5 @@ -69,7 +95,7 @@ margin_bottom = 33.0 texture = ExtResource( 5 ) -[node name="Label" type="Label" parent="Control/Control"] +[node name="BulletBar" type="Label" parent="Control/Control"] anchor_left = 0.5 anchor_right = 0.5 margin_left = -28.0 diff --git a/DungeonShooting_Godot/resource/sprite/ui/healthBar.png b/DungeonShooting_Godot/resource/sprite/ui/healthBar.png index a6a317d..7df8bfc 100644 --- a/DungeonShooting_Godot/resource/sprite/ui/healthBar.png +++ b/DungeonShooting_Godot/resource/sprite/ui/healthBar.png Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/ui/hpBar.png b/DungeonShooting_Godot/resource/sprite/ui/hpBar.png index 6e7c957..c28030d 100644 --- a/DungeonShooting_Godot/resource/sprite/ui/hpBar.png +++ b/DungeonShooting_Godot/resource/sprite/ui/hpBar.png Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/ui/hpSlot.png b/DungeonShooting_Godot/resource/sprite/ui/hpSlot.png new file mode 100644 index 0000000..6f93842 --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/ui/hpSlot.png Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/ui/hpSlot.png.import b/DungeonShooting_Godot/resource/sprite/ui/hpSlot.png.import new file mode 100644 index 0000000..69543c7 --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/ui/hpSlot.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/hpSlot.png-03029dcac2b929c5a4bb98c52cbb512e.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://resource/sprite/ui/hpSlot.png" +dest_files=[ "res://.import/hpSlot.png-03029dcac2b929c5a4bb98c52cbb512e.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 +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/DungeonShooting_Godot/resource/sprite/ui/shieldBar.png b/DungeonShooting_Godot/resource/sprite/ui/shieldBar.png index 1ddba9a..650d354 100644 --- a/DungeonShooting_Godot/resource/sprite/ui/shieldBar.png +++ b/DungeonShooting_Godot/resource/sprite/ui/shieldBar.png Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/ui/shieldSlot.png b/DungeonShooting_Godot/resource/sprite/ui/shieldSlot.png new file mode 100644 index 0000000..8486c17 --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/ui/shieldSlot.png Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/ui/shieldSlot.png.import b/DungeonShooting_Godot/resource/sprite/ui/shieldSlot.png.import new file mode 100644 index 0000000..914c421 --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/ui/shieldSlot.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/shieldSlot.png-b05866327c1a09631a522d084d9ba831.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://resource/sprite/ui/shieldSlot.png" +dest_files=[ "res://.import/shieldSlot.png-b05866327c1a09631a522d084d9ba831.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 +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0