diff --git a/Fk/Pages/Lobby.qml b/Fk/Pages/Lobby.qml index f6c9e57f..8c59d164 100644 --- a/Fk/Pages/Lobby.qml +++ b/Fk/Pages/Lobby.qml @@ -15,42 +15,6 @@ Item { property string password - /* - Rectangle { - visible: false - width: parent.width / 2 - roomListLayout.width / 2 - 50 - height: parent.height * 0.7 - anchors.top: exitButton.bottom - anchors.bottom: createRoomButton.top - anchors.right: parent.right - anchors.rightMargin: 20 - color: "#88EEEEEE" - radius: 6 - - Flickable { - id: flickableContainer - ScrollBar.vertical: ScrollBar {} - anchors.horizontalCenter: parent.horizontalCenter - anchors.top: parent.top - anchors.topMargin: 10 - flickableDirection: Flickable.VerticalFlick - width: parent.width - 10 - height: parent.height - 10 - contentHeight: bulletin_info.height - clip: true - - Text { - id: bulletin_info - width: parent.width - wrapMode: TextEdit.WordWrap - textFormat: Text.MarkdownText - text: config.serverMotd + "\n___\n" + luatr('Bulletin Info') - onLinkActivated: Qt.openUrlExternally(link); - } - } - } - */ - Component { id: roomDelegate @@ -155,9 +119,9 @@ Item { height: root.height - 72 y: 16 anchors.left: parent.left - anchors.leftMargin: root.width * 0.05 + root.width * 0.9 * 0.8 % 128 / 2 + anchors.leftMargin: root.width * 0.03 + root.width * 0.94 * 0.8 % 128 / 2 width: { - let ret = root.width * 0.90 * 0.8; + let ret = root.width * 0.94 * 0.8; ret -= ret % 128; return ret; } @@ -207,14 +171,55 @@ Item { Rectangle { id: serverInfoLayout - anchors.top: parent.top - anchors.topMargin: root.height * 0.05 + height: root.height - 112 + y: 56 + width: root.width * 0.94 * 0.2 anchors.right: parent.right - anchors.rightMargin: root.width * 0.05 + anchors.rightMargin: root.width * 0.03 // anchors.horizontalCenter: parent.horizontalCenter - height: root.height * 0.90 - width: root.width * 0.90 * 0.2 - color: "white" + color: "#88EEEEEE" + property bool chatShown: true + + Flickable { + ScrollBar.vertical: ScrollBar {} + anchors.horizontalCenter: parent.horizontalCenter + anchors.top: parent.top + anchors.topMargin: 10 + flickableDirection: Flickable.VerticalFlick + width: parent.width - 10 + height: parent.height - 10 - (parent.chatShown ? 200 : 0) + contentHeight: bulletin_info.height + clip: true + + Text { + id: bulletin_info + width: parent.width + wrapMode: TextEdit.WordWrap + textFormat: Text.MarkdownText + text: config.serverMotd + "\n\n___\n\n" + luatr('Bulletin Info') + onLinkActivated: Qt.openUrlExternally(link); + } + } + + MetroButton { + text: "🗨️" + (parent.chatShown ? "➖" : "➕") + anchors.horizontalCenter: parent.horizontalCenter + anchors.bottom: lobbyChat.top + onClicked: { + parent.chatShown = !parent.chatShown + } + } + + ChatBox { + id: lobbyChat + width: parent.width + height: parent.chatShown ? 200 : 0 + Behavior on height { NumberAnimation { duration: 200 } } + anchors.bottom: parent.bottom + isLobby: true + color: "#88EEEEEE" + clip: true + } } RowLayout { @@ -386,16 +391,6 @@ Item { onServerPlayerNumChanged: updateOnlineInfo(); /* - ChatBox { - id: lobbyChat - visible: false - anchors.bottom: info.top - width: info.width - height: root.height * 0.6 - isLobby: true - color: "#88EEEEEE" - radius: 4 - } */ Danmaku { diff --git a/sgs b/sgs new file mode 100644 index 00000000..804335a2 --- /dev/null +++ b/sgs @@ -0,0 +1,10 @@ +{ + "banwords": [ "习近", "近平", "共产党", "介石", "刘少奇", "邓小平", "江泽民", "胡锦涛", "毛泽东" ], + "description": "新月杀 [0.4.15] 主力联机服务器!请素质交流、理性对局!交流请去贴吧[新月杀]吧", + "iconUrl": "http://175.178.66.93/ba-freekill.png", + "capacity": 800, + "tempBanTime": 15, + "motd": "6.5更新\n\n手杀测试服:司马孚、成济、SP毌丘俭、李昭焦伯;十周年(一将24获奖版初稿):宣公主、徐琨、令狐愚、司马孚\n\n6.3~6.4更新\n\nOL:界法正、蒋琬(注:暂不实现禁用手牌排序,且点击“牌序”按钮并不影响真实顺序,如不小心点击则通过点击武将上的“自若”标记查看真实顺序);十周年:韩嵩、马铁;线下:周姬、鄂焕\n\n5.31~6.1更新\n\n十周年:乐诸葛果、小孙权、乐邹氏、乐祢衡、谋张绣;\n\n\n\n请为新月杀的Github仓库点一个star吧!感谢! https://github.com/Notify-ctrl/FreeKill\n\n## 点此查看游玩教程: https://fkbook-all-in-one.readthedocs.io", + "hiddenPacks": [], + "enableBots": false +}