From 3fad81a218155d42c35060d47805c290b9fcd5a2 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Thu, 24 Oct 2019 00:11:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E4=BC=9A=E6=88=98=E5=AE=89=E6=85=B0?= =?UTF-8?q?=E5=A5=96=E5=8A=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ljsd/jieling/logic/family/GuildFightLogic.java | 11 +++++++++++ tablemanager/src/main/java/config/SGuildSetting.java | 6 ++++++ 2 files changed, 17 insertions(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildFightLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildFightLogic.java index 4287f30e7..6fcb755b2 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildFightLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildFightLogic.java @@ -834,6 +834,17 @@ public class GuildFightLogic { if(zsetreverseRangeWithScores.size()<1){ continue; } + Map defendInfo = guildInfo.getDefendInfo(); + String particapateReward = SGuildSetting.sGuildSetting.getParticipation(); + for(Integer uid:defendInfo.keySet()){ + Integer attackCount = redisUtil.getMapEntry(RedisKey.FAMILY_FIGHT_ATTACK_COUNT,"",String.valueOf(uid),Integer.class); + if(attackCount!=null&&attackCount>0){ + continue; + } + String title = SErrorCodeEerverConfig.getI18NMessage("family_fight_reward_title"); + String content = SErrorCodeEerverConfig.getI18NMessage("family_fight_reward_txt"); + MailLogic.getInstance().sendMail(uid,title,content,particapateReward,(int) (TimeUtils.now()/1000), Global.MAIL_EFFECTIVE_TIME); + } Iterator> it = zsetreverseRangeWithScores.iterator(); int userRank = 0; int userResultRank = 0; diff --git a/tablemanager/src/main/java/config/SGuildSetting.java b/tablemanager/src/main/java/config/SGuildSetting.java index 03819eee6..511b0990d 100644 --- a/tablemanager/src/main/java/config/SGuildSetting.java +++ b/tablemanager/src/main/java/config/SGuildSetting.java @@ -62,6 +62,8 @@ public class SGuildSetting implements BaseConfig { private int recruitCD; + private String participation; + public static SGuildSetting sGuildSetting; @@ -183,4 +185,8 @@ public class SGuildSetting implements BaseConfig { public int getRecruitCD() { return recruitCD; } + + public String getParticipation() { + return participation; + } } \ No newline at end of file