Merge branch 'master' of http://60.1.1.230/backend/jieling_server
commit
9497535341
|
@ -121,6 +121,7 @@ public class ActivityLogic {
|
|||
long now = TimeUtils.now();
|
||||
ActivityManager activityManager = user.getActivityManager();
|
||||
Map<Integer, SGlobalActivity> sGlobalActivityMap = SGlobalActivity.getsGlobalActivityMap();
|
||||
Set<Integer> openNewActivityIds = new HashSet<>();
|
||||
for (Integer openActivityId : openActivityIds) {
|
||||
SGlobalActivity sGlobalActivity = sGlobalActivityMap.get(openActivityId);
|
||||
|
||||
|
@ -136,10 +137,11 @@ public class ActivityLogic {
|
|||
continue;
|
||||
}
|
||||
abstractActivity.initActivity(user);
|
||||
//非角色活动开启通知
|
||||
openNewActivityIds.add(openActivityId);
|
||||
}
|
||||
Map<Integer, ActivityMission> activityMissionMap = activityManager.getActivityMissionMap();
|
||||
long userCreateTime = user.getPlayerInfoManager().getCreateTime();
|
||||
Set<Integer> openNewActivityIds = new HashSet<>();
|
||||
for (SGlobalActivity sGlobalActivity : sGlobalActivityMap.values()) {
|
||||
int activityId = sGlobalActivity.getId();
|
||||
if (openActivityIds.contains(activityId)) {
|
||||
|
|
Loading…
Reference in New Issue