Merge branch 'cn/develop' into cn/publish/preview

# Conflicts: # src/csvdata

Merge branch 'cn/develop' into cn/publish/preview
# Conflicts: # src/csvdata
jiyue
2 parents 5fbbad7c 7d5e688f
Showing 3 changed files with 16 additions and 7 deletions Show diff stats
src/actions/RoleAction.lua
src/models/Activity.lua
src/models/RolePlugin.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
@@ -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
@@ -52,7 +52,6 @@ function RolePlugin.bind(Role)
 			["uid"] = uid,
 			["key"] = "zhaolugame20170831",
 		}
-		dump(content)
 		httpc.get(codeurl, "/collect?" .. httpGetFormatData(content), {})
 	end