wasteland / server

Commit f84286c1f47b5077b9a9d009c1394b900e041dc2

Authored by 熊润斐
2 parents 439fad96 2485b746

Merge branch 'cn/develop' into cn/publish/release

Showing 1 changed file with 11 additions and 7 deletions   Show diff stats
Inline Side-by-side
src/models/RoleCross.lua
  Show/Hide comments   View file @f84286c
@@ -6,13 +6,13 @@ local RoleCross = {} @@ -6,13 +6,13 @@ local RoleCross = {}
6 RoleCross.bind = function (Role) 6 RoleCross.bind = function (Role)
7 -- 好友列表简约信息 7 -- 好友列表简约信息
8 function Role:friendSInfo() 8 function Role:friendSInfo()
  9 + local fteam = self.getProperty("friendTeam") or {}
9 local info = { 10 local info = {
10 name = self:getProperty("name"), 11 name = self:getProperty("name"),
11 level = self:getProperty("level"), 12 level = self:getProperty("level"),
12 headId = self:getProperty("headId"), 13 headId = self:getProperty("headId"),
13 ltime = self:getProperty("ltime"), 14 ltime = self:getProperty("ltime"),
14 -  
15 - battleV = self.getProperty("friendTeam").v or 0, 15 + battleV = fteam.v or 0,
16 --battleV = self:getProperty("pvpTBVC") ~= 0 and self:getProperty("pvpTBVC") or self:getProperty("hangTBV") 16 --battleV = self:getProperty("pvpTBVC") ~= 0 and self:getProperty("pvpTBVC") or self:getProperty("hangTBV")
17 } 17 }
18 return info 18 return info
@@ -23,7 +23,8 @@ RoleCross.bind = function (Role) @@ -23,7 +23,8 @@ RoleCross.bind = function (Role)
23 local info = self:friendSInfo() 23 local info = self:friendSInfo()
24 --local team = self:getProperty("pvpTBVC") ~= 0 and self:getProperty("pvpTSC") or self:getProperty("hangTS") 24 --local team = self:getProperty("pvpTBVC") ~= 0 and self:getProperty("pvpTSC") or self:getProperty("hangTS")
25 --info.team = team 25 --info.team = team
26 - info.team = self:getProperty("friendTeam").team or {} 26 + local fteam = self.getProperty("friendTeam") or {}
  27 + info.team = fteam.team or {}
27 info.heroCnt = self:getProperty("heroCnt") 28 info.heroCnt = self:getProperty("heroCnt")
28 info.achieveCnt = table.numbers(self:getProperty("achiveV")) 29 info.achieveCnt = table.numbers(self:getProperty("achiveV"))
29 info.bgId = self:getProperty("bgId") 30 info.bgId = self:getProperty("bgId")
@@ -283,19 +284,21 @@ end @@ -283,19 +284,21 @@ end
283 function CMD.friendSInfo(roleId) 284 function CMD.friendSInfo(roleId)
284 --local info = CMD.getProperties(roleId, {"name", "level", "headId", "ltime", "pvpTBVC", "hangTBV"}) 285 --local info = CMD.getProperties(roleId, {"name", "level", "headId", "ltime", "pvpTBVC", "hangTBV"})
285 local info = CMD.getProperties(roleId, {"name", "level", "headId", "ltime", "friendTeam"}) 286 local info = CMD.getProperties(roleId, {"name", "level", "headId", "ltime", "friendTeam"})
  287 + local fteam = info.friendTeam or {}
286 return { 288 return {
287 name = info.name, 289 name = info.name,
288 level = info.level, 290 level = info.level,
289 headId = info.headId, 291 headId = info.headId,
290 ltime = info.ltime, 292 ltime = info.ltime,
291 --battleV = info.pvpTBVC ~= 0 and info.pvpTBVC or info.hangTBV, 293 --battleV = info.pvpTBVC ~= 0 and info.pvpTBVC or info.hangTBV,
292 - battleV = info.friendTeam.v or 0, 294 + battleV = fteam.v or 0,
293 } 295 }
294 end 296 end
295 297
296 function CMD.friendInfo(roleId) 298 function CMD.friendInfo(roleId)
297 --local info = CMD.getProperties(roleId, {"name", "level", "headId", "ltime", "pvpTBVC", "hangTBV", "pvpTSC", "hangTS"}) 299 --local info = CMD.getProperties(roleId, {"name", "level", "headId", "ltime", "pvpTBVC", "hangTBV", "pvpTSC", "hangTS"})
298 local info = CMD.getProperties(roleId, {"name", "level", "headId", "ltime", "friendTeam", "heroCnt", "achiveV", "bgId", "hangPass"}) 300 local info = CMD.getProperties(roleId, {"name", "level", "headId", "ltime", "friendTeam", "heroCnt", "achiveV", "bgId", "hangPass"})
  301 + local fteam = info.friendTeam or {}
299 return { 302 return {
300 name = info.name, 303 name = info.name,
301 level = info.level, 304 level = info.level,
@@ -303,8 +306,8 @@ function CMD.friendInfo(roleId) @@ -303,8 +306,8 @@ function CMD.friendInfo(roleId)
303 ltime = info.ltime, 306 ltime = info.ltime,
304 --battleV = info.pvpTBVC ~= 0 and info.pvpTBVC or info.hangTBV, 307 --battleV = info.pvpTBVC ~= 0 and info.pvpTBVC or info.hangTBV,
305 --team = info.pvpTBVC ~= 0 and info.pvpTSC or info.hangTS 308 --team = info.pvpTBVC ~= 0 and info.pvpTSC or info.hangTS
306 - battleV = info.friendTeam.v or 0,  
307 - team = info.friendTeam.team or {}, 309 + battleV = fteam.v or 0,
  310 + team = fteam.team or {},
308 heroCnt = info.heroCnt, 311 heroCnt = info.heroCnt,
309 achieveCnt = table.numbers(info.achiveV), 312 achieveCnt = table.numbers(info.achiveV),
310 bgId = info.bgId, 313 bgId = info.bgId,
@@ -316,7 +319,8 @@ function CMD.friendBattleInfo(roleId) @@ -316,7 +319,8 @@ function CMD.friendBattleInfo(roleId)
316 --local info = CMD.getProperties(roleId, {"pvpTBC", "hangTB"}) 319 --local info = CMD.getProperties(roleId, {"pvpTBC", "hangTB"})
317 local info = CMD.getProperties(roleId, {"friendTeam"}) 320 local info = CMD.getProperties(roleId, {"friendTeam"})
318 --return (next(info.pvpTBC) and next(info.pvpTBC.heros)) and info.pvpTBC or info.hangTB 321 --return (next(info.pvpTBC) and next(info.pvpTBC.heros)) and info.pvpTBC or info.hangTB
319 - return info.friendTeam.bInfo or {} 322 + local fteam = info.friendTeam or {}
  323 + return fteam.bInfo or {}
320 end 324 end
321 325
322 function CMD.pvpCInfo(roleId) 326 function CMD.pvpCInfo(roleId)