Changelog: v0.4.5

CHANGELOG.md

@@ -1,6 +1,6 @@
 # ChangeLog
 
-## v0.4.4
+## v0.4.4 & 0.4.5
 
 禁将增强；修复bug
 

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

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();

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();

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();

Fk/Pages/Room.qml

@@ -1163,6 +1163,7 @@ Item {
       const idx = parseInt(splited[1]);
       const gene = splited[2];
 
+      if (!config.disableMsgAudio)
         try {
           callbacks["LogEvent"](JSON.stringify({
             type: "PlaySkillSound",

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;

android/AndroidManifest.xml

@@ -3,8 +3,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="org.notify.FreeKill"
   android:installLocation="preferExternal"
-  android:versionCode="404"
-  android:versionName="0.4.4">
+  android:versionCode="405"
+  android:versionName="0.4.5">
   <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
   <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

lua/client/i18n/zh_CN.lua

@@ -311,7 +311,7 @@ FreeKill使用的是libgit2的C API，与此同时使用Git完成拓展包的下
   ["Resume"] = "继续",
 
   ["Bulletin Info"] = [==[
-  ## v0.4.4
+  ## v0.4.5
 
   禁将体验优化，然而烦请重新禁将。请善用禁用拓展包与白名单功能，旧方案已经不可导入。