From 2bece3f31d15aff1db7f7de3ba651a1ca5143bd2 Mon Sep 17 00:00:00 2001 From: jiahuiwen <1024696487@qq.com> Date: Fri, 19 Apr 2019 15:20:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=A5=96=E5=8A=B1=E6=94=B9?= =?UTF-8?q?=E6=95=B0=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ljsd/jieling/config/SMissionEventsConfig.java | 4 ++-- .../java/com/ljsd/jieling/handler/map/MapLogic.java | 12 +----------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/SMissionEventsConfig.java b/serverlogic/src/main/java/com/ljsd/jieling/config/SMissionEventsConfig.java index cd84fed18..f5a05ce1b 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/SMissionEventsConfig.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/SMissionEventsConfig.java @@ -16,7 +16,7 @@ public class SMissionEventsConfig implements BaseConfig { private int missionNum; - private int reward; + private int[] reward; private int[] openRules; @@ -38,7 +38,7 @@ public class SMissionEventsConfig implements BaseConfig { return missionNum; } - public int getReward() { + public int[] getReward() { return reward; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java index 74ab3b5ae..31686b1e3 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java @@ -1118,15 +1118,6 @@ public class MapLogic { } // LOGGER.info("endFight() uid=>{},nextEventId=>{}", uid, nextEventId); updateMapMission(mapManager,EventType.fightEvent,0,monsterGroupId); - List teamPosHeroInfos = user.getTeamPosManager().getTeamPosForHero().get(mapManager.getTeamId()); - for (TeamPosHeroInfo heroInfo : teamPosHeroInfos) { - int position = heroInfo.getPosition(); - Hero hero = user.getHeroManager().getHero(heroInfo.getHeroId()); - if (hero == null) { - continue; - } - hero.setCurHp(checkResult[position]); - } // LOGGER.info("endFight() uid=>{} sMonsterGroup.getRewardgroup()=>{} misson=>{} eventDrop=>{}, missionDrop=>{}", uid, sMonsterGroup.getRewardgroup(), fightEndResponse.getMission(), fightEndResponse.getEnventDrop(), fightEndResponse.getMissionDrop()); MessageUtil.sendMessage(session, 1, messageType.getNumber(), fightEndResponse.build(), true); @@ -1318,8 +1309,7 @@ public class MapLogic { if (mission.getMissionInfo() != null) { checkMissionReturn.newEventId = mission.getMissionInfo(); } - int[] reward = {sMissionEventsConfig.getReward()}; - CommonProto.Drop.Builder drop = ItemUtil.drop(user, reward, 1, 1); + CommonProto.Drop.Builder drop = ItemUtil.drop(user, sMissionEventsConfig.getReward(), 1, 1); checkMissionReturn.drop = drop; int useTime = getUseTime(user); mission.setTime(useTime);