diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/WholeLifeActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/WholeLifeActivity.java index 318189e9d..cecbdc247 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/WholeLifeActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/WholeLifeActivity.java @@ -47,7 +47,7 @@ public class WholeLifeActivity extends AbstractActivity { LOGGER.info("神尊特权初始化...uid={} activityId={}", user.getId(), id); } - public void calWhenLogin(User user) throws Exception{ + public void calWhenLogin(User user) throws Exception { ActivityManager activityManager = user.getActivityManager(); ActivityMission activityMission = activityManager.getActivityMissionMap().get(id); if (activityMission == null) { @@ -56,40 +56,34 @@ public class WholeLifeActivity extends AbstractActivity { if (activityMission.getActivityState() != ActivityType.OPEN_STATE || activityMission.getOpenType() == 0) { return; } - if(activityMission.getCreatTime() == 0){ + if (activityMission.getCreatTime() == 0) { return; } activityMission.setV(1); long time = 0; - if(user.getPlayerInfoManager().getLastWholeLifeTime() ==0 ){ - time=activityMission.getCreatTime(); - }else{ - time=user.getPlayerInfoManager().getLastWholeLifeTime(); + if (user.getPlayerInfoManager().getLastWholeLifeTime() == 0) { + time = activityMission.getCreatTime(); + } else { + time = user.getPlayerInfoManager().getLastWholeLifeTime(); } int day = (int) TimeUtils.getGapDaysByTwoTime(TimeUtils.getTimeStamp2(time), - TimeUtils.getTimeStamp2(TimeUtils.now()))-1; - if(day <= 0){ + TimeUtils.getTimeStamp2(TimeUtils.now())) - 1; + if (day <= 0) { return; } + if (day > 7) { + day = 7; + } user.getPlayerInfoManager().setLastWholeLifeTime(TimeUtils.now()); String title = SErrorCodeEerverConfig.getI18NMessage("shenzuntequan_mail_title"); String content = SErrorCodeEerverConfig.getI18NMessage("shenzuntequan_mail_txt"); SRechargeCommodityNewConfig config = SRechargeCommodityNewConfig.getConfigById(1000); String mailReward = ItemUtil.getMailReward(config.getExtraReward()); int nowTime = (int) (TimeUtils.now() / 1000); - for(int i =day;i>0;i--){ + for (int i = day; i > 0; i--) { MailLogic.getInstance().sendMail(user.getId(), title, content, mailReward, nowTime, Global.MAIL_EFFECTIVE_TIME_SERVEN); } //ActivityLogic.getInstance().sendActivityInfo(user, id); - /*long times; - if (user.getPlayerInfoManager().getLastWholeLifeTime() == 0) { - times = activityMission.getCreatTime(); - } else { - times = user.getPlayerInfoManager().getLastWholeLifeTime(); - } - int day = (int) TimeUtils.getGapDaysByTwoTime(TimeUtils.getTimeStamp2(times), - TimeUtils.getTimeStamp2(TimeUtils.now())); - activityMission.setV(activityMission.getV() + day > 7 ? 7 : day);*/ } @Override