diff --git a/CHANGELOG.md b/CHANGELOG.md
index 21c9f97e..1ee2051a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,21 @@
 # ChangeLog
 
+## v0.4.21
+
+- 修复了确认键亮起时取消键不可用的bug
+- lua端的ob属性根本没同步，同步一下
+- [需要C++] 让requestTimer的超时影响到Lua
+- 修复windows没图标
+- 移除了modmaker
+- 修理了选卡器
+- 修理了确定取消消失
+- 删除了已经不用的autoPending和respond_play
+- 修复异常烧条（或许吧）
+- 修复负数烧条时间，若为负数则无事发生
+
+___
+
+
 ## v0.4.20
 
 - 重构了UI逻辑
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 75038278..b8229d3b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 cmake_minimum_required(VERSION 3.22)
 
-project(FreeKill VERSION 0.4.20)
+project(FreeKill VERSION 0.4.21)
 add_definitions(-DFK_VERSION=\"${CMAKE_PROJECT_VERSION}\")
 
 find_package(Qt6 REQUIRED COMPONENTS
diff --git a/Fk/Pages/Room.qml b/Fk/Pages/Room.qml
index 81f91d79..bf6686bf 100644
--- a/Fk/Pages/Room.qml
+++ b/Fk/Pages/Room.qml
@@ -318,6 +318,8 @@ Item {
           skillInteraction.sourceComponent = undefined;
           promptText = "";
           okCancel.visible = false;
+          okButton.enabled = false;
+          cancelButton.enabled = false;
           endPhaseButton.visible = false;
           progress.visible = false;
           extra_data = {};
@@ -1364,8 +1366,6 @@ Item {
     const buttons = uiUpdate["Button"];
     if (buttons) {
       okCancel.visible = true;
-      okButton.enabled = false;
-      cancelButton.enabled = false;
     }
     buttons?.forEach(bdata => {
       switch (bdata.id) {
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 072e16fd..71a8afe2 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="420"
-  android:versionName="0.4.20">
+  android:versionCode="421"
+  android:versionName="0.4.21">
   <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" />