Merge branch 'master_test_gn' into master_prb_gn

back_recharge
mengchengzhen 2021-04-30 13:38:39 +08:00
commit d2e6ae8048
1 changed files with 3 additions and 1 deletions

View File

@ -149,7 +149,9 @@ public abstract class AbstractActivity implements IActivity, IEventHandler {
//up miss
int[][] reward = sActivityRewardConfig.getReward();
CommonProto.Drop.Builder drop = ItemUtil.drop(user, reward, BIReason.TAKE_ACTIVITY_REWARD);
fiveStarPushByActivity(user,drop.getHero(0).getHeroId(),1);
if(drop.getHeroList().size() > 0){
fiveStarPushByActivity(user,drop.getHero(0).getHeroId(),1);
}
checkAndSetProgress(activityMission, activityProgressInfo, missionId);
SGlobalActivity sGlobalActivity = SGlobalActivity.getsGlobalActivityMap().get(id);
if (null != sGlobalActivity && ActivityLogic.getInstance().checkActivityMissionFinishAndTaked(session.getUid(),id, activityMission) && sGlobalActivity.getResetGrade() == 1) {