Merge branch 'tr/develop' into tr/publish/release

jiyue
2 parents 4ea9503a b75396fd
Showing 1 changed file with 4 additions and 2 deletions Show diff stats
src/actions/RoleAction.lua
@@ -170,8 +170,10 @@ function _M.loginRpc( agent, data )
 	if not resetMode or not resetMode["CrossDay"] then -- 没有跨天
 		role.activity:checkActivityStatus(now, false, false)
 		role:log("onLogin")
+
+    else
+        role:checkTaskEnter("Login", {})
 	end
-	role:checkTaskEnter("Login", {})
  
 	redisproxy:zadd(FRIEND_RECOMMEND, now, roleId)
  
@@ -1480,4 +1482,4 @@ function _M.accuseRpc(agent, data)
 	return true
 end
  
-return _M
 \ No newline at end of file
+return _M