diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/SActivityRankingReward.java b/serverlogic/src/main/java/com/ljsd/jieling/config/SActivityRankingReward.java index 4aa052a7b..1018c983a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/SActivityRankingReward.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/SActivityRankingReward.java @@ -36,7 +36,7 @@ public class SActivityRankingReward implements BaseConfig { } integerListHashMap.get(activityId).add(sActivityRankingReward); } - + sActivityRankingRewardMapByActivityId = integerListHashMap; } public static Map getsActivityRankingRewardMap() { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java index f9acb225d..0c84054e2 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java @@ -41,13 +41,11 @@ public class ActivityLogic { public void flushEveryDay(User user, PlayerInfoProto.FivePlayerUpdateIndication.Builder fBuilder) throws Exception { //跟新签到天数 - if (user.getPlayerInfoManager().getSignTotay() == 1) { - Calendar cale = Calendar.getInstance(); - int first = cale.getActualMinimum(Calendar.DAY_OF_MONTH); - if (first == 1) - user.getPlayerInfoManager().setSign(1); - else - user.getPlayerInfoManager().setSign(user.getPlayerInfoManager().getSign() + 1); + if (!TimeUtils.isSameMonthWithNow(user.getPlayerInfoManager().getOffLineTime())) { + user.getPlayerInfoManager().setSign(0); + user.getPlayerInfoManager().setSignTotay(0); + } else if (user.getPlayerInfoManager().getSignTotay() == 1) { + user.getPlayerInfoManager().setSign(user.getPlayerInfoManager().getSign() + 1); user.getPlayerInfoManager().setSignTotay(0); } //更新每日充值 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/DefaultEmptyActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/DefaultEmptyActivity.java index 84feedaee..895c70909 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/DefaultEmptyActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/DefaultEmptyActivity.java @@ -48,7 +48,7 @@ public class DefaultEmptyActivity extends AbstractActivity{ sevenHappyMissionType.getRewardedMissionIds().set(sTreasureTaskConfig.getId()); user.getUserMissionManager().setSevenHappyMissionType(sevenHappyMissionType); SSevenDaysScore sSevenDaysScore = SSevenDaysScore.SSevenDaysScoreByActivityIdAndScoreMap.get(id).get(senvenScores); - if(sSevenDaysScore!=null){ + if(null!=sSevenDaysScore){ String mailReward = ItemUtil.getMailReward(sSevenDaysScore.getReward()); String title=SErrorCodeEerverConfig.getI18NMessage("opencarnival_activity_"+id+"_title"); String content = SErrorCodeEerverConfig.getI18NMessage("opencarnival_activity_"+id+"_txt"); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ExpectRankActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ExpectRankActivity.java index 9d5b75ce2..61b6d3970 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ExpectRankActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ExpectRankActivity.java @@ -31,7 +31,7 @@ class ExpectRankActivity extends AbstractActivity { void updateProgress(User user, ActivityMission activityMission, int count) { activityMission.setValue(count + activityMission.getValue()); String key = RedisKey.getKey(RedisKey.EXPERT_RANK, String.valueOf(id), false); - RedisUtil.getInstence().zsetAddOne(key, String.valueOf(user.getId()), count); + RedisUtil.getInstence().zsetAddOne(key, String.valueOf(user.getId()), activityMission.getValue()); } @@ -80,13 +80,13 @@ class ExpectRankActivity extends AbstractActivity { if (activityMission == null || activityMission.getActivityState() != ActivityType.OPEN_STATE || activityMission.getOpenType() == 0) { continue; } - int missionId = rank2miss.get(rank++); + int missionId = rank2miss.get(rank); //check value SActivityRankingReward sActivityRankingReward1 = SActivityRankingReward.getsActivityRankingRewardMap().get(missionId); //sendmail SGlobalActivity sGlobalActivity = SGlobalActivity.getsGlobalActivityMap().get(id); String content = SErrorCodeEerverConfig.getI18NMessage("expertrank_activity_title"); - String title = SErrorCodeEerverConfig.getI18NMessage("expertrank_activity_txt", new Object[]{sGlobalActivity.getSesc(), rank}); + String title = SErrorCodeEerverConfig.getI18NMessage("expertrank_activity_txt", new Object[]{sGlobalActivity.getSesc(), rank++}); String mailReward = ItemUtil.getMailReward(sActivityRankingReward1.getRankingReward()); MailLogic.getInstance().sendMail(uid, title, content, mailReward, nowTime, Global.MAIL_EFFECTIVE_TIME); }