Commit d66e5487397d482e20efbbaae048a1f509ef9893

Authored by jiyue
2 parents f9823bb4 52837c5a

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

# Conflicts:
#	src/csvdata
Showing 1 changed file with 1 additions and 1 deletions   Show diff stats
src/actions/ActivityAction.lua
... ... @@ -1187,7 +1187,7 @@ function _M.friendHelpRpc(agent, data)
1187 1187 cmd1 = 2
1188 1188 end
1189 1189  
1190   - if members[friendId] and not getAE[friendId] and limit <= getLimit then
  1190 + if members[friendId] and not getAE[friendId] and limit < getLimit then
1191 1191 cmd2 = 1
1192 1192 limit = limit + 1
1193 1193 getAE[friendId] = 1
... ...