Changelog: v0.3.3

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ___
 
+## v0.3.3
+
+修复上个版本发现的bug.
+
+___
+
 ## v0.3.2
 
 本次更新的主要看点是废除装备栏和判定区。

CMakeLists.txt

@@ -2,7 +2,7 @@
 
 cmake_minimum_required(VERSION 3.16)
 
-project(FreeKill VERSION 0.3.2)
+project(FreeKill VERSION 0.3.3)
 add_definitions(-DFK_VERSION=\"${CMAKE_PROJECT_VERSION}\")
 
 find_package(Qt6 REQUIRED COMPONENTS

Fk/Common/ChatBox.qml

@@ -92,7 +92,7 @@ Rectangle {
       Layout.preferredHeight: 120
       cellHeight: 48
       cellWidth: 48
-      model: 50
+      model: 59
       visible: false
       clip: true
       delegate: ItemDelegate {

Fk/Logic.js

@@ -180,9 +180,9 @@ callbacks["Chat"] = (jsonData) => {
   }
 
   if (general === "")
-    current.addToChat(pid, data, `[${time}] ${userName}: ${msg}`);
+    current.addToChat(pid, data, `<font color="#3598E8">[${time}] ${userName}:</font> ${msg}`);
   else
-    current.addToChat(pid, data, `[${time}] ${userName}(${general}): ${msg}`);
+    current.addToChat(pid, data, `<font color="#3598E8">[${time}] ${userName}(${general}):</font> ${msg}`);
 }
 
 callbacks["ServerMessage"] = (jsonData) => {

Fk/Pages/Room.qml

@@ -288,8 +288,6 @@ Item {
               let ret = Backend.translate(e);
               if (ret.search(/特殊牌|衍生牌/) === -1) { // TODO: 这种东西最好还是变量名规范化= =
                 ret = "<b>" + ret + "</b>";
-              } else {
-                ret = '<font color="grey"><i>' + ret + "</i></font>";
               }
               return ret;
             }).join('，')

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="302"
+  android:versionCode="303"
-  android:versionName="0.3.2">
+  android:versionName="0.3.3">
   <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/server/room.lua

@@ -19,7 +19,6 @@
 ---@field public discard_pile integer[] @ 弃牌堆，也是卡牌id的数组
 ---@field public processing_area integer[] @ 处理区，依然是卡牌id数组
 ---@field public void integer[] @ 从游戏中除外区，一样的是卡牌id数组
----@field public general_pile string[] @ 武将牌堆，这是武将名的数组
 ---@field public card_place table<integer, CardArea> @ 每个卡牌的id对应的区域，一张表
 ---@field public owner_map table<integer, integer> @ 每个卡牌id对应的主人，表的值是那个玩家的id，可能是nil
 ---@field public status_skills Skill[] @ 这个房间中含有的状态技列表
@@ -81,7 +80,6 @@ function Room:initialize(_room)
   self.discard_pile = {}
   self.processing_area = {}
   self.void = {}
-  self.general_pile = {}
   self.card_place = {}
   self.owner_map = {}
   self.status_skills = {}
@@ -110,6 +108,7 @@ function Room:resume()
   -- 如果还没运行的话就先创建自己的主协程
   if not self.main_co then
     self.main_co = coroutine.create(function()
+      self.tag["_general_pile"] = Fk:getAllGenerals()
       self:run()
     end)
   end
@@ -2440,6 +2439,7 @@ function Room:handleCardEffect(event, cardEffectEvent)
           end
         end
         if not table.contains(players, p) then
+          Self = p -- for enabledAtResponse
           for _, s in ipairs(p.player_skills) do
             if
               s.pattern and

packages/standard/init.lua

@@ -1283,8 +1283,8 @@ Fk:loadTranslationTable{
   ["anjiang"] = "暗将",
 }
 
-local heg_mode = require "packages.standard.hegemony"
+-- local heg_mode = require "packages.standard.hegemony"
-extension:addGameMode(heg_mode)
+-- extension:addGameMode(heg_mode)
 
 -- load translations of this package
 dofile "packages/standard/i18n/init.lua"