diff --git a/lua/fk_ex.lua b/lua/fk_ex.lua index 1995c09ec843ffde71b9275aa276b63e474c68b9..9d9afd3296904cd2f2cb9fa0f21eca4d3aa96c59 100644 --- a/lua/fk_ex.lua +++ b/lua/fk_ex.lua @@ -98,6 +98,8 @@ end ---@field public max_round_use_time? integer ---@field public max_game_use_time? integer ---@field public times? integer | fun(self: UsableSkill): integer +---@field public on_acquire? fun(self: UsableSkill, player: ServerPlayer, is_start: boolean) +---@field public on_lose? fun(self: UsableSkill, player: ServerPlayer, is_death: boolean) ---@class StatusSkillSpec: StatusSkill diff --git a/lua/server/gameevent.lua b/lua/server/gameevent.lua index 0c9fc5a93c3f433cd01fed4f6c3074337dc51cdc..e7892e827b653e59442e25038c3d4a129fc7d030 100644 --- a/lua/server/gameevent.lua +++ b/lua/server/gameevent.lua @@ -181,7 +181,7 @@ local function bin_search(events, from, to, n, func) end -- 从某个区间中,找出类型符合且符合func函数检测的至多n个事件。 ----@param eventType integer @ 要查找的事件类型 +---@param eventType GameEvent @ 要查找的事件类型 ---@param n integer @ 最多找多少个 ---@param func fun(e: GameEvent): boolean? @ 过滤用的函数 ---@param endEvent? GameEvent @ 区间终止点,默认为本事件结束 diff --git a/lua/server/room.lua b/lua/server/room.lua index f146a6e470876a4ac9245a36cd05f602cdb2bbfe..ac4e74a7174b8a70b476e2f2cc258500644f9dc4 100644 --- a/lua/server/room.lua +++ b/lua/server/room.lua @@ -1218,7 +1218,7 @@ end ---@param minNum? integer @ 最少交出的卡牌数,默认0 ---@param maxNum? integer @ 最多交出的卡牌数,默认所有牌 ---@param prompt? string @ 询问提示信息 ----@param expand_pile? string @ 可选私人牌堆名称,如要分配你武将牌上的牌请填写 +---@param expand_pile? string|integer[] @ 可选私人牌堆名称,如要分配你武将牌上的牌请填写 ---@param skipMove? boolean @ 是否跳过移动。默认不跳过 ---@param single_max? integer|table @ 限制每人能获得的最大牌数。输入整数或(以角色id为键以整数为值)的表 ---@return table @ 返回一个表,键为角色id转字符串,值为分配给其的牌id数组