From 4a64400cbb0b33896283018f360dfa5bb3273565 Mon Sep 17 00:00:00 2001 From: ZXXX1999 <1511137684@qq.com> Date: Sat, 16 Aug 2025 03:46:56 +0800 Subject: [PATCH 1/6] =?UTF-8?q?fix:=20=E7=84=A6=E7=82=B9=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=9A=90=E8=97=8F=E7=84=A6=E7=82=B9=E6=96=B9?= =?UTF-8?q?=E6=B3=95=EF=BC=8C=E5=BD=93=E6=BB=A1=E8=B6=B3=E8=A7=84=E5=88=99?= =?UTF-8?q?=EF=BC=88=E8=A1=80=E9=87=8F=E7=99=BE=E5=88=86=E6=AF=94=E3=80=81?= =?UTF-8?q?=E7=9B=AE=E6=A0=87=E5=85=B3=E7=B3=BB=EF=BC=89=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=9C=80=E5=A4=A7=E8=B7=9D=E7=A6=BB=EF=BC=88?= =?UTF-8?q?nMaxDistance=EF=BC=89=E6=98=AF=E5=90=A6=E4=B8=BA-1=EF=BC=8C?= =?UTF-8?q?=E8=8B=A5=E4=B8=BA-1=E5=88=99=E4=B8=8D=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E7=84=A6=E7=82=B9=E5=B9=B6=E8=B7=B3=E5=87=BA=E5=90=8E=E7=BB=AD?= =?UTF-8?q?=E8=A7=84=E5=88=99=E9=81=8D=E5=8E=86=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MY_Focus/src/MY_Focus.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/MY_Focus/src/MY_Focus.lua b/MY_Focus/src/MY_Focus.lua index b6a0b3e59..c70ac9bdf 100644 --- a/MY_Focus/src/MY_Focus.lua +++ b/MY_Focus/src/MY_Focus.lua @@ -882,7 +882,8 @@ function D.GetDisplayList() end end if bRuleFocus then - bFocus = true + --2025.8.16增加隐藏焦点方法，上述规则满足后，判断最大距离是否为-1，若为-1不显示焦点并跳出规则遍历 + if via.tRule.nMaxDistance == -1 then bFocus = false else bFocus = true end tRule = via.tRule szVia = via.szVia bDeletable = via.bDeletable From f9d8fff9a0086c1dc1f429ab1f8bee9d8067fddd Mon Sep 17 00:00:00 2001 From: ZXXX1999 <1511137684@qq.com> Date: Sun, 17 Aug 2025 01:55:06 +0800 Subject: [PATCH 2/6] =?UTF-8?q?fix:=20=E6=8C=89=E6=8F=90=E7=A4=BA=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MY_Focus/src/MY_Focus.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MY_Focus/src/MY_Focus.lua b/MY_Focus/src/MY_Focus.lua index c70ac9bdf..b4ea04bb5 100644 --- a/MY_Focus/src/MY_Focus.lua +++ b/MY_Focus/src/MY_Focus.lua @@ -883,7 +883,7 @@ function D.GetDisplayList() end if bRuleFocus then --2025.8.16增加隐藏焦点方法，上述规则满足后，判断最大距离是否为-1，若为-1不显示焦点并跳出规则遍历 - if via.tRule.nMaxDistance == -1 then bFocus = false else bFocus = true end + bFocus = via.tRule.nMaxDistance ~= -1 tRule = via.tRule szVia = via.szVia bDeletable = via.bDeletable From d5e283a13b71955d7156d2600d261fed9be1438c Mon Sep 17 00:00:00 2001 From: ZXXX1999 <1511137684@qq.com> Date: Mon, 25 Aug 2025 21:51:12 +0800 Subject: [PATCH 3/6] =?UTF-8?q?feat:=20=E7=BC=93=E5=AD=98=E5=9B=A2?= =?UTF-8?q?=E9=98=9F=E6=95=B0=E6=8D=AE=E6=B0=94=E5=8A=B2=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MY_Cataclysm/src/MY_CataclysmMain.lua | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/MY_Cataclysm/src/MY_CataclysmMain.lua b/MY_Cataclysm/src/MY_CataclysmMain.lua index 0f65cb802..02b6cf774 100644 --- a/MY_Cataclysm/src/MY_CataclysmMain.lua +++ b/MY_Cataclysm/src/MY_CataclysmMain.lua @@ -108,6 +108,12 @@ local function UpdateTeamMonData() v.nLevel = data.nLevel end v.nIcon = data.nIcon + --2025.08.25加载团队数据时缓存气劲名称，避免后续反复调用GetBuffName + if data.szName then + v.szName = X.RenderTemplateString(data.szName, { sender = '', receiver = '' }, -1, true, false) + else + v.szName = X.GetBuffName(data.dwID, data.nLevel) + end table.insert(aBuff, v) end end From f2d46c9467cbbf0b626e97150c16cd9ce635a6a0 Mon Sep 17 00:00:00 2001 From: ZXXX1999 <1511137684@qq.com> Date: Tue, 26 Aug 2025 01:49:06 +0800 Subject: [PATCH 4/6] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E5=9B=A2?= =?UTF-8?q?=E9=98=9F=E7=9B=91=E6=8E=A7=E5=80=92=E8=AE=A1=E6=97=B6=E6=9D=A1?= =?UTF-8?q?=E5=BC=BA=E5=88=B6=E8=AE=BE=E7=BD=AEnRefresh?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MY_TeamMon/src/MY_TeamMon_SpellTimer.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 From 60382eca6c8e380c3c62a214efa92377274726ad Mon Sep 17 00:00:00 2001 From: ZXXX1999 <1511137684@qq.com> Date: Tue, 26 Aug 2025 02:13:48 +0800 Subject: [PATCH 5/6] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=9B=A2=E9=98=9F?= =?UTF-8?q?=E7=9B=91=E6=8E=A7=E4=B8=AD=E4=BD=BF=E7=94=A8=E6=AD=A3=E5=88=99?= =?UTF-8?q?=E8=A1=A8=E8=BE=BE=E5=BC=8F=E5=96=8A=E8=AF=9D=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E7=9A=84=E5=A4=9A=E6=AE=B5=E5=80=92=E8=AE=A1=E6=97=B6=E6=9D=A1?= =?UTF-8?q?=E6=9C=AA=E6=9B=BF=E6=8D=A2{$1}=E6=A8=A1=E6=9D=BF=E5=AD=97?= =?UTF-8?q?=E7=AC=A6=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MY_TeamMon/src/MY_TeamMon.lua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/MY_TeamMon/src/MY_TeamMon.lua b/MY_TeamMon/src/MY_TeamMon.lua index 5aa0c9c26..4f9db3882 100644 --- a/MY_TeamMon/src/MY_TeamMon.lua +++ b/MY_TeamMon/src/MY_TeamMon.lua @@ -1020,6 +1020,10 @@ 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}模板字符 + if X.IsString(v.nTime) then + v.nTime = FilterCustomText(v.nTime, szSender, szReceiver, aBackreferences) + end local tParam = { nIcon = v.nIcon or data.nIcon or 340, nFrame = v.nFrame, From 4f16b13417e82b75b85b9c07059e1630fbe22c9b Mon Sep 17 00:00:00 2001 From: ZXXX1999 <1511137684@qq.com> Date: Tue, 26 Aug 2025 02:44:07 +0800 Subject: [PATCH 6/6] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=9B=A2=E9=98=9F?= =?UTF-8?q?=E7=9B=91=E6=8E=A7=E4=B8=AD=E4=BD=BF=E7=94=A8=E6=AD=A3=E5=88=99?= =?UTF-8?q?=E8=A1=A8=E8=BE=BE=E5=BC=8F=E5=96=8A=E8=AF=9D=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E7=9A=84=E5=A4=9A=E6=AE=B5=E5=80=92=E8=AE=A1=E6=97=B6=E6=9D=A1?= =?UTF-8?q?=E6=9C=AA=E6=9B=BF=E6=8D=A2{$1}=E6=A8=A1=E6=9D=BF=E5=AD=97?= =?UTF-8?q?=E7=AC=A6=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MY_TeamMon/src/MY_TeamMon.lua | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/MY_TeamMon/src/MY_TeamMon.lua b/MY_TeamMon/src/MY_TeamMon.lua index 4f9db3882..245de089f 100644 --- a/MY_TeamMon/src/MY_TeamMon.lua +++ b/MY_TeamMon/src/MY_TeamMon.lua @@ -1021,14 +1021,15 @@ function D.CountdownEvent(data, nClass, szSender, szReceiver, aBackreferences) if nClass == v.nClass then local nType, szKey = D.GetCountdownTypeKey(data, i, szSender, szReceiver, aBackreferences) -- 2025.08.26解决正则表达式喊话事件的多段倒计时nTime字段未替换{$1}模板字符 - if X.IsString(v.nTime) then - v.nTime = FilterCustomText(v.nTime, szSender, szReceiver, aBackreferences) + 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,