排名修改
parent
8b8d24f551
commit
bbaf6a1556
|
@ -146,7 +146,7 @@ public class GetWorldArenaChallengeRequestHandler extends BaseHandler<WorldProto
|
||||||
|
|
||||||
teamInfo = FightUtil.makeRobotFightData(info.getEnemyId());
|
teamInfo = FightUtil.makeRobotFightData(info.getEnemyId());
|
||||||
// force = SArenaRobotConfig.getsArenaRobotConfigById(info.getEnemyId()).getTotalForce();
|
// force = SArenaRobotConfig.getsArenaRobotConfigById(info.getEnemyId()).getTotalForce();
|
||||||
arenaEnemys =ArenaLogic.getInstance().getRobotCrossArenaEnemy(proto.getChallengeUid(),crossGroup).build();
|
arenaEnemys =ArenaLogic.getInstance().getRobotCrossArenaEnemy(crossGroup,proto.getChallengeRank(),proto.getChallengeUid()).build();
|
||||||
}
|
}
|
||||||
arenaAttack = CommonProto.ArenaEnemy.newBuilder().setPersonInfo(CommonProto.ArenaPersonInfo.newBuilder().setUid(iSession.getUid())).build();
|
arenaAttack = CommonProto.ArenaEnemy.newBuilder().setPersonInfo(CommonProto.ArenaPersonInfo.newBuilder().setUid(iSession.getUid())).build();
|
||||||
|
|
||||||
|
|
|
@ -824,7 +824,7 @@ public class ArenaLogic {
|
||||||
Set<ZSetOperations.TypedTuple<String>> rankByKey = rank.getRankByKey(String.valueOf(groupId),rankIndex-1,rankIndex-1);
|
Set<ZSetOperations.TypedTuple<String>> rankByKey = rank.getRankByKey(String.valueOf(groupId),rankIndex-1,rankIndex-1);
|
||||||
ZSetOperations.TypedTuple<String> next = rankByKey.iterator().next();
|
ZSetOperations.TypedTuple<String> next = rankByKey.iterator().next();
|
||||||
if(Integer.parseInt(next.getValue())<1000){
|
if(Integer.parseInt(next.getValue())<1000){
|
||||||
CommonProto.ArenaEnemy.Builder robotCrossArenaEnemy = getRobotCrossArenaEnemy(rankIndex, groupId);
|
CommonProto.ArenaEnemy.Builder robotCrossArenaEnemy = getRobotCrossArenaEnemy(groupId,rankIndex,Integer.parseInt(next.getValue()));
|
||||||
if(list!=null&&list.size()>0){
|
if(list!=null&&list.size()>0){
|
||||||
robotCrossArenaEnemy.setHadProud(list.contains(String.valueOf(robotCrossArenaEnemy.getPersonInfo().getUid())));
|
robotCrossArenaEnemy.setHadProud(list.contains(String.valueOf(robotCrossArenaEnemy.getPersonInfo().getUid())));
|
||||||
}
|
}
|
||||||
|
@ -851,12 +851,12 @@ public class ArenaLogic {
|
||||||
}
|
}
|
||||||
//获取单个信息(机器人)
|
//获取单个信息(机器人)
|
||||||
|
|
||||||
public CommonProto.ArenaEnemy.Builder getRobotCrossArenaEnemy(int id,int groupId){
|
public CommonProto.ArenaEnemy.Builder getRobotCrossArenaEnemy(int groupId,int rank,int id){
|
||||||
CrossArenaEnemy info = RedisUtil.getInstence().getMapEntry(RedisKey.CROSS_ARENA_ROBOT_INFO, String.valueOf(groupId), String.valueOf(id), CrossArenaEnemy.class);
|
CrossArenaEnemy info = RedisUtil.getInstence().getMapEntry(RedisKey.CROSS_ARENA_ROBOT_INFO, String.valueOf(groupId), String.valueOf(id), CrossArenaEnemy.class);
|
||||||
if(info==null){
|
if(info==null){
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
return getRobotCrossArenaEnemy(id,info);
|
return getRobotCrossArenaEnemy(rank,info);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue