Commit ee534d4a71f492b6e19579eb747417ffb3adc575
Merge branch 'tr/develop' into tr/publish/release
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 ) | @@ -170,8 +170,10 @@ function _M.loginRpc( agent, data ) | ||
| 170 | if not resetMode or not resetMode["CrossDay"] then -- 没有跨天 | 170 | if not resetMode or not resetMode["CrossDay"] then -- 没有跨天 |
| 171 | role.activity:checkActivityStatus(now, false, false) | 171 | role.activity:checkActivityStatus(now, false, false) |
| 172 | role:log("onLogin") | 172 | role:log("onLogin") |
| 173 | + | ||
| 174 | + else | ||
| 175 | + role:checkTaskEnter("Login", {}) | ||
| 173 | end | 176 | end |
| 174 | - role:checkTaskEnter("Login", {}) | ||
| 175 | 177 | ||
| 176 | redisproxy:zadd(FRIEND_RECOMMEND, now, roleId) | 178 | redisproxy:zadd(FRIEND_RECOMMEND, now, roleId) |
| 177 | 179 | ||
| @@ -1480,4 +1482,4 @@ function _M.accuseRpc(agent, data) | @@ -1480,4 +1482,4 @@ function _M.accuseRpc(agent, data) | ||
| 1480 | return true | 1482 | return true |
| 1481 | end | 1483 | end |
| 1482 | 1484 | ||
| 1483 | -return _M | ||
| 1484 | \ No newline at end of file | 1485 | \ No newline at end of file |
| 1486 | +return _M |