diff --git a/src/actions/ActivityAction.lua b/src/actions/ActivityAction.lua index 69903b8..4b07ec3 100644 --- a/src/actions/ActivityAction.lua +++ b/src/actions/ActivityAction.lua @@ -375,6 +375,8 @@ function _M.hangDropRpc(agent, data) local msg = MsgPack.unpack(data) local actid = msg.actid if not role.activity:isOpenById(actid, "HangDrop") then return 1 end + local actCtrlData = csvdb["activity_ctrlCsv"][actid] + if not actCtrlData then return end local actCfg = csvdb["activity_putCsv"][actid] if not actCfg then return 2 end @@ -407,7 +409,7 @@ function _M.hangDropRpc(agent, data) return 4 end local num = math.floor((timeNow - actData)/ period) - num = num > 8 and 8 or num + num = num > actCtrlData.condition and actCtrlData.condition or num if num == 0 then return 5 end diff --git a/src/csvdata b/src/csvdata index fc11cc4..94b161b 160000 --- a/src/csvdata +++ b/src/csvdata @@ -1 +1 @@ -Subproject commit fc11cc4a7ae4881df79ae2ffc6c09d50df33bf51 +Subproject commit 94b161b3a3ae6933c8c9a8e3827721411368cad9 -- libgit2 0.21.2