Skip to content
This repository was archived by the owner on Feb 3, 2026. It is now read-only.

Commit aa82d8d

Browse files
tinyminstinymins
committed
fix: 修复获取队友心法兼容问题
1 parent aaa26c8 commit aa82d8d

File tree

15 files changed

+40
-40
lines changed

15 files changed

+40
-40
lines changed

‎MY_!Base/src/MY_Bidding.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -787,7 +787,7 @@ X.RegisterBgMsg('MY_BIDDING_ACTION', function(_, data, nChannel, dwTalkerID, szT
787787
nPrice = data.nPrice,
788788
dwTime = GetCurrentTime(),
789789
dwTick = GetTickCount(),
790-
dwKungfu = GetClientTeam().GetMemberInfo(dwTalkerID).dwMountKungfuID,
790+
dwKungfu = X.GetTeamMemberInfo(dwTalkerID).dwKungfuID,
791791
})
792792
local frame = D.GetFrame(data.szKey)
793793
if not frame then

‎MY_Cataclysm/src/MY_CataclysmParty.lua‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -728,7 +728,7 @@ function CTM:GetMemberInfo(dwID)
728728
if not team then
729729
return
730730
end
731-
return team.GetMemberInfo(dwID)
731+
return X.GetTeamMemberInfo(dwID)
732732
end
733733

