diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossYuxulundaoChallengeHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossYuxulundaoChallengeHandler.java index 35b236a6d..9e97c5a06 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossYuxulundaoChallengeHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossYuxulundaoChallengeHandler.java @@ -240,6 +240,7 @@ public class CrossYuxulundaoChallengeHandler extends BaseHandler> teamPosForHero = teamPosManager.getTeamPosForHero(); + if(teamPosForHero.containsKey(GlobalsDef.FORMATION_NORMAL)){ + teamPosManager.updateTeamPosByTeamId(GlobalsDef.CROSS_YU_XU_LUN_DAO_ONE, teamPosManager.getTeamPosForHero().get(GlobalsDef.FORMATION_NORMAL)); + } builder.setIsFirst(true); arenaManager.setCrossYuxulundaoFirst(System.currentTimeMillis()); //重置段位发奖 @@ -82,6 +89,8 @@ public class CrossYuxulundaoGetInfoHandler extends BaseHandler arenaRank = RedisUtil.getInstence().getReverseZset(rkey, 0, -1); List arenaRankfilt = arenaRank.stream().mapToInt(n -> Integer.parseInt(n)).filter(n -> n > 1000).boxed().collect(Collectors.toList()); for (int i = 0; i < arenaRankfilt.size(); i++) { SMServerRankReward config = SMServerRankReward.getIdByScore(i + 1); try { - MailLogic.getInstance().sendMail(arenaRankfilt.get(0), "玉虚论道排名奖励", "恭喜您在本次玉虚论道荣获" + (i + 1) + "名,请及时领取附件中的排名奖励!", + String content = SErrorCodeEerverConfig.getI18NMessageNeedConvert("MsRankContent",new Object[]{(i + 1)},new int[0],"#"); + MailLogic.getInstance().sendMail(arenaRankfilt.get(i), title, content, StringUtil.parseArrayToString(config.getSeasonReward()), TimeUtils.nowInt(), Global.MAIL_EFFECTIVE_TIME); //TODO 跑马灯 //ChatLogic.getInstance().sendSysChatMessage(message,Global.LUCKY_LUCK,String.valueOf(equipId),0,0,0,0,0); @@ -238,8 +237,8 @@ public class CrossYuxulundaoLogic { } } else { //比他低的三个 比他高的两个 - Set arenaRank1 = RedisUtil.getInstence().getReverseZset(rkey, myRank - 3, myRank - 1); - Set arenaRank2 = RedisUtil.getInstence().getReverseZset(rkey, myRank, myRank + 3); + Set arenaRank1 = RedisUtil.getInstence().getReverseZset(rkey, myRank - 3, myRank - 2); + Set arenaRank2 = RedisUtil.getInstence().getReverseZset(rkey, myRank, myRank + 2); arenaRank.addAll(arenaRank1); arenaRank.addAll(arenaRank2); } @@ -296,7 +295,7 @@ public class CrossYuxulundaoLogic { .setLevel(arenaOfUser.getPlayerManager().getLevel()) .setName(arenaOfUser.getPlayerManager().getName()) .setServername(serverName) - .setTotalForce(arenaOfUser.getHeroManager().getTotalForce()) + .setTotalForce(arenaOfUser.getHeroManager().getYxldForce()) .setUserTitle(arenaOfUser.getPlayerManager().getUserTitle()) .setUserMount(arenaOfUser.getPlayerManager().getUserMount()) .setGender(arenaOfUser.getPlayerManager().getGender()) @@ -355,7 +354,7 @@ public class CrossYuxulundaoLogic { .addAllResult(result) .setMyScoreChange(arenaRecord.getYxldScoreChange()) .setLevel(arenaRecord.getLevel()) - .setHead(arenaRecord.getHead()) + .setHead(arenaRecord.getHead()).setServerName(arenaRecord.getServerName()) .setUserName(arenaRecord.getUserName()) .setHeadFrame(arenaRecord.getHeadFrame()).setFightData1(fightDataProto1).setFightData2(fightDataProto2).setFightData3(fightDataProto3) .setPower(arenaRecord.getAttackForce()).setType(arenaRecord.getYxldBattleType()).build(); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/gm/ArenaOfHeroManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/gm/ArenaOfHeroManager.java index 3e3104f84..129d61570 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/gm/ArenaOfHeroManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/gm/ArenaOfHeroManager.java @@ -25,6 +25,8 @@ public class ArenaOfHeroManager { private int totalForce; + private int yxldForce; + public ArenaOfHeroManager(Map> teams, Map heros, Map jewels, Map totalForceByTeam, int totalForce) { this.teams = teams; @@ -76,4 +78,12 @@ public class ArenaOfHeroManager { public void setTotalForceByTeam(Map totalForceByTeam) { this.totalForceByTeam = totalForceByTeam; } + + public int getYxldForce() { + return yxldForce; + } + + public void setYxldForce(int yxldForce) { + this.yxldForce = yxldForce; + } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/CrossYuXuLunDaoRank.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/CrossYuXuLunDaoRank.java index 85912a6b7..f79658df9 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/CrossYuXuLunDaoRank.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/CrossYuXuLunDaoRank.java @@ -72,7 +72,7 @@ public class CrossYuXuLunDaoRank extends AbstractRank{ .setUserSkin(80012) .setRankInfo(everyRankInfo) .setServerName(serverName) - .setSex(0); + .setSex(0).setCrossScore(mapEntry.getEnemyStatus()); builder.addRanks(everyRank); }else{ ArenaOfUser query = CrossServiceLogic.getInstance().query(Integer.valueOf(data.getValue()));