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