734734
function CTM:GetTeamInfo()
@@ -1121,10 +1121,10 @@ function CTM:RefreshImages(h, dwID, info, tSetting, bIcon, bFormationLeader, bLa
11211121
if bIcon then -- 刷新icon
11221122
local img, bVisible = h:Lookup('Image_Icon'), true
11231123
if CFG.nShowIcon ~= 4 then
1124-
if CFG.nShowIcon == 2 and info.dwActualMountKungfuID == 0 then
1124+
if CFG.nShowIcon == 2 and info.dwActualKungfuID == 0 then
11251125
img:FromUITex('ui/image/TargetPanel/Target.UITex', 21)
11261126
elseif CFG.nShowIcon == 2 then
1127-
local _, nIconID = X.GetSkillName(info.dwActualMountKungfuID, 1)
1127+
local _, nIconID = X.GetSkillName(info.dwActualKungfuID, 1)
11281128
if nIconID == 1435 then nIconID = 889 end
11291129
img:FromIconID(nIconID)
11301130
elseif CFG.nShowIcon == 1 then
@@ -1187,7 +1187,7 @@ function CTM:RefreshImages(h, dwID, info, tSetting, bIcon, bFormationLeader, bLa
11871187
end
11881188
if CFG.nShowIcon == 4 then
11891189
local r, g, b = X.GetForceColor(info.dwForceID, 'foreground')
1190-
txtSchool:SetText(CTM_KUNGFU_TEXT[info.dwActualMountKungfuID])
1190+
txtSchool:SetText(CTM_KUNGFU_TEXT[info.dwActualKungfuID])
11911191
txtSchool:SetFontScheme(CFG.nNameFont)
11921192
txtSchool:SetFontColor(r, g, b)
11931193
txtSchool:SetFontScale(fScale)
@@ -2133,7 +2133,7 @@ function CTM:DrawHPMP(h, dwID, info, bRefresh)
21332133
life:SetFontColor(128, 128, 128)
21342134
life:SetText(COINSHOP_SOURCE_NULL)
21352135
end
2136-
-- if info.dwActualMountKungfuID == 0 then -- 没有同步成功时显示的内容
2136+
-- if info.dwActualKungfuID == 0 then -- 没有同步成功时显示的内容
21372137
-- life:SetText('sync ...')
21382138
-- end
21392139
h:Lookup('Text_Death'):SetVisible(bDeathFlag)

‎MY_Focus/src/MY_Focus.UI.lua‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -172,10 +172,10 @@ function D.UpdateItem(hItem, p)
172172
-- 心法
173173
hInfoList:Lookup('Handle_Kungfu'):Hide()
174174
if dwType == TARGET.PLAYER then
175-
if tMemberInfo and tMemberInfo.dwActualMountKungfuID then
176-
hItem:Lookup('Handle_L/Handle_KungfuName/Text_Kungfu'):SetText(X.GetKungfuName(tMemberInfo.dwActualMountKungfuID))
175+
if tMemberInfo and tMemberInfo.dwActualKungfuID then
176+
hItem:Lookup('Handle_L/Handle_KungfuName/Text_Kungfu'):SetText(X.GetKungfuName(tMemberInfo.dwActualKungfuID))
177177
hInfoList:Lookup('Handle_Kungfu'):Show()
178-
hInfoList:Lookup('Handle_Kungfu/Image_Kungfu'):FromIconID(Table_GetSkillIconID(tMemberInfo.dwActualMountKungfuID, 1))
178+
hInfoList:Lookup('Handle_Kungfu/Image_Kungfu'):FromIconID(Table_GetSkillIconID(tMemberInfo.dwActualKungfuID, 1))
179179
else
180180
local kungfu = KObject.GetKungfuMount()
181181
if kungfu then
@@ -234,8 +234,8 @@ function D.UpdateItem(hItem, p)
234234
hItem:Lookup('Handle_L/Handle_Compass'):Hide()
235235
hItem:Lookup('Handle_L/Handle_School'):Show()
236236
-- 心法图标
237-
if tMemberInfo and tMemberInfo.dwActualMountKungfuID then
238-
hItem:Lookup('Handle_L/Handle_School/Image_School'):FromIconID(Table_GetSkillIconID(tMemberInfo.dwActualMountKungfuID, 1))
237+
if tMemberInfo and tMemberInfo.dwActualKungfuID then
238+
hItem:Lookup('Handle_L/Handle_School/Image_School'):FromIconID(Table_GetSkillIconID(tMemberInfo.dwActualKungfuID, 1))
239239
else
240240
local kungfu = KObject.GetKungfuMount()
241241
if kungfu then

‎MY_LifeBar/src/MY_LifeBar_ScreenArrow.lua‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -355,8 +355,8 @@ function D.OnBreathe()
355355
dwMountKungfuID = UI_GetPlayerMountKungfuID()
356356
else
357357
local info = X.GetTeamMemberInfo(dwID)
358-
if info and not X.IsEmpty(info.dwActualMountKungfuID) then
359-
dwMountKungfuID = info.dwActualMountKungfuID
358+
if info and not X.IsEmpty(info.dwActualKungfuID) then
359+
dwMountKungfuID = info.dwActualKungfuID
360360
else
361361
local kungfu = kTarget.GetKungfuMount()
362362
if kungfu then

‎MY_Target/src/MY_TargetDirection.lua‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,8 @@ end
139139
do
140140
local function SetObjectAvatar(img, tar, info)
141141
if X.IsPlayer(tar.dwID) then
142-
if info and info.dwActualMountKungfuID then
143-
img:FromIconID(Table_GetSkillIconID(info.dwActualMountKungfuID, 1))
142+
if info and info.dwActualKungfuID then
143+
img:FromIconID(Table_GetSkillIconID(info.dwActualKungfuID, 1))
144144
else
145145
local kungfu = tar.GetKungfuMount and tar.GetKungfuMount()
146146
if kungfu and kungfu.dwSkillID ~= 0 then

‎MY_TeamMon/src/MY_TeamMon_PartyBuffList.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ function D.OnTableInsert(dwID, dwBuffID, nLevel, nIcon)
285285
if dwTargetID == dwID then
286286
h:Lookup('Image_Select'):Show()
287287
end
288-
h:Lookup('Image_KungFu'):FromIconID(Table_GetSkillIconID(info.dwActualMountKungfuID) or 1435)
288+
h:Lookup('Image_KungFu'):FromIconID(Table_GetSkillIconID(info.dwActualKungfuID) or 1435)
289289
h:Lookup('Text_Name'):SetText(nCount .. ' ' .. info.szName)
290290
h:Lookup('Image_life'):SetPercentage(info.fCurrentLife64 / math.max(info.fMaxLife64, 1))
291291
local box = h:Lookup('Box_Icon')

‎MY_TeamTools/src/MY_CharInfo.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ function CharInfo.UpdateFrame(frame, status, data)
9292
return { 255, 255, 255 }
9393
end
9494
-- 设置基础属性
95-
ui:Children('#Image_Kungfu'):Icon((select(2, X.GetSkillName(data.dwActualMountKungfuID or data.dwMountKungfuID, 1))))
95+
ui:Children('#Image_Kungfu'):Icon((select(2, X.GetSkillName(data.dwActualKungfuID or data.dwKungfuID, 1))))
9696
ui:Children('#Text_Name'):Color({ X.GetForceColor(data.dwForceID) })
9797
-- 绘制属性条
9898
local y0 = 20

‎MY_TeamTools/src/MY_CombatLogs.lua‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -416,8 +416,8 @@ function D.OnTargetUpdate(dwID, bForce)
416416
dwMountKungfuID = UI_GetPlayerMountKungfuID()
417417
else
418418
local info = X.GetTeamMemberInfo(dwID)
419-
if info and not X.IsEmpty(info.dwActualMountKungfuID) then
420-
dwMountKungfuID = info.dwActualMountKungfuID
419+
if info and not X.IsEmpty(info.dwActualKungfuID) then
420+
dwMountKungfuID = info.dwActualKungfuID
421421
else
422422
local kungfu = player.GetKungfuMount()
423423
if kungfu then

‎MY_TeamTools/src/MY_JBAchievementRank.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ X.RegisterEvent({
238238
local info = X.GetTeamMemberInfo(dwTarID)
239239
local guid = X.GetPlayerGlobalID(dwTarID) or 0
240240
if info then
241-
table.insert(aTeammate, info.szName .. ',' .. info.dwActualMountKungfuID .. ',' .. guid .. ',' .. dwTarID)
241+
table.insert(aTeammate, info.szName .. ',' .. info.dwActualKungfuID .. ',' .. guid .. ',' .. dwTarID)
242242
end
243243
end
244244
else

‎MY_TeamTools/src/MY_JBTeamSnapshot.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ function D.CreateSnapshot()
5050
for _, dwTarID in ipairs(team.GetTeamMemberList()) do
5151
local info = X.GetTeamMemberInfo(dwTarID)
5252
local guid = X.GetPlayerGlobalID(dwTarID) or 0
53-
table.insert(aTeammate, info.szName .. ',' .. dwTarID .. ',' .. guid .. ',' .. info.dwActualMountKungfuID)
53+
table.insert(aTeammate, info.szName .. ',' .. dwTarID .. ',' .. guid .. ',' .. info.dwActualKungfuID)
5454
end
5555
end
5656
local me = X.GetClientPlayer()

0 commit comments

Comments
 (0)