Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn

DESKTOP-98AVA47\Administrator 2021-11-05 01:48:08 +08:00
commit bbceffe1a9
1 changed files with 11 additions and 1 deletions

View File

@ -439,9 +439,19 @@ public class CrossYuxulundaoChallengeHandler extends BaseHandler<ArenaInfoProto.
continue;
}
CommonProto.FightTeamInfo defteamInfo = FightUtil.getYxldRobotFightTeamInfo(sArenaRobotConfig, i + 1);
//HeroLogic.getInstance().calTeamTotalForce(user, team, false)
int myforce = 0;int defforce =0;
myforce = HeroLogic.getInstance().calTeamTotalForce(myUser, myteamId[i], false);
if(defTeamId[i] == GlobalsDef.CROSS_YU_XU_LUN_DAO_ONE){
defforce =sArenaRobotConfig.getYxldTotalForce1();
}else if(defTeamId[i] == GlobalsDef.CROSS_YU_XU_LUN_DAO_TWO){
defforce =sArenaRobotConfig.getYxldTotalForce2();
}else if(defTeamId[i] == GlobalsDef.CROSS_YU_XU_LUN_DAO_THREE){
defforce =sArenaRobotConfig.getYxldTotalForce3();
}
FightResult fightResult = GetWorldArenaChallengeRequestHandler.getFightForPVP(myUser.getId(), defUserUid,
fightTeamInfo, defteamInfo, FightUtil.getFightSeed(), true);
fightTeamInfo, defteamInfo, FightUtil.getFightSeed(), myforce<defforce);
int seed = fightResult.getSeed();
CommonProto.FightData build = CommonProto.FightData.newBuilder()
.setFightMaxTime(SArenaSetting.getSArenaSetting().getMostTime())