Skip to content

Commit f298ea5

Browse files
tinyminstinymins
committed
feat: 优化目标实际心法显示
1 parent 6dbcf19 commit f298ea5

File tree

12 files changed

+34
-31
lines changed

12 files changed

+34
-31
lines changed

‎MY_Cataclysm/src/MY_CataclysmParty.lua‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1120,10 +1120,10 @@ function CTM:RefreshImages(h, dwID, info, tSetting, bIcon, bFormationLeader, bLa
11201120
if bIcon then -- 刷新icon
11211121
local img, bVisible = h:Lookup('Image_Icon'), true
11221122
if CFG.nShowIcon ~= 4 then
1123-
if CFG.nShowIcon == 2 and info.dwMountKungfuID == 0 then
1123+
if CFG.nShowIcon == 2 and info.dwActualMountKungfuID == 0 then
11241124
img:FromUITex('ui/image/TargetPanel/Target.UITex', 21)
11251125
elseif CFG.nShowIcon == 2 then
1126-
local _, nIconID = X.GetSkillName(info.dwMountKungfuID, 1)
1126+
local _, nIconID = X.GetSkillName(info.dwActualMountKungfuID, 1)
11271127
if nIconID == 1435 then nIconID = 889 end
11281128
img:FromIconID(nIconID)
11291129
elseif CFG.nShowIcon == 1 then
@@ -1186,7 +1186,7 @@ function CTM:RefreshImages(h, dwID, info, tSetting, bIcon, bFormationLeader, bLa
11861186
end
11871187
if CFG.nShowIcon == 4 then
11881188
local r, g, b = X.GetForceColor(info.dwForceID, 'foreground')
1189-
txtSchool:SetText(CTM_KUNGFU_TEXT[info.dwMountKungfuID])
1189+
txtSchool:SetText(CTM_KUNGFU_TEXT[info.dwActualMountKungfuID])
11901190
txtSchool:SetFontScheme(CFG.nNameFont)
11911191
txtSchool:SetFontColor(r, g, b)
11921192
txtSchool:SetFontScale(fScale)
@@ -2131,7 +2131,7 @@ function CTM:DrawHPMP(h, dwID, info, bRefresh)
21312131
life:SetFontColor(128, 128, 128)
21322132
life:SetText(COINSHOP_SOURCE_NULL)
21332133
end
2134-
-- if info.dwMountKungfuID == 0 then -- 没有同步成功时显示的内容
2134+
-- if info.dwActualMountKungfuID == 0 then -- 没有同步成功时显示的内容
21352135
-- life:SetText('sync ...')
21362136
-- end
21372137
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.dwMountKungfuID then
176-
hItem:Lookup('Handle_L/Handle_KungfuName/Text_Kungfu'):SetText(X.GetKungfuName(tMemberInfo.dwMountKungfuID))
175+
if tMemberInfo and tMemberInfo.dwActualMountKungfuID then
176+
hItem:Lookup('Handle_L/Handle_KungfuName/Text_Kungfu'):SetText(X.GetKungfuName(tMemberInfo.dwActualMountKungfuID))
177177
hInfoList:Lookup('Handle_Kungfu'):Show()
178-
hInfoList:Lookup('Handle_Kungfu/Image_Kungfu'):FromIconID(Table_GetSkillIconID(tMemberInfo.dwMountKungfuID, 1))
178+
hInfoList:Lookup('Handle_Kungfu/Image_Kungfu'):FromIconID(Table_GetSkillIconID(tMemberInfo.dwActualMountKungfuID, 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.dwMountKungfuID then
238-
hItem:Lookup('Handle_L/Handle_School/Image_School'):FromIconID(Table_GetSkillIconID(tMemberInfo.dwMountKungfuID, 1))
237+
if tMemberInfo and tMemberInfo.dwActualMountKungfuID then
238+
hItem:Lookup('Handle_L/Handle_School/Image_School'):FromIconID(Table_GetSkillIconID(tMemberInfo.dwActualMountKungfuID, 1))
239239
else
240240
local kungfu = KObject.GetKungfuMount()
241241
if kungfu then

‎MY_LifeBar/src/MY_LifeBar_ScreenArrow.lua‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -354,9 +354,9 @@ function D.OnBreathe()
354354
if dwID == X.GetClientPlayerID() then
355355
dwMountKungfuID = UI_GetPlayerMountKungfuID()
356356
else
357-
local info = GetClientTeam().GetMemberInfo(dwID)
358-
if info and not X.IsEmpty(info.dwMountKungfuID) then
359-
dwMountKungfuID = info.dwMountKungfuID
357+
local info = X.GetTeamMemberInfo(dwID)
358+
if info and not X.IsEmpty(info.dwActualMountKungfuID) then
359+
dwMountKungfuID = info.dwActualMountKungfuID
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.dwMountKungfuID then
143-
img:FromIconID(Table_GetSkillIconID(info.dwMountKungfuID, 1))
142+
if info and info.dwActualMountKungfuID then
143+
img:FromIconID(Table_GetSkillIconID(info.dwActualMountKungfuID, 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: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,11 +233,12 @@ function D.GetPlayer(dwID)
233233
player = X.GetClientPlayer()
234234
info = {
235235
dwMountKungfuID = UI_GetPlayerMountKungfuID(),
236+
dwActualMountKungfuID = UI_GetPlayerMountKungfuID(),
236237
szName = player.szName,
237238
}
238239
else
239240
player = X.GetPlayer(dwID)
240-
info = GetClientTeam().GetMemberInfo(dwID)
241+
info = X.GetTeamMemberInfo(dwID)
241242
end
242243
if info then
243244
if player then
@@ -284,7 +285,7 @@ function D.OnTableInsert(dwID, dwBuffID, nLevel, nIcon)
284285
if dwTargetID == dwID then
285286
h:Lookup('Image_Select'):Show()
286287
end
287-
h:Lookup('Image_KungFu'):FromIconID(Table_GetSkillIconID(info.dwMountKungfuID) or 1435)
288+
h:Lookup('Image_KungFu'):FromIconID(Table_GetSkillIconID(info.dwActualMountKungfuID) or 1435)
288289
h:Lookup('Text_Name'):SetText(nCount .. ' ' .. info.szName)
289290
h:Lookup('Image_life'):SetPercentage(info.fCurrentLife64 / math.max(info.fMaxLife64, 1))
290291
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.dwMountKungfuID, 1))))
95+
ui:Children('#Image_Kungfu'):Icon((select(2, X.GetSkillName(data.dwActualMountKungfuID or data.dwMountKungfuID, 1))))
9696
ui:Children('#Text_Name'):Color({ X.GetForceColor(data.dwForceID) })
9797
-- 绘制属性条
9898
local y0 = 20

‎MY_TeamTools/src/MY_CombatLogs.lua‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -415,9 +415,9 @@ function D.OnTargetUpdate(dwID, bForce)
415415
if dwID == X.GetClientPlayerID() then
416416
dwMountKungfuID = UI_GetPlayerMountKungfuID()
417417
else
418-
local info = GetClientTeam().GetMemberInfo(dwID)
419-
if info and not X.IsEmpty(info.dwMountKungfuID) then
420-
dwMountKungfuID = info.dwMountKungfuID
418+
local info = X.GetTeamMemberInfo(dwID)
419+
if info and not X.IsEmpty(info.dwActualMountKungfuID) then
420+
dwMountKungfuID = info.dwActualMountKungfuID
421421
else
422422
local kungfu = player.GetKungfuMount()
423423
if kungfu then

‎MY_TeamTools/src/MY_JBAchievementRank.lua‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,10 +235,10 @@ X.RegisterEvent({
235235
end
236236
-- 团员
237237
for _, dwTarID in ipairs(team.GetTeamMemberList()) do
238-
local info = team.GetMemberInfo(dwTarID)
238+
local info = X.GetTeamMemberInfo(dwTarID)
239239
local guid = X.GetPlayerGlobalID(dwTarID) or 0
240240
if info then
241-
table.insert(aTeammate, info.szName .. ',' .. info.dwMountKungfuID .. ',' .. guid .. ',' .. dwTarID)
241+
table.insert(aTeammate, info.szName .. ',' .. info.dwActualMountKungfuID .. ',' .. guid .. ',' .. dwTarID)
242242
end
243243
end
244244
else

‎MY_TeamTools/src/MY_JBTeamSnapshot.lua‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ function D.CreateSnapshot()
4848
local team = X.IsClientPlayerInParty() and GetClientTeam()
4949
if team then
5050
for _, dwTarID in ipairs(team.GetTeamMemberList()) do
51-
local info = team.GetMemberInfo(dwTarID)
51+
local info = X.GetTeamMemberInfo(dwTarID)
5252
local guid = X.GetPlayerGlobalID(dwTarID) or 0
53-
table.insert(aTeammate, info.szName .. ',' .. dwTarID .. ',' .. guid .. ',' .. info.dwMountKungfuID)
53+
table.insert(aTeammate, info.szName .. ',' .. dwTarID .. ',' .. guid .. ',' .. info.dwActualMountKungfuID)
5454
end
5555
end
5656
local me = X.GetClientPlayer()

‎MY_TeamTools/src/MY_TeamTools_DeathLog.lua‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,15 +163,17 @@ local function OnDeath(dwID, dwKiller)
163163
szName = me.szName,
164164
dwForceID = me.dwForceID,
165165
dwMountKungfuID = UI_GetPlayerMountKungfuID(),
166+
dwActualMountKungfuID = UI_GetPlayerMountKungfuID(),
166167
}
167168
else
168169
local team = GetClientTeam()
169-
local info = team.GetMemberInfo(dwID)
170+
local info = X.GetTeamMemberInfo(dwID)
170171
if info then
171172
INFO_CACHE[dwID] = {
172173
szName = info.szName,
173174
dwForceID = info.dwForceID,
174-
dwMountKungfuID = info.dwMountKungfuID,
175+
dwMountKungfuID = info.dwActualMountKungfuID,
176+
dwActualMountKungfuID = info.dwActualMountKungfuID,
175177
}
176178
end
177179
end
@@ -233,7 +235,7 @@ function D.UpdatePage(page)
233235
local info = INFO_CACHE[dwID]
234236
if info then
235237
local h = hDeathList:AppendItemFromData(page.hDeathPlayer, 'Handle_DeathPlayer')
236-
local icon = select(2, MY_GetSkillName(info.dwMountKungfuID))
238+
local icon = select(2, MY_GetSkillName(info.dwActualMountKungfuID))
237239
local szName = info.szName
238240
h.dwID = dwID
239241
h.szName = szName

0 commit comments

Comments
 (0)