Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion MY_TeamMon/src/MY_TeamMon.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1020,11 +1020,16 @@ function D.CountdownEvent(data, nClass, szSender, szReceiver, aBackreferences)
for i, v in ipairs(data.tCountdown) do
if nClass == v.nClass then
local nType, szKey = D.GetCountdownTypeKey(data, i, szSender, szReceiver, aBackreferences)
-- 2025.08.26����������ʽ�����¼��Ķ�ε���ʱnTime�ֶ�δ�滻{$1}ģ���ַ�
local nTime = v.nTime
if X.IsTable(aBackreferences) and X.IsString(v.nTime) then
nTime = FilterCustomText(nTime, szSender, szReceiver, aBackreferences)
end
local tParam = {
nIcon = v.nIcon or data.nIcon or 340,
nFrame = v.nFrame,
szContent = FilterCustomText(v.szName or data.szName, szSender, szReceiver, aBackreferences),
nTime = v.nTime,
nTime = nTime,
nRefresh = v.nRefresh,
bTalk = v.bTeamChannel,
bHold = v.bHold,
Expand Down
4 changes: 3 additions & 1 deletion MY_TeamMon/src/MY_TeamMon_SpellTimer.lua
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,10 @@ local function CreateCountdown(nType, szKey, tParam, szSender, szReceiver)
if ui and ui:IsValid() then
ui.obj:RemoveItem()
end
-- 2025.08.25���ӵ���ʱ��ǿ������nRefresh��nTimeΪ-1��-2ǿ�Ƹ���nRefresh
ST_TIME_EXPIRE[nType][szKey] = nTime + (tParam.nRefresh or 0) * 1000
elseif tTime.nTime == -2 then
ST_TIME_EXPIRE[nType][szKey] = nil
ST_TIME_EXPIRE[nType][szKey] = nTime + (tParam.nRefresh or 0) * 1000
else
local nExpire = ST_TIME_EXPIRE[nType][szKey]
if nExpire and nExpire > nTime then
Expand Down