From 30c1a61b62519afa88fcc1fdbad38c58ddee9cee Mon Sep 17 00:00:00 2001 From: xuexinpeng Date: Fri, 21 May 2021 18:25:03 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A4=BE=E7=A8=B7=E5=A4=A7=E5=85=B8=E9=82=AE?= =?UTF-8?q?=E4=BB=B6=E5=86=85=E5=AE=B9=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jieling/logic/activity/SheJiActivity.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SheJiActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SheJiActivity.java index f2f1a90d7..8fc944955 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SheJiActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SheJiActivity.java @@ -189,10 +189,13 @@ class SheJiActivity extends AbstractActivity { Set> rankInfo = expertRank.getRankByKey(String.valueOf(id), 0, -1); int rank = 1; int nowTime = (int) (TimeUtils.now() / 1000); + //特殊分值 2500 + //int specailScore = SSpecialConfig.getIntegerValue(SSpecialConfig.ADVENTURE_RANKINGSHOWNUM); for (ZSetOperations.TypedTuple item : rankInfo) { String value = item.getValue(); int uid = Integer.parseInt(value); + boolean isSpecial =false; try { User user = UserManager.getUser(uid, true); if (null == user) { @@ -207,8 +210,9 @@ class SheJiActivity extends AbstractActivity { // return; // } if (rank2miss.containsKey(rank)) { - if (rank <= 10 && score <2500) { + if (rank <= 10 && score < 2500) { missionId = rank2miss.get(11); + isSpecial= true; } else { missionId = rank2miss.get(rank); } @@ -221,6 +225,7 @@ class SheJiActivity extends AbstractActivity { } final int finalIndex = rank; + final boolean finalIsSpecial = isSpecial; AyyncWorker ayyncWorker = new AyyncWorker(user, true, new AyncWorkerRunnable() { @Override public void work(User user) throws Exception { @@ -230,7 +235,13 @@ class SheJiActivity extends AbstractActivity { //sendmail String title = SErrorCodeEerverConfig.getI18NMessageNeedConvert("personal_activity_reward_title", new Object[]{sGlobalActivity.getSesc()},new int[]{1},"#"); - String content = SErrorCodeEerverConfig.getI18NMessageNeedConvert("personal_activity_reward_txt", new Object[]{sGlobalActivity.getSesc(), finalIndex},new int[]{1,0},"#"); + String content; + if(finalIsSpecial){ + content = SErrorCodeEerverConfig.getI18NMessageNeedConvert("personal_activity_reward_extra_txt", new Object[]{2500},new int[0],"#"); + }else{ + content = SErrorCodeEerverConfig.getI18NMessageNeedConvert("personal_activity_reward_txt", new Object[]{sGlobalActivity.getSesc(), finalIndex},new int[]{1,0},"#"); + } + String mailReward = ItemUtil.getMailReward(sActivityRankingReward1.getRankingReward()); MailLogic.getInstance().sendMail(uid, title, content, mailReward, nowTime, Global.MAIL_EFFECTIVE_TIME);