From 761fb9901de9304a49fa6fd84f2545d5ae8d2c87 Mon Sep 17 00:00:00 2001 From: zhangshanxue Date: Tue, 9 Jun 2020 15:43:19 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90ID1007808=E3=80=91=E3=80=90ID1007804?= =?UTF-8?q?=E3=80=91=E3=80=90ID1007810=E3=80=91=E3=80=90=E5=85=AC=E4=BC=9A?= =?UTF-8?q?=E6=8F=B4=E5=8A=A9=E3=80=91=E5=85=AC=E4=BC=9A=E6=8F=B4=E5=8A=A9?= =?UTF-8?q?=E6=8A=A5=E9=94=99=20=20=20=E5=92=8C=E7=8C=8E=E5=A6=96=E4=B9=8B?= =?UTF-8?q?=E8=B7=AF=E5=9C=A3=E7=89=A9=E4=B8=8D=E7=94=9F=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reportBeans_37/Repot37EventUtil.java | 52 +++++++++---------- ...ConfirmExpeditionBattleRequestHandler.java | 4 +- .../GuildSendHelpMessageRequestHandler.java | 15 ++++-- .../family/GuildSendHelpRequestHandler.java | 6 ++- .../logic/expedition/ExpeditionLogic.java | 42 +++++++++------ .../ljsd/jieling/logic/family/GuildLogic.java | 3 +- .../ljsd/jieling/logic/hero/HeroLogic.java | 23 +++++++- 7 files changed, 93 insertions(+), 52 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/dataReport/reportBeans_37/Repot37EventUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/dataReport/reportBeans_37/Repot37EventUtil.java index d4104a19c..c0e725b06 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/dataReport/reportBeans_37/Repot37EventUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/dataReport/reportBeans_37/Repot37EventUtil.java @@ -89,32 +89,32 @@ public class Repot37EventUtil { public static boolean Report37Chat(User user,Object... parm){ - ServerProperties serverProperties = GameApplication.serverProperties; - if(!serverProperties.isSendlog37()){ - return true; - } - final ExecutorService exec = Executors.newFixedThreadPool(1); - Callable call = new Callable() { - @Override - public Report37Response call(){ - Report37Response report37Response = hadResReport(Report37Response.class, user, Report37EventType.CHECK_CHAT_CONTENT, parm); - return report37Response; - } - }; - try { - Future future = exec.submit(call); - Report37Response response = future.get(1000*2,TimeUnit.MILLISECONDS); - if(response.getState()==1){ - return true; - } - }catch (TimeoutException ex){ - return true; - }catch (Exception e){ - e.printStackTrace(); - }finally { - exec.shutdown(); - } - return false; +// ServerProperties serverProperties = GameApplication.serverProperties; +// if(!serverProperties.isSendlog37()){ +// return true; +// } +// final ExecutorService exec = Executors.newFixedThreadPool(1); +// Callable call = new Callable() { +// @Override +// public Report37Response call(){ +// Report37Response report37Response = hadResReport(Report37Response.class, user, Report37EventType.CHECK_CHAT_CONTENT, parm); +// return report37Response; +// } +// }; +// try { +// Future future = exec.submit(call); +// Report37Response response = future.get(1000*2,TimeUnit.MILLISECONDS); +// if(response.getState()==1){ +// return true; +// } +// }catch (TimeoutException ex){ +// return true; +// }catch (Exception e){ +// e.printStackTrace(); +// }finally { +// exec.shutdown(); +// } + return true; } public enum Report37EventType { 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 1d921665a..4de45475b 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 @@ -82,7 +82,9 @@ public class EndConfirmExpeditionBattleRequestHandler extends BaseHandler entry:guildMyInfo.getGuidHelpHadTakeInfo().entrySet()) { - if(entry.getValue() entry:guildMyInfo.getGuidHelpInfo().entrySet()) { + if(entry.getValue() entry : user.getGuildMyInfo().getGuidHelpInfo().entrySet()) { - builder.addGuildHelpInfo(CommonProto.GuildHelpInfo.newBuilder().setHadtakenum(user.getGuildMyInfo().getGuidHelpHadTakeInfo().getOrDefault(entry.getKey(),0)).setType(entry.getKey()).setHadtakenum(0).setNum(0)); + builder.addGuildHelpInfo(CommonProto.GuildHelpInfo.newBuilder() + .setHadtakenum(user.getGuildMyInfo().getGuidHelpHadTakeInfo().getOrDefault(entry.getKey(),0)) + .setType(entry.getKey()) + .setNum(0)); } //notify all change 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 05976d1fd..c376e634a 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 @@ -184,7 +184,7 @@ public class ExpeditionLogic { .setState(state) .build()); - if(nodeInfo1.getType()==ExpeditionLogic.NODETYPE_SHOP){ + if(nodeInfo1.getType()==ExpeditionLogic.NODETYPE_SHOP&&newlay==nodeInfo1.getLay()){ try { //更新商店 StoreLogic.initOneStore(user, 56); @@ -940,12 +940,24 @@ public class ExpeditionLogic { } StringBuilder skillSb = new StringBuilder(); StringBuilder propertySb = new StringBuilder(); - String heroSkill = HeroLogic.getInstance().getHeroSkills(user,hero,skillSb).toString(); + HeroLogic.getInstance().getHeroSkills(user,hero,skillSb).toString(); + + if(teamId==GlobalsDef.EXPEDITION_TEAM){ + ExpeditionManager expeditionManager = user.getExpeditionManager(); + Set expeditionHolyConfigs = ExpeditionLogic.getFirstRankHoly(expeditionManager); + for (SExpeditionHolyConfig expeditionHolyConfig:expeditionHolyConfigs) { + SPassiveSkillLogicConfig config = SPassiveSkillLogicConfig.getConfig(expeditionHolyConfig.getPassiveSkillId()); + if(config!=null &&config.getEffectiveRange()==1){ + skillSb.append(expeditionHolyConfig.getPassiveSkillId()).append("#"); + } + } + } + String property = HeroLogic.getInstance().getHeroPropertyBuilder(propertySb, hero.getTemplateId(),hero.getLevel(), heroAttributeMap).toString(); CommonProto.FightUnitInfo heroFightInfo = CommonProto.FightUnitInfo .newBuilder() .setUnitId(Integer.toString(hero.getTemplateId())) - .setUnitSkillIds(heroSkill.substring(0,heroSkill.length()-1)) + .setUnitSkillIds(skillSb.substring(0,skillSb.length()-1)) .setProperty(property.substring(0, property.length()-1)) .setPosition(teamPosHeroInfo.getPosition()) .setStar(hero.getStar()) @@ -956,22 +968,22 @@ public class ExpeditionLogic { //TOO 添加被动技能 String pokenmonPassiveSkills = HeroLogic.getInstance().getPokenmonPassiveSkills(user, teamId); - ExpeditionManager expeditionManager = user.getExpeditionManager(); - Set expeditionHolyConfigs = ExpeditionLogic.getFirstRankHoly(expeditionManager); - StringBuilder passiveSkillResult = new StringBuilder(); - if(pokenmonPassiveSkills.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):""; +// ExpeditionManager expeditionManager = user.getExpeditionManager(); +// Set expeditionHolyConfigs = ExpeditionLogic.getFirstRankHoly(expeditionManager); +// StringBuilder passiveSkillResult = new StringBuilder(); +// if(pokenmonPassiveSkills.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):""; return CommonProto.FightTeamInfo. newBuilder() .addAllFightUnitList(heroFightInfos) .setTeamSkillList(HeroLogic.getInstance().getPokenmonSkills(user,teamId)) - .setTeamPassiveList(pokenmonPassiveSkills+holySkill) + .setTeamPassiveList(pokenmonPassiveSkills) .setSpecialPassive(SpecialForTeamBuildEnum.toParm(teamId,user)) .build(); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java index 9b0ff8b93..f6e9a71be 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java @@ -1403,7 +1403,7 @@ public class GuildLogic { boolean isfinish =true; SGuildHelpConfig sGuildHelpConfig = STableManager.getConfig(SGuildHelpConfig.class).get(1); - if(guildMyInfo.getGuidHelpInfo().size()==sGuildHelpConfig.getRecourseTime()[0]){ + if(guildMyInfo.getGuidHelpHadTakeInfo().size()==sGuildHelpConfig.getRecourseTime()[0]){ for (Map.Entry entry:guildMyInfo.getGuidHelpHadTakeInfo().entrySet()) { if(entry.getValue() heroSkillList = CombatLogic.getInstance().passiveskillEffect(user, hero,teamId); + + if(teamId==GlobalsDef.EXPEDITION_TEAM){ + ExpeditionManager expeditionManager = user.getExpeditionManager(); + Set expeditionHolyConfigs = ExpeditionLogic.getFirstRankHoly(expeditionManager); + for (SExpeditionHolyConfig config:expeditionHolyConfigs) { + heroSkillList.add(config.getPassiveSkillId()); + } + } + Map heroSkillAdMap = new HashMap<>(); heroSkillList.forEach(skill->{ SPassiveSkillLogicConfig config = SPassiveSkillLogicConfig.getConfig(skill); if(null!=config.getValue()&&config.getValue().length>2&&config.getValue()[2] !=4){ - PassiveskillCalEnum.calEnumMap.get(config.getType()).getPassiveSkillProcessor().process(config,hero,heroSkillAdMap); + PassiveskillCalEnum passiveskillCalEnum = PassiveskillCalEnum.calEnumMap.get(config.getType()); + if(null!= passiveskillCalEnum){ + passiveskillCalEnum.getPassiveSkillProcessor().process(config,hero,heroSkillAdMap); + } } }); + + + if(!heroSkillAdMap.isEmpty()){ combinedAttribute(heroSkillAdMap,heroAllAttribute); heroSkillAdMap.clear(); @@ -1469,7 +1485,10 @@ public class HeroLogic{ heroSkillList.forEach(skill->{ SPassiveSkillLogicConfig configTmp = SPassiveSkillLogicConfig.getConfig(skill); if(null!=configTmp.getValue()&&configTmp.getValue().length>2&&configTmp.getValue()[2] ==4){ - PassiveskillCalEnum.calEnumMap.get(configTmp.getType()).getPassiveSkillProcessor().process(configTmp,hero,heroSkillAdMap); + PassiveskillCalEnum passiveskillCalEnum = PassiveskillCalEnum.calEnumMap.get(configTmp.getType()); + if(null!= passiveskillCalEnum){ + passiveskillCalEnum.getPassiveSkillProcessor().process(configTmp,hero,heroSkillAdMap); + } } }); if(!heroSkillAdMap.isEmpty()){