From 763872915ffbd30587ff23e3272ed339311d5ba2 Mon Sep 17 00:00:00 2001 From: zhangshanxue Date: Sat, 31 Oct 2020 14:02:38 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A4=BE=E7=A8=B7=E5=A4=A7=E5=85=B8=E5=85=AC?= =?UTF-8?q?=E4=BC=9A=E6=8E=92=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jieling/logic/activity/SheJiActivity.java | 20 +++-- .../java/config/SGodSacrificeSetting.java | 84 +++++++++---------- 2 files changed, 52 insertions(+), 52 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 f522a0dfd..adb1f6a1d 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 @@ -124,6 +124,7 @@ class SheJiActivity extends AbstractActivity { @Override public void onActivityEnd() throws Exception { ThreadManager.getScheduledExecutor().execute(this::sendReward); + ThreadManager.getScheduledExecutor().execute(this::sendGuildReward); } protected void sendReward() { @@ -190,8 +191,6 @@ class SheJiActivity extends AbstractActivity { e.printStackTrace(); } } - - sendGuildReward(); } protected void sendGuildReward() { @@ -199,9 +198,9 @@ class SheJiActivity extends AbstractActivity { SGodSacrificeSetting sGodSacrificeSetting = STableManager.getConfig(SGodSacrificeSetting.class).get(1); Thread.currentThread().setName("sendGuildReward-Activity-" + id); SGlobalActivity sGlobalActivity = SGlobalActivity.getsGlobalActivityMap().get(id); - if (sGlobalActivity.getOpenRanking() == 0) { - return; - } +// if (sGlobalActivity.getOpenRanking() == 0) { +// return; +// } int nowTime = (int) (TimeUtils.now() / 1000); InnerResult rewardMap = getRewardMap(2); Map rank2miss = rewardMap.getRank2miss(); @@ -209,7 +208,7 @@ class SheJiActivity extends AbstractActivity { AbstractRank abstractRank = RankContext.getRankEnum(RankEnum.GUILD_SHEJI_SCORE_RANK.getType()); - Set> rankByKey = abstractRank.getRankByKey("", 0, -1); + Set> rankByKey = abstractRank.getRankByKey(""+id, 0, -1); int rankIndex = 1; for (ZSetOperations.TypedTuple item : rankByKey) { @@ -229,10 +228,12 @@ class SheJiActivity extends AbstractActivity { if (null == user) { continue; } - if (user.getPlayerInfoManager().getCreateTime() + sGodSacrificeSetting.getLifeLimit() * TimeUtils.ONE_DAY - nowTime > 0) { + long l = user.getPlayerInfoManager().getCreateTime() + sGodSacrificeSetting.getLifeLimit() * TimeUtils.ONE_DAY; + int i = nowTime * 1000; + if (user.getPlayerInfoManager().getCreateTime() + sGodSacrificeSetting.getLifeLimit() * TimeUtils.ONE_DAY - TimeUtils.now() > 0) { continue; } - if (user.getGuildMyInfo().getJoinTime() + sGodSacrificeSetting.getJoinLimit() * TimeUtils.ONE_DAY - nowTime > 0) { + if (user.getGuildMyInfo().getJoinTime() + sGodSacrificeSetting.getJoinLimit() * TimeUtils.ONE_DAY - TimeUtils.now() > 0) { continue; } int missionId; @@ -249,7 +250,7 @@ class SheJiActivity extends AbstractActivity { SGodSacrificeConfig sActivityRankingReward1 = SGodSacrificeConfig.getsGodSacrificeConfigMap().get(missionId); //sendmail String title = SErrorCodeEerverConfig.getI18NMessage("guild_activity_reward_title", new Object[]{sGlobalActivity.getSesc()}); - String content = SErrorCodeEerverConfig.getI18NMessage("guild_activity_reward_txt", new Object[]{sGlobalActivity.getSesc(), rankIndex++}); + String content = SErrorCodeEerverConfig.getI18NMessage("guild_activity_reward_txt", new Object[]{sGlobalActivity.getSesc(), rankIndex}); String mailReward = ItemUtil.getMailReward(sActivityRankingReward1.getRankingReward()); MailLogic.getInstance().sendMail(uid, title, content, mailReward, nowTime, Global.MAIL_EFFECTIVE_TIME); } catch (Exception e) { @@ -259,6 +260,7 @@ class SheJiActivity extends AbstractActivity { } } + rankIndex++; } catch (Exception e) { LOGGER.error("排行奖励没有发成功=>{}", id); diff --git a/tablemanager/src/main/java/config/SGodSacrificeSetting.java b/tablemanager/src/main/java/config/SGodSacrificeSetting.java index 5dad92aff..aa72e0491 100644 --- a/tablemanager/src/main/java/config/SGodSacrificeSetting.java +++ b/tablemanager/src/main/java/config/SGodSacrificeSetting.java @@ -6,124 +6,122 @@ import manager.Table; import java.util.HashMap; import java.util.Map; -@Table(name ="GodSacrificeSetting") +@Table(name = "GodSacrificeSetting") public class SGodSacrificeSetting implements BaseConfig { - private int id; + private int id; - private int activityId; + private int activityId; - private int[] activityItems; + private int[] activityItems; - private int activityMoney; + private int activityMoney; - private int[] rankType; + private int[] rankType; - private int[] rewardItemChangRate; + private int[] rewardItemChangRate; - private int qAId; + private int qAId; - private int itemDelete; + private int itemDelete; - private int timeRewardNum; + private int timeRewardNum; - private int[] timePointList; + private int[] timePointList; - private int timeRewardGroup; + private int timeRewardGroup; - private int lastTime; + private int lastTime; - public static HashMap exchangeRate= new HashMap<>(); + public static HashMap exchangeRate = new HashMap<>(); private int levelLimit; - private int lifeLimit; + private int lifeLimit; - private int joinLimit; + private int joinLimit; - private int[][] mailId; + private int[][] mailId; - private int l1Score; + private int l1Score; - - @Override + + @Override public void init() throws Exception { SGodSacrificeSetting sGodSacrificeSetting = STableManager.getConfig(SGodSacrificeSetting.class).get(1); - if(null!=sGodSacrificeSetting){ - if(sGodSacrificeSetting.getItemDelete()==1){ - int[] activityItems = sGodSacrificeSetting.getActivityItems(); - for (int i = 0; i