From 1209ca43fa979d8919a6b03cf7b14e47ccfd1685 Mon Sep 17 00:00:00 2001
From: YoumuKon <38815081+YoumuKon@users.noreply.github.com>
Date: Tue, 27 Feb 2024 17:47:56 +0800
Subject: [PATCH] redo (#327)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

重新添加轮次和回合的锁视和手牌上限提醒

---------

Co-authored-by: notify <notify-ctrl@qq.com>
---
 CHANGELOG.md                   |  2 +-
 CMakeLists.txt                 |  2 +-
 android/AndroidManifest.xml    |  4 ++--
 lua/client/i18n/zh_CN.lua      |  2 +-
 lua/server/events/gameflow.lua | 10 ++++++++++
 5 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 36bd161c..4a18f2f8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # ChangeLog
 
-## v0.4.8
+## v0.4.8 & v0.4.9
 
 - Qml: 新增leval函数可获得lua表达式的值
 - 新增AbstractRoom类 去除冗余
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 98d49f82..dbe3a5c5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 cmake_minimum_required(VERSION 3.16)
 
-project(FreeKill VERSION 0.4.8)
+project(FreeKill VERSION 0.4.9)
 add_definitions(-DFK_VERSION=\"${CMAKE_PROJECT_VERSION}\")
 
 find_package(Qt6 REQUIRED COMPONENTS
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 439d9d85..45896229 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="408"
-  android:versionName="0.4.8">
+  android:versionCode="409"
+  android:versionName="0.4.9">
   <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 2a080f60..b9400988 100644
--- a/lua/client/i18n/zh_CN.lua
+++ b/lua/client/i18n/zh_CN.lua
@@ -321,7 +321,7 @@ FreeKill使用的是libgit2的C API，与此同时使用Git完成拓展包的下
   ["Resume"] = "继续",
 
   ["Bulletin Info"] = [==[
-  ## v0.4.8
+  ## v0.4.9
 
   修复投降莫名奇妙把对面杀了的bug
 
diff --git a/lua/server/events/gameflow.lua b/lua/server/events/gameflow.lua
index 5f096687..47370508 100644
--- a/lua/server/events/gameflow.lua
+++ b/lua/server/events/gameflow.lua
@@ -187,6 +187,11 @@ GameEvent.cleaners[GameEvent.Round] = function(self)
       end
     end
   end
+
+  for _, p in ipairs(room.players) do
+    p:filterHandcards()
+    room:broadcastProperty(p, "MaxCards")
+  end
 end
 
 GameEvent.prepare_funcs[GameEvent.Turn] = function(self)
@@ -262,6 +267,11 @@ GameEvent.cleaners[GameEvent.Turn] = function(self)
       end
     end
   end
+
+  for _, p in ipairs(room.players) do
+    p:filterHandcards()
+    room:broadcastProperty(p, "MaxCards")
+  end
 end
 
 GameEvent.functions[GameEvent.Phase] = function(self)