Changelog: v0.4.2

CHANGELOG.md

@@ -1,6 +1,6 @@
 # ChangeLog
 
-## 0.4.1
+## v0.4.2 && v0.4.1
 
 1. 修复和完善qml mark
 2. 修复国战野心家放副将

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

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;

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" />

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)

lua/client/i18n/zh_CN.lua

@@ -304,7 +304,7 @@ FreeKill使用的是libgit2的C API，与此同时使用Git完成拓展包的下
   ["Resume"] = "继续",
 
   ["Bulletin Info"] = [==[
-  ## v0.4.1
+  ## v0.4.2
 
   增加游玩计时和屏蔽提示。