diff --git a/CHANGELOG.md b/CHANGELOG.md index ecf4f9f0..3817611c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ ___ +## v0.3.3 + +修复上个版本发现的bug. + +___ + ## v0.3.2 本次更新的主要看点是废除装备栏和判定区。 diff --git a/CMakeLists.txt b/CMakeLists.txt index 08d78fdf..11e8ccc3 100644 --- a/CMakeLists.txt +++ b/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 diff --git a/Fk/Common/ChatBox.qml b/Fk/Common/ChatBox.qml index 9f72f9b6..8985cecd 100644 --- a/Fk/Common/ChatBox.qml +++ b/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 { diff --git a/Fk/Logic.js b/Fk/Logic.js index 39fabeb3..b6cb6ed3 100644 --- a/Fk/Logic.js +++ b/Fk/Logic.js @@ -180,9 +180,9 @@ callbacks["Chat"] = (jsonData) => { } if (general === "") - current.addToChat(pid, data, `[${time}] ${userName}: ${msg}`); + current.addToChat(pid, data, `[${time}] ${userName}: ${msg}`); else - current.addToChat(pid, data, `[${time}] ${userName}(${general}): ${msg}`); + current.addToChat(pid, data, `[${time}] ${userName}(${general}): ${msg}`); } callbacks["ServerMessage"] = (jsonData) => { diff --git a/Fk/Pages/Room.qml b/Fk/Pages/Room.qml index 74d68abd..a24c6b11 100644 --- a/Fk/Pages/Room.qml +++ b/Fk/Pages/Room.qml @@ -288,8 +288,6 @@ Item { let ret = Backend.translate(e); if (ret.search(/特殊牌|衍生牌/) === -1) { // TODO: 这种东西最好还是变量名规范化= = ret = "" + ret + ""; - } else { - ret = '' + ret + ""; } return ret; }).join(',') diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index 590eeee1..76bc5edc 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -3,8 +3,8 @@ + android:versionCode="303" + android:versionName="0.3.3"> diff --git a/image/emoji/50.png b/image/emoji/50.png new file mode 100644 index 00000000..46cb9bf8 Binary files /dev/null and b/image/emoji/50.png differ diff --git a/image/emoji/51.png b/image/emoji/51.png new file mode 100644 index 00000000..4a5888f7 Binary files /dev/null and b/image/emoji/51.png differ diff --git a/image/emoji/52.png b/image/emoji/52.png new file mode 100644 index 00000000..5a8689f7 Binary files /dev/null and b/image/emoji/52.png differ diff --git a/image/emoji/53.png b/image/emoji/53.png new file mode 100644 index 00000000..183750df Binary files /dev/null and b/image/emoji/53.png differ diff --git a/image/emoji/54.png b/image/emoji/54.png new file mode 100644 index 00000000..dd00fed0 Binary files /dev/null and b/image/emoji/54.png differ diff --git a/image/emoji/55.png b/image/emoji/55.png new file mode 100644 index 00000000..02784b84 Binary files /dev/null and b/image/emoji/55.png differ diff --git a/image/emoji/56.png b/image/emoji/56.png new file mode 100644 index 00000000..98acc3c6 Binary files /dev/null and b/image/emoji/56.png differ diff --git a/image/emoji/57.png b/image/emoji/57.png new file mode 100644 index 00000000..c56bcb90 Binary files /dev/null and b/image/emoji/57.png differ diff --git a/image/emoji/58.png b/image/emoji/58.png new file mode 100644 index 00000000..7a240f4e Binary files /dev/null and b/image/emoji/58.png differ diff --git a/lua/server/room.lua b/lua/server/room.lua index cac56746..9b21a534 100644 --- a/lua/server/room.lua +++ b/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 @ 每个卡牌的id对应的区域,一张表 ---@field public owner_map table @ 每个卡牌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 diff --git a/packages/standard/init.lua b/packages/standard/init.lua index d94dad89..be876613 100644 --- a/packages/standard/init.lua +++ b/packages/standard/init.lua @@ -1283,8 +1283,8 @@ Fk:loadTranslationTable{ ["anjiang"] = "暗将", } -local heg_mode = require "packages.standard.hegemony" -extension:addGameMode(heg_mode) +-- local heg_mode = require "packages.standard.hegemony" +-- extension:addGameMode(heg_mode) -- load translations of this package dofile "packages/standard/i18n/init.lua"