diff --git a/src/actions/ActivityAction.lua b/src/actions/ActivityAction.lua index bd897f9..b618783 100644 --- a/src/actions/ActivityAction.lua +++ b/src/actions/ActivityAction.lua @@ -703,6 +703,10 @@ function _M.endBattleRpc(agent, data) role:checkStoryStatus(false, 5, id) end + if battleCfg.worldBoss_award ~= 0 and msg.point then + battleInfo["bossP"] = (battleInfo["bossP"] or 0) + msg.point + end + reward, change = role:award(reward, {log = {desc = "actBattle", int1 = actid, int2 = newStarNum}}) SendPacket(actionCodes.Activity_endBattleRpc, MsgPack.pack({ diff --git a/src/actions/HeroAction.lua b/src/actions/HeroAction.lua index 169d1a7..c11a4a6 100644 --- a/src/actions/HeroAction.lua +++ b/src/actions/HeroAction.lua @@ -975,12 +975,12 @@ function _M.drawHeroRpc(agent, data) SendPacket(actionCodes.Hero_drawHeroRpc, MsgPack.pack({reward = reward})) -- 这个 reward 是数组 local feedbackId = buildTypeData["can_feedback"] or 0 - if feedbackId ~= 1 then + if feedbackId ~= 0 then -- 达到一定次数,给响应奖励 local oldVal = role:getProperty("repayHero") or 0 if actid then local actData = role.activity:getActData("ActHeroPool") - oldVal = actData[btype] + oldVal = actData[btype] or 0 end local newVal = oldVal + drawCount[drawType] local drawCardReward, val = role:getDrawCardExtraReward(feedbackId, oldVal, newVal) diff --git a/src/csvdata b/src/csvdata index f0e032e..f6a6263 160000 --- a/src/csvdata +++ b/src/csvdata @@ -1 +1 @@ -Subproject commit f0e032edd4de127bf13d4a915e3909d724ba7652 +Subproject commit f6a626350c1f4039f0f677a1baf262f3493757d2 -- libgit2 0.21.2