Merge branch 'master_test_gn_zf' into master_test_gn

back_recharge
xuexinpeng 2021-10-28 11:31:53 +08:00
commit bb2ace9b66
2 changed files with 19 additions and 0 deletions

View File

@ -551,6 +551,9 @@ public class ActivityLogic implements IEventHandler{
if (activityMission == null) {
continue;
}
if(activityId == 7201){
continue;
}
int activityStatus = activityMission.getActivityState();
if(activityStatus == -1){
continue;
@ -775,7 +778,17 @@ public class ActivityLogic implements IEventHandler{
ActivityManager activityManager = user.getActivityManager();
Map<Integer, ActivityMission> activityMissionMap = activityManager.getActivityMissionMap();
for (Map.Entry<Integer, ActivityMission> item : activityMissionMap.entrySet()) {
if(item == null || item.getValue() == null){
continue;
}
ActivityMission activityMission = item.getValue();
//7201活动弃用
if(activityMission == null){
continue;
}
if(item.getKey() == 7201){
continue;
}
if (activityMission.getActivityState() != ActivityType.OPEN_STATE) {
continue;
}

View File

@ -187,6 +187,12 @@ public class MissionLoigc {
Map<Integer, ActivityMission> activityMissionMap = user.getActivityManager().getActivityMissionMap();
int treasureActivityId = 0;
for(Integer activityId : activityMissionMap.keySet()){
if(activityId == null){
continue;
}
if(!SGlobalActivity.getsGlobalActivityMap().containsKey(activityId)){
continue;
}
if(SGlobalActivity.getsGlobalActivityMap().get(activityId).getType() == activityType){
treasureActivityId = activityId;
}