CommonParrot/Blobby
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: red light flashing overlay size

Browse Source
This commit is contained in:
Jakob Feldmann 2023-09-19 20:13:31 +02:00
parent c02296721a
commit 6fab67bdec
5 changed files with 37 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Contraptions/Portal/Portal.tscn
View File

@ -100,7 +100,6 @@ shape = SubResource( 1 )
layer = 100
[node name="ColorRect" type="ColorRect" parent="TransitionLayer"]
visible = false
margin_right = 1024.0
margin_bottom = 600.0
color = Color( 0, 0, 0, 0 )

2
src/Levels/Level 0.1.tscn
View File

@ -1327,7 +1327,7 @@ position = Vector2( -70, 1 )
scale = Vector2( 0.878906, 0.936025 )
[node name="BlobbySprite" parent="Blobby" index="5"]
frame = 6
frame = 9
[node name="BlobbymationTree" parent="Blobby/BlobbySprite" index="0"]
parameters/playback = SubResource( 33 )

2
src/Levels/Level 0.2.tscn
View File

@ -1151,7 +1151,7 @@ position = Vector2( -156, -51 )
scale = Vector2( 0.878906, 0.936025 )
[node name="BlobbySprite" parent="Blobby" index="5"]
frame = 6
frame = 5
[node name="BlobbymationTree" parent="Blobby/BlobbySprite" index="0"]
parameters/playback = SubResource( 6 )

12
src/UserInterface/Screens/HUD.gd
View File

@ -3,8 +3,8 @@ extends Control
# Smart ist es die notwendigen Resourcen vor dem Skriptstart zu laden
onready var current_scene := get_tree().get_current_scene()
onready var pause_overlay: ColorRect = $HUDOverlay
onready var timer: Label = $HUDOverlay/GetBackTimer
onready var currency: Label = $HUDOverlay/Currency
onready var timer: Label = $GetBackTimer
onready var currency: Label = $Currency
onready var level_state := get_tree().root.get_child(4).get_node("%LevelState")
onready var signal_manager := get_tree().root.get_child(4).get_node("%SignalManager")
@ -17,13 +17,13 @@ func _ready():
func _process(delta):
if timer.visible:
timer.text = String(round($HUDOverlay/GetBackTimer/Timer.time_left))
timer.text = String(round($GetBackTimer/Timer.time_left))
func start_timer(time):
timer.visible = true
$HUDOverlay/GetBackTimer/Timer.wait_time = time
$HUDOverlay/GetBackTimer/Timer.start()
$HUDOverlay/GetBackTimer/AnimationPlayer.play("Redlight")
$GetBackTimer/Timer.wait_time = time
$GetBackTimer/Timer.start()
$GetBackTimer/AnimationPlayer.play("Redlight")
_zoom_timer()

55
src/UserInterface/Screens/HUD.tscn
View File

@ -23,16 +23,16 @@ resource_name = "Redlight"
length = 3.33
loop = true
tracks/0/type = "value"
tracks/0/path = NodePath("..:color")
tracks/0/path = NodePath("../HUDOverlay:color")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/keys = {
"times": PoolRealArray( 0, 1.65 ),
"times": PoolRealArray( 0, 1.7 ),
"transitions": PoolRealArray( 1, 1 ),
"update": 0,
"values": [ Color( 0, 0, 0, 0 ), Color( 0.423529, 0, 0, 0.160784 ) ]
"values": [ Color( 0, 0, 0, 0 ), Color( 0.478431, 0, 0, 0.207843 ) ]
}
[node name="HUD" type="Control"]
@ -45,29 +45,15 @@ script = ExtResource( 5 )
[node name="HUDOverlay" type="ColorRect" parent="."]
unique_name_in_owner = true
margin_right = 640.0
margin_bottom = 360.0
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
size_flags_horizontal = 3
size_flags_vertical = 3
color = Color( 0, 0, 0, 0 )
[node name="Panel" type="Panel" parent="HUDOverlay"]
visible = false
margin_left = 3.0
margin_top = 291.0
margin_right = 216.0
margin_bottom = 354.0
[node name="Currency" type="Label" parent="HUDOverlay"]
unique_name_in_owner = true
anchor_top = 1.0
anchor_bottom = 1.0
margin_left = 9.0
margin_top = -21.0
margin_right = 253.0
margin_bottom = -3.05176e-05
rect_scale = Vector2( 0.590909, 0.627907 )
text = "Orbs: 100000000000000000"
[node name="GetBackTimer" type="Label" parent="HUDOverlay"]
[node name="GetBackTimer" type="Label" parent="."]
unique_name_in_owner = true
visible = false
anchor_left = 0.5
@ -83,10 +69,27 @@ size_flags_vertical = 0
text = "100"
align = 1
[node name="Timer" type="Timer" parent="HUDOverlay/GetBackTimer"]
[node name="Timer" type="Timer" parent="GetBackTimer"]
wait_time = 100.0
one_shot = true
[node name="AnimationPlayer" type="AnimationPlayer" parent="HUDOverlay/GetBackTimer"]
[node name="AnimationPlayer" type="AnimationPlayer" parent="GetBackTimer"]
anims/RESET = SubResource( 1 )
anims/Redlight = SubResource( 2 )
[node name="Currency" type="Label" parent="."]
unique_name_in_owner = true
anchor_top = 1.0
anchor_bottom = 1.0
margin_left = 9.0
margin_top = -21.0
margin_right = 253.0
rect_scale = Vector2( 0.590909, 0.627907 )
text = "Orbs: 100000000000000000"
[node name="Panel" type="Panel" parent="."]
visible = false
margin_left = 3.0
margin_top = 291.0
margin_right = 216.0
margin_bottom = 354.0