Changelog: v0.4.0

This commit is contained in:
notify 2023-12-12 21:34:51 +08:00
parent 6f7e64be09
commit 94b7493e2e
7 changed files with 42 additions and 8 deletions

View File

@ -1,9 +1,11 @@
# ChangeLog # ChangeLog
## v0.3.14 ## v0.4.0 && v0.3.14
修复bug详见git log 修复bug详见git log
- 新增canPindian禁止技新增prohibitPindian
___ ___
## v0.3.13 ## v0.3.13

View File

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

View File

@ -3,8 +3,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.notify.FreeKill" package="org.notify.FreeKill"
android:installLocation="preferExternal" android:installLocation="preferExternal"
android:versionCode="314" android:versionCode="400"
android:versionName="0.3.14"> android:versionName="0.4.0">
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

View File

@ -112,7 +112,7 @@ Fk:loadTranslationTable{
RalphR Nyutanislavsky xxyheaven RalphR Nyutanislavsky xxyheaven
deepskybird deepskybird s1134s емо
Mogara Mogara
@ -122,7 +122,7 @@ Fk:loadTranslationTable{
Qt是一个C++使API Qt是一个C++使API
使Qt 6.4QtQuick开发UI使Qt的网络库开发服务端程序 使Qt 6.5QtQuick开发UI使Qt的网络库开发服务端程序
https://www.qt.io https://www.qt.io
]], ]],
@ -301,9 +301,13 @@ FreeKill使用的是libgit2的C API与此同时使用Git完成拓展包的下
["Resume"] = "继续", ["Resume"] = "继续",
["Bulletin Info"] = [==[ ["Bulletin Info"] = [==[
## v0.3.14 ## v0.4.0
线 UI都或多或少的更新了
BGM复活
]==], ]==],
} }

View File

@ -938,6 +938,25 @@ function Player:prohibitReveal(isDeputy)
return false return false
end end
---@param to Player
---@param ignoreFromKong? boolean
---@param ignoreToKong? boolean
function Player:canPindian(to, ignoreFromKong, ignoreToKong)
if self:isKongcheng() and not ignoreFromKong then
return false
end
if to:isKongcheng() and not ignoreToKong then
return false
end
local status_skills = Fk:currentRoom().status_skills[ProhibitSkill] or Util.DummyTable
for _, skill in ipairs(status_skills) do
if skill:prohibitPindian(self, to) then
return false
end
end
return true
end
--转换技状态阳 --转换技状态阳
fk.SwitchYang = 0 fk.SwitchYang = 0
--转换技状态阴 --转换技状态阴

View File

@ -32,4 +32,11 @@ function ProhibitSkill:prohibitDiscard(player, card)
return false return false
end end
---@param from Player
---@param to Player
---@return boolean
function ProhibitSkill:prohibitPindian(from, to)
return false
end
return ProhibitSkill return ProhibitSkill

View File

@ -300,6 +300,7 @@ end
---@field public prohibit_use? fun(self: ProhibitSkill, player: Player, card: Card): boolean? ---@field public prohibit_use? fun(self: ProhibitSkill, player: Player, card: Card): boolean?
---@field public prohibit_response? fun(self: ProhibitSkill, player: Player, card: Card): boolean? ---@field public prohibit_response? fun(self: ProhibitSkill, player: Player, card: Card): boolean?
---@field public prohibit_discard? fun(self: ProhibitSkill, player: Player, card: Card): boolean? ---@field public prohibit_discard? fun(self: ProhibitSkill, player: Player, card: Card): boolean?
---@field public prohibit_pindian? fun(self: ProhibitSkill, from: Player, to: Player): boolean?
---@param spec ProhibitSpec ---@param spec ProhibitSpec
---@return ProhibitSkill ---@return ProhibitSkill
@ -312,6 +313,7 @@ function fk.CreateProhibitSkill(spec)
skill.prohibitUse = spec.prohibit_use or skill.prohibitUse skill.prohibitUse = spec.prohibit_use or skill.prohibitUse
skill.prohibitResponse = spec.prohibit_response or skill.prohibitResponse skill.prohibitResponse = spec.prohibit_response or skill.prohibitResponse
skill.prohibitDiscard = spec.prohibit_discard or skill.prohibitDiscard skill.prohibitDiscard = spec.prohibit_discard or skill.prohibitDiscard
skill.prohibitPindian = spec.prohibit_pindian or skill.prohibitPindian
return skill return skill
end end