From 2aba5b20ccf7c9ae11355c4054d88d18119975af Mon Sep 17 00:00:00 2001 From: duhui Date: Thu, 4 Nov 2021 16:14:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A0=E7=94=A8=E4=BB=A3=E7=A0=81=E6=B3=A8?= =?UTF-8?q?=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../handler/map/mapType/EndlessMap.java | 29 +++---------------- 1 file changed, 4 insertions(+), 25 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/mapType/EndlessMap.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/mapType/EndlessMap.java index ccf62b576..df0aede83 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/mapType/EndlessMap.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/mapType/EndlessMap.java @@ -214,8 +214,8 @@ public class EndlessMap extends AbstractMap{ @Override public void fastFight(int uid, FightInfoProto.FastFightResponse.Builder fastFightResponseBuilder) throws Exception { super.fastFight(uid, fastFightResponseBuilder); - MapManager mapManager = UserManager.getUser(uid).getMapManager(); User user = UserManager.getUser(uid); + MapManager mapManager = user.getMapManager(); if (mapManager.getMapInfo() == null) { LOGGER.info("fastFight mapManager.getMapInfo() == null"); throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE); @@ -266,7 +266,6 @@ public class EndlessMap extends AbstractMap{ if (resultCode == -1) { throw new ErrorCodeException(ErrorCode.FIGHT_EXCEPTION); }else if(resultCode==0) { -// user.getTeamPosManager().updateTeamPosByTeamId(GlobalsDef.ENDLESS_TEAM, new ArrayList<>()); for (int i = 0 ; i updateTeam = new ArrayList<>(); -// Map endlessThisHeroInfo = mapManager.getEndlessMapInfo().getEndlessHeroInfo(); -// for(TeamPosHeroInfo info:team){ -// if(endlessThisHeroInfo.containsKey(info.getHeroId())&&endlessThisHeroInfo.get(info.getHeroId())!=0){ -// updateTeam.add(info); -// } -// } -// user.getTeamPosManager().updateTeamPosByTeamId(GlobalsDef.ENDLESS_TEAM, updateTeam); user.getUserMissionManager().onGameEvent(user,GameEvent.ENDLESS_KILL_MONTER); mapManager.removeEndlessOneMonsterHp(mapManager.getTriggerXY()); SMonsterGroup sMonsterGroup = SMonsterGroup.getsMonsterGroupMap().get(groupId); CommonProto.Drop.Builder drop = ItemUtil.drop(user, sMonsterGroup.getRewardgroup(), 1, 0, BIReason.MAP_FAST_FIGHT_REWARD); fastFightResponseBuilder.setEnventDrop(drop.build()); - } - - - - mapManager.setLastFightResult(resultCode); - - - checkMoraleLevel(user); -// if (mapManager.getMonsterId() > 0) { -// BaseBehavior baseBehavior = baseBehaviorMap.get(1); -// baseBehavior.process(user, groupId, fastFightResponseBuilder); -// } fastFightResponseBuilder.setResult(resultCode); fastFightResponseBuilder.setFightData(fightResult.getFightData()); - // 记录战报 FightRecordLogic.getInstance().addRecordMap(user,fightResult.getFightData()); - //todo 临时粘贴 mapManager.updateEndlessFightCount(1+mapManager.getEndlessMapInfo().getFightCount()); @@ -609,7 +586,9 @@ public class EndlessMap extends AbstractMap{ List monsterHp = mapManager.getEndlessMapInfo().getMonsterHp().get(mapManager.getTriggerXY()); BehaviorUtil.getEndlessFightInfo(user,401, groupId, responseBuilder, pointId, sChallengeConfig.getMostTime(), true,bloodMap,monsterHp); } - public void endFight(int uid, String frames, FightInfoProto.FightEndResponse.Builder builder,int dropout) throws Exception { + + @Override + public void endFight(int uid, String frames, FightInfoProto.FightEndResponse.Builder builder, int dropout) throws Exception { User user = UserManager.getUser(uid); String key = RedisKey.getKey(RedisKey.FIGHT, Integer.toString(uid), false); Map valueMap = RedisUtil.getInstence().hmget(key);