fix: eliminates intermittent flicker with UI; NO_UI shouldn't be allowed for :setup events
This commit is contained in:
committed by
Julian Murgia
parent
eeb7042d11
commit
f69b29da29
@@ -222,6 +222,8 @@ func check_game_scene_methods():
|
|||||||
|
|
||||||
assert(current_scene.game.has_method("hide_ui"))
|
assert(current_scene.game.has_method("hide_ui"))
|
||||||
assert(current_scene.game.has_method("show_ui"))
|
assert(current_scene.game.has_method("show_ui"))
|
||||||
|
assert(current_scene.game.has_method("escoria_hide_ui"))
|
||||||
|
assert(current_scene.game.has_method("escoria_show_ui"))
|
||||||
assert(current_scene.game.has_method("_on_event_done"))
|
assert(current_scene.game.has_method("_on_event_done"))
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ bg_color = Color( 0.6, 0.6, 0.6, 0.5 )
|
|||||||
script = ExtResource( 5 )
|
script = ExtResource( 5 )
|
||||||
main_menu = NodePath("ui/main_menu")
|
main_menu = NodePath("ui/main_menu")
|
||||||
pause_menu = NodePath("ui/pause_menu")
|
pause_menu = NodePath("ui/pause_menu")
|
||||||
|
ui_parent_control_node = NodePath("ui/Control")
|
||||||
|
|
||||||
[node name="dialog_layer" type="CanvasLayer" parent="."]
|
[node name="dialog_layer" type="CanvasLayer" parent="."]
|
||||||
|
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ script = ExtResource( 5 )
|
|||||||
main_menu = NodePath("CanvasLayer/main_menu")
|
main_menu = NodePath("CanvasLayer/main_menu")
|
||||||
pause_menu = NodePath("CanvasLayer/pause_menu")
|
pause_menu = NodePath("CanvasLayer/pause_menu")
|
||||||
editor_debug_mode = 1
|
editor_debug_mode = 1
|
||||||
|
ui_parent_control_node = NodePath("CanvasLayer/ui")
|
||||||
|
|
||||||
[node name="camera" parent="." instance=ExtResource( 3 )]
|
[node name="camera" parent="." instance=ExtResource( 3 )]
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
:setup | NO_UI
|
:setup
|
||||||
anim_block intro_animation_player RESET
|
anim_block intro_animation_player RESET
|
||||||
|
|
||||||
:ready | NO_UI
|
:ready | NO_UI
|
||||||
|
|||||||
Reference in New Issue
Block a user