From 8282607ce38fc49882ab8fde2312e5cd9b3ae304 Mon Sep 17 00:00:00 2001
From: notify <notify-ctrl@qq.com>
Date: Tue, 27 Feb 2024 02:33:49 +0800
Subject: [PATCH] Changelog: v0.4.8

---
 .github/workflows/build-windows.yml |  6 +++++-
 CHANGELOG.md                        | 27 +++++++++++++++++++++++++++
 CMakeLists.txt                      |  2 +-
 android/AndroidManifest.xml         |  4 ++--
 lua/client/i18n/zh_CN.lua           |  4 ++--
 5 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
index a3589ed1..b0176e85 100644
--- a/.github/workflows/build-windows.yml
+++ b/.github/workflows/build-windows.yml
@@ -32,6 +32,7 @@ jobs:
         target: 'desktop'
         arch: 'win64_mingw'
         modules: 'qtmultimedia qt5compat qtshadertools'
+        tools: 'tools_opensslv3_x64'
 
     - name: Disable PCH
       shell: bash
@@ -46,6 +47,9 @@ jobs:
       working-directory: ${{github.workspace}}
       env:
         CMAKE_PREFIX_PATH: ${{env.Qt6_Dir}}
+        OPENSSL_ROOT_DIR: ${{env.Qt6_Dir}}/../../Tools/OpenSSLv3/Win_x64
+        OPENSSL_INCLUDE_DIR: ${{env.OPENSSL_ROOT_DIR}}/include
+        OPENSSL_CRYPTO_LIBRARY: ${{env.OPENSSL_ROOT_DIR}}/bin/libcrypto-3-x64.dll
       run: |
         cmake -DCMAKE_BUILD_TYPE=MinSizeRel -G "MinGW Makefiles" -B ${{github.workspace}}/build
 
@@ -74,7 +78,7 @@ jobs:
         cp build/zh_CN.qm FreeKill-release
         cp build/en_US.qm FreeKill-release
         cp ../Qt/6.5.3/mingw_64/bin/li*.dll FreeKill-release
-        cp '/c/Program Files/OpenSSL/bin/libcrypto-1_1-x64.dll' FreeKill-release
+        cp ../Qt/Tools/OpenSSLv3/Win_x64/bin/libcrypto-3-x64.dll' FreeKill-release
         7z a -t7z FreeKill-release.7z FreeKill-release -r -mx=9 -m0=LZMA2 -ms=10m -mf=on -mhc=on -mmt=on
 
     - name: Upload Release
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 391202f9..36bd161c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,32 @@
 # ChangeLog
 
+## v0.4.8
+
+- Qml: 新增leval函数可获得lua表达式的值
+- 新增AbstractRoom类 去除冗余
+- 修gameOver相关bug（或许）
+- 从Utility那里搬运了askForYiji和doYiji两个函数，负责分配
+  虽然暂时没实现单烧条，但先这么用着
+- 修复了askForCardAndPlayers的选择中可以选择复数张牌的bug
+- 为prohibitDiscard添加了输入id选项
+- 正式添加对多后缀标记的支持
+- 添加了一点注释
+- 搬运了moveCardIntoEquip和canMoveCardIntoEquip
+- 为选牌的默认prompt添加了目标
+- 完善了朱雀羽扇的判定
+- 修复了抽选武将牌堆时未删除已选武将的bug
+- 修复了maxCard标记不识别“-turn”以外标记的bug
+- 修复了obtaincard实际不能接受id数组的bug
+- CardItem一律可长按，除了卡牌一览
+- Qml Mark在QML中可获得主人的id
+- Qml Mark可实现某某视角完全不可见
+- 隐藏#开头的pile
+- 可自定义interaction了
+- LogMessage新增toast成员
+- 修复投降杀人bug
+
+___
+
 ## v0.4.6 & v0.4.7
 
 - 攻击范围状态技类新增基础值修正函数
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2d46cec1..98d49f82 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 cmake_minimum_required(VERSION 3.16)
 
-project(FreeKill VERSION 0.4.7)
+project(FreeKill VERSION 0.4.8)
 add_definitions(-DFK_VERSION=\"${CMAKE_PROJECT_VERSION}\")
 
 find_package(Qt6 REQUIRED COMPONENTS
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index bbac166b..439d9d85 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="407"
-  android:versionName="0.4.7">
+  android:versionCode="408"
+  android:versionName="0.4.8">
   <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/lua/client/i18n/zh_CN.lua b/lua/client/i18n/zh_CN.lua
index 59cdc393..2a080f60 100644
--- a/lua/client/i18n/zh_CN.lua
+++ b/lua/client/i18n/zh_CN.lua
@@ -321,9 +321,9 @@ FreeKill使用的是libgit2的C API，与此同时使用Git完成拓展包的下
   ["Resume"] = "继续",
 
   ["Bulletin Info"] = [==[
-  ## v0.4.7
+  ## v0.4.8
 
-  补全快捷短语
+  修复投降莫名奇妙把对面杀了的bug
 
   ]==],
 }