wasteland / server

Commit eb5b69f0ccede5249523206455ee57910e8f3406

Authored by zhouhaihai
2 parents 7bbb7931 150e01af

Merge branch 'develop' into qa

Showing 2 changed files with 9 additions and 9 deletions   Show diff stats
Inline Side-by-side
src/actions/GmAction.lua
  Show/Hide comments   View file @eb5b69f
... ... @@ -354,16 +354,16 @@ function _M.adv(role, pms)
354 354 local chapterId = tonum(pms.pm1)
355 355 local layer = tonum(pms.pm2)
356 356  
357   - local advData = csvdb["adv_chapterCsv"][chapterId]
358   - if not advData then return end
  357 + local advCsv = csvdb["adv_chapterCsv"][chapterId]
  358 + if not advCsv then return end
359 359 if math.floor(chapterId / 100) ~= 2 then
360   - layer = math.min(layer, advData.limitlevel)
  360 + layer = math.min(layer, advCsv.limitlevel)
361 361 end
362 362 local advPass = role:getProperty("advPass")
363 363 local addPre
364 364 addPre = function(chapterId)
365   - local advData = csvdb["adv_chapterCsv"][chapterId]
366   - for pre, l in ipairs(advData.prepose:toNumMap()) do
  365 + local advCsv = csvdb["adv_chapterCsv"][chapterId]
  366 + for pre, l in ipairs(advCsv.prepose:toNumMap()) do
367 367 if (advPass[pre] or 0) < l then
368 368 advPass[pre] = l
369 369 addPre(pre)
... ... @@ -384,15 +384,15 @@ table.insert(helpDes, {&quot;冒险到达指定层&quot;, &quot;advt&quot;, &quot;章节id&quot;, &quot;层数&quot;})
384 384 function _M.advt(role, pms)
385 385 local chapterId = tonum(pms.pm1)
386 386 local layer = tonum(pms.pm2)
387   - local advData = csvdb["adv_chapterCsv"][chapterId]
388   - if not advData then return "不存在的章节" end
  387 + local advCsv = csvdb["adv_chapterCsv"][chapterId]
  388 + if not advCsv then return "不存在的章节" end
389 389  
390 390 local advData = role:getAdvData()
391 391 if not advData.chapterId then
392 392 return "先随便开启一关"
393 393 end
394 394 if not advData:isEndless() then
395   - layer = math.min(layer, advData.limitlevel)
  395 + layer = math.min(layer, advCsv.limitlevel)
396 396 end
397 397  
398 398 _M.adv(role, {pm1 = chapterId, pm2 = layer - 1})
... ...
src/models/RolePvp.lua
  Show/Hide comments   View file @eb5b69f
... ... @@ -98,7 +98,7 @@ function Role:calculatePvpHGift(division)
98 98 newTime = oldTime + times * globalCsv.pvp_high_reward_add_pre
99 99  
100 100 for itemId, count in pairs(divisionData.reward:toNumMap()) do
101   - newReward[itemId] = math.min((newReward[itemId] or 0) + count, divisionData.limit)
  101 + newReward[itemId] = math.min((newReward[itemId] or 0) + count * times, divisionData.limit)
102 102 end
103 103 end
104 104 return newTime, newReward
... ...