From 0183e2016c3993698bf1febdba4ba9e86d43f6b9 Mon Sep 17 00:00:00 2001 From: waterfast <1301917161@qq.com> Date: Sun, 26 Oct 2025 13:20:35 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E5=8A=A8=E6=80=81=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Fk/Pages/Common/WaitingRoom.qml | 13 +++++++++++++ Fk/Pages/Lobby/CreateRoom.qml | 26 ++++++++++++++++++++------ lua/client/i18n/zh_CN.lua | 1 + 3 files changed, 34 insertions(+), 6 deletions(-) diff --git a/Fk/Pages/Common/WaitingRoom.qml b/Fk/Pages/Common/WaitingRoom.qml index 26e4ade..0122752 100644 --- a/Fk/Pages/Common/WaitingRoom.qml +++ b/Fk/Pages/Common/WaitingRoom.qml @@ -283,6 +283,19 @@ W.PageBase { anchors.bottom: parent.bottom anchors.margins: 40 + W.ButtonContent{ + visible: isOwner + text: Lua.tr("Change Room Config") + onClicked: { + room_drawer.sourceComponent = + Qt.createComponent("../Lobby/CreateRoom.qml"); + room_drawer.item.isChangeRoom = true; + room_drawer.open(); + Config.observing = false; + Config.replaying = false; + } + } + W.ButtonContent { text: Lua.tr("Chat") font.pixelSize: 28 diff --git a/Fk/Pages/Lobby/CreateRoom.qml b/Fk/Pages/Lobby/CreateRoom.qml index 94ef8e2..f1ed804 100644 --- a/Fk/Pages/Lobby/CreateRoom.qml +++ b/Fk/Pages/Lobby/CreateRoom.qml @@ -10,7 +10,7 @@ import Fk.Widgets as W Item { id: root anchors.fill: parent - + property bool isChangeRoom: false signal finish() W.SideBarSwitcher { @@ -128,9 +128,9 @@ Item { const boardgameConf = Db.getModeSettings(boardgameName); const gameModeConf = Db.getModeSettings(boardgameName + ":" + gameMode); - ClientInstance.notifyServer( - "CreateRoom", - [ + if (root.isChangeRoom) { + App.quitPage(); + ClientInstance.notifyServer("ChangeRoom", [ roomGeneralSettings.roomName, roomGeneralSettings.playerNum, Config.preferredTimeout, { gameMode, @@ -142,8 +142,22 @@ Item { disabledPack: boardgameName === "lunarltk" ? disabledPack : [], disabledGenerals: boardgameName === "lunarltk" ? disabledGenerals : [], } - ] - ); + ]); + } else { + ClientInstance.notifyServer("CreateRoom",[ + roomGeneralSettings.roomName, roomGeneralSettings.playerNum, + Config.preferredTimeout, { + gameMode, + roomName: roomGeneralSettings.roomName, + password: roomGeneralSettings.roomPassword, + _game: boardgameConf, + _mode: gameModeConf, + // FIXME 暂且拿他俩没办法 + disabledPack: boardgameName === "lunarltk" ? disabledPack : [], + disabledGenerals: boardgameName === "lunarltk" ? disabledGenerals : [], + } + ]); + } } } diff --git a/lua/client/i18n/zh_CN.lua b/lua/client/i18n/zh_CN.lua index 68900de..6fe84aa 100644 --- a/lua/client/i18n/zh_CN.lua +++ b/lua/client/i18n/zh_CN.lua @@ -97,6 +97,7 @@ Fk:loadTranslationTable { ["Full"] = "已满", ["Not Full"] = "未满", ["Room Capacity"] = "人数上限", + ["Change Room Config"] = "房间配置", ["Add Robot"] = "添加机器人", ["Start Game"] = "开始游戏", ["Ready"] = "准备", -- Gitee From 7c86f1a60861e9077fb2882ad6ac917822f1b521 Mon Sep 17 00:00:00 2001 From: waterfast <1301917161@qq.com> Date: Sun, 26 Oct 2025 13:22:02 +0800 Subject: [PATCH 02/12] =?UTF-8?q?fix=E6=96=B0qml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Fk/Pages/Common/WaitingRoom.qml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Fk/Pages/Common/WaitingRoom.qml b/Fk/Pages/Common/WaitingRoom.qml index 0122752..0d188a8 100644 --- a/Fk/Pages/Common/WaitingRoom.qml +++ b/Fk/Pages/Common/WaitingRoom.qml @@ -131,6 +131,14 @@ W.PageBase { id: photoModel } + W.PopupLoader { + id: room_drawer + padding: 0 + width: Config.winWidth * 0.80 + height: Config.winHeight * 0.95 + anchors.centerIn: parent + } + GridLayout { id: roomArea -- Gitee From a0a74b2cc9148aea9b247ffed5e4136a99e2e627 Mon Sep 17 00:00:00 2001 From: waterfast <1301917161@qq.com> Date: Sun, 26 Oct 2025 20:22:00 +0800 Subject: [PATCH 03/12] =?UTF-8?q?10/26/=E9=82=AA=E6=81=B6=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Fk/Pages/Lobby/CreateRoom.qml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Fk/Pages/Lobby/CreateRoom.qml b/Fk/Pages/Lobby/CreateRoom.qml index f1ed804..a3e0846 100644 --- a/Fk/Pages/Lobby/CreateRoom.qml +++ b/Fk/Pages/Lobby/CreateRoom.qml @@ -143,6 +143,8 @@ Item { disabledGenerals: boardgameName === "lunarltk" ? disabledGenerals : [], } ]); + App.setBusy(false); + } else { ClientInstance.notifyServer("CreateRoom",[ roomGeneralSettings.roomName, roomGeneralSettings.playerNum, -- Gitee From 934811ee761d6836e3271dea54bcf7762203b2c0 Mon Sep 17 00:00:00 2001 From: waterfast <1301917161@qq.com> Date: Sun, 2 Nov 2025 21:31:40 +0800 Subject: [PATCH 04/12] 11/2/xiee --- Fk/Base/RootPage.qml | 3 ++- Fk/Pages/Common/WaitingRoom.qml | 5 ++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Fk/Base/RootPage.qml b/Fk/Base/RootPage.qml index 8d125d6..54d25d7 100644 --- a/Fk/Base/RootPage.qml +++ b/Fk/Base/RootPage.qml @@ -209,10 +209,11 @@ W.PageBase { } function setServerSettings(sender, data) { - const [ motd, hiddenPacks, enableBots ] = data; + const [ motd, hiddenPacks, enableBots, enableChangeRoom ] = data; Config.serverMotd = motd; Config.serverHiddenPacks = hiddenPacks; Config.serverEnableBot = enableBots; + Config.serverEnableChangeRoom = enableChangeRoom || false; } function setBusy(sender, data) { diff --git a/Fk/Pages/Common/WaitingRoom.qml b/Fk/Pages/Common/WaitingRoom.qml index c1d9b77..0c092e3 100644 --- a/Fk/Pages/Common/WaitingRoom.qml +++ b/Fk/Pages/Common/WaitingRoom.qml @@ -14,7 +14,7 @@ W.PageBase { property int playerNum: 0 property bool isAllReady: false - property bool canAddRobot: false + property bool canChangeRoom: false property bool isOwner: false property bool isFull: false @@ -292,7 +292,7 @@ W.PageBase { anchors.margins: 40 W.ButtonContent{ - visible: isOwner + visible: isOwner && Config.serverEnableChangeRoom text: Lua.tr("Change Room Config") onClicked: { room_drawer.sourceComponent = @@ -590,7 +590,6 @@ W.PageBase { App.showToast(Lua.tr("$EnterRoom")); playerNum = Config.roomCapacity; - resetPhotos(); } } -- Gitee From 48aff1944410021e6a8ddff41c4d7c00f3186e1f Mon Sep 17 00:00:00 2001 From: waterfast <1301917161@qq.com> Date: Sun, 2 Nov 2025 21:32:59 +0800 Subject: [PATCH 05/12] 11/2/update --- 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 0c092e3..4dc5bb5 100644 --- a/Fk/Pages/Common/WaitingRoom.qml +++ b/Fk/Pages/Common/WaitingRoom.qml @@ -14,7 +14,7 @@ W.PageBase { property int playerNum: 0 property bool isAllReady: false - property bool canChangeRoom: false + property bool canAddRobot: false property bool isOwner: false property bool isFull: false -- Gitee From fe4b44ff1135610a90cbf95a5c213d2280ad4098 Mon Sep 17 00:00:00 2001 From: waterfast <1301917161@qq.com> Date: Sun, 2 Nov 2025 21:39:02 +0800 Subject: [PATCH 06/12] =?UTF-8?q?11/2/=E6=9B=B4=E6=96=B0=E6=9C=AA=E6=9D=A5?= =?UTF-8?q?=E5=8D=95=E6=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Fk/Pages/Common/WaitingRoom.qml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Fk/Pages/Common/WaitingRoom.qml b/Fk/Pages/Common/WaitingRoom.qml index 4dc5bb5..050403f 100644 --- a/Fk/Pages/Common/WaitingRoom.qml +++ b/Fk/Pages/Common/WaitingRoom.qml @@ -15,7 +15,7 @@ W.PageBase { property bool isAllReady: false property bool canAddRobot: false - + property bool canChangeRoom: false property bool isOwner: false property bool isFull: false property bool isReady: false @@ -292,7 +292,7 @@ W.PageBase { anchors.margins: 40 W.ButtonContent{ - visible: isOwner && Config.serverEnableChangeRoom + visible: isOwner && canChangeRoom text: Lua.tr("Change Room Config") onClicked: { room_drawer.sourceComponent = @@ -590,6 +590,7 @@ W.PageBase { App.showToast(Lua.tr("$EnterRoom")); playerNum = Config.roomCapacity; + canChangeRoom = Config.serverEnableChangeRoom; resetPhotos(); } } -- Gitee From 6ac3d575ec4c7675942d998668c75848fe8a5ab9 Mon Sep 17 00:00:00 2001 From: waterfast <1301917161@qq.com> Date: Sun, 2 Nov 2025 21:41:33 +0800 Subject: [PATCH 07/12] 11/2/update --- 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 050403f..4ee0c4f 100644 --- a/Fk/Pages/Common/WaitingRoom.qml +++ b/Fk/Pages/Common/WaitingRoom.qml @@ -590,7 +590,7 @@ W.PageBase { App.showToast(Lua.tr("$EnterRoom")); playerNum = Config.roomCapacity; - canChangeRoom = Config.serverEnableChangeRoom; + canChangeRoom = Config.serverEnableChangeRoom || false; resetPhotos(); } } -- Gitee From 6fd09267e599e13dc141bfe3775a1542b0dee57e Mon Sep 17 00:00:00 2001 From: waterfast <1301917161@qq.com> Date: Sun, 2 Nov 2025 21:47:52 +0800 Subject: [PATCH 08/12] update --- Fk/Pages/Common/WaitingRoom.qml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Fk/Pages/Common/WaitingRoom.qml b/Fk/Pages/Common/WaitingRoom.qml index 4ee0c4f..74b4850 100644 --- a/Fk/Pages/Common/WaitingRoom.qml +++ b/Fk/Pages/Common/WaitingRoom.qml @@ -591,6 +591,8 @@ W.PageBase { App.showToast(Lua.tr("$EnterRoom")); playerNum = Config.roomCapacity; canChangeRoom = Config.serverEnableChangeRoom || false; + console.log(Config.roomCapacity); + console.log(Config.serverEnableChangeRoom); resetPhotos(); } } -- Gitee From 366814ca032d2059109aad54c33a53f00e7e8744 Mon Sep 17 00:00:00 2001 From: waterfast <1301917161@qq.com> Date: Sun, 2 Nov 2025 21:49:40 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E6=9C=80=E5=90=8E=E7=9A=84=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Fk/Base/Config.qml | 1 + Fk/Base/RootPage.qml | 2 +- Fk/Pages/Common/WaitingRoom.qml | 4 +--- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Fk/Base/Config.qml b/Fk/Base/Config.qml index 4c01e52..a62a2f9 100644 --- a/Fk/Base/Config.qml +++ b/Fk/Base/Config.qml @@ -68,6 +68,7 @@ QtObject { property string serverMotd: "" property list serverHiddenPacks: [] property bool serverEnableBot: true + property bool serverEnableChangeRoom: false property string headerName: "" property int roomCapacity: 0 property int roomTimeout: 0 diff --git a/Fk/Base/RootPage.qml b/Fk/Base/RootPage.qml index 54d25d7..ad992a6 100644 --- a/Fk/Base/RootPage.qml +++ b/Fk/Base/RootPage.qml @@ -213,7 +213,7 @@ W.PageBase { Config.serverMotd = motd; Config.serverHiddenPacks = hiddenPacks; Config.serverEnableBot = enableBots; - Config.serverEnableChangeRoom = enableChangeRoom || false; + Config.serverEnableChangeRoom = enableChangeRoom; } function setBusy(sender, data) { diff --git a/Fk/Pages/Common/WaitingRoom.qml b/Fk/Pages/Common/WaitingRoom.qml index 74b4850..050403f 100644 --- a/Fk/Pages/Common/WaitingRoom.qml +++ b/Fk/Pages/Common/WaitingRoom.qml @@ -590,9 +590,7 @@ W.PageBase { App.showToast(Lua.tr("$EnterRoom")); playerNum = Config.roomCapacity; - canChangeRoom = Config.serverEnableChangeRoom || false; - console.log(Config.roomCapacity); - console.log(Config.serverEnableChangeRoom); + canChangeRoom = Config.serverEnableChangeRoom; resetPhotos(); } } -- Gitee From 5869bda7c3e029c9203277093d731ec6d893b5a2 Mon Sep 17 00:00:00 2001 From: waterfast <1301917161@qq.com> Date: Sun, 2 Nov 2025 21:52:24 +0800 Subject: [PATCH 10/12] 11/2/update --- Fk/Base/RootPage.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/Fk/Base/RootPage.qml b/Fk/Base/RootPage.qml index ad992a6..de8a75a 100644 --- a/Fk/Base/RootPage.qml +++ b/Fk/Base/RootPage.qml @@ -213,6 +213,7 @@ W.PageBase { Config.serverMotd = motd; Config.serverHiddenPacks = hiddenPacks; Config.serverEnableBot = enableBots; + console.log(enableChangeRoom); Config.serverEnableChangeRoom = enableChangeRoom; } -- Gitee From f27360be07168c25e0e10642d106434cd75f8859 Mon Sep 17 00:00:00 2001 From: waterfast <1301917161@qq.com> Date: Sun, 2 Nov 2025 21:53:59 +0800 Subject: [PATCH 11/12] 11/2update --- Fk/Base/RootPage.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Fk/Base/RootPage.qml b/Fk/Base/RootPage.qml index de8a75a..6657061 100644 --- a/Fk/Base/RootPage.qml +++ b/Fk/Base/RootPage.qml @@ -213,7 +213,7 @@ W.PageBase { Config.serverMotd = motd; Config.serverHiddenPacks = hiddenPacks; Config.serverEnableBot = enableBots; - console.log(enableChangeRoom); + console.log(enableBots); Config.serverEnableChangeRoom = enableChangeRoom; } -- Gitee From afc9723e1300883ba68810ed210183db4b387e8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AF=A5=E8=B4=A6=E5=8F=B7=E5=B7=B2=E6=B3=A8=E9=94=80?= <1301917161@qq.com> Date: Sun, 2 Nov 2025 14:13:15 +0000 Subject: [PATCH 12/12] update Fk/Base/RootPage.qml. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 该账号已注销 <1301917161@qq.com> --- Fk/Base/RootPage.qml | 1 - 1 file changed, 1 deletion(-) diff --git a/Fk/Base/RootPage.qml b/Fk/Base/RootPage.qml index 6657061..ad992a6 100644 --- a/Fk/Base/RootPage.qml +++ b/Fk/Base/RootPage.qml @@ -213,7 +213,6 @@ W.PageBase { Config.serverMotd = motd; Config.serverHiddenPacks = hiddenPacks; Config.serverEnableBot = enableBots; - console.log(enableBots); Config.serverEnableChangeRoom = enableChangeRoom; } -- Gitee