From a1f8b46f9e5f35db6e6dd91246d0b5759f583071 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Wed, 20 Nov 2019 11:26:37 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AB=9E=E6=8A=80=E5=9C=BA=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/logic/arena/ArenaLogic.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java index 5bf2fb7a1..06d41b8b8 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java @@ -172,11 +172,11 @@ public class ArenaLogic { myscore = RedisUtil.getInstence().getZSetScore(RedisKey.ARENA_RANK, Integer.toString(curSeason), Integer.toString(uid)).intValue(); } user.getTeamPosManager().setCurTeamPosId(teamId); - ArenaInfoProto.ArenaChallengeResponse.Builder builder = ArenaInfoProto.ArenaChallengeResponse.newBuilder(); + User defUser = null; if( enemyType == GlobalsDef.ARENA_PLAYER_TYPE){ ArenaRecord arenaRecord = new ArenaRecord(); - User defUser = UserManager.getUser(challengeUid); + defUser = UserManager.getUser(challengeUid); fightResult = getFightResultByPersonToPerson(user, teamId, defUser, GlobalsDef.TEAM_ARENA_DEFENSE,arenaRecord,skipFight,builder); if(fightResult == -1){ throw new ErrorCodeException(ErrorCode.FIGHT_EXCEPTION); @@ -219,7 +219,11 @@ public class ArenaLogic { .addAllArenaEnemys(getArenaEnemyList(arenaManager.getArenaEnemies())) .setFightResult(fightResult) .build(); - user.getUserMissionManager().onGameEvent(user, GameEvent.ARENA_CHALLENGE,fightResult,myscoreChange + myscore); + user.getUserMissionManager().onGameEvent(user, GameEvent.ARENA_CHALLENGE,fightResult, myscore + myscoreChange); + if(defUser!=null){ + user.getUserMissionManager().onGameEvent(defUser, GameEvent.ARENA_CHALLENGE,fightResult,defScore+defScoreChange); + } + Poster.getPoster().dispatchEvent(new ArenaChallengeEvent(user.getId())); MessageUtil.sendMessage(session,1, MessageTypeProto.MessageType.ARENA_CHALLENGE_RESPONSE_VALUE,build,true); KtEventUtils.onKtEvent(user, ParamEventBean.UserGameType,KTGameType.ARENA.getIndex(),challengeUid);