wasteland / server

Commit 7bbb79311c3fb32e909f3fa606dcd041df1fa28c

Authored by zhouhaihai
2 parents 8e0e3fe9 75e7709e

Merge branch 'develop' into qa

Showing 1 changed file with 2 additions and 2 deletions   Show diff stats
Inline Side-by-side
src/actions/PvpAction.lua
  Show/Hide comments   View file @7bbb793
@@ -817,7 +817,7 @@ function _M.highDivisionGiftRpc(agent, data) @@ -817,7 +817,7 @@ function _M.highDivisionGiftRpc(agent, data)
817 local role = agent.role 817 local role = agent.role
818 local roleId = role:getProperty("id") 818 local roleId = role:getProperty("id")
819 819
820 - local pvpHGTime = self:getProperty("pvpHGTime") 820 + local pvpHGTime = role:getProperty("pvpHGTime")
821 if pvpHGTime == 0 then return end 821 if pvpHGTime == 0 then return end
822 local score = role:unpackPvpScore(redisproxy:zscore(role:getPvpDBKey(RANK_PVP_HIGHT), roleId)) 822 local score = role:unpackPvpScore(redisproxy:zscore(role:getPvpDBKey(RANK_PVP_HIGHT), roleId))
823 823
@@ -833,7 +833,7 @@ function _M.highDivisionGiftRpc(agent, data) @@ -833,7 +833,7 @@ function _M.highDivisionGiftRpc(agent, data)
833 local newTime, newReward = role:calculatePvpHGift(divisionId) 833 local newTime, newReward = role:calculatePvpHGift(divisionId)
834 if not next(newReward) then return end 834 if not next(newReward) then return end
835 835
836 - self:updateProperties({ 836 + role:updateProperties({
837 pvpHGTime = newTime, 837 pvpHGTime = newTime,
838 pvpHGift = {}, 838 pvpHGift = {},
839 }) 839 })