Merge pull request '[Fix]: Dead Code' (!8) from fix/unused-breaking-old-template-code into trunk
All checks were successful
Quality Check / Linting (push) Successful in 7s
Build Application / generate (push) Successful in 22s
Build Application / build (tower_defence_web, build/*, build, build/index.html, Web) (push) Successful in 15s
Build Application / build (tower_defence.elf, tower_defence.elf, tower_defence.elf, Linux) (push) Successful in 18s
Build Application / build (tower_defence.exe, tower_defence.exe, tower_defence.exe, Windows) (push) Successful in 20s
Build Application / build-docker (push) Successful in 17s
Build Application / release (push) Successful in 9s
All checks were successful
Quality Check / Linting (push) Successful in 7s
Build Application / generate (push) Successful in 22s
Build Application / build (tower_defence_web, build/*, build, build/index.html, Web) (push) Successful in 15s
Build Application / build (tower_defence.elf, tower_defence.elf, tower_defence.elf, Linux) (push) Successful in 18s
Build Application / build (tower_defence.exe, tower_defence.exe, tower_defence.exe, Windows) (push) Successful in 20s
Build Application / build-docker (push) Successful in 17s
Build Application / release (push) Successful in 9s
Reviewed-on: #8 Reviewed-by: SZUT-Kevin <kevin.schmidt9101@gmail.com>
This commit is contained in:
commit
8b61ddb89e
3 changed files with 2 additions and 30 deletions
|
@ -1,7 +1,6 @@
|
||||||
[gd_scene load_steps=6 format=4 uid="uid://co1x3hlc2efr6"]
|
[gd_scene load_steps=5 format=4 uid="uid://co1x3hlc2efr6"]
|
||||||
|
|
||||||
[ext_resource type="Script" path="res://scripts/match/ui/opponent_name.gd" id="1_saby1"]
|
[ext_resource type="Script" path="res://scripts/match/ui/opponent_name.gd" id="1_saby1"]
|
||||||
[ext_resource type="Script" path="res://scripts/match/ui/current_game_time.gd" id="2_3jcub"]
|
|
||||||
[ext_resource type="TileSet" uid="uid://cvp867israfjk" path="res://tile_set.tres" id="3_0etcd"]
|
[ext_resource type="TileSet" uid="uid://cvp867israfjk" path="res://tile_set.tres" id="3_0etcd"]
|
||||||
[ext_resource type="Script" path="res://scripts/match/map.gd" id="4_4c550"]
|
[ext_resource type="Script" path="res://scripts/match/map.gd" id="4_4c550"]
|
||||||
|
|
||||||
|
@ -35,24 +34,6 @@ scroll_active = false
|
||||||
autowrap_mode = 0
|
autowrap_mode = 0
|
||||||
script = ExtResource("1_saby1")
|
script = ExtResource("1_saby1")
|
||||||
|
|
||||||
[node name="Time" type="RichTextLabel" parent="UI/HUD"]
|
|
||||||
layout_mode = 1
|
|
||||||
anchors_preset = 8
|
|
||||||
anchor_left = 0.5
|
|
||||||
anchor_top = 0.5
|
|
||||||
anchor_right = 0.5
|
|
||||||
anchor_bottom = 0.5
|
|
||||||
offset_left = -20.0
|
|
||||||
offset_top = -20.0
|
|
||||||
offset_right = 20.0
|
|
||||||
offset_bottom = 20.0
|
|
||||||
grow_horizontal = 2
|
|
||||||
grow_vertical = 2
|
|
||||||
fit_content = true
|
|
||||||
scroll_active = false
|
|
||||||
autowrap_mode = 0
|
|
||||||
script = ExtResource("2_3jcub")
|
|
||||||
|
|
||||||
[node name="Seperator" type="Panel" parent="UI/HUD"]
|
[node name="Seperator" type="Panel" parent="UI/HUD"]
|
||||||
custom_minimum_size = Vector2(4, 0)
|
custom_minimum_size = Vector2(4, 0)
|
||||||
layout_mode = 1
|
layout_mode = 1
|
||||||
|
|
|
@ -14,7 +14,7 @@ func _process(_delta: float) -> void:
|
||||||
return
|
return
|
||||||
while self.socket.get_available_packet_count():
|
while self.socket.get_available_packet_count():
|
||||||
var msg: Message = (
|
var msg: Message = (
|
||||||
CurrentUnixTimeMessage
|
Message
|
||||||
. deserialize(
|
. deserialize(
|
||||||
self.socket.get_packet().get_string_from_utf8(),
|
self.socket.get_packet().get_string_from_utf8(),
|
||||||
[TowerPlacedMessage, InvalidPlacementMessage],
|
[TowerPlacedMessage, InvalidPlacementMessage],
|
||||||
|
|
|
@ -1,9 +0,0 @@
|
||||||
extends RichTextLabel
|
|
||||||
|
|
||||||
|
|
||||||
func _ready() -> void:
|
|
||||||
MatchChannel.connect("on_match_update", on_match_update)
|
|
||||||
|
|
||||||
|
|
||||||
func on_match_update(msg: CurrentUnixTimeMessage) -> void:
|
|
||||||
self.text = str(msg.time)
|
|
Loading…
Add table
Reference in a new issue