From 9c82a394dd2406aedb99a096f2d53bcb1a7976f3 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Sat, 29 Feb 2020 00:03:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=92=E7=81=B5=E7=A7=98=E5=AE=9D=E5=8D=87?= =?UTF-8?q?=E7=BA=A7=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ljsd/jieling/handler/ServerZeroHandler.java | 2 +- serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/ServerZeroHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/ServerZeroHandler.java index 946912a99..304b35a32 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/ServerZeroHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/ServerZeroHandler.java @@ -35,7 +35,7 @@ public class ServerZeroHandler extends BaseHandler { if(user.getPlayerInfoManager().getHadBuyTreasure()!=0){ Map activityMissionMap = user.getActivityManager().getActivityMissionMap(); for(Map.Entry entry:activityMissionMap.entrySet()){ - if(SGlobalActivity.getsGlobalActivityMap().get(entry).getType()== ActivityType.TREASURE){ + if(SGlobalActivity.getsGlobalActivityMap().get(entry.getKey()).getType()== ActivityType.TREASURE){ MailLogic.getInstance().sendMail(iSession.getUid(), SErrorCodeEerverConfig.getI18NMessage("secret_daily_title"),SErrorCodeEerverConfig.getI18NMessage("secret_daily_txt"), SSpecialConfig.getStringValue(SSpecialConfig.SUNLONG_INTEGRAL),(int)(TimeUtils.now()/1000), Global.MAIL_EFFECTIVE_TIME); break; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java index 99a2c8f53..d6011aae0 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java @@ -649,7 +649,7 @@ public class ItemUtil { public static void treasureLevelUp(User user) throws Exception { List activities = SGlobalActivity.sGlobalActivityMapByType.get(ActivityType.TREASURE); - SGlobalActivity activity = activities.stream().filter(a -> user.getActivityManager().getActivityMissionMap().containsKey(a)).findAny().orElse(null); + SGlobalActivity activity = activities.stream().filter(a -> user.getActivityManager().getActivityMissionMap().containsKey(a.getId())).findAny().orElse(null); if(activity==null){ return; }