diff --git a/src/actions/RoleAction.lua b/src/actions/RoleAction.lua index 48dc759..3b65183 100644 --- a/src/actions/RoleAction.lua +++ b/src/actions/RoleAction.lua @@ -345,6 +345,15 @@ function _M.loginRpc( agent, data ) end end + -- 临时处理方式,清空电台活动队伍 + local radioTask = role:getProperty("radioTask") + for id, data in pairs(radioTask) do + if (data["actid"] or 0) ~= 0 then + radioTask[id] = nil + end + end + --- + return true end diff --git a/src/csvdata b/src/csvdata index bd0ab71..3fe1beb 160000 --- a/src/csvdata +++ b/src/csvdata @@ -1 +1 @@ -Subproject commit bd0ab7120f5574d3a720dd1bbeb513fb67b6d21b +Subproject commit 3fe1beb0f0efedddb79ccfac950b8eeca98f9c91 diff --git a/src/models/Activity.lua b/src/models/Activity.lua index 264957b..ac3ccd5 100644 --- a/src/models/Activity.lua +++ b/src/models/Activity.lua @@ -1488,12 +1488,13 @@ activityFunc[Activity.ActivityType.RadioTask] = { if config.activity_ctrl_id == actid then radioTask[id] = nil - if not task then return 4 end - if skynet.timex() < task.time then return 5 end - - local reward = getActRadioTaskReward(self.owner, id, task) - for k, v in pairs(reward) do - result[k] = (result[k] or 0) + v + if task then + if skynet.timex() > task.time then + local reward = getActRadioTaskReward(self.owner, id, task) + for k, v in pairs(reward) do + result[k] = (result[k] or 0) + v + end + end end end end diff --git a/src/models/RolePlugin.lua b/src/models/RolePlugin.lua index 786d09f..f104288 100644 --- a/src/models/RolePlugin.lua +++ b/src/models/RolePlugin.lua @@ -52,7 +52,6 @@ function RolePlugin.bind(Role) ["uid"] = uid, ["key"] = "zhaolugame20170831", } - dump(content) httpc.get(codeurl, "/collect?" .. httpGetFormatData(content), {}) end -- libgit2 0.21.2