diff options
| -rw-r--r-- | client/menu/menu_manager.gd | 3 | ||||
| -rw-r--r-- | client/menu/scene_transition.gd | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/client/menu/menu_manager.gd b/client/menu/menu_manager.gd index 2d196d71..907f23e7 100644 --- a/client/menu/menu_manager.gd +++ b/client/menu/menu_manager.gd @@ -34,6 +34,7 @@ func go_back(): print("Go back called. Stack: " + str(menu_stack)) func show_menu(menu_name: String): + await transition.fade_out() for k in menus.keys(): if k == menu_name: menus[k].show() @@ -42,3 +43,5 @@ func show_menu(menu_name: String): Global.focus_first_button(menus[k]) else: menus[k].hide() + await transition.fade_in() + diff --git a/client/menu/scene_transition.gd b/client/menu/scene_transition.gd index 66b6c4e4..f68f6aa7 100644 --- a/client/menu/scene_transition.gd +++ b/client/menu/scene_transition.gd @@ -33,8 +33,10 @@ func fade_in(): black = false if fading: await anim.animation_finished fading = false + self.mouse_filter = Control.MOUSE_FILTER_IGNORE func fade_out(): + self.mouse_filter = Control.MOUSE_FILTER_STOP if not black: anim.play("fade_out"); fading = true black = true if fading: await anim.animation_finished |