Merge branch 'master_prb_gn' into master_test_gn

back_recharge
jiahuiwen 2021-12-07 17:59:54 +08:00
commit e6d3b7a85c
1 changed files with 3 additions and 0 deletions

View File

@ -746,6 +746,9 @@ public class ActivityLogic implements IEventHandler{
}
Integer activityId = item.getKey();
SGlobalActivity sGlobalActivity = SGlobalActivity.getsGlobalActivityMap().get(activityId);
if (sGlobalActivity == null){
continue;
}
int targetActivityType = sGlobalActivity.getType();
if (!activityType.contains(targetActivityType)) {
continue;