From 8ef68e0a986114c325a28a735d002b043a732459 Mon Sep 17 00:00:00 2001 From: xuexinpeng Date: Mon, 8 Nov 2021 00:04:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=91=A8=E5=8D=A1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ljsd/jieling/logic/GlobalDataManaager.java | 4 ++-- .../activity/activityLogic/WeekCardLogic.java | 17 +++++++++++------ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java index a785e3a34..62c8b2b8d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java @@ -432,10 +432,10 @@ public class GlobalDataManaager implements IManager { SevenWorldLogic.getInstance().sevenWorldInfoIndication(session); // 御剑行 RidingSwardLogic.getInstance().zeroClearRidingSwardByUser(user); - //周卡每日刷新 - WeekCardLogic.getInstance().sendWeekCardInitInfo(session); //周卡邮件发放未领取奖励 WeekCardLogic.getInstance().sendWeekCardRewardMail(session); + //周卡每日刷新 + WeekCardLogic.getInstance().sendWeekCardInitInfo(session); // GuildChallengeLogic.getInstance().resetBossDamage(user); if(TimeUtils.isSpanTime(user.getPlayerInfoManager().getLoginTime(),TimeUtils.now(),1,0)){ diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/activityLogic/WeekCardLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/activityLogic/WeekCardLogic.java index 753655411..60ce53bd0 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/activityLogic/WeekCardLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/activityLogic/WeekCardLogic.java @@ -74,12 +74,6 @@ public class WeekCardLogic { weekCardVal.setBuy(false); weekCardVal.setBugTime(0); isSave =true; - int [][] dropArray= dropMap.entrySet().stream().map(n->new int[]{n.getKey(),n.getValue()}).toArray(int[][]::new); - /*String content = SErrorCodeEerverConfig.getI18NMessageNeedConvert("MsRankContent",new Object[]{(i + 1)},new int[0],"#"); - MailLogic.getInstance().sendMail(arenaRankfilt.get(i), title, content, - StringUtil.parseArrayToString(config.getSeasonReward()), TimeUtils.nowInt(), Global.MAIL_EFFECTIVE_TIME);*/ - MailLogic.getInstance().sendMail(user.getId(), "周卡未领取奖励", "周卡奖励", - StringUtil.parseArrayToString(dropArray), TimeUtils.nowInt(), Global.MAIL_EFFECTIVE_TIME); }else{ weekCardVal.setBuy(false); weekCardVal.setBugTime(0); @@ -88,6 +82,14 @@ public class WeekCardLogic { if(isSave){ user.getPlayerInfoManager().setWeekCard(weekCard); } + if(dropMap.size()>0){ + int [][] dropArray= dropMap.entrySet().stream().map(n->new int[]{n.getKey(),n.getValue()}).toArray(int[][]::new); + String title = SErrorCodeEerverConfig.getI18NMessage("WeekcardReward_mail_title"); + String content = SErrorCodeEerverConfig.getI18NMessage("WeekcardReward_mail_txt"); + // 排行奖励 + MailLogic.getInstance().sendMail(user.getId(), title, content, + StringUtil.parseArrayToString(dropArray), TimeUtils.nowInt(), Global.MAIL_EFFECTIVE_TIME); + } } } @@ -102,6 +104,9 @@ public class WeekCardLogic { Map config = STableManager.getConfig(SWeekcardRotationConfig.class); boolean isSaveToDb =false; List weekCardList=new ArrayList<>(); + if(weekCardType == null || weekCardType.length ==0){ + return weekCardList; + } for(int i= 1;i