From f0677a67062193a5d37eb15bd86178df69e4425b Mon Sep 17 00:00:00 2001 From: lvxinran Date: Thu, 18 Mar 2021 18:55:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=8A=82=E7=82=B9=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/logic/expedition/ExpeditionLogic.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/expedition/ExpeditionLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/expedition/ExpeditionLogic.java index 91210b363..9a5b672e0 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/expedition/ExpeditionLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/expedition/ExpeditionLogic.java @@ -420,7 +420,7 @@ public class ExpeditionLogic { Map 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) { From 66bea3f2c5ce9d2f7005b4ef7328ea4dacee2d17 Mon Sep 17 00:00:00 2001 From: mengchengzhen <13682025901@163.com> Date: Fri, 19 Mar 2021 14:05:16 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A4=A7=E9=97=B9=E5=A4=A9=E5=AE=AB?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ConfirmExpeditionBattleRequestHandler.java | 22 ++----------------- .../Expedition/TakeHolyEquipRequest.java | 2 +- .../com/ljsd/jieling/kefu/Cmd_addholy.java | 2 +- .../jieling/logic/dao/ExpeditionManager.java | 14 ++++++++++-- .../logic/expedition/ExpeditionLogic.java | 3 ++- .../com/ljsd/jieling/util/FightDataUtil.java | 2 +- 6 files changed, 19 insertions(+), 26 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/EndConfirmExpeditionBattleRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/EndConfirmExpeditionBattleRequestHandler.java index 120b030f1..2f0ab4baf 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/EndConfirmExpeditionBattleRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/EndConfirmExpeditionBattleRequestHandler.java @@ -84,27 +84,9 @@ public class EndConfirmExpeditionBattleRequestHandler extends BaseHandler expeditionHolyConfigs = ExpeditionLogic.getFirstRankHoly(expeditionManager); - - StringBuilder passiveSkillResult = new StringBuilder(); - if(deffightInfo.getPassiveSkills().length()!=0){ - passiveSkillResult.append("|"); - } - for (SExpeditionHolyConfig config:expeditionHolyConfigs) { - passiveSkillResult.append(String.valueOf(config.getPassiveSkillId())).append("|"); - } - String holySkill = passiveSkillResult.length()!=0?passiveSkillResult.substring(0,passiveSkillResult.length()-1):""; - LuaValue getFightData; -// if(ExpeditionLogic.NODETYPE_GREED == nodeInfo.getType()){ -// int tid = deffightInfo.getUid(); -// List 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()+holySkill),nodeInfo.getBossHP()); - getFightData = FightDataUtil.getFinalPlayerFightData(fightTeamInfo, deffightTeamInfo); -// } + 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+""); int[] checkResult = CheckFight.getInstance().checkFight(seed, maxTime, getFightData, getOptionData, GameFightType.Expediton.getFightType()); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/TakeHolyEquipRequest.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/TakeHolyEquipRequest.java index db4ee33ad..38419b5bf 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/TakeHolyEquipRequest.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/TakeHolyEquipRequest.java @@ -88,7 +88,7 @@ public class TakeHolyEquipRequest extends BaseHandler 0){ - expeditionManager.getHeroItems().put(sExpeditionHolyConfig.getHeroId(),sExpeditionHolyConfig); + expeditionManager.addHeroItems(sExpeditionHolyConfig); } //notify client diff --git a/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_addholy.java b/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_addholy.java index 8dc2b1c26..21ec1a556 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_addholy.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_addholy.java @@ -54,7 +54,7 @@ public class Cmd_addholy extends GmRoleAbstract{ } //添加专属英雄圣物缓存 if(sExpeditionHolyConfig.getHeroId() > 0){ - expeditionManager.getHeroItems().put(sExpeditionHolyConfig.getHeroId(),sExpeditionHolyConfig); + expeditionManager.addHeroItems(sExpeditionHolyConfig); } //notify client diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/ExpeditionManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/ExpeditionManager.java index c40ec23d8..f291c19db 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/ExpeditionManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/ExpeditionManager.java @@ -31,7 +31,7 @@ public class ExpeditionManager extends MongoBase { private int freshTime;//刷新时间 @Transient private Map effectItems = new HashMap<>();//圣物叠加 不入库 - private Map heroItems = new HashMap<>();//英雄专属圣物 不入库 + private Map heroItems = new HashMap<>();//英雄专属圣物 private Set getHeroSet = new HashSet<>();//招募英雄id组 不入库 private Map heroMap = new HashMap<>(); @@ -293,7 +293,7 @@ public class ExpeditionManager extends MongoBase { return null; } - public Map getHeroItems() { + public Map getHeroItems() { return heroItems; } @@ -301,4 +301,14 @@ public class ExpeditionManager extends MongoBase { return getHeroSet; } + public void addHeroItems(SExpeditionHolyConfig config){ + this.heroItems.put(config.getHeroId(),config.getId()); + updateString("heroItems",heroItems); + } + + public void clearHeroItems(){ + this.heroItems.clear(); + updateString("heroItems",heroItems); + } + } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/expedition/ExpeditionLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/expedition/ExpeditionLogic.java index 9a5b672e0..77e73a83c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/expedition/ExpeditionLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/expedition/ExpeditionLogic.java @@ -843,7 +843,8 @@ public class ExpeditionLogic { * 处理圣物英雄技能 */ private static void disposeWithHeroHoly(User user,Hero hero,StringBuilder skillSb){ - SExpeditionHolyConfig con = user.getExpeditionManager().getHeroItems().get(hero.getTemplateId()); + int holyId = user.getExpeditionManager().getHeroItems().get(hero.getTemplateId()); + SExpeditionHolyConfig con = STableManager.getConfig(SExpeditionHolyConfig.class).get(holyId); if( con != null ){ int[][] skillModify = con.getSkillModify(); for(int i = 0 ; i < skillModify.length ; i++){ diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/FightDataUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/FightDataUtil.java index d5326d78d..31ddbaeea 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/FightDataUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/FightDataUtil.java @@ -232,7 +232,7 @@ public class FightDataUtil { LuaValue passivityDataPer= new LuaTable(); for(int i=0;i