大闹天宫修改

back_recharge
lvxinran 2021-03-18 22:35:49 +08:00
parent 3905b8b26d
commit 1c97143e97
3 changed files with 11 additions and 8 deletions

View File

@ -92,7 +92,10 @@ public class EndConfirmExpeditionBattleRequestHandler extends BaseHandler<Expedi
passiveSkillResult.append("|");
}
for (SExpeditionHolyConfig config:expeditionHolyConfigs) {
passiveSkillResult.append(String.valueOf(config.getPassiveSkillId())).append("|");
//如果是英雄专属的 不加进去
if(config.getPassiveSkillId()!=0){
passiveSkillResult.append(String.valueOf(config.getPassiveSkillId())).append("|");
}
}
String holySkill = passiveSkillResult.length()!=0?passiveSkillResult.substring(0,passiveSkillResult.length()-1):"";

View File

@ -96,14 +96,14 @@ public class EndExpeditionBattleRequest extends BaseHandler<Expedition.EndExpedi
ExpeditionManager expeditionManager = user.getExpeditionManager();
LuaValue getFightData;
if(nodeInfo.getType()==ExpeditionLogic.NODETYPE_GREED){
int tid = deffightInfo.getUid();
List<CommonProto.FightTeamInfo> gropFightTeamInfoWithDouble = ExpeditionLogic.getGropFightTeamInfoWithDouble(tid, nodeInfo.getBossHP());
getFightData = FightDataUtil.getFinalFightData(fightTeamInfo, gropFightTeamInfoWithDouble);
}else {
// if(nodeInfo.getType()==ExpeditionLogic.NODETYPE_GREED){
// int tid = deffightInfo.getUid();
// List<CommonProto.FightTeamInfo> gropFightTeamInfoWithDouble = ExpeditionLogic.getGropFightTeamInfoWithDouble(tid, nodeInfo.getBossHP());
// getFightData = FightDataUtil.getFinalFightData(fightTeamInfo, gropFightTeamInfoWithDouble);
// }else {
CommonProto.FightTeamInfo deffightTeamInfo = FightUtil.makeFightBySnapDataWithDouble(new DefFightSnapData(deffightInfo.getHeroAttribute(),deffightInfo.getHeroSkills(),deffightInfo.getPokenmonSkills(),deffightInfo.getPassiveSkills()),nodeInfo.getBossHP());
getFightData = FightDataUtil.getFinalPlayerFightData(fightTeamInfo, deffightTeamInfo);
}
// }
LuaValue getOptionData = FightDataUtil.getOptionData(uid+"");
long[] checkResult = CheckFight.getInstance().checkFight(seed, maxTime, getFightData, getOptionData, GameFightType.Expediton.getFightType());

View File

@ -420,7 +420,7 @@ public class ExpeditionLogic {
Map<String, Double> heroHP = nodeInfo.getBossHP();
SnapFightInfo fightInfo = nodeInfo.getSnapFightInfo();
CommonProto.ExpeditionTeamInfo.Builder builder = CommonProto.ExpeditionTeamInfo.newBuilder();
if (!ExpeditionLogic.isBattleNode(nodeInfo.getType())&&nodeInfo.getType()!=ExpeditionLogic.NODETYPE_GREED) {
if (!ExpeditionLogic.isBattleNode(nodeInfo.getType())&&!ExpeditionLogic.isHardNode(nodeInfo.getType())) {
return builder.build();
}
if (null == fightInfo) {