fix: 修复子插件逻辑中 bOnline 兼容性问题

Author: tinymins

MY_Cataclysm/src/MY_CataclysmParty.lua

@@ -181,7 +181,7 @@ end
 
 local function OpenRaidDragPanel(dwMemberID)
 	local hTeam = GetClientTeam()
-	local tMemberInfo = hTeam.GetMemberInfo(dwMemberID)
+	local tMemberInfo = X.GetTeamMemberInfo(dwMemberID)
 	if not tMemberInfo then
 		return
 	end
@@ -202,7 +202,7 @@ local function OpenRaidDragPanel(dwMemberID)
 
 	local hImageLife = hMember:Lookup('Image_Health')
 	local hImageMana = hMember:Lookup('Image_Mana')
-	if tMemberInfo.bIsOnLine then
+	if tMemberInfo.bOnline then
 		local fCurrentLife, fMaxLife = X.GetCharacterLife(tMemberInfo)
 		if fMaxLife > 0 then
 			hImageLife:SetPercentage(fCurrentLife / fMaxLife)
@@ -330,7 +330,7 @@ end
 function D.SetTargetTeammate(dwID, info)
 	if X.IsInPubgMap() and X.GetClientPlayer().nMoveState == MOVE_STATE.ON_DEATH then
 		BattleField_MatchPlayer(dwID)
-	elseif info.bIsOnLine and CanTarget(dwID) then -- 有待考证
+	elseif info.bOnline and CanTarget(dwID) then -- 有待考证
 		if CFG.bTempTargetEnable then
 			X.DelayCall('MY_Cataclysm_TempTarget', false)
 			CTM_TEMP_TARGET_TYPE, CTM_TEMP_TARGET_ID = nil
@@ -436,7 +436,7 @@ function MY_CataclysmParty_Base.OnItemMouseEnter()
 	OnItemRefreshTip()
 	local dwID = (this.bBuff and this:GetParent():GetParent().dwID) or (this.bRole and this.dwID)
 	local info = dwID ~= CTM_TEMP_TARGET_ID and CTM:GetMemberInfo(dwID) or nil
-	if info and info.bIsOnLine and CanTarget(dwID) and CFG.bTempTargetEnable then
+	if info and info.bOnline and CanTarget(dwID) and CFG.bTempTargetEnable then
 		X.DelayCall('MY_Cataclysm_TempTarget', false)
 		local function fnAction()
 			if not CTM_TEMP_TARGET_TYPE then
@@ -534,12 +534,12 @@ function MY_CataclysmParty_Base.OnItemRButtonClick()
 				table.insert(menu, v)
 			end
 		end
