diff --git a/src/csvdata b/src/csvdata index 9aff702..7e36066 160000 --- a/src/csvdata +++ b/src/csvdata @@ -1 +1 @@ -Subproject commit 9aff702ee3155b22558066e653585574bc730791 +Subproject commit 7e360667871839f748175e801bbb1ff39ba802ac diff --git a/src/models/RoleCross.lua b/src/models/RoleCross.lua index e3b5a61..ba3dd60 100644 --- a/src/models/RoleCross.lua +++ b/src/models/RoleCross.lua @@ -6,13 +6,13 @@ local RoleCross = {} RoleCross.bind = function (Role) -- 好友列表简约信息 function Role:friendSInfo() + local fteam = self.getProperty("friendTeam") or {} local info = { name = self:getProperty("name"), level = self:getProperty("level"), headId = self:getProperty("headId"), ltime = self:getProperty("ltime"), - - battleV = self.getProperty("friendTeam").v or 0, + battleV = fteam.v or 0, --battleV = self:getProperty("pvpTBVC") ~= 0 and self:getProperty("pvpTBVC") or self:getProperty("hangTBV") } return info @@ -23,7 +23,8 @@ RoleCross.bind = function (Role) local info = self:friendSInfo() --local team = self:getProperty("pvpTBVC") ~= 0 and self:getProperty("pvpTSC") or self:getProperty("hangTS") --info.team = team - info.team = self:getProperty("friendTeam").team or {} + local fteam = self.getProperty("friendTeam") or {} + info.team = fteam.team or {} info.heroCnt = self:getProperty("heroCnt") info.achieveCnt = table.numbers(self:getProperty("achiveV")) info.bgId = self:getProperty("bgId") @@ -283,19 +284,21 @@ end function CMD.friendSInfo(roleId) --local info = CMD.getProperties(roleId, {"name", "level", "headId", "ltime", "pvpTBVC", "hangTBV"}) local info = CMD.getProperties(roleId, {"name", "level", "headId", "ltime", "friendTeam"}) + local fteam = info.friendTeam or {} return { name = info.name, level = info.level, headId = info.headId, ltime = info.ltime, --battleV = info.pvpTBVC ~= 0 and info.pvpTBVC or info.hangTBV, - battleV = info.friendTeam.v or 0, + battleV = fteam.v or 0, } end function CMD.friendInfo(roleId) --local info = CMD.getProperties(roleId, {"name", "level", "headId", "ltime", "pvpTBVC", "hangTBV", "pvpTSC", "hangTS"}) local info = CMD.getProperties(roleId, {"name", "level", "headId", "ltime", "friendTeam", "heroCnt", "achiveV", "bgId", "hangPass"}) + local fteam = info.friendTeam or {} return { name = info.name, level = info.level, @@ -303,8 +306,8 @@ function CMD.friendInfo(roleId) ltime = info.ltime, --battleV = info.pvpTBVC ~= 0 and info.pvpTBVC or info.hangTBV, --team = info.pvpTBVC ~= 0 and info.pvpTSC or info.hangTS - battleV = info.friendTeam.v or 0, - team = info.friendTeam.team or {}, + battleV = fteam.v or 0, + team = fteam.team or {}, heroCnt = info.heroCnt, achieveCnt = table.numbers(info.achiveV), bgId = info.bgId, @@ -316,7 +319,8 @@ function CMD.friendBattleInfo(roleId) --local info = CMD.getProperties(roleId, {"pvpTBC", "hangTB"}) local info = CMD.getProperties(roleId, {"friendTeam"}) --return (next(info.pvpTBC) and next(info.pvpTBC.heros)) and info.pvpTBC or info.hangTB - return info.friendTeam.bInfo or {} + local fteam = info.friendTeam or {} + return fteam.bInfo or {} end function CMD.pvpCInfo(roleId) -- libgit2 0.21.2