From 33982c311e8cf35f5899b7911033ec5184972d1d Mon Sep 17 00:00:00 2001 From: David Yang Date: Mon, 27 Jan 2025 01:28:03 +0800 Subject: [PATCH 1/2] [UI/UX] Allow viewing egg list from rewards screen (#5181) --- src/ui/menu-ui-handler.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/menu-ui-handler.ts b/src/ui/menu-ui-handler.ts index bb950f328e8..7ea8dbe7a4e 100644 --- a/src/ui/menu-ui-handler.ts +++ b/src/ui/menu-ui-handler.ts @@ -111,7 +111,7 @@ export default class MenuUiHandler extends MessageUiHandler { render() { const ui = this.getUi(); this.excludedMenus = () => [ - { condition: globalScene.getCurrentPhase() instanceof SelectModifierPhase, options: [ MenuOptions.EGG_GACHA, MenuOptions.EGG_LIST ]}, + { condition: globalScene.getCurrentPhase() instanceof SelectModifierPhase, options: [ MenuOptions.EGG_GACHA ]}, { condition: bypassLogin, options: [ MenuOptions.LOG_OUT ]} ]; From 2593d0206cda17ea1a1be4c78670699844fcd17f Mon Sep 17 00:00:00 2001 From: NightKev <34855794+DayKev@users.noreply.github.com> Date: Sun, 26 Jan 2025 16:12:11 -0800 Subject: [PATCH 2/2] [i18n] Update locales submodule (#5190) --- public/locales | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/locales b/public/locales index e07ab625f20..5ef993b95fa 160000 --- a/public/locales +++ b/public/locales @@ -1 +1 @@ -Subproject commit e07ab625f2080afe36b61fad291b0ec5eff4000c +Subproject commit 5ef993b95fa8248adc0fb7d9489baccf546bf8e3