From 445da5f7c011c89ac89eaace5f400ba31eb23341 Mon Sep 17 00:00:00 2001 From: duhui Date: Sat, 19 Nov 2022 11:42:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=86=B2=E6=A6=9C=E5=8F=91=E9=82=AE=E4=BB=B6?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OpenServerCompeteRankActivity.java | 73 ++++--------------- .../src/main/java/config/SChongRankInfo.java | 10 +++ .../main/java/config/SMainLevelConfig.java | 8 +- 3 files changed, 33 insertions(+), 58 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/OpenServerCompeteRankActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/OpenServerCompeteRankActivity.java index 57747b30f..c9ab02d78 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/OpenServerCompeteRankActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/OpenServerCompeteRankActivity.java @@ -12,10 +12,7 @@ import com.ljsd.jieling.logic.rank.rankImpl.AbstractRank; import com.ljsd.jieling.network.server.ProtocolsManager; import com.ljsd.jieling.thread.ThreadManager; import com.ljsd.jieling.util.*; -import config.SChongRank; -import config.SChongRankInfo; -import config.SErrorCodeEerverConfig; -import config.SGlobalActivity; +import config.*; import org.luaj.vm2.ast.Str; import org.springframework.data.redis.core.ZSetOperations; import util.TimeUtils; @@ -181,7 +178,7 @@ public class OpenServerCompeteRankActivity extends AbstractActivity { continue; } final int rankId = rank; - final double count = score; + final int count = Integer.parseInt(String.valueOf(score)); AyyncWorker ayyncWorker = new AyyncWorker(user, true, user1 -> { //sendmail String title = OpenServerCompeteRankActivity.this.getMailTitle(rankType); @@ -223,61 +220,23 @@ public class OpenServerCompeteRankActivity extends AbstractActivity { } private String getMailTitle(int rankType){ - String title = ""; - switch (rankType){ - case 101: - title = "chongrankchongxing_mail_title"; - break; - case 3: - title = "chongrankguanka_mail_title"; - break; - case 22: - title = "chongrankzhanli_mail_title"; - break; - case 102: - title = "chongrankzhuangbei_mail_title"; - break; - case 4: - title = "chongrankxinmo_mail_title"; - break; - case 30: - title = "chongrankshanhe_mail_title"; - break; - case 103: - title = "chongrankhunyin_mail_title"; - break; - default:break; - } - return SErrorCodeEerverConfig.getI18NMessage(title); + int mailTitle = SChongRankInfo.getMap().get(id).get(rankType).getMailTitle(); + String msg = SErrorCodeEerverConfig.getMsgById(mailTitle); + return SErrorCodeEerverConfig.getI18NMessage(msg); } - private String getMailContent(int rankType,double score,int rank){ - String content = ""; - switch (rankType){ - case 101: - content = "chongrankchongxing_mail_text"; - break; - case 3: - content = "chongrankguanka_mail_text"; - break; - case 22: - content = "chongrankzhanli_mail_text"; - break; - case 102: - content = "chongrankzhuangbei_mail_text"; - break; - case 4: - content = "chongrankxinmo_mail_text"; - break; - case 30: - content = "chongrankshanhe_mail_text"; - break; - case 103: - content = "chongrankhunyin_mail_text"; - break; - default:break; + private String getMailContent(int rankType,int score,int rank){ + // 获取邮件内容格式 + int mailText = SChongRankInfo.getMap().get(id).get(rankType).getMailText(); + String msg = SErrorCodeEerverConfig.getMsgById(mailText); + // 分值 + String scoreStr = String.valueOf(score); + // 类型3主线编队排行榜的分数需要特殊处理 + if (rankType == 3){ + SMainLevelConfig config = SMainLevelConfig.getVirtualMap().get(score); + scoreStr = config.getName(); } - return SErrorCodeEerverConfig.getFormatMessage(content, new Object[]{(int)score,rank}); + return SErrorCodeEerverConfig.getFormatMessage(msg, new Object[]{scoreStr,rank}); } diff --git a/tablemanager/src/main/java/config/SChongRankInfo.java b/tablemanager/src/main/java/config/SChongRankInfo.java index 85f568cb5..38374ced6 100644 --- a/tablemanager/src/main/java/config/SChongRankInfo.java +++ b/tablemanager/src/main/java/config/SChongRankInfo.java @@ -21,6 +21,10 @@ public class SChongRankInfo implements BaseConfig { private int closeTime; + private int mailTitle; + + private int mailText; + /** * key:活动id:key:排行榜类型:value:对象 */ @@ -65,5 +69,11 @@ public class SChongRankInfo implements BaseConfig { return closeTime; } + public int getMailTitle() { + return mailTitle; + } + public int getMailText() { + return mailText; + } } \ No newline at end of file diff --git a/tablemanager/src/main/java/config/SMainLevelConfig.java b/tablemanager/src/main/java/config/SMainLevelConfig.java index 1720c0d58..f681ce00e 100644 --- a/tablemanager/src/main/java/config/SMainLevelConfig.java +++ b/tablemanager/src/main/java/config/SMainLevelConfig.java @@ -11,6 +11,8 @@ public class SMainLevelConfig implements BaseConfig { private int id; + private String name; + private int nextLevel; private int levelLimit; @@ -110,7 +112,11 @@ public class SMainLevelConfig implements BaseConfig { return levelLimit; } - public int getMonsterGroup() { + public String getName() { + return name; + } + + public int getMonsterGroup() { return monsterGroup; }