From ce09673dcc9734fc54e9d03449b6117e32adef46 Mon Sep 17 00:00:00 2001
From: notify <notify-ctrl@qq.com>
Date: Sat, 15 Apr 2023 12:40:07 +0800
Subject: [PATCH] ChangeLog: v0.1.0

---
 CHANGELOG.md                | 35 +++++++++++++++++++++++++++++++++++
 CMakeLists.txt              |  2 +-
 android/AndroidManifest.xml |  4 ++--
 flake.nix                   |  2 +-
 lua/server/room.lua         |  2 +-
 qml/Logic.js                |  2 +-
 6 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 31344cb2..ce331ef4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,41 @@
 
 ___
 
+## v0.1.0
+
+标准包终于完结！版本号也随机升了一位
+
+主要新机制：
+
+1. 主公技
+2. 护甲机制
+3. AES加密通信
+
+新机制：
+
+1. 添加武将相关技能
+2. 添加武将中性和无性
+3. 给Card堆一个伤害牌属性
+4. 能添加虚拟牌为子卡
+5. 封装了“视为使用xx牌”的函数
+6. 护甲机制
+7. interaction现在可以作为一个函数，以实现动态化
+8. 冰属性伤害
+9. 使用牌堆中的牌不再报错
+
+修bug：
+
+1. 修流离锁定技
+2. 修斧子弃自己
+3. 修顺手空城卡死
+4. 修旁观者id是自己的
+5. 修旁观者再开新局就闪退（或许吧）
+6. 修拼点报nil
+7. 修询问无懈时旁观者被卡在外面
+8. 修Room的请求队列不清理干净
+
+___
+
 ## v0.0.8
 
 1. 禁止使用打出弃置
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3219e6d9..611525cd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@
 
 cmake_minimum_required(VERSION 3.16)
 
-project(FreeKill VERSION 0.0.8)
+project(FreeKill VERSION 0.1.0)
 add_definitions(-DFK_VERSION=\"${CMAKE_PROJECT_VERSION}\")
 
 if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Emscripten")
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 2d25b19b..06a76e4e 100644
--- a/android/AndroidManifest.xml
+++ b/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="8"
-  android:versionName="0.0.8">
+  android:versionCode="100"
+  android:versionName="0.1.0">
   <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" />
diff --git a/flake.nix b/flake.nix
index 070101c1..de4b3459 100644
--- a/flake.nix
+++ b/flake.nix
@@ -10,7 +10,7 @@
       with import nixpkgs { system = "x86_64-linux"; };
       stdenv.mkDerivation {
         name = "freekill";
-        version = "0.0.8";
+        version = "0.1.0";
         src = self;
 
         buildInputs = with qt6; [
diff --git a/lua/server/room.lua b/lua/server/room.lua
index e10aeceb..f6ef45ab 100644
--- a/lua/server/room.lua
+++ b/lua/server/room.lua
@@ -893,7 +893,7 @@ function Room:askForDiscard(player, minNum, maxNum, includeEquip, skillName, can
   maxNum = math.min(#canDiscards, maxNum)
   minNum = math.min(#canDiscards, minNum)
 
-  if minNum < 1 then
+  if minNum < 1 and not cancelable then
     return {}
   end
 
diff --git a/qml/Logic.js b/qml/Logic.js
index 37289a07..6f37e8d4 100644
--- a/qml/Logic.js
+++ b/qml/Logic.js
@@ -25,7 +25,7 @@ callbacks["NetworkDelayTest"] = function(jsonData) {
     && config.savedPassword[config.serverAddr].shorten_password === config.password) {
     cipherText = config.savedPassword[config.serverAddr].password;
     aeskey = config.savedPassword[config.serverAddr].key;
-    config.aeskey = aeskey;
+    config.aeskey = aeskey ?? "";
     Backend.setAESKey(aeskey);
     if (Debugging)
       console.log("use remembered password", config.password);