在线奖励

lvxinran 2019-11-30 22:29:34 +08:00
parent 6dd5cd1cde
commit 3b722004b9
2 changed files with 10 additions and 6 deletions

View File

@ -176,8 +176,8 @@ public class GlobalDataManaager {
ArenaLogic.getInstance().updateArenaSeason(timeControllerOfFunction.getTimes()); ArenaLogic.getInstance().updateArenaSeason(timeControllerOfFunction.getTimes());
break; break;
case Endless: case Endless:
MapLogic.getInstance().updateEndlessSeason(timeControllerOfFunction.getTimes());
int level = calWorldLevel(); int level = calWorldLevel();
MapLogic.getInstance().updateEndlessSeason(timeControllerOfFunction.getTimes());
serverConfigTmp.setWorldLevel(level); serverConfigTmp.setWorldLevel(level);
STableManager.getFigureConfig(MapStaticConfig.class).setDifficult(); STableManager.getFigureConfig(MapStaticConfig.class).setDifficult();
MongoUtil.getLjsdMongoTemplate().save(serverConfigTmp); MongoUtil.getLjsdMongoTemplate().save(serverConfigTmp);
@ -228,8 +228,8 @@ public class GlobalDataManaager {
if(timeControllerOfFunction != null){ if(timeControllerOfFunction != null){
ArenaLogic.getInstance().updateArenaSeason(timeControllerOfFunction.getTimes()); ArenaLogic.getInstance().updateArenaSeason(timeControllerOfFunction.getTimes());
} }
if(globalSystemControl.getTimeControllerOfFunctionMap().containsKey(46)){ if(globalSystemControl.getTimeControllerOfFunctionMap().containsKey(FunctionIdEnum.Endless.getFunctionId())){
MapLogic.getInstance().updateEndlessSeason(globalSystemControl.getTimeControllerOfFunctionMap().get(46).getTimes()); MapLogic.getInstance().updateEndlessSeason(globalSystemControl.getTimeControllerOfFunctionMap().get(FunctionIdEnum.Endless.getFunctionId()).getTimes());
MapLogic.setEndlessMapId(getEndleeMapIdByLevel()); MapLogic.setEndlessMapId(getEndleeMapIdByLevel());
} }

View File

@ -142,10 +142,14 @@ public abstract class AbstractActivity implements IActivity, IEventHandler {
SGlobalActivity sGlobalActivity = SGlobalActivity.getsGlobalActivityMap().get(id); SGlobalActivity sGlobalActivity = SGlobalActivity.getsGlobalActivityMap().get(id);
if (null != sGlobalActivity && ActivityLogic.getInstance().checkActivityMissionFinishAndTaked(id, activityMission) && sGlobalActivity.getResetGrade() == 1) { if (null != sGlobalActivity && ActivityLogic.getInstance().checkActivityMissionFinishAndTaked(id, activityMission) && sGlobalActivity.getResetGrade() == 1) {
reSetValue(user); reSetValue(user);
ActivityMission newmiss = user.getActivityManager().getActivityMissionMap().get(id); if(sGlobalActivity.getType() != ActivityType.OnlineReward) {
sendActivityProgress(session, newmiss, null); ActivityMission newmiss = user.getActivityManager().getActivityMissionMap().get(id);
sendActivityProgress(session, newmiss, null);
}
} else { } else {
sendActivityProgress(session, activityMission, Collections.singleton(missionId)); if(sGlobalActivity.getType() != ActivityType.OnlineReward){
sendActivityProgress(session, activityMission, Collections.singleton(missionId));
}
} }
KtEventUtils.onKtEvent(user, ParamEventBean.UserActivityEvent, id, missionId); KtEventUtils.onKtEvent(user, ParamEventBean.UserActivityEvent, id, missionId);
PlayerInfoProto.TakeActivityRewardResponse build = PlayerInfoProto.TakeActivityRewardResponse.newBuilder().setDrop(drop).build(); PlayerInfoProto.TakeActivityRewardResponse build = PlayerInfoProto.TakeActivityRewardResponse.newBuilder().setDrop(drop).build();