-		table.insert(menu, { szOption = g_tStrings.STR_LOOKUP, bDisable = not info.bIsOnLine, fnAction = function()
+		table.insert(menu, { szOption = g_tStrings.STR_LOOKUP, bDisable = not info.bOnline, fnAction = function()
 			X.ViewOtherPlayerByID(dwID)
 		end })
 		if MY_CharInfo and MY_CharInfo.ViewCharInfoToPlayer then
 			table.insert(menu, {
-				szOption = g_tStrings.STR_LOOK .. g_tStrings.STR_EQUIP_ATTR, bDisable = not info.bIsOnLine, fnAction = function()
+				szOption = g_tStrings.STR_LOOK .. g_tStrings.STR_EQUIP_ATTR, bDisable = not info.bOnline, fnAction = function()
 					MY_CharInfo.ViewCharInfoToPlayer(dwID)
 				end
 			})
@@ -1963,7 +1963,7 @@ function CTM:DrawHPMP(h, dwID, info, bRefresh)
 	if CFG.nBGColorMode ~= CTM_BG_COLOR_MODE.BY_DISTANCE then
 		if h.nDistanceLevel then
 			nAlpha = CFG.tDistanceAlpha[h.nDistanceLevel]
-		elseif info.bIsOnLine then
+		elseif info.bOnline then
 			nAlpha = CFG.tOtherAlpha[3]
 		else
 			nAlpha = CFG.tOtherAlpha[2]
@@ -1991,13 +1991,13 @@ function CTM:DrawHPMP(h, dwID, info, bRefresh)
 		end
 		if bSha then
 			local r, g, b = unpack(CFG.tManaColor)
-			if not info.bIsOnLine then
+			if not info.bOnline then
 				r, g, b = unpack(CFG.tOtherCol[2]) -- 不在线就灰色了
 			end
 			self:DrawShadow(Msha, hMana:GetW() * nPercentage, Msha:GetH(), r, g, b, nAlpha, CFG.bManaGradient)
 			Msha:Show()
 		else
-			if info.bIsOnLine then
+			if info.bOnline then
 				Mimg:ToNormal()
 			else
 				Mimg:ToGray()
@@ -2048,7 +2048,7 @@ function CTM:DrawHPMP(h, dwID, info, bRefresh)
 			-- 颜色计算
 			local nNewW = hLife:GetW() * fLifePercentage
 			local r, g, b = unpack(CFG.tOtherCol[2]) -- 不在线就灰色了
-			if info.bIsOnLine then
+			if info.bOnline then
 				if CFG.nBGColorMode == CTM_BG_COLOR_MODE.BY_DISTANCE then
 					if player or X.GetPlayer(dwID) then
 						if h.nDistanceLevel then
@@ -2073,7 +2073,7 @@ function CTM:DrawHPMP(h, dwID, info, bRefresh)
 			Ledg:SetAlpha(nAlpha)
 			Ledg:SetRelX(nRelX)
 			Ledg:SetAbsX(hLife:GetAbsX() + nRelX)
-			if info.bIsOnLine then
+			if info.bOnline then
 				Limg:ToNormal()
 			else
 				Limg:ToGray()
@@ -2091,15 +2091,15 @@ function CTM:DrawHPMP(h, dwID, info, bRefresh)
 		-- 数值绘制
 		local life = h:Lookup('Text_Life')
 		local nFontAlpha = math.min(nAlpha * 0.4 + 255 * 0.6, 255)
-		if not info.bIsOnLine then
+		if not info.bOnline then
 			nFontAlpha = nFontAlpha * 0.8
 		end
 		life:SetAlpha(nAlpha == 0 and 0 or nFontAlpha)
 		life:SetFontScheme(CFG.nLifeFont)
 		life:SetFontScale(CFG.fLifeFontScale)
 		h:Lookup('Text_Name'):SetAlpha(nFontAlpha)
 
-		if not bDeathFlag and info.bIsOnLine then
+		if not bDeathFlag and info.bOnline then
 			life:SetFontColor(255, 255, 255)
 			if CFG.nHPShownMode2 == 0 then
 				life:SetText('')
@@ -2125,7 +2125,7 @@ function CTM:DrawHPMP(h, dwID, info, bRefresh)
 					end
 				end
 			end
-		elseif not info.bIsOnLine then
+		elseif not info.bOnline then
 			life:SetText('')
 		elseif bDeathFlag then
 			life:SetText('')
@@ -2137,10 +2137,10 @@ function CTM:DrawHPMP(h, dwID, info, bRefresh)
 			-- life:SetText('sync ...')
 		-- end
 		h:Lookup('Text_Death'):SetVisible(bDeathFlag)
-		h:Lookup('Text_OffLine'):SetVisible(not info.bIsOnLine)
+		h:Lookup('Text_OffLine'):SetVisible(not info.bOnline)
 		h:Lookup('Text_Death'):SetFontScale(CFG.fLifeFontScale)
 		h:Lookup('Text_OffLine'):SetFontScale(CFG.fLifeFontScale)
-		h:Lookup('Image_PlayerBg'):SetVisible(info.bIsOnLine)
+		h:Lookup('Image_PlayerBg'):SetVisible(info.bOnline)
 	end
 end
 
@@ -2157,11 +2157,11 @@ function CTM:RefreshSputtering()
 			for _, dwID in pairs(tGroupInfo.MemberList) do
 				local info, nCount = team.GetMemberInfo(dwID), 0
 				local player = X.GetPlayer(dwID)
-				if player and not info.bDeathFlag and info.bIsOnLine then
+				if player and not info.bDeathFlag and info.bOnline then
 					for _, dwID2 in pairs(tGroupInfo.MemberList) do
 						local info2 = team.GetMemberInfo(dwID2)
 						local player2 = X.GetPlayer(dwID2)
-						if player2 and not info2.bDeathFlag and info2.bIsOnLine
+						if player2 and not info2.bDeathFlag and info2.bOnline
 						and X.GetCharacterDistance(player, player2, 'gwwean') <= CFG.nSputteringDistance then
 							nCount = nCount + 1
 						end
@@ -2227,7 +2227,7 @@ function CTM:StartTeamVote(eType)
 	for k, v in pairs(CTM_CACHE) do
 		if v:IsValid() then
 			local info = self:GetMemberInfo(k)
-			local bAwait = info.bIsOnLine
+			local bAwait = info.bOnline
 			if k == X.GetClientPlayerID() then
 				if eType == 'raid_ready' then
 					bAwait = false

MY_GKP/src/MY_GKP.lua

@@ -277,8 +277,8 @@ end
 function D.GetTeamMemberMenu(fnAction, bDisable, bSelf)
 	local tTeam, menu = {}, {}
 	for _, v in ipairs(GetClientTeam().GetTeamMemberList()) do
-		local info = GetClientTeam().GetMemberInfo(v)
-		table.insert(tTeam, { szName = info.szName, dwID = v, dwForce = info.dwForceID, bIsOnLine = info.bIsOnLine})
+		local info = X.GetTeamMemberInfo(v)
+		table.insert(tTeam, { szName = info.szName, dwID = v, dwForce = info.dwForceID, bOnline = info.bOnline})
 	end
 	local dwID = X.GetClientPlayerID()
 	table.sort(tTeam, function(a, b) return a.dwForce < b.dwForce end)
@@ -288,7 +288,7 @@ function D.GetTeamMemberMenu(fnAction, bDisable, bSelf)
 			table.insert(menu, {
 				szOption = v.szName,
 				szLayer  = 'ICON_RIGHTMOST',
-				bDisable = bDisable and not v.bIsOnLine,
+				bDisable = bDisable and not v.bOnline,
 				szIcon   = szIcon,
 				nFrame   = nFrame,
 				rgb      = { X.GetForceColor(v.dwForce) },

MY_GKP/src/MY_GKPLoot.lua

@@ -1382,21 +1382,20 @@ function D.DistributeItem(dwID, info, szAutoDistType, bSkipRecordPanel)
 		end
 	end
 	local item         = GetItem(info.dwID)
-	local team         = GetClientTeam()
-	local player       = team.GetMemberInfo(dwID)
+	local playerInfo   = X.GetTeamMemberInfo(dwID)
 	local aPartyMember = D.GetaPartyMember(info.dwDoodadID)
 	if item then
-		if not player or (player and not player.bIsOnLine) then -- 不在线
+		if not playerInfo or (playerInfo and not playerInfo.bOnline) then -- 不在线
 			return X.Alert(_L['No Pick up Object, may due to Network off - line'])
 		end
 		if not aPartyMember(dwID) then -- 给不了
 			return X.Alert(_L['No Pick up Object, may due to Network off - line'])
 		end
-		if player.dwMapID ~= me.GetMapID() then -- 不在同一地图
+		if playerInfo.dwMapID ~= me.GetMapID() then -- 不在同一地图
 			return X.Alert(_L['No Pick up Object, Please confirm that in the Dungeon.'])
 		end
 		local tab = {
-			szPlayer   = player.szName,
+			szPlayer   = playerInfo.szName,
 			dwID       = item.dwID,
 			nUiId      = item.nUiId,
 			szNpcName  = info.szDoodadName,
@@ -1406,7 +1405,7 @@ function D.DistributeItem(dwID, info, szAutoDistType, bSkipRecordPanel)
 			nVersion   = item.nVersion,
 			nTime      = GetCurrentTime(),
 			nQuality   = item.nQuality,
-			dwForceID  = player.dwForceID,
+			dwForceID  = playerInfo.dwForceID,
 			szName     = X.GetItemNameByItem(item),
 			nGenre     = item.nGenre,
 		}

MY_Recount/src/MY_Recount_DS.lua

@@ -1724,9 +1724,9 @@ X.RegisterEvent('MY_RECOUNT_NEW_FIGHT', function() -- 
 	local me = X.GetClientPlayer()
 	if team and me and (me.IsInParty() or me.IsInRaid()) then
 		for _, dwID in ipairs(team.GetTeamMemberList()) do
-			local info = team.GetMemberInfo(dwID)
+			local info = X.GetTeamMemberInfo(dwID)
 			if info then
-				if not info.bIsOnLine then
+				if not info.bOnline then
 					D.OnTeammateStateChange(dwID, true, AWAYTIME_TYPE.OFFLINE, true)
 				elseif info.bDeathFlag then
 					D.OnTeammateStateChange(dwID, true, AWAYTIME_TYPE.DEATH, true)

MY_TeamTools/src/MY_CombatLogs.lua

@@ -797,10 +797,10 @@ X.RegisterEvent('MY_RECOUNT_NEW_FIGHT', function() -- 
 		return
 	end
 	for _, dwID in ipairs(team.GetTeamMemberList()) do
-		local info = team.GetMemberInfo(dwID)
+		local info = X.GetTeamMemberInfo(dwID)
 		if info and D.WillRecID(dwID) then
 			D.OnTargetUpdate(dwID)
-			if not info.bIsOnLine then
+			if not info.bOnline then
 				D.InsertLog(LOG_TYPE.PARTY_SET_MEMBER_ONLINE_FLAG, { team.dwTeamID, dwID, 0 })
 			elseif info.bDeathFlag then
 				D.InsertLog(LOG_TYPE.SYS_MSG_UI_OME_DEATH_NOTIFY, { dwID, nil })

MY_TeamTools/src/MY_TeamTools_Achievement.lua

@@ -223,12 +223,12 @@ X.RegisterEvent('LOADING_ENDING', function()
 end)
 
 -- 获取成员列表
-function D.GetMemberList(bIsOnLine)
+function D.GetMemberList(bOnline)
 	local aList = {}
 	if MY_TeamTools.szStatRange == 'RAID' then
 		for _, dwID in ipairs(X.GetTeamMemberList()) do
 			local tMember = X.GetTeamMemberInfo(dwID)
-			if tMember and (not bIsOnLine or tMember.bOnline) then
+			if tMember and (not bOnline or tMember.bOnline) then
 				table.insert(aList, {
 					dwID = tMember.dwID,
 					szGlobalID = tMember.szGlobalID,

MY_TeamTools/src/MY_TeamTools_Summary.lua

@@ -198,7 +198,7 @@ function D.CalculateSort(tInfo)
 			nCount = tInfo[RT_SORT_FIELD]
 		end
 	end
-	if nCount == 0 and not tInfo.bIsOnLine then
+	if nCount == 0 and not tInfo.bOnline then
 		nCount = -2
 	end
 	return nCount
@@ -269,7 +269,7 @@ function D.UpdateList(page)
 			end
 			local hBuff = h:Lookup('Box_Buff')
 			local hBox = h:Lookup('Box_Grandpa')
-			if not v.bIsOnLine then
+			if not v.bOnline then
 				h.hHandle_Equip.Pool:Clear()
 				h:Lookup('Text_Toofar1'):Show()
 				h:Lookup('Text_Toofar1'):SetText(g_tStrings.STR_GUILD_OFFLINE)
@@ -279,7 +279,7 @@ function D.UpdateList(page)
 				h:Lookup('Text_Toofar1'):Show()
 				if MY_TeamTools.szStatRange == 'ROOM' then
 					h:Lookup('Text_Toofar1'):SetText('-')
-				elseif v.bIsOnLine then
+				elseif v.bOnline then
 					h:Lookup('Text_Toofar1'):SetText(_L['Too far'])
 				end
 				hBuff:Hide()
@@ -476,7 +476,7 @@ function D.UpdateList(page)
 			else
 				if MY_TeamTools.szStatRange == 'ROOM' then
 					hScore:SetText('-')
-				elseif v.bIsOnLine then
+				elseif v.bOnline then
 					hScore:SetText(_L['Loading'])
 				else
 					hScore:SetText(g_tStrings.STR_GUILD_OFFLINE)
@@ -841,11 +841,11 @@ function D.GetTeamData(page)
 			nCopyID           = nil, -- 秘境ID
 			tBossKill         = {}, -- 秘境进度
 			nFightState       = KPlayer and KPlayer.bFightState and 1 or 0, -- 战斗状态
-			bIsOnLine         = true,
+			bOnline           = true,
 			bGrandpa          = false, -- 大爷
 		}
 		if tMember.bOnline ~= nil then
-			tInfo.bIsOnLine = tMember.bOnline
+			tInfo.bOnline = tMember.bOnline
 		end
 		if KPlayer then
 			-- 小吃和buff
@@ -868,7 +868,7 @@ function D.GetTeamData(page)
 		end
 		-- 秘境进度
 		if MY_TeamTools.szStatRange == 'RAID' then
-			if tInfo.bIsOnLine and bCDProgressMap then
+			if tInfo.bOnline and bCDProgressMap then
 				for i, boss in ipairs(aProgressMapBoss) do
 					tInfo.tBossKill[i] = GetDungeonRoleProgress(RT_MAP_ID, tMember.dwID, boss.dwProgressID)
 				end
@@ -897,8 +897,8 @@ function D.ApplyTeamEquip(page)
 		local team = GetClientTeam()
 		for _, tMember in ipairs(D.GetMemberList()) do
 			if tMember.dwID ~= X.GetClientPlayerID() then
-				local info = team.GetMemberInfo(tMember.dwID)
-				if info.bIsOnLine then
+				local info = X.GetTeamMemberInfo(tMember.dwID)
+				if info.bOnline then
 					D.ApplyRemotePlayerView(page, tMember.dwID, tMember.dwServerID, tMember.szGlobalID)
 				end
 			end
@@ -907,12 +907,12 @@ function D.ApplyTeamEquip(page)
 end
 
 -- 获取团队成员列表
-function D.GetMemberList(bIsOnLine)
+function D.GetMemberList(bOnline)
 	local aList = {}
 	if MY_TeamTools.szStatRange == 'RAID' then
 		for _, dwID in ipairs(X.GetTeamMemberList()) do
 			local tMember = X.GetTeamMemberInfo(dwID)
-			if tMember and (not bIsOnLine or tMember.bOnline) then
+			if tMember and (not bOnline or tMember.bOnline) then
 				table.insert(aList, {
 					dwID = tMember.dwID,
 					szGlobalID = tMember.szGlobalID,

MY_Toolbox/src/MY_Love.lua

@@ -932,8 +932,8 @@ function D.RequestBackupLover()
 	local lover = X.Clone(D.lover)
 	if lover.nLoverType == 1 then -- 双向
 		local kTarget = D.GetNearbyPlayerByXID(lover.xID)
-		local info = kTarget and GetClientTeam().GetMemberInfo(kTarget.dwID)
-		if not info or not info.bIsOnLine then
+		local info = kTarget and X.GetTeamMemberInfo(kTarget.dwID)
+		if not info or not info.bOnline then
 			X.OutputSystemAnnounceMessage(_L['Lover must in your team and online to do backup.'])
 		else
 			X.SendBgMsg(lover.szName, 'MY_LOVE', {'BACKUP'})