diff --git a/src/locales/es/menu-ui-handler.json b/src/locales/es/menu-ui-handler.json index c906324cdbf..8c3d29a7f94 100644 --- a/src/locales/es/menu-ui-handler.json +++ b/src/locales/es/menu-ui-handler.json @@ -24,5 +24,6 @@ "linkGoogle": "Conectar Google", "unlinkGoogle": "Desconectar Google", "cancel": "Cancelar", - "losingProgressionWarning": "Perderás cualquier progreso desde el inicio de la batalla. ¿Continuar?" + "losingProgressionWarning": "Perderás cualquier progreso desde el inicio de la batalla. ¿Continuar?", + "noEggs": "No hay huevos incubándose ahora mismo." } \ No newline at end of file diff --git a/src/locales/zh_CN/menu-ui-handler.json b/src/locales/zh_CN/menu-ui-handler.json index c8ecaa6dd98..e93340b4779 100644 --- a/src/locales/zh_CN/menu-ui-handler.json +++ b/src/locales/zh_CN/menu-ui-handler.json @@ -25,5 +25,5 @@ "unlinkGoogle": "解除关联Google", "cancel": "取消", "losingProgressionWarning": "你将失去自战斗开始以来的所有进度。\n是否继续?", - "noEggs": "当前没有任何蛋\n正在孵化中!" + "noEggs": "当前没有任何蛋正在孵化中!" } \ No newline at end of file diff --git a/src/locales/zh_TW/menu-ui-handler.json b/src/locales/zh_TW/menu-ui-handler.json index 33e6b44d73d..3e3bfb28a16 100644 --- a/src/locales/zh_TW/menu-ui-handler.json +++ b/src/locales/zh_TW/menu-ui-handler.json @@ -20,5 +20,6 @@ "exportData": "導出數據", "consentPreferences": "同意偏好", "cancel": "取消", - "losingProgressionWarning": "你將失去自戰鬥開始以來的所有進度。是否\n繼續?" + "losingProgressionWarning": "你將失去自戰鬥開始以來的所有進度。是否\n繼續?", + "noEggs": "當前沒有任何蛋正在孵化中!" } \ No newline at end of file diff --git a/src/ui/menu-ui-handler.ts b/src/ui/menu-ui-handler.ts index 2466e1fd089..9b2bbb01651 100644 --- a/src/ui/menu-ui-handler.ts +++ b/src/ui/menu-ui-handler.ts @@ -142,7 +142,7 @@ export default class MenuUiHandler extends MessageUiHandler { const menuMessageText = addTextObject(this.scene, 8, 8, "", TextStyle.WINDOW, { maxLines: 2 }); menuMessageText.setName("menu-message"); menuMessageText.setOrigin(0, 0); - menuMessageText.setWordWrapWidth(menuMessageBox.getBounds().width - this.menuBg.width * 0.04); + menuMessageText.setWordWrapWidth(menuMessageBox.getBounds().width * 0.95); this.menuMessageBoxContainer.add(menuMessageText); this.message = menuMessageText; @@ -173,7 +173,7 @@ export default class MenuUiHandler extends MessageUiHandler { return true; } }]), - xOffset: 98 + xOffset: this.menuBg.width }; ui.setOverlayMode(Mode.MENU_OPTION_SELECT, config); }); @@ -534,7 +534,6 @@ export default class MenuUiHandler extends MessageUiHandler { showText(text: string, delay?: number, callback?: Function, callbackDelay?: number, prompt?: boolean, promptDelay?: number): void { this.menuMessageBoxContainer.setVisible(!!text); this.adjustText(text, this.message, this.messageBoxBg.getBounds().width, { - padding: this.message.x, ignoreTextBalance: "all" }); diff --git a/src/ui/message-ui-handler.ts b/src/ui/message-ui-handler.ts index 3e2761a1ac0..50137ad27c0 100644 --- a/src/ui/message-ui-handler.ts +++ b/src/ui/message-ui-handler.ts @@ -5,7 +5,6 @@ import * as Utils from "../utils"; import i18next from "i18next"; type argsAjustText = { - padding?:number; ignoreTextBalance?:Array|"all"; ignoreLanguages?:Array; }; @@ -236,18 +235,15 @@ export default abstract class MessageUiHandler extends AwaitableUiHandler { textObject.setWordWrapWidth(maxWidth * 0.65); } - // If is very near to border add "padding", not need if border container appareance is nice - const padding = opts.padding ?? 0; - // Text ajust - if (textWrapped().length > textObject.style.maxLines || (textSize().width + padding) > maxWidth) { + if (textWrapped().length > textObject.style.maxLines || (textSize().width + textObject.x) > maxWidth) { let fontDecrement = fontSize; - while (textWrapped().length > textObject.style.maxLines || (textSize().width + padding) > maxWidth) { + while (textWrapped().length > textObject.style.maxLines || (textSize().width + textObject.x) > maxWidth) { fontDecrement -= 1; textObject.setFontSize(fontDecrement); } - textObject.setFontSize(fontDecrement - padding / 2); + textObject.setFontSize(fontDecrement - textObject.x / 2); } }