From d054d48907608698ecb1c00083831f7ca95915c7 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Fri, 23 Oct 2020 13:38:08 +0800 Subject: [PATCH] =?UTF-8?q?=E7=81=B5=E5=85=BD=E6=88=98=E6=96=97=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../handler/map/behavior/BehaviorUtil.java | 2 +- .../handler/room/RoomMatchRequestHandler.java | 2 +- .../com/ljsd/jieling/kefu/Cmd_role_gm.java | 2 +- .../logic/championship/ChampionshipLogic.java | 2 +- .../logic/expedition/ExpeditionLogic.java | 4 +- .../jieling/logic/family/GuildFightLogic.java | 2 +- .../ljsd/jieling/logic/fight/FightUtil.java | 6 +- .../ljsd/jieling/logic/hero/HeroLogic.java | 34 ++++----- .../java/com/ljsd/jieling/util/ItemUtil.java | 2 +- .../main/java/config/SSpiritAnimalSkill.java | 74 +++++++++++++++++++ 10 files changed, 102 insertions(+), 28 deletions(-) create mode 100644 tablemanager/src/main/java/config/SSpiritAnimalSkill.java diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/BehaviorUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/BehaviorUtil.java index c8f2db8f4..3781be6c4 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/BehaviorUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/BehaviorUtil.java @@ -247,7 +247,7 @@ public class BehaviorUtil { return CommonProto.FightTeamInfo. newBuilder() .addAllFightUnitList(heroFightInfos) - .setTeamSkillList(HeroLogic.getInstance().getPokenmonSkills(user,teamId)) + .setTeamSkillList(HeroLogic.getInstance().getPokenmonSkills(user)) .setTeamPassiveList(HeroLogic.getInstance().getPokenmonPassiveSkills(user,teamId)) .build(); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/room/RoomMatchRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/room/RoomMatchRequestHandler.java index a682d3f76..01bc7b110 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/room/RoomMatchRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/room/RoomMatchRequestHandler.java @@ -120,7 +120,7 @@ public class RoomMatchRequestHandler extends BaseHandler{ String heroSkill = HeroLogic.getInstance().getHeroSkills(mine, hero,skillSb ).toString(); userBloodySnpInfo.updateHeroSkill(heroId,heroSkill.substring(0, heroSkill.length() - 1)); } - String pokenmonSkills = HeroLogic.getInstance().getPokenmonSkills(mine, myteamId); + String pokenmonSkills = HeroLogic.getInstance().getPokenmonSkills(mine); userBloodySnpInfo.setPokenmonSkills(pokenmonSkills); Map heroAllAttribute = BloodLogic.getInstance().battleRecord(mine, myteamId,null); userBloodySnpInfo.setHeroAllAttributes(heroAllAttribute); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_role_gm.java b/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_role_gm.java index febb383b0..6f8773588 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_role_gm.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_role_gm.java @@ -221,7 +221,7 @@ public class Cmd_role_gm extends GmRoleAbstract { if (self.getPokemonManager().getPokemonMap().size()!=0) { //玩家未激活异妖(神器)时,敌人阵容中不会出现异妖;激活异妖后,由敌人数据来源方决定战斗时是否有敌方异妖。 - String pokenmonSkills = HeroLogic.getInstance().getPokenmonSkills(user, snapTeamId); + String pokenmonSkills = HeroLogic.getInstance().getPokenmonSkills(user); String pokenmonPassiveSkills = HeroLogic.getInstance().getPokenmonPassiveSkills(user, snapTeamId); // List teamPosForPokenInfos = user.getTeamPosManager().getTeamPosForPoken().get(snapTeamId); // if (null!=teamPosForPokenInfos) { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/championship/ChampionshipLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/championship/ChampionshipLogic.java index 7c824765c..f79282801 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/championship/ChampionshipLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/championship/ChampionshipLogic.java @@ -690,7 +690,7 @@ public class ChampionshipLogic { String heroSkill = HeroLogic.getInstance().getHeroSkills(user, hero, skillSb).toString(); fightInfo.updateHeroSkill(heroId, heroSkill.substring(0, heroSkill.length() - 1)); } - String pokenmonSkills = HeroLogic.getInstance().getPokenmonSkills(user, snapTeamId); + String pokenmonSkills = HeroLogic.getInstance().getPokenmonSkills(user); fightInfo.setPokenmonSkills(pokenmonSkills); String pokenmonPassiveSkills = HeroLogic.getInstance().getPokenmonPassiveSkills(user, snapTeamId); fightInfo.setPassiveSkills(pokenmonPassiveSkills); 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 4cc47d0b0..026f90304 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 @@ -586,7 +586,7 @@ public class ExpeditionLogic { if (self.getPokemonManager().getPokemonMap().size()!=0) { //玩家未激活异妖(神器)时,敌人阵容中不会出现异妖;激活异妖后,由敌人数据来源方决定战斗时是否有敌方异妖。 - String pokenmonSkills = HeroLogic.getInstance().getPokenmonSkills(user, snapTeamId); + String pokenmonSkills = HeroLogic.getInstance().getPokenmonSkills(user); String pokenmonPassiveSkills = HeroLogic.getInstance().getPokenmonPassiveSkills(user, snapTeamId); fightInfo.setPokenmonSkills(pokenmonSkills); fightInfo.setPassiveSkills(pokenmonPassiveSkills); @@ -1042,7 +1042,7 @@ public class ExpeditionLogic { return CommonProto.FightTeamInfo. newBuilder() .addAllFightUnitList(heroFightInfos) - .setTeamSkillList(HeroLogic.getInstance().getPokenmonSkills(user,teamId)) + .setTeamSkillList(HeroLogic.getInstance().getPokenmonSkills(user)) .setTeamPassiveList(pokenmonPassiveSkills) .setSpecialPassive(SpecialForTeamBuildEnum.toParm(teamId,user)) .build(); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildFightLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildFightLogic.java index ffa1f8908..dd609cb79 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildFightLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildFightLogic.java @@ -352,7 +352,7 @@ public class GuildFightLogic { String heroSkill = HeroLogic.getInstance().getHeroSkills(user, hero,skillSb ).toString(); fightInfo.updateHeroSkill(heroId,heroSkill.substring(0, heroSkill.length() - 1)); } - String pokenmonSkills = HeroLogic.getInstance().getPokenmonSkills(user, 501); + String pokenmonSkills = HeroLogic.getInstance().getPokenmonSkills(user); fightInfo.setPokenmonSkills(pokenmonSkills); String pokenmonPassiveSkills = HeroLogic.getInstance().getPokenmonPassiveSkills(user, 501); fightInfo.setPassiveSkills(pokenmonPassiveSkills); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/FightUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/FightUtil.java index c2a67be01..ef4ec5f17 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/FightUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/FightUtil.java @@ -297,7 +297,7 @@ public class FightUtil { return CommonProto.FightTeamInfo. newBuilder() .addAllFightUnitList(heroFightInfos) - .setTeamSkillList(HeroLogic.getInstance().getPokenmonSkills(user,teamId)) + .setTeamSkillList(HeroLogic.getInstance().getPokenmonSkills(user)) .setTeamPassiveList(HeroLogic.getInstance().getPokenmonPassiveSkills(user,teamId)) .setSpecialPassive(SpecialForTeamBuildEnum.toParm(teamId,user)) .build(); @@ -334,7 +334,7 @@ public class FightUtil { return CommonProto.FightTeamInfo. newBuilder() .addAllFightUnitList(heroFightInfos) - .setTeamSkillList(HeroLogic.getInstance().getPokenmonSkills(user,teamId)) + .setTeamSkillList(HeroLogic.getInstance().getPokenmonSkills(user)) .setTeamPassiveList(HeroLogic.getInstance().getPokenmonPassiveSkills(user,teamId)) .setSpecialPassive(SpecialForTeamBuildEnum.toParm(teamId,user)) .build(); @@ -376,7 +376,7 @@ public class FightUtil { return CommonProto.FightTeamInfo. newBuilder() .addAllFightUnitList(heroFightInfos) - .setTeamSkillList(HeroLogic.getInstance().getPokenmonSkills(user,teamId)) + .setTeamSkillList(HeroLogic.getInstance().getPokenmonSkills(user)) .setTeamPassiveList(HeroLogic.getInstance().getPokenmonPassiveSkills(user,teamId)) .build(); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java index 35ae60257..0141b1743 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java @@ -1297,29 +1297,29 @@ public class HeroLogic{ return sb; } - public String getPokenmonSkills(User user,int teamId){ + public String getPokenmonSkills(User user){ StringBuilder pokenSkillResult = new StringBuilder(); //todo 灵兽 -// Map pokemonMap = user.getPokemonManager().getPokemonMap(); -// Collections.sort(teamPosForPokenInfos); -// int size = teamPosForPokenInfos.size(); -// for(int i=0;i pokemonTeamMap = user.getPokemonManager().getPokemonTeamMap(); + int[] blockUnlockLevel = SSpiritAnimalSetting.sSpiritAnimalSetting.getBlockUnlockLevel(); + PokemonManager pokemonManager = user.getPokemonManager(); + for(int i = 0;i pokemonMap = user.getPokemonManager().getPokemonMap(); // Collections.sort(teamPosForPokenInfos); // for(TeamPosForPokenInfo teamPosForPokenInfo:teamPosForPokenInfos){ diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java index 6f790aaec..2ee534c45 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java @@ -1593,7 +1593,7 @@ public class ItemUtil { for(int i = 0 ; i > skillByAnimalAndStar; + @Override + public void init() throws Exception { + Map> skillByAnimalAndStarTmp = new HashMap<>(); + Map configMap = STableManager.getConfig(SSpiritAnimalSkill.class); + for(Map.Entry entry:configMap.entrySet()){ + skillByAnimalAndStarTmp.computeIfAbsent(entry.getValue().getSpiritAnimalMatch(),n->new HashMap<>()).put(entry.getValue().getStarMatch(),entry.getValue()); + } + + skillByAnimalAndStar = skillByAnimalAndStarTmp; + } + + + public int getId() { + return id; + } + + public int getSpiritAnimalMatch() { + return spiritAnimalMatch; + } + + public int getStarMatch() { + return starMatch; + } + + public int[] getSkillIDList() { + return skillIDList; + } + + public int[] getReleasePoint() { + return releasePoint; + } + + public int[][] getReleaseLimit() { + return releaseLimit; + } + + public int[] getWarEffectCount() { + return warEffectCount; + } + + public int[] getTurnEffectCount() { + return turnEffectCount; + } + + +} \ No newline at end of file