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 57be58a60..072c26d9d 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 @@ -26,8 +26,10 @@ class ExpectRankActivity extends AbstractActivity { @Override void updateProgressWithUser(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()), activityMission.getValue()); + if(SGlobalActivity.getsGlobalActivityMap().get(id).getOpenRanking()==1){ + String key = RedisKey.getKey(RedisKey.EXPERT_RANK, String.valueOf(id), false); + RedisUtil.getInstence().zsetAddOne(key, String.valueOf(user.getId()), activityMission.getValue()); + } } @@ -54,6 +56,10 @@ class ExpectRankActivity extends AbstractActivity { @Override public void onActivityEnd() throws Exception { + SGlobalActivity sGlobalActivity = SGlobalActivity.getsGlobalActivityMap().get(id); + if(sGlobalActivity.getOpenRanking()==0){ + return; + } List sActivityRankingReward = SActivityRankingReward.getsActivityRankingRewardMapByActivityId(id); if(null==sActivityRankingReward) return; @@ -84,7 +90,7 @@ class ExpectRankActivity extends AbstractActivity { //check value SActivityRankingReward sActivityRankingReward1 = SActivityRankingReward.getsActivityRankingRewardMap().get(missionId); //sendmail - SGlobalActivity sGlobalActivity = SGlobalActivity.getsGlobalActivityMap().get(id); + String title = SErrorCodeEerverConfig.getI18NMessage("expertrank_activity_title", new Object[]{sGlobalActivity.getSesc()}); String content = SErrorCodeEerverConfig.getI18NMessage("expertrank_activity_txt", new Object[]{sGlobalActivity.getSesc(), rank++}); String mailReward = ItemUtil.getMailReward(sActivityRankingReward1.getRankingReward()); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java index 28c5f13d1..3048c391c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java @@ -581,8 +581,8 @@ public class ItemUtil { Poster.getPoster().dispatchEvent(new UserLevelEvent(user.getId(),playerInfoManager.getLevel())); if(playerInfoManager.getLevel()==2&&playerInfoManager.getNickName().equals(String.valueOf(playerInfoManager.getRootId()))){ //TODO 走表 - String title ="改名卡奖励"; - String content = "送您一张改名卡,快去起个喜欢的名字吧!"; + String title = SErrorCodeEerverConfig.getI18NMessage("change_playername_title"); + String content = SErrorCodeEerverConfig.getI18NMessage("change_playername_txt"); int[][] values = new int[1][2]; values[0][0] = Global.CHANGENAME; values[0][1] = 1; diff --git a/tablemanager/src/main/java/config/SGlobalActivity.java b/tablemanager/src/main/java/config/SGlobalActivity.java index 3bbc54774..4c862a43c 100644 --- a/tablemanager/src/main/java/config/SGlobalActivity.java +++ b/tablemanager/src/main/java/config/SGlobalActivity.java @@ -127,4 +127,7 @@ public class SGlobalActivity implements BaseConfig { return resetGrade; } + public int getOpenRanking() { + return openRanking; + } } \ No newline at end of file