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 3dc090bcc..5386a73c0 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 @@ -701,7 +701,9 @@ public class PlayerLogic { EquipManager equipManager = userInMem.getEquipManager(); Map equipMap = equipManager.getEquipMap(); for(String equipId : hero.getJewelInfo()){ - builder.addEquip(CBean2Proto.getEquipProto(equipMap.get(equipId)).toBuilder().setTreeLv(userInMem.getPlayerInfoManager().getTreeLevel())); + CommonProto.Equip.Builder toBuilder = CBean2Proto.getEquipProto(equipMap.get(equipId), userInMem.getHeroManager(), hero.getId()).toBuilder(); + toBuilder.setTreeLv(userInMem.getPlayerInfoManager().getTreeLevel()); + builder.addEquip(toBuilder); } for(int equipId : hero.getEquipByHongmengPositionMap(userInMem.getHeroManager()).values()){ builder.addEquip(CBean2Proto.getEquipProto(equipId)); 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 085b7c431..29b3c6fc5 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java @@ -346,6 +346,18 @@ public class CBean2Proto { return equipProto.build(); } + public static CommonProto.Equip getEquipProto(PropertyItem equip,HeroManager heroManager,String heroId){ + CommonProto.Equip.Builder proto = getEquipProto(equip).toBuilder(); + + if(equip instanceof Jewel){ + Jewel tempEquip =(Jewel)equip; + proto.setRebuildLevel(tempEquip.getLevelByHongMeng(heroManager,heroId)) + .setExp(tempEquip.getLevel()); + } + + return proto.build(); + } + public static CommonProto.Equip getEquipProto(int equipId) { return CommonProto.Equip.newBuilder().setEquipId(equipId).build(); } diff --git a/tablemanager/src/main/java/config/SExpeditionFloorConfig.java b/tablemanager/src/main/java/config/SExpeditionFloorConfig.java index 28525d1b9..843aca5f5 100644 --- a/tablemanager/src/main/java/config/SExpeditionFloorConfig.java +++ b/tablemanager/src/main/java/config/SExpeditionFloorConfig.java @@ -9,6 +9,8 @@ public class SExpeditionFloorConfig implements BaseConfig { private int floor; + private int floorLay; + private int node; private int[][] nodeType; @@ -60,5 +62,7 @@ public class SExpeditionFloorConfig implements BaseConfig { return treasureBox; } - + public int getFloorLay() { + return floorLay; + } } \ No newline at end of file diff --git a/tablemanager/src/main/java/config/SExpeditionHolyConfig.java b/tablemanager/src/main/java/config/SExpeditionHolyConfig.java index 85d3c74ac..4cbb3d03c 100644 --- a/tablemanager/src/main/java/config/SExpeditionHolyConfig.java +++ b/tablemanager/src/main/java/config/SExpeditionHolyConfig.java @@ -19,7 +19,16 @@ public class SExpeditionHolyConfig implements BaseConfig { private int passiveSkillId; private int forceType; + /** + * 是否可以重复 + */ + private int canRepeat; + /** + * 专属英雄id,0表示没有 + */ + private int heroId; + private int[][] skillModify; @Override public void init() throws Exception { @@ -51,5 +60,23 @@ public class SExpeditionHolyConfig implements BaseConfig { return forceType; } + public int getType() { + return type; + } + public int getEffect() { + return effect; + } + + public int getCanRepeat() { + return canRepeat; + } + + public int getHeroId() { + return heroId; + } + + public int[][] getSkillModify() { + return skillModify; + } } \ No newline at end of file diff --git a/tablemanager/src/main/java/config/SExpeditionSetting.java b/tablemanager/src/main/java/config/SExpeditionSetting.java index fca181bc9..4ed670c67 100644 --- a/tablemanager/src/main/java/config/SExpeditionSetting.java +++ b/tablemanager/src/main/java/config/SExpeditionSetting.java @@ -33,6 +33,9 @@ public class SExpeditionSetting implements BaseConfig { private int recruitTime; + private int[][] playerLevelfix; + + private int specialReward; @Override public void init() throws Exception { @@ -96,5 +99,11 @@ public class SExpeditionSetting implements BaseConfig { return recruitTime; } + public int[][] getPlayerLevelfix() { + return playerLevelfix; + } + public int getSpecialReward() { + return specialReward; + } } \ No newline at end of file