diff --git a/serverlogic/src/main/java/com/ljsd/CoreService.java b/serverlogic/src/main/java/com/ljsd/CoreService.java index 1d7eb3e05..fbf89722e 100644 --- a/serverlogic/src/main/java/com/ljsd/CoreService.java +++ b/serverlogic/src/main/java/com/ljsd/CoreService.java @@ -98,6 +98,12 @@ public class CoreService implements RPCRequestIFace.Iface { teams.put(GlobalsDef.FORMATION_NORMAL,nomal); set.addAll(nomal); + //罗浮争锋 + List luofu = user.getTeamPosManager().getTeamPosForHero().getOrDefault(GlobalsDef.WORLD_TEAM_ARENA_DEFENSE,new ArrayList<>()); + List luofurpc = new ArrayList(); + luofu.forEach(n->luofurpc.add(new TeamPosHeroInfo().setHeroId(n.getHeroId()).setPosition(n.getPosition()))); + teams.put(GlobalsDef.WORLD_TEAM_ARENA_DEFENSE,luofurpc); + set.addAll(luofurpc); //玉虚论道编队 List yxldOne = user.getTeamPosManager().getTeamPosForHero().getOrDefault(GlobalsDef.CROSS_YU_XU_LUN_DAO_ONE,new ArrayList<>()); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/CrossYuxulundaoLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/CrossYuxulundaoLogic.java index 5fab19908..f5a64ea71 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/CrossYuxulundaoLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/CrossYuxulundaoLogic.java @@ -242,6 +242,16 @@ public class CrossYuxulundaoLogic { }else{ arenaRank.addAll(SArenaRobotConfig.getSArenaRobotConfigsByRangeAndCount(con.getScoreLow1(),con.getScoreUp1(),5)); } + //没有高分段机器人 从相近的里面取机器人 + if(arenaRank.size() == 0){ + for(int i= con.getId()-1;i>0;i--){ + SMServerRankConfig serverRankConfig = SMServerRankConfig.serverRankConfig.get(i); + arenaRank.addAll(SArenaRobotConfig.getSArenaRobotConfigsByRangeAndCount(con.getScoreLow1(),con.getScoreUp1(),5)); + if(arenaRank.size()>= 5){ + break; + } + } + } //正常从排行榜中匹配 //Set arenaRank = new HashSet(); /*int myRank = RedisUtil.getInstence().getZSetreverseRank(RedisKey.CROSS_YUXULUNDAO_RANK, Integer.toString(crossGroup), Integer.toString(user.getId())).intValue();