wasteland / server

Commit 125293660c14998060b047818ffc4b26e729fd04

Authored by zhouhaihai
2 parents ce3e592c 1627de1c

Merge branch 'tr/bugfix' into tr/publish/ts 

* tr/bugfix:
  铭文升级超过上限bug
  世界boss行动点奖励领完后重置
  世界boss行动点bug
  拾荒失败也要触发成就引导
Showing 4 changed files with 30 additions and 11 deletions   Show diff stats
Inline Side-by-side
src/actions/ActivityAction.lua
  Show/Hide comments   View file @1252936
... ... @@ -485,8 +485,16 @@ function _M.startBattleRpc(agent, data)
485 485 local bi = actData[id]
486 486 if not bi then return 8 end
487 487 local star = bi["star"] or 0
488   - if star < 1 then
489   - return 9
  488 + local maxP = bi["maxP"] or 0
  489 + -- 世界boss
  490 + if battleCfg.worldBoss_award ~= 0 then
  491 + if maxP < 1 then
  492 + return 9
  493 + end
  494 + else
  495 + if star < 1 then
  496 + return 9
  497 + end
490 498 end
491 499 num = num * count
492 500 end
... ... @@ -513,7 +521,7 @@ function _M.startBattleRpc(agent, data)
513 521 return 7
514 522 end
515 523 local bi = actData[id]
516   - local star = bi["star"]
  524 + local star = bi["star"] or 0
517 525 local award = battleCfg.item_clear:toNumMap()
518 526 if getStarCount(battleCfg, star) == 3 then
519 527 local aw = battleCfg.perfect_reward:toNumMap()
... ... @@ -528,7 +536,7 @@ function _M.startBattleRpc(agent, data)
528 536 SendPacket(actionCodes.Activity_startBattleRpc, MsgPack.pack(role:packReward(reward, change)))
529 537  
530 538 if battleCfg.worldBoss_award ~= 0 and (bi["maxP"] or 0) > 0 then
531   - bi["bossP"] = (bi["bossP"] or 0) + bi["maxP"]
  539 + bi["bossP"] = (bi["bossP"] or 0) + bi["maxP"] * count
532 540 end
533 541  
534 542 bi["sum"] = bi["sum"] + bi["top"]
... ... @@ -833,6 +841,7 @@ function _M.bossRewardRpc(agent, data)
833 841 local awardCfg = actCfg[index]
834 842 if not awardCfg then return 6 end
835 843  
  844 + local totalAwardCnt = #actCfg
836 845 local preList = awardCfg.condition1:toArray(true, "=")
837 846  
838 847 local actData = role.activity:getActData("ChallengeLevel") or {}
... ... @@ -860,6 +869,16 @@ function _M.bossRewardRpc(agent, data)
860 869 if not ok then return 8 end
861 870  
862 871 battleInfo["bossR"] = string.setbit(bossRecord, index)
  872 + local allFinish = true
  873 + for i = 1, totalAwardCnt do
  874 + if string.char(string.getbit(battleInfo["bossR"], i)) == "0" then
  875 + allFinish = false
  876 + break
  877 + end
  878 + end
  879 + if allFinish then
  880 + battleInfo["bossR"] = ""
  881 + end
863 882 battleInfo["bossP"] = bossPoint - 1
864 883 actData[id] = battleInfo
865 884 role.activity:updateActData("ChallengeLevel", actData)
... ...
src/actions/CarAction.lua
  Show/Hide comments   View file @1252936
... ... @@ -129,8 +129,8 @@ function _M.runeUpRpc( agent, data )
129 129 local runeData = runeSet[id]
130 130 if not runeData then return 5 end
131 131  
132   - local maxLv = #csvdb["rune_buildCsv"]
133   - if level >= maxLv then return 6 end
  132 + --local maxLv = #csvdb["rune_buildCsv"]
  133 + if level >= runeData.lvLimit then return 6 end
134 134 local lvData = csvdb["rune_buildCsv"][level]
135 135 local cost = lvData.cost:toNumMap()
136 136 if not role:checkItemEnough(cost) then
... ...
src/adv/Adv.lua
  Show/Hide comments   View file @1252936
... ... @@ -829,10 +829,10 @@ function Adv:over(success, rewardRatio, overType)
829 829 red:hset(RANK_ADV_INFO, roleId, MsgPack.pack(curInfo))
830 830 end)
831 831 end
832   - -- 通关的时候要把引导步骤设定到成就引导
833   - if not self.owner:checkOverGuide(57) then
834   - self.owner:saveGuide(57,1,true)
835   - end
  832 + end
  833 + -- 通关的时候要把引导步骤设定到成就引导
  834 + if not self.owner:checkOverGuide(57) then
  835 + self.owner:saveGuide(57,1,true)
836 836 end
837 837 self:clearAdvUnlockCache()
838 838  
... ...
1   -Subproject commit 94b161b3a3ae6933c8c9a8e3827721411368cad9
  1 +Subproject commit 5963ca5e80ac32e27cadf4c2553f1f24af8d9435
... ...