diff --git a/serverlogic/src/main/java/com/ljsd/jieling/core/function/SevenWorldFunction.java b/serverlogic/src/main/java/com/ljsd/jieling/core/function/SevenWorldFunction.java index fbcba2ed9..29b552e78 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/core/function/SevenWorldFunction.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/core/function/SevenWorldFunction.java @@ -3,10 +3,13 @@ package com.ljsd.jieling.core.function; import com.ljsd.jieling.core.FunctionManager; import com.ljsd.jieling.db.redis.RedisKey; import com.ljsd.jieling.db.redis.RedisUtil; +import com.ljsd.jieling.handler.BaseHandler; import com.ljsd.jieling.logic.dao.TimeControllerOfFunction; import com.ljsd.jieling.logic.rank.RankContext; import com.ljsd.jieling.logic.rank.RankEnum; import com.ljsd.jieling.logic.sevenworld.SevenWorldLogic; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @author lvxinran @@ -15,6 +18,8 @@ import com.ljsd.jieling.logic.sevenworld.SevenWorldLogic; */ public class SevenWorldFunction implements FunctionManager { + public static final Logger LOGGER = LoggerFactory.getLogger(SevenWorldFunction.class); + @Override public void closeAction(){ } @@ -26,6 +31,6 @@ public class SevenWorldFunction implements FunctionManager { String key = RedisUtil.getInstence().getKey(crossRedisKey, "",false); RedisUtil.getInstence().del(key); SevenWorldLogic.setEnd(false); - System.out.printf("七界试炼活动开始，清理排行榜...{%s}\n",key); + LOGGER.info("七界试炼活动开始，清理排行榜...{}",key); } } 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(); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java index 751d6f66d..3b7e93d06 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java @@ -555,7 +555,7 @@ public class HeroLogic { /* ======================= 中不中心愿 ======================= */ // 获取钻石抽奖抽中五星的次数 boolean randomBol = (num - 1) % 3 == 0; - LOGGER.error("*************************************是否中心愿;num:{},random:{}", num, randomBol); + LOGGER.info("*************************************是否中心愿;num:{},random:{}", num, randomBol); if (!randomBol) { // 不到次数,不走心愿 return item; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java index f5fcf0e40..d1319155d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java @@ -1810,7 +1810,7 @@ public class PlayerLogic { }else{ mapItemShow.put(item.getItemId(),(int)item.getItemNum()); } - LOGGER.error("掉落1->{}->{}",item.getItemId(),item.getItemNum()); + LOGGER.info("掉落1->{}->{}",item.getItemId(),item.getItemNum()); } for(CommonProto.Equip equip:drop.getEquipIdList()){ if(mapItemShow.containsKey(equip.getEquipId())){ @@ -1818,7 +1818,7 @@ public class PlayerLogic { }else{ mapItemShow.put(equip.getEquipId(),1); } - LOGGER.error("掉落2->{}->{}",equip.getEquipId(),1); + LOGGER.info("掉落2->{}->{}",equip.getEquipId(),1); } for(CommonProto.Hero hero:drop.getHeroList()){ if(mapItemShow.containsKey(hero.getHeroId())){ @@ -1826,7 +1826,7 @@ public class PlayerLogic { }else{ mapItemShow.put(hero.getHeroId(),1); } - LOGGER.error("掉落3->{}->{}",hero.getHeroId(),1); + LOGGER.info("掉落3->{}->{}",hero.getHeroId(),1); } for(CommonProto.PokemonInfo pokemonInfo:drop.getPokemonList()){ if(mapItemShow.containsKey(pokemonInfo.getTempId())){ @@ -1834,7 +1834,7 @@ public class PlayerLogic { }else{ mapItemShow.put(pokemonInfo.getTempId(),1); } - LOGGER.error("掉落4->{}->{}",pokemonInfo.getTempId(),1); + LOGGER.info("掉落4->{}->{}",pokemonInfo.getTempId(),1); } } }