Merge branch 'master_test_gn_arena' into dev_dh_cross_rank

back_recharge
duhui 2021-07-28 18:05:26 +08:00
commit 657519a083
1 changed files with 11 additions and 16 deletions

View File

@ -993,9 +993,7 @@ public class ArenaLogic {
int enemyId = enemy.getEnemyId(); int enemyId = enemy.getEnemyId();
SArenaRobotConfig sArenaRobotConfig = SArenaRobotConfig.getsArenaRobotConfigById(enemyId); SArenaRobotConfig sArenaRobotConfig = SArenaRobotConfig.getsArenaRobotConfigById(enemyId);
CommonProto.Team teamBuild = CommonProto.Team.newBuilder().addAllHeroTid(sArenaRobotConfig.getHeroList()).build(); CommonProto.Team teamBuild = CommonProto.Team.newBuilder().addAllHeroTid(sArenaRobotConfig.getHeroList()).build();
CommonProto.ArenaPersonInfo personInfoBuild = null; CommonProto.ArenaPersonInfo personInfoBuild = CommonProto.ArenaPersonInfo.newBuilder()
try {
personInfoBuild = CommonProto.ArenaPersonInfo.newBuilder()
.setUid(enemy.getEnemyId_UUid()) .setUid(enemy.getEnemyId_UUid())
.setLevel(sArenaRobotConfig.getRobotLevel()) .setLevel(sArenaRobotConfig.getRobotLevel())
.setName(enemy.getRandomName()==null?"":enemy.getRandomName()) .setName(enemy.getRandomName()==null?"":enemy.getRandomName())
@ -1006,9 +1004,6 @@ public class ArenaLogic {
.setGender(enemy.isGender()?1:0) .setGender(enemy.isGender()?1:0)
.setRank(rank) .setRank(rank)
.build(); .build();
} catch (UnknownHostException e) {
e.printStackTrace();
}
return CommonProto.ArenaEnemy.newBuilder() return CommonProto.ArenaEnemy.newBuilder()
.setPersonInfo(personInfoBuild) .setPersonInfo(personInfoBuild)
.setWorshipTime(proudTime) .setWorshipTime(proudTime)