mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-07-18 14:22:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'beta' into pre-pr-illusion

Browse Source
This commit is contained in:
Lylian 2025-01-27 20:08:03 +01:00
commit 382b0cdd0e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/locales

@ -1 +1 @@
Subproject commit a4d9129bfbe9fed2fcf64a8fbec5b4c797a8d4fa
Subproject commit 5ef993b95fa8248adc0fb7d9489baccf546bf8e3

2
src/ui/menu-ui-handler.ts
View File

@ -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 ]}
];