diff --git a/MY_TeamMon/src/MY_TeamMon.lua b/MY_TeamMon/src/MY_TeamMon.lua index 5aa0c9c26..245de089f 100644 --- a/MY_TeamMon/src/MY_TeamMon.lua +++ b/MY_TeamMon/src/MY_TeamMon.lua @@ -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, diff --git a/MY_TeamMon/src/MY_TeamMon_SpellTimer.lua b/MY_TeamMon/src/MY_TeamMon_SpellTimer.lua index 9fc26b007..9fb837445 100644 --- a/MY_TeamMon/src/MY_TeamMon_SpellTimer.lua +++ b/MY_TeamMon/src/MY_TeamMon_SpellTimer.lua @@ -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