Commit 3df1e9ea7213d842ff9a9f7aa38612ccbd0da581
1 parent
3df73a9e
掉落增加 地块信息,。click 增加新的效果
Showing
1 changed file
with
11 additions
and
5 deletions
Show diff stats
src/adv/Adv.lua
| ... | ... | @@ -969,7 +969,7 @@ local function chooseCommon(self, room, block, chooseData, choose, tag) |
| 969 | 969 | local item = csvdb["event_dropCsv"][effect[2]]["range"]:randWeight(true) |
| 970 | 970 | reward[item[1]] = (reward[item[1]] or 0) + item[2] |
| 971 | 971 | end |
| 972 | - self:backReward(self:award(reward, {})) | |
| 972 | + self:backReward(self:award(reward, {}), {roomId = room.roomId, blockId = block.blockId}) | |
| 973 | 973 | end, |
| 974 | 974 | [2] = function() --获得冒险buff |
| 975 | 975 | local layer = effect[3] or 1 |
| ... | ... | @@ -1106,7 +1106,7 @@ local function clickDrop(self, room, block, params) |
| 1106 | 1106 | local reward = self:award({[block.event.item[1]] = block.event.item[2]}) |
| 1107 | 1107 | -- local reward = self:award({[5801] = 1}) |
| 1108 | 1108 | block:clear() |
| 1109 | - self:backReward(reward) | |
| 1109 | + self:backReward(reward, {roomId = room.roomId, blockId = block.blockId}) | |
| 1110 | 1110 | return true |
| 1111 | 1111 | end |
| 1112 | 1112 | |
| ... | ... | @@ -1179,7 +1179,12 @@ local function clickClick(self, room, block, params) |
| 1179 | 1179 | local item = csvdb["event_dropCsv"][dropId]["range"]:randWeight(true) |
| 1180 | 1180 | reward[item[1]] = (reward[item[1]] or 0) + item[2] |
| 1181 | 1181 | end |
| 1182 | - self:backReward(self:award(reward, {})) | |
| 1182 | + self:backReward(self:award(reward, {}), {roomId = room.roomId, blockId = block.blockId}) | |
| 1183 | + end, | |
| 1184 | + [3] = function() | |
| 1185 | + for _, buffId in ipairs(clickData.effect:toArray(true, "=")) do | |
| 1186 | + self.battle.player:addBuff(buffId) | |
| 1187 | + end | |
| 1183 | 1188 | end, |
| 1184 | 1189 | } |
| 1185 | 1190 | assert(doEffect[clickData.type], "error effect, event_clickCsv id :" .. block.event.id) |
| ... | ... | @@ -1603,8 +1608,9 @@ function Adv:pushBackEvent(btype, params) |
| 1603 | 1608 | table.insert(self.backEvents, {btype = btype, params = params}) |
| 1604 | 1609 | end |
| 1605 | 1610 | |
| 1606 | -function Adv:backReward(items) | |
| 1607 | - self:pushBackEvent(AdvBackEventType.Reward, {items = items}) | |
| 1611 | +function Adv:backReward(items, params) | |
| 1612 | + params = params or {} | |
| 1613 | + self:pushBackEvent(AdvBackEventType.Reward, {items = items, roomId = params.roomId, blockId = params.blockId}) | |
| 1608 | 1614 | end |
| 1609 | 1615 | -- if is player enemyId is nil |
| 1610 | 1616 | --isMax 是否是改变血量上限 | ... | ... |