From dad2b5406cd6b14984f755446a0d651121df0b37 Mon Sep 17 00:00:00 2001
From: notify <notify-ctrl@qq.com>
Date: Sun, 2 Jul 2023 20:53:42 +0800
Subject: [PATCH] Changelog: v0.2.7

---
 CHANGELOG.md                        | 13 +++++++++++++
 CMakeLists.txt                      |  2 +-
 android/AndroidManifest.xml         |  4 ++--
 freekill.server.config.json.example |  7 +++++++
 lang/zh_CN.ts                       |  4 ++++
 lua/client/i18n/zh_CN.lua           |  7 +++++--
 packages/standard/init.lua          |  2 +-
 src/server/server.cpp               |  2 ++
 8 files changed, 35 insertions(+), 6 deletions(-)
 create mode 100644 freekill.server.config.json.example

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 65ba6acb..12a62313 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,19 @@
 
 ___
 
+## v0.2.7
+
+1. 胜率直接写在脸上
+2. 逃跑封禁20min
+3. 屏蔽发言功能
+4. 新的登陆界面
+5. 快速短语
+6. 投降，牌序
+7. 房间列表手动刷
+8. 修bug
+
+___
+
 ## v0.2.6
 
 新功能：
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 233915df..42331db6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@
 
 cmake_minimum_required(VERSION 3.16)
 
-project(FreeKill VERSION 0.2.6)
+project(FreeKill VERSION 0.2.7)
 add_definitions(-DFK_VERSION=\"${CMAKE_PROJECT_VERSION}\")
 
 find_package(Qt6 REQUIRED COMPONENTS
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index f8bd57b7..53c0c288 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="206"
-  android:versionName="0.2.6">
+  android:versionCode="207"
+  android:versionName="0.2.7">
   <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/freekill.server.config.json.example b/freekill.server.config.json.example
new file mode 100644
index 00000000..6e8e0e31
--- /dev/null
+++ b/freekill.server.config.json.example
@@ -0,0 +1,7 @@
+{
+  "banwords": [],
+  "description": "FreeKill Server",
+  "iconUrl": "https://img1.imgtp.com/2023/07/01/DGUdj8eu.png",
+  "capacity": 100,
+  "tempBanTime": 20
+}
diff --git a/lang/zh_CN.ts b/lang/zh_CN.ts
index 8a70e9e1..58b7a2a8 100644
--- a/lang/zh_CN.ts
+++ b/lang/zh_CN.ts
@@ -330,6 +330,10 @@
     <source>Room is full or already started!</source>
     <translation>房间已满！</translation>
   </message>
+  <message>
+    <source>server is full!</source>
+    <translation>服务器已满！</translation>
+  </message>
 </context>
 
 <context>
diff --git a/lua/client/i18n/zh_CN.lua b/lua/client/i18n/zh_CN.lua
index fe2354c4..00a499cd 100644
--- a/lua/client/i18n/zh_CN.lua
+++ b/lua/client/i18n/zh_CN.lua
@@ -235,9 +235,12 @@ FreeKill使用的是libgit2的C API，与此同时使用Git完成拓展包的下
   ["Back To Lobby"] = "返回大厅",
 
   ["Bulletin Info"] = [==[
-  ## v0.2.6
+  ## v0.2.7
 
-  新增反选卡牌功能和连续送花（酒杯）的交互表情。同时，在个人设置中新增了“不可使用牌下移”的选项，可以在牌很多时辅助选择；顺便修复了一大堆bug。
+  - 牌序、投降、优化屏幕边缘按键
+  - 胜率显示
+  - 房间列表改为手动刷新
+  - bug修复，以及一些新增的小细节
   ]==],
 }
 
diff --git a/packages/standard/init.lua b/packages/standard/init.lua
index c02715af..0e67092f 100644
--- a/packages/standard/init.lua
+++ b/packages/standard/init.lua
@@ -1193,7 +1193,7 @@ local role_mode = fk.CreateGameMode{
     end
 
     return {
-      { text = "time limitation: 5 sec", passed = playedTime >= 5 },
+      { text = "time limitation: 5 min", passed = playedTime >= 300 },
       { text = roleText, passed = roleCheck },
     }
   end,
diff --git a/src/server/server.cpp b/src/server/server.cpp
index 404eff8b..e232d05e 100644
--- a/src/server/server.cpp
+++ b/src/server/server.cpp
@@ -223,6 +223,8 @@ void Server::processNewConnection(ClientSocket *client) {
     errmsg = "you have been banned!";
   } else if (temp_banlist.contains(addr)) {
     errmsg = "you have been temporarily banned!";
+  } else if (players.count() >= getConfig("capacity").toInt()) {
+    errmsg = "server is full!";
   }
 
   if (!errmsg.isEmpty()) {