kristoferssolo/FuncIt
1
0
Fork 0
mirror of https://github.com/kristoferssolo/FuncIt.git synced 2025-10-21 19:30:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed bug 'trinity site not loading'

Browse Source
This commit is contained in:
Kristofers Solo 2021-11-14 22:07:11 +02:00
parent ccf3093fac
commit ba44fd60d1
5 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/assets/scripts/server_handlers/trinity_site_level.gd
View File

@ -32,7 +32,7 @@ func _player_disconnected(id) -> void:
PersistentNodes.get_node(str(id)).queue_free() PersistentNodes.get_node(str(id)).queue_free()
func _process(delta): func _process(_delta):
globalActivePhase = Global.get_current_phase() globalActivePhase = Global.get_current_phase()
if globalActivePhase["active"] != null: if globalActivePhase["active"] != null:
phase.text = str(globalActivePhase["active"]["phase_name"]) phase.text = str(globalActivePhase["active"]["phase_name"])

2
source/assets/scripts/server_handlers/trinity_site_level_playground.gd
View File

@ -33,7 +33,7 @@ func _on_timer_timeout():
time -= 1 time -= 1
func _process(delta): func _process(_delta):
globalActivePhase = Global.get_current_phase() globalActivePhase = Global.get_current_phase()
if globalActivePhase["active"] != null: if globalActivePhase["active"] != null:
$timer.text = str(globalActivePhase["active"]["phase_name"]) $timer.text = str(globalActivePhase["active"]["phase_name"])

1
source/levels/trinity_site/trinity_site_level.tscn
View File

@ -153,7 +153,6 @@ script = ExtResource( 2 )
script = ExtResource( 6 ) script = ExtResource( 6 )
[node name="winner" type="Label" parent="game_UI"] [node name="winner" type="Label" parent="game_UI"]
visible = false
anchor_top = 0.5 anchor_top = 0.5
anchor_right = 1.0 anchor_right = 1.0
anchor_bottom = 0.5 anchor_bottom = 0.5

2
source/levels/trinity_site/trinity_site_level_playground.tscn
View File

@ -158,10 +158,10 @@ margin_left = 2.37842
margin_top = -35.5 margin_top = -35.5
margin_right = 2.37842 margin_right = 2.37842
margin_bottom = 106.5 margin_bottom = 106.5
custom_fonts/font = SubResource( 1 )
custom_colors/font_color_shadow = Color( 0, 0, 0, 1 ) custom_colors/font_color_shadow = Color( 0, 0, 0, 1 )
custom_constants/shadow_offset_x = 6 custom_constants/shadow_offset_x = 6
custom_constants/shadow_offset_y = 6 custom_constants/shadow_offset_y = 6
custom_fonts/font = SubResource( 1 )
text = "You are the winner" text = "You are the winner"
align = 1 align = 1
valign = 1 valign = 1

2
source/scenes/OVERLAY/elements/user_input.tscn
View File

@ -1,6 +1,6 @@
[gd_scene load_steps=24 format=2] [gd_scene load_steps=24 format=2]
[ext_resource path="res://source/assets/sprites/GUI/in_game/user_input/user_input_background_panel.svg" type="Texture" id=1] [ext_resource path="res://source/assets/sprites/GUI/in_game/user_input/background_panel.svg" type="Texture" id=1]
[ext_resource path="res://source/fonts/oxygen/Oxygen-Regular.ttf" type="DynamicFontData" id=2] [ext_resource path="res://source/fonts/oxygen/Oxygen-Regular.ttf" type="DynamicFontData" id=2]
[ext_resource path="res://source/assets/sprites/GUI/in_game/trajectories/line_active.svg" type="Texture" id=3] [ext_resource path="res://source/assets/sprites/GUI/in_game/trajectories/line_active.svg" type="Texture" id=3]
[ext_resource path="res://source/assets/sprites/GUI/in_game/trajectories/hyperbol_active.svg" type="Texture" id=4] [ext_resource path="res://source/assets/sprites/GUI/in_game/trajectories/hyperbol_active.svg" type="Texture" id=4]