diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/CombatPlan.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/CombatPlan.java index 9ede1b7..9ee2b95 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/CombatPlan.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/CombatPlan.java @@ -94,6 +94,10 @@ public class CombatPlan extends MongoBase implements Serializable { updateString("skill", skill); } + public int getQuality() { + return 0; + } + public void setSkill(Set skill) { this.skill = skill; updateString("skill", this.skill); 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 517e1b7..92bc7e1 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 @@ -127,6 +127,7 @@ public class Hero extends MongoBase implements Cloneable, Serializable { combatPlanMap = new HashMap<>(2); medalMap = new HashMap<>(4); this.adjustByPositionMap = hero.adjustByPositionMap; + this.heroGiftEquipList = new HashSet<>(hero.getHeroGiftEquipList()); } public Hero(int uid, int heroTid, int initStar) { @@ -156,6 +157,7 @@ public class Hero extends MongoBase implements Cloneable, Serializable { combatPlanPosMap = new HashMap<>(2); medalMap = new HashMap<>(4); this.adjustByPositionMap = new HashMap<>(); + this.heroGiftEquipList = new HashSet<>(this.getHeroGiftEquipList()); } public Hero(int uid, int heroTid, int initStar, int level) { @@ -184,6 +186,7 @@ public class Hero extends MongoBase implements Cloneable, Serializable { combatPlanPosMap = new HashMap<>(2); medalMap = new HashMap<>(4); this.adjustByPositionMap = new HashMap<>(); + this.heroGiftEquipList = new HashSet<>(this.getHeroGiftEquipList()); } public void upStar(int upStar) throws Exception { 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 bea526b..482cff5 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java @@ -218,7 +218,7 @@ public class CBean2Proto { continue; } combatPlanSlots.add(CommonProto.CombatPlanSlot.newBuilder().setPosition(item.getKey()).setPlanId(item.getValue().getId()).setConfPlanId(item.getValue().getCombatPlanId()).build()); - combatPlans.add(getCombatPlan(item.getValue())); +// combatPlans.add(getCombatPlan(item.getValue()));暂时注掉,前端解析有问题 } } List medals = new ArrayList<>(); @@ -314,6 +314,8 @@ public class CBean2Proto { .setCombatPlanId(plan.getCombatPlanId()) .addAllProperty(list) .addAllSkill(plan.getSkill()) + .setQuality(plan.getQuality()) + .setIsLocked(plan.getIsLocked()) .setPromotionLevel(plan.getPromotionLevel()) .build(); }