Commit 707e61add11c17ae639338548078fea799315424
Merge branch 'tr/bugfix' into tr/publish/ts
* tr/bugfix: 跨服竞技场 关卡boss活动扫荡累计伤害值不正确bug
Showing
4 changed files
with
6 additions
and
5 deletions
Show diff stats
src/actions/ActivityAction.lua
| ... | ... | @@ -539,7 +539,7 @@ function _M.startBattleRpc(agent, data) |
| 539 | 539 | bi["bossP"] = (bi["bossP"] or 0) + bi["maxP"] * count |
| 540 | 540 | end |
| 541 | 541 | |
| 542 | - bi["sum"] = bi["sum"] + bi["top"] | |
| 542 | + bi["sum"] = bi["sum"] + bi["top"] * count | |
| 543 | 543 | actData["ticket"] = ticket - num |
| 544 | 544 | actData[id] = bi |
| 545 | 545 | changeFlag = true | ... | ... |
src/models/RoleLog.lua
src/models/RolePvp.lua
| ... | ... | @@ -521,7 +521,7 @@ function Role:changeCrossServerPvpSelfInfo(cType) |
| 521 | 521 | change[cType] = self:getProperty(cType) |
| 522 | 522 | elseif cType == "format" then |
| 523 | 523 | -- 是否过了时间 |
| 524 | - local crossTime = skynet.timex() - self:getTimeResetStartTime(TimeReset.PvpCross) | |
| 524 | + local crossTime = skynet.timex() - self:getTimeResetStartTime(TimeReset.PvpCross) + RESET_TIME * 3600 | |
| 525 | 525 | local aday = 3600 * 24 |
| 526 | 526 | local day = math.ceil(crossTime / aday) -- 当前是第几个比赛日 |
| 527 | 527 | local ctime = crossTime % aday -- 当前在本天 经过多少时间 |
| ... | ... | @@ -615,7 +615,7 @@ end |
| 615 | 615 | |
| 616 | 616 | function Role:setCrossServerPvpBet(idx) |
| 617 | 617 | if not self:isTimeResetOpen(TimeReset.PvpCross) then return false , 1 end |
| 618 | - local crossTime = skynet.timex() - self:getTimeResetStartTime(TimeReset.PvpCross) | |
| 618 | + local crossTime = skynet.timex() - self:getTimeResetStartTime(TimeReset.PvpCross) + RESET_TIME * 3600 | |
| 619 | 619 | local aday = 3600 * 24 |
| 620 | 620 | local day = math.ceil(crossTime / aday) -- 当前是第几个比赛日 |
| 621 | 621 | local ctime = crossTime % aday -- 当前在本天 经过多少时间 | ... | ... |
src/services/pvpd.lua
| ... | ... | @@ -84,7 +84,7 @@ function CMD.updateRoleInfo(change) |
| 84 | 84 | CMD.refreshRoleInfo(change) |
| 85 | 85 | local pvpd = cluster.query("center", "pvpd") |
| 86 | 86 | if pvpd then |
| 87 | - pcall(cluster.call, "center", pvpd, "updateRoleInfo", change) | |
| 87 | + pcall(cluster.send, "center", pvpd, "updateRoleInfo", change) | |
| 88 | 88 | end |
| 89 | 89 | end |
| 90 | 90 | |
| ... | ... | @@ -92,7 +92,7 @@ local function getDayAndTime() |
| 92 | 92 | local startTime = getStartTime() |
| 93 | 93 | local now = skynet.timex() |
| 94 | 94 | |
| 95 | - local crossTime = now - startTime | |
| 95 | + local crossTime = now - startTime + RESET_TIME * 3600 | |
| 96 | 96 | local aday = 3600 * 24 |
| 97 | 97 | local day = math.ceil(crossTime / aday) -- 当前是第几个比赛日 |
| 98 | 98 | local ctime = crossTime % aday -- 当前在本天 经过多少时间 | ... | ... |