diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/championship/ChampionshipLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/championship/ChampionshipLogic.java index cf2c2f3b0..596177a28 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/championship/ChampionshipLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/championship/ChampionshipLogic.java @@ -392,6 +392,8 @@ public class ChampionshipLogic { scoreToRedis(); } + roundTimes=13; + progress=-2; // close(); @@ -418,7 +420,7 @@ public class ChampionshipLogic { int teamId = (index++ % groupNums); memberOfTeamTmp.get(teamId).add(memberInfo.getUid()); if(teamUpdate){ - memberInfo.setTeamId(teamId*100); + memberInfo.setTeamId(teamId*100+memberInfo.getTeamId()); }else{ memberInfo.setTeamId(teamId); } @@ -441,8 +443,7 @@ public class ChampionshipLogic { int myRank = RedisUtil.getInstence().getZSetreverseRank(RedisKey.CHAMPION_RANK, "", Integer.toString(uid)).intValue(); ArenaInfoProto.ChampionGetInfoResponse.Builder builder = ArenaInfoProto.ChampionGetInfoResponse.newBuilder().setProgress(progress).setEndTime(endTime).setMyrank(myRank); if(myRank!=-1){ - MemberInfo memberInfo = RedisUtil.getInstence().getMapEntry(RedisKey.CHAMPION_JOIN, "", Integer.toString(uid), MemberInfo.class); - builder.setMyscore(memberInfo.getScore()); + builder.setMyscore(RedisUtil.getInstence().getZSetScore(RedisKey.CHAMPION_RANK, "", Integer.toString(uid)).intValue()); builder.setJoinState(1); String key = RedisUtil.getInstence().getKey(RedisKey.CHAMPION_MY_BATTLLE_IDS, Integer.toString(uid)); Object latestKey = RedisUtil.getInstence().lGetIndex(key, -1); @@ -1055,10 +1056,6 @@ public class ChampionshipLogic { int attackUid = memberInfoAttack.getUid(); int defUid = memberInfoDef.getUid(); int type = memberInfoAttack.getType() + memberInfoDef.getType(); - if(memberInfoAttack.getType() == 1){ - attackUid = memberInfoDef.getUid(); - defUid = memberInfoAttack.getUid(); - } ArenaRecord arenaRecord = new ArenaRecord(); arenaRecord.setId(KeyGenUtils.produceIdByModule(UUIDEnum.ARENARECORD,memberInfoAttack.getUid())); arenaRecord.setAttackId(attackUid);