diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Hero.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Hero.java index 6efbbda71..f67adb46e 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Hero.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Hero.java @@ -158,7 +158,7 @@ public class Hero extends MongoBase implements Comparable,Cloneable { jewelInfo = new HashSet<>(2); } - //无尽使用固定配置英雄 + //无尽和玉虚使用固定配置英雄 public Hero(int heroId,int uid){ this.setRootCollection(User._COLLECTION_NAME); this.id = KeyGenUtils.produceIdByModule(UUIDEnum.HERO,uid); @@ -179,11 +179,11 @@ public class Hero extends MongoBase implements Comparable,Cloneable { for(int i = 0; i < equipSign.length; i++){ soulEquipByPositionMap.put(i+1,equipSign[i]); } - int[] equip = propConfig.getEquipList(); +// int[] equip = propConfig.getEquipList(); equipByPositionMap = new HashMap<>(); - for(int i = 0; i < equip.length; i++){ - equipByPositionMap.put(i+1,equip[i]); - } +// for(int i = 0; i < equip.length; i++){ +// equipByPositionMap.put(i+1,equip[i]); +// } } public void upStar(int upStar) { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java index a9695812f..26260800a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java @@ -1985,13 +1985,15 @@ public class PlayerLogic { throw new ErrorCodeException(ErrorCode.newDefineCode("hero no")); } CommonProto.Hero.Builder heroBuilder = CommonProto.Hero.newBuilder(). - setLevel(rpcHero.getLevel()). + setLevel(yuxuHero.getYuXuLevel()). setEspecialEquipLevel(rpcHero.getEspecialEquipLevel()). setStar(yuxuHero.getStar()). setId(rpcHero.getId()). setHeroId(rpcHero.getTemplateId()). setGodSoulLv(yuxuHero.getGodSoulLv()). - setBreakId(rpcHero.getBreakId()).setStarBreakId(rpcHero.getStarBreakId()); + setBreakId(yuxuHero.getBreakId()). + setStarBreakId(yuxuHero.getStarBreakId()) + .setPropertyId(rpcHero.getPropertyId()); PlayerInfoProto.ViewHeroInfoResponse.Builder builder = PlayerInfoProto.ViewHeroInfoResponse.newBuilder(); Map config = STableManager.getConfig(SEndlessHeroProp.class); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java index 14c4e9ff0..d51c1d184 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java @@ -1372,13 +1372,11 @@ public class CBean2Proto { * @return */ public static CommonProto.Hero getYuxuHero(Hero yuxuHero,Hero hero,HeroManager heroManager){ - // 无装备 - Collection equipList =new ArrayList<>(); CommonProto.Hero hero1 = getHero(yuxuHero); CommonProto.Hero.Builder builder = hero1.toBuilder(); - builder.addAllEquipIdList(equipList); - builder.setLevel(yuxuHero.getLevel(heroManager)); - builder.setBreakId(hero.getBreakIdByHongMeng(heroManager)); + builder.setLevel(yuxuHero.getYuXuLevel()); + builder.setBreakId(yuxuHero.getBreakId()); + builder.setStarBreakId(yuxuHero.getStarBreakId()); //显示真实的法宝等级 builder.setEspecialEquipLevel(hero.getEspecialEquipLevel()); return builder.build();