From 8b56a51e8dc97bfad39c107248f07ac1b875b80a Mon Sep 17 00:00:00 2001 From: Young_Vanshang <1776488893@qq.com> Date: Mon, 22 Sep 2025 14:59:16 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=BB=99UI=E5=8C=85=E5=8A=A0=E4=B8=AA?= =?UTF-8?q?=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Fk/Pages/Lobby/UISetting.qml | 3 ++- lua/core/engine.lua | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Fk/Pages/Lobby/UISetting.qml b/Fk/Pages/Lobby/UISetting.qml index 29e3e29..6857e65 100644 --- a/Fk/Pages/Lobby/UISetting.qml +++ b/Fk/Pages/Lobby/UISetting.qml @@ -29,13 +29,14 @@ W.PreferencePage { W.ComboRow { id: selfCombo title: Lua.tr(modelData) + textRole: "translation" property list uipaks: currentRepeater.getUIPackagesByBoardGame(modelData) visible: uipaks.length > 1 model: ListModel { id: boardgameListModel Component.onCompleted: { for (let i = 0; i < uipaks.length; i++) { - boardgameListModel.append( {name: uipaks[i]} ) + boardgameListModel.append( {name: uipaks[i], translation: Lua.tr(uipaks[i])} ) } if (uipaks.length > 1) { boardGameUI.visibleBoardgames.push(modelData) diff --git a/lua/core/engine.lua b/lua/core/engine.lua index 3ac52e1..6b52702 100644 --- a/lua/core/engine.lua +++ b/lua/core/engine.lua @@ -131,7 +131,7 @@ function Engine:getDescription(name, lang, player) end local UIPackage = require "core.ui_package" ----@param uipak table +---@param uipak UIPackageSpec function Engine:addUIPackage(uipak) self.ui_packages[uipak.name] = UIPackage:new(uipak) end -- Gitee From f8f4012f1f9b1f813fef04fabb31af73435757fa Mon Sep 17 00:00:00 2001 From: Young_Vanshang <1776488893@qq.com> Date: Mon, 22 Sep 2025 23:29:13 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=9A=BE=E7=BB=B7=E4=BF=AE=E4=B8=AAbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Fk/Pages/Common/WaitingRoom.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Fk/Pages/Common/WaitingRoom.qml b/Fk/Pages/Common/WaitingRoom.qml index 7c982be..00d0e4e 100644 --- a/Fk/Pages/Common/WaitingRoom.qml +++ b/Fk/Pages/Common/WaitingRoom.qml @@ -535,7 +535,7 @@ W.PageBase { const boardgame = Lua.evaluate(`Fk:getBoardGame(ClientInstance.settings.gameMode).name`); const ui_config = Config.enabledUIPackages[boardgame]; if (ui_config !== undefined && ui_config !== "default" && Lua.evaluate(`not not Fk:getUIPackage("${ui_config}")`)) { - data = Lua.evaluate(`Fk.ui_packages.${ui_config}.page`) + data = Lua.evaluate(`Fk.ui_packages["${ui_config}"].page`) } else { data = Lua.evaluate(`Fk:getBoardGame(ClientInstance.settings.gameMode).page`) } -- Gitee