From 6f9a1ee82c7e0cba1505d4f98c699221ad49cbf8 Mon Sep 17 00:00:00 2001 From: xuexinpeng Date: Tue, 25 Jan 2022 13:43:02 +0800 Subject: [PATCH] =?UTF-8?q?log=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jieling/logic/explorerMap/ExplorerMapLogic.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/explorerMap/ExplorerMapLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/explorerMap/ExplorerMapLogic.java index 2ee51a86e..02e6dee56 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/explorerMap/ExplorerMapLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/explorerMap/ExplorerMapLogic.java @@ -121,7 +121,7 @@ public class ExplorerMapLogic { explorerInfo.setPlayerHp(explorerInfo.getPlayerHp() - reducePlayer); explorerInfo.setEnemyHp(0); LOGGER.info("{}玩家掉血:=》{},剩余血量-》{}", user.getId(), reducePlayer, explorerInfo.getPlayerHp()); - LOGGER.info("玩家赢了 怪物死 怪物走复活逻辑=>{} 掉落组=>{}", explorerInfo.getEnemyReliveTime(), exploreConfig.getReward()); + LOGGER.info("{}玩家赢了 怪物死 怪物走复活逻辑=>{} 掉落组=>{}",user.getId(), explorerInfo.getEnemyReliveTime(), exploreConfig.getReward()); //活动是否开启 Set openActivityIdsByType = ActivityLogic.getInstance().getOpenActivityIdsByType(user, ActivityTypeEnum.EXPLORE_EXPECT_ACTIVITY.getType(), false); //if (ActivityLogic.checkActivityOpen(user, ActivityType.EXPLORE_EXPECT_ACTIVITY)) { @@ -287,9 +287,6 @@ public class ExplorerMapLogic { continue; } //探索时间到期 - if(keyVal.getValue().getMapId() == 0){ - delayId.add(keyVal.getKey()); - } if (keyVal.getValue().getSendEndTime() < TimeUtils.nowInt()) { delayId.add(keyVal.getKey()); deleteMapPlayer.add(keyVal.getValue().getMapId()); @@ -365,13 +362,15 @@ public class ExplorerMapLogic { MailLogic.getInstance().sendMail(uid, title, content, "", TimeUtils.nowInt(), Global.MAIL_EFFECTIVE_TIME); } else { - LOGGER.info("到期发邮件:" + uid); + String title = SErrorCodeEerverConfig.getI18NMessage("exploresuccess_mail_title"); String content = SErrorCodeEerverConfig.getFormatMessage("exploresuccess_mail_txt", new Object[]{teamName, mapName, hour}); //CommonProto.Drop.Builder drop = ItemUtil.drop(user, explorer.get(id).getDropItem().stream().toArray(int[][]::new), BIReason.EXPEDITION_BOX_REWARD); int[][] dropArray = explorer.get(id).getDropMap().entrySet().stream().map(n -> new int[]{n.getKey(), n.getValue()}).toArray(int[][]::new); + String reward = StringUtil.parseArrayToString(dropArray); + LOGGER.info("{}探索{}小时到期发id=>{}邮件,邮件内容=>{}",uid,hour,id,reward); MailLogic.getInstance().sendMail(uid, title, content, - StringUtil.parseArrayToString(dropArray), TimeUtils.nowInt(), Global.MAIL_EFFECTIVE_TIME); + reward, TimeUtils.nowInt(), Global.MAIL_EFFECTIVE_TIME); } explorer.remove(id); CommonProto.ExplorerMapInfo mapInfo = CommonProto.ExplorerMapInfo.newBuilder().setTeamId(id).build();