From bdd1a68b1c1211c2b8f854fb9821ac6b6cda68b7 Mon Sep 17 00:00:00 2001 From: notify Date: Fri, 26 Jan 2024 16:01:41 +0800 Subject: [PATCH] Changelog: v0.4.5 --- CHANGELOG.md | 2 +- CMakeLists.txt | 2 +- Fk/LobbyElement/RoomGeneralSettings.qml | 4 +++- Fk/LobbyElement/RoomPackageSettings.qml | 6 +++--- Fk/Pages/GeneralsOverview.qml | 13 +++++++++---- Fk/Pages/Room.qml | 17 +++++++++-------- Fk/RoomElement/Dashboard.qml | 2 +- android/AndroidManifest.xml | 4 ++-- lua/client/i18n/zh_CN.lua | 2 +- 9 files changed, 30 insertions(+), 22 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f19b2ced..ccfd4e26 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # ChangeLog -## v0.4.4 +## v0.4.4 & 0.4.5 禁将增强；修复bug diff --git a/CMakeLists.txt b/CMakeLists.txt index 8a7e4122..f62fe2b4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.16) -project(FreeKill VERSION 0.4.4) +project(FreeKill VERSION 0.4.5) add_definitions(-DFK_VERSION=\"${CMAKE_PROJECT_VERSION}\") find_package(Qt6 REQUIRED COMPONENTS diff --git a/Fk/LobbyElement/RoomGeneralSettings.qml b/Fk/LobbyElement/RoomGeneralSettings.qml index 1889a42a..0da41eda 100644 --- a/Fk/LobbyElement/RoomGeneralSettings.qml +++ b/Fk/LobbyElement/RoomGeneralSettings.qml @@ -109,6 +109,7 @@ Flickable { } } + /* Text { id: warning anchors.rightMargin: 8 @@ -121,6 +122,7 @@ Flickable { text: luatr("No enough generals") color: "red" } + */ RowLayout { anchors.rightMargin: 8 @@ -158,7 +160,7 @@ Flickable { spacing: 16 Button { text: luatr("OK") - enabled: !(warning.visible) + // enabled: !(warning.visible) onClicked: { config.saveConf(); root.finished(); diff --git a/Fk/LobbyElement/RoomPackageSettings.qml b/Fk/LobbyElement/RoomPackageSettings.qml index cbd2a405..3b03385b 100644 --- a/Fk/LobbyElement/RoomPackageSettings.qml +++ b/Fk/LobbyElement/RoomPackageSettings.qml @@ -132,10 +132,10 @@ Flickable { const s = config.curScheme; if (!checked) { s.banPkg[orig_name] = []; - s.normalPkg[orig_name] = undefined; + delete s.normalPkg[orig_name]; } else { - s.normalPkg[orig_name] = undefined; - s.banPkg[orig_name] = undefined; + delete s.normalPkg[orig_name]; + delete s.banPkg[orig_name]; } lcall("UpdatePackageEnable", orig_name, checked); config.curSchemeChanged(); diff --git a/Fk/Pages/GeneralsOverview.qml b/Fk/Pages/GeneralsOverview.qml index 840b515e..8a01f8a8 100644 --- a/Fk/Pages/GeneralsOverview.qml +++ b/Fk/Pages/GeneralsOverview.qml @@ -92,12 +92,13 @@ Item { const name = modelData; let s = config.curScheme; if (s.banPkg[name]) { - s.banPkg[name] = undefined; - s.normalPkg[name] = undefined; + delete s.banPkg[name]; + delete s.normalPkg[name]; } else { - s.normalPkg[name] = undefined; + delete s.normalPkg[name]; s.banPkg[name] = []; } + console.log(JSON.stringify(config.curScheme)) config.curSchemeChanged(); } else { pkgList.currentIndex = index; @@ -135,7 +136,7 @@ Item { } elide: Label.ElideLeft verticalAlignment: Qt.AlignVCenter - font.pixelSize: 24 + font.pixelSize: 28 } Item { Layout.fillWidth: true } @@ -149,6 +150,7 @@ Item { ToolButton { text: luatr("Search") + font.pixelSize: 20 enabled: word.text !== "" onClicked: { pkgList.currentIndex = 0; @@ -158,6 +160,7 @@ Item { ToolButton { id: banButton + font.pixelSize: 20 text: { if (stat === 2) return luatr("OK"); return luatr("BanGeneral"); @@ -174,6 +177,7 @@ Item { ToolButton { id: banPkgButton + font.pixelSize: 20 text: { if (stat === 1) return luatr("OK"); return luatr("BanPackage"); @@ -190,6 +194,7 @@ Item { ToolButton { text: luatr("Quit") + font.pixelSize: 20 onClicked: { mainStack.pop(); config.saveConf(); diff --git a/Fk/Pages/Room.qml b/Fk/Pages/Room.qml index 16264eb9..b35e462e 100644 --- a/Fk/Pages/Room.qml +++ b/Fk/Pages/Room.qml @@ -1163,14 +1163,15 @@ Item { const idx = parseInt(splited[1]); const gene = splited[2]; - try { - callbacks["LogEvent"](JSON.stringify({ - type: "PlaySkillSound", - name: skill, - general: gene, - i: idx, - })); - } catch (e) {} + if (!config.disableMsgAudio) + try { + callbacks["LogEvent"](JSON.stringify({ + type: "PlaySkillSound", + name: skill, + general: gene, + i: idx, + })); + } catch (e) {} const m = luatr("$" + skill + (gene ? "_" + gene : "") + (idx ? idx.toString() : "")); data.msg = m; diff --git a/Fk/RoomElement/Dashboard.qml b/Fk/RoomElement/Dashboard.qml index 8e601289..39454312 100644 --- a/Fk/RoomElement/Dashboard.qml +++ b/Fk/RoomElement/Dashboard.qml @@ -82,7 +82,7 @@ RowLayout { expanded_piles[pile] = []; let ids, footnote; if (pile === "_equip") { - ids = self.equipArea.getAllCards(); + ids = self.equipArea.getAllCards().map(e => e.cid); footnote = "$Equip"; } else if (pile === "_extra") { ids = extra_ids; diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index d2fc268e..c086fe0c 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -3,8 +3,8 @@ + android:versionCode="405" + android:versionName="0.4.5"> diff --git a/lua/client/i18n/zh_CN.lua b/lua/client/i18n/zh_CN.lua index df4fb1a7..0163c376 100644 --- a/lua/client/i18n/zh_CN.lua +++ b/lua/client/i18n/zh_CN.lua @@ -311,7 +311,7 @@ FreeKill使用的是libgit2的C API，与此同时使用Git完成拓展包的下 ["Resume"] = "继续", ["Bulletin Info"] = [==[ - ## v0.4.4 + ## v0.4.5 禁将体验优化，然而烦请重新禁将。请善用禁用拓展包与白名单功能，旧方案已经不可导入。