generated from root/miduo_server
修复英雄戒指协议前端解析不了的问题
parent
c03c7e525f
commit
bf3e83304d
|
@ -94,6 +94,10 @@ public class CombatPlan extends MongoBase implements Serializable {
|
|||
updateString("skill", skill);
|
||||
}
|
||||
|
||||
public int getQuality() {
|
||||
return 0;
|
||||
}
|
||||
|
||||
public void setSkill(Set<Integer> skill) {
|
||||
this.skill = skill;
|
||||
updateString("skill", this.skill);
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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<CommonProto.Medal> 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();
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue