diff --git a/src/ProtocolCode.lua b/src/ProtocolCode.lua index 516c71c..933358d 100644 --- a/src/ProtocolCode.lua +++ b/src/ProtocolCode.lua @@ -117,6 +117,7 @@ actionCodes = { Diner_rankRpc = 315, Diner_entrustRpc = 316, Diner_collectRpc = 317, + Diner_comboRewardRpc = 318, Tower_roleFormatRpc = 350, Tower_startBattleRpc = 351, diff --git a/src/actions/DinerAction.lua b/src/actions/DinerAction.lua index c72e36b..df4ff7a 100644 --- a/src/actions/DinerAction.lua +++ b/src/actions/DinerAction.lua @@ -785,7 +785,8 @@ function _M.collectRpc(agent , data) local msg = MsgPack.unpack(data) local id = msg.id - if not id or not csvdb["diner_customerCsv"][id] then return end + local customerData = csvdb["diner_customerCsv"][id] + if not id or not customerData then return end local customer = role.dinerData:getProperty("customer") if customer[id] ~= 0 then return @@ -796,11 +797,11 @@ function _M.collectRpc(agent , data) for slot, _ in pairs(sells) do role.dinerData:updateSell(slot) end - + local reward = role:award(customerData.reward) customer[id] = 1 role.dinerData:updateProperty({field = "customer", value = customer}) -- 解锁了 - SendPacket(actionCodes.Diner_collectRpc, '') + SendPacket(actionCodes.Diner_collectRpc, MsgPack.pack({reward = reward})) return true end @@ -824,11 +825,11 @@ function _M.comboRewardRpc(agent , data) end comboStatus[id] = 1 - role:award(comboData.reward) + local reward = role:award(comboData.reward) role.dinerData:updateProperty({field = "comboStatus", value = comboStatus}) -- 解锁了 - SendPacket(actionCodes.Diner_comboRewardRpc, '') + SendPacket(actionCodes.Diner_comboRewardRpc, MsgPack.pack({reward = reward})) return true end -- libgit2 0.21.2