Commit 6857a37f1ea01143874e302e4bee962ee67c8587

Authored by liuzujun
1 parent 51cac1d4

世界Boss 增加行动点

src/actions/ActivityAction.lua
@@ -703,6 +703,10 @@ function _M.endBattleRpc(agent, data) @@ -703,6 +703,10 @@ function _M.endBattleRpc(agent, data)
703 role:checkStoryStatus(false, 5, id) 703 role:checkStoryStatus(false, 5, id)
704 end 704 end
705 705
  706 + if battleCfg.worldBoss_award ~= 0 and msg.point then
  707 + battleInfo["bossP"] = (battleInfo["bossP"] or 0) + msg.point
  708 + end
  709 +
706 reward, change = role:award(reward, {log = {desc = "actBattle", int1 = actid, int2 = newStarNum}}) 710 reward, change = role:award(reward, {log = {desc = "actBattle", int1 = actid, int2 = newStarNum}})
707 711
708 SendPacket(actionCodes.Activity_endBattleRpc, MsgPack.pack({ 712 SendPacket(actionCodes.Activity_endBattleRpc, MsgPack.pack({
src/actions/HeroAction.lua
@@ -975,12 +975,12 @@ function _M.drawHeroRpc(agent, data) @@ -975,12 +975,12 @@ function _M.drawHeroRpc(agent, data)
975 SendPacket(actionCodes.Hero_drawHeroRpc, MsgPack.pack({reward = reward})) -- 这个 reward 是数组 975 SendPacket(actionCodes.Hero_drawHeroRpc, MsgPack.pack({reward = reward})) -- 这个 reward 是数组
976 976
977 local feedbackId = buildTypeData["can_feedback"] or 0 977 local feedbackId = buildTypeData["can_feedback"] or 0
978 - if feedbackId ~= 1 then 978 + if feedbackId ~= 0 then
979 -- 达到一定次数,给响应奖励 979 -- 达到一定次数,给响应奖励
980 local oldVal = role:getProperty("repayHero") or 0 980 local oldVal = role:getProperty("repayHero") or 0
981 if actid then 981 if actid then
982 local actData = role.activity:getActData("ActHeroPool") 982 local actData = role.activity:getActData("ActHeroPool")
983 - oldVal = actData[btype] 983 + oldVal = actData[btype] or 0
984 end 984 end
985 local newVal = oldVal + drawCount[drawType] 985 local newVal = oldVal + drawCount[drawType]
986 local drawCardReward, val = role:getDrawCardExtraReward(feedbackId, oldVal, newVal) 986 local drawCardReward, val = role:getDrawCardExtraReward(feedbackId, oldVal, newVal)
1 -Subproject commit f0e032edd4de127bf13d4a915e3909d724ba7652 1 +Subproject commit f6a626350c1f4039f0f677a1baf262f3493757d2