From 1005863b1ed0b149d8414be67d9e48a27d7cb738 Mon Sep 17 00:00:00 2001
From: notify <notify-ctrl@qq.com>
Date: Thu, 28 Dec 2023 13:40:34 +0800
Subject: [PATCH] Changelog: v0.4.2

---
 CHANGELOG.md                | 2 +-
 CMakeLists.txt              | 2 +-
 Fk/Pages/Room.qml           | 2 +-
 android/AndroidManifest.xml | 4 ++--
 lua/client/client.lua       | 2 +-
 lua/client/i18n/zh_CN.lua   | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 73f61475..1295912c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # ChangeLog
 
-## 0.4.1
+## v0.4.2 && v0.4.1
 
 1. 修复和完善qml mark
 2. 修复国战野心家放副将
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d2e2a1c0..84812c68 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@
 
 cmake_minimum_required(VERSION 3.16)
 
-project(FreeKill VERSION 0.4.1)
+project(FreeKill VERSION 0.4.2)
 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 33c5b52c..501e23bc 100644
--- a/Fk/Pages/Room.qml
+++ b/Fk/Pages/Room.qml
@@ -1309,7 +1309,7 @@ Item {
       if (d.id == Self.id) {
         roomScene.isOwner = d.isOwner;
       } else {
-        Backend.callLuaFunction("ResetAddPlayer", [JSON.stringify([d.id, d.name, d.avatar, d.ready])]);
+        Backend.callLuaFunction("ResetAddPlayer", [JSON.stringify([d.id, d.name, d.avatar, d.ready, d.gameData[3]])]);
       }
       Backend.callLuaFunction("SetPlayerGameData", [d.id, d.gameData]);
       Logic.getPhotoModel(d.id).isOwner = d.isOwner;
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 7ee8b1c8..09a828f4 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="401"
-  android:versionName="0.4.1">
+  android:versionCode="402"
+  android:versionName="0.4.2">
   <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/client.lua b/lua/client/client.lua
index 2c52ff47..c4352732 100644
--- a/lua/client/client.lua
+++ b/lua/client/client.lua
@@ -288,7 +288,7 @@ fk.client_callback["AddPlayer"] = function(jsonData)
   local data = json.decode(jsonData)
   local id, name, avatar, time = data[1], data[2], data[3], data[5]
   local player = fk.ClientInstance:addPlayer(id, name, avatar)
-  player:addTotalGameTime(time)
+  player:addTotalGameTime(time or 0) -- 以防再次智迟
   local p = ClientPlayer:new(player)
   table.insert(ClientInstance.players, p)
   table.insert(ClientInstance.alive_players, p)
diff --git a/lua/client/i18n/zh_CN.lua b/lua/client/i18n/zh_CN.lua
index 75df5b1f..02ef90f3 100644
--- a/lua/client/i18n/zh_CN.lua
+++ b/lua/client/i18n/zh_CN.lua
@@ -304,7 +304,7 @@ FreeKill使用的是libgit2的C API，与此同时使用Git完成拓展包的下
   ["Resume"] = "继续",
 
   ["Bulletin Info"] = [==[
-  ## v0.4.1
+  ## v0.4.2
 
   增加游玩计时和屏蔽提示。