Merge branch 'master_test_gn_zf' into master_prb_gn
commit
de7c59dff1
|
@ -566,6 +566,9 @@ public class ActivityLogic implements IEventHandler{
|
|||
if (activityMission == null) {
|
||||
continue;
|
||||
}
|
||||
if(activityId == 7201){
|
||||
continue;
|
||||
}
|
||||
int activityStatus = activityMission.getActivityState();
|
||||
if(activityStatus == -1){
|
||||
continue;
|
||||
|
@ -790,7 +793,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;
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue