Implemented new crosshair design.

This commit is contained in:
unfa 2021-09-28 00:47:37 +02:00
parent c59e5110a5
commit b3be7780a9
4 changed files with 121 additions and 71 deletions

BIN
Game/Assets/HUD/Crosshair Baseline.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Game/Assets/HUD/Crosshair Hit.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Game/Assets/HUD/Crosshair Kill.png (Stored with Git LFS) Normal file

Binary file not shown.

View file

@ -1,10 +1,12 @@
[gd_scene load_steps=17 format=3 uid="uid://bff5uslrxesjx"] [gd_scene load_steps=20 format=3 uid="uid://bff5uslrxesjx"]
[ext_resource type="Texture2D" uid="uid://blnjjtjifk22i" path="res://Assets/HUD/Vignette.png" id="1"] [ext_resource type="Texture2D" uid="uid://blnjjtjifk22i" path="res://Assets/HUD/Vignette.png" id="1"]
[ext_resource type="Script" path="res://Assets/HUD/HUD.gd" id="1_wc430"] [ext_resource type="Script" path="res://Assets/HUD/HUD.gd" id="1_wc430"]
[ext_resource type="Texture2D" uid="uid://cvckx0ssydl4d" path="res://Assets/HUD/Crosshair.png" id="2"] [ext_resource type="Texture2D" uid="uid://dim1jrwuiy4qt" path="res://Assets/HUD/Crosshair Baseline.png" id="3_r05jh"]
[ext_resource type="Texture2D" uid="uid://d0p7vfc62t5sb" path="res://Assets/HUD/Crosshair Hit.png" id="4_guqkl"]
[ext_resource type="AudioStream" uid="uid://dfcyohpsqvri1" path="res://Assets/SFX/HUD_Confirm_Hit.wav" id="4_llqcq"] [ext_resource type="AudioStream" uid="uid://dfcyohpsqvri1" path="res://Assets/SFX/HUD_Confirm_Hit.wav" id="4_llqcq"]
[ext_resource type="Script" path="res://Assets/HUD/Crosshair.gd" id="5"] [ext_resource type="Script" path="res://Assets/HUD/Crosshair.gd" id="5"]
[ext_resource type="Texture2D" uid="uid://cjo2bjogp16ax" path="res://Assets/HUD/Crosshair Kill.png" id="5_4mbbg"]
[ext_resource type="AudioStream" uid="uid://bllgajqussdi5" path="res://Assets/SFX/HUD_Confirm_Kill.wav" id="5_hh74r"] [ext_resource type="AudioStream" uid="uid://bllgajqussdi5" path="res://Assets/SFX/HUD_Confirm_Kill.wav" id="5_hh74r"]
[ext_resource type="Script" path="res://Assets/HUD/Chat.gd" id="6"] [ext_resource type="Script" path="res://Assets/HUD/Chat.gd" id="6"]
[ext_resource type="Theme" uid="uid://ddtu7o1dbp0s8" path="res://Assets/HUD/Theme.tres" id="7"] [ext_resource type="Theme" uid="uid://ddtu7o1dbp0s8" path="res://Assets/HUD/Theme.tres" id="7"]
@ -15,9 +17,72 @@
[sub_resource type="Animation" id="1"] [sub_resource type="Animation" id="1"]
resource_name = "Default" resource_name = "Default"
length = 0.1
[sub_resource type="Animation" id="2"]
length = 0.2
step = 0.05
tracks/0/type = "audio"
tracks/0/path = NodePath("ConfirmSound")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/keys = {
"clips": [{
"end_offset": 0.0,
"start_offset": 0.0,
"stream": ExtResource( "4_llqcq" )
}],
"times": PackedFloat32Array(0)
}
tracks/1/type = "value"
tracks/1/path = NodePath("Hit:modulate")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/keys = {
"times": PackedFloat32Array(0, 0.2),
"transitions": PackedFloat32Array(2, 1),
"update": 0,
"values": [Color(1, 1, 1, 1), Color(1, 1, 1, 0)]
}
[sub_resource type="Animation" id="3"]
length = 0.5
step = 0.05
tracks/0/type = "audio"
tracks/0/path = NodePath("ConfirmSound")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/keys = {
"clips": [{
"end_offset": 0.0,
"start_offset": 0.0,
"stream": ExtResource( "5_hh74r" )
}],
"times": PackedFloat32Array(0)
}
tracks/1/type = "value"
tracks/1/path = NodePath("Kill:modulate")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/keys = {
"times": PackedFloat32Array(0, 0.5),
"transitions": PackedFloat32Array(2, 1),
"update": 0,
"values": [Color(1, 1, 1, 1), Color(1, 1, 1, 0)]
}
[sub_resource type="Animation" id="Animation_j1um2"]
length = 0.001 length = 0.001
tracks/0/type = "value" tracks/0/type = "value"
tracks/0/path = NodePath("Crosshair:modulate") tracks/0/path = NodePath("Hit:modulate")
tracks/0/interp = 1 tracks/0/interp = 1
tracks/0/loop_wrap = true tracks/0/loop_wrap = true
tracks/0/imported = false tracks/0/imported = false
@ -26,67 +91,19 @@ tracks/0/keys = {
"times": PackedFloat32Array(0), "times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1), "transitions": PackedFloat32Array(1),
"update": 0, "update": 0,
"values": [Color(1, 1, 1, 1)] "values": [Color(1, 1, 1, 0)]
} }
tracks/1/type = "value"
[sub_resource type="Animation" id="2"] tracks/1/path = NodePath("Kill:modulate")
length = 0.2
step = 0.05
tracks/0/type = "value"
tracks/0/path = NodePath("Crosshair:modulate")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/keys = {
"times": PackedFloat32Array(0, 0.1, 0.2),
"transitions": PackedFloat32Array(1, 1, 1),
"update": 0,
"values": [Color(1, 0.716667, 0, 1), Color(1, 0.716667, 0, 1), Color(1, 1, 1, 1)]
}
tracks/1/type = "audio"
tracks/1/path = NodePath("ConfirmSound")
tracks/1/interp = 1 tracks/1/interp = 1
tracks/1/loop_wrap = true tracks/1/loop_wrap = true
tracks/1/imported = false tracks/1/imported = false
tracks/1/enabled = true tracks/1/enabled = true
tracks/1/keys = { tracks/1/keys = {
"clips": [{ "times": PackedFloat32Array(0),
"end_offset": 0.0, "transitions": PackedFloat32Array(1),
"start_offset": 0.0,
"stream": ExtResource( "4_llqcq" )
}],
"times": PackedFloat32Array(0)
}
[sub_resource type="Animation" id="3"]
length = 0.5
step = 0.05
tracks/0/type = "value"
tracks/0/path = NodePath("Crosshair:modulate")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/keys = {
"times": PackedFloat32Array(0, 0.25, 0.5),
"transitions": PackedFloat32Array(1, 1, 1),
"update": 0, "update": 0,
"values": [Color(1, 0.0532926, 0, 1), Color(1, 0.0532926, 0, 1), Color(1, 1, 1, 1)] "values": [Color(1, 1, 1, 0)]
}
tracks/1/type = "audio"
tracks/1/path = NodePath("ConfirmSound")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/keys = {
"clips": [{
"end_offset": 0.0,
"start_offset": 0.0,
"stream": ExtResource( "5_hh74r" )
}],
"times": PackedFloat32Array(0)
} }
[sub_resource type="CanvasItemMaterial" id="CanvasItemMaterial_j0kta"] [sub_resource type="CanvasItemMaterial" id="CanvasItemMaterial_j0kta"]
@ -109,19 +126,42 @@ __meta__ = {
"_edit_use_anchors_": false "_edit_use_anchors_": false
} }
[node name="Crosshair" type="TextureRect" parent="Crosshair"] [node name="Baseline" type="TextureRect" parent="Crosshair"]
texture_filter = 2 texture_filter = 1
anchor_left = 0.5 texture_repeat = 1
anchor_top = 0.5 offset_left = -16.0
anchor_right = 0.5 offset_top = -16.0
anchor_bottom = 0.5 offset_right = 16.0
offset_left = -32.0 offset_bottom = 16.0
offset_top = -32.0 texture = ExtResource( "3_r05jh" )
offset_right = 96.0 script = null
offset_bottom = 96.0 __meta__ = {
rect_scale = Vector2(0.5, 0.5) "_edit_use_anchors_": false
texture = ExtResource( "2" ) }
expand = true
[node name="Hit" type="TextureRect" parent="Crosshair"]
modulate = Color(1, 1, 1, 0)
texture_filter = 1
texture_repeat = 1
offset_left = -16.0
offset_top = -16.0
offset_right = 16.0
offset_bottom = 16.0
texture = ExtResource( "4_guqkl" )
script = null
__meta__ = {
"_edit_use_anchors_": false
}
[node name="Kill" type="TextureRect" parent="Crosshair"]
modulate = Color(1, 1, 1, 0)
texture_filter = 1
texture_repeat = 1
offset_left = -16.0
offset_top = -16.0
offset_right = 16.0
offset_bottom = 16.0
texture = ExtResource( "5_4mbbg" )
script = null script = null
__meta__ = { __meta__ = {
"_edit_use_anchors_": false "_edit_use_anchors_": false
@ -132,11 +172,12 @@ autoplay = "Default"
anims/Default = SubResource( "1" ) anims/Default = SubResource( "1" )
anims/Hit = SubResource( "2" ) anims/Hit = SubResource( "2" )
anims/Kill = SubResource( "3" ) anims/Kill = SubResource( "3" )
anims/RESET = SubResource( "Animation_j1um2" )
blend_times = [] blend_times = []
script = null script = null
[node name="ConfirmSound" type="AudioStreamPlayer" parent="Crosshair"] [node name="ConfirmSound" type="AudioStreamPlayer" parent="Crosshair"]
stream = ExtResource( "4_llqcq" ) stream = ExtResource( "5_hh74r" )
volume_db = 6.0 volume_db = 6.0
script = null script = null