From b27b38d3d080be9f06f0df8677fb67bf4521aa20 Mon Sep 17 00:00:00 2001 From: yuanshuai <243578945@qq.com> Date: Thu, 21 Oct 2021 11:03:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E8=A1=8C=E6=8A=80=E8=83=BD=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ljsd/jieling/logic/hero/HeroLogic.java | 42 +++++++++++-------- 1 file changed, 24 insertions(+), 18 deletions(-) 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 87c6e371c..1a2b68912 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 @@ -2351,6 +2351,28 @@ public class HeroLogic{ return sb; } + //获取修行技能数据 + public CommonProto.FightUnitInfo getPracticeSkill(Map skillMap){ + String skillStr=""; + for (Map.Entry entry : skillMap.entrySet()) { + int skillId=SPlayerSkill.GetSPlayerSkill(entry.getKey(),entry.getValue()).getId(); + if (skillStr.isEmpty()){ + skillStr+= skillId; + }else{ + skillStr+= "#"+skillId; + } + } + CommonProto.FightUnitInfo skillInfo = CommonProto.FightUnitInfo + .newBuilder() + .setUnitId("0") + .setUnitSkillIds(skillStr) + .setProperty("0") + .setPosition(100) + .setSkinId(0) + .build(); + return skillInfo; + } + public List getPokemonSkills(User user){ //todo 灵兽 Map pokemonTeamMap = user.getPokemonManager().getPokemonTeamMap(); @@ -2386,27 +2408,11 @@ public class HeroLogic{ .build(); pokemonInfos.add(info); } - String skillStr=""; - for (Map.Entry entry : user.getHeroManager().getPracticeSkillMap().entrySet()) { - int skillId=SPlayerSkill.GetSPlayerSkill(entry.getKey(),entry.getValue()).getId(); - if (skillStr.isEmpty()){ - skillStr+= skillId; - }else{ - skillStr+= "#"+skillId; - } - } - CommonProto.FightUnitInfo skillInfo = CommonProto.FightUnitInfo - .newBuilder() - .setUnitId("0") - .setUnitSkillIds(skillStr) - .setProperty("0") - .setPosition(100) - .setSkinId(0) - .build(); - pokemonInfos.add(skillInfo); + pokemonInfos.add(getPracticeSkill(user.getHeroManager().getPracticeSkillMap())); return pokemonInfos; } + //老跨服 public List getCrossPokemonSkills(ArenaOfUser user){ //todo 灵兽 Map pokemons = user.getPokemons();