皮肤修改
parent
4105cb1292
commit
f3af1b0c4b
|
|
@ -1461,7 +1461,6 @@ public class HeroLogic{
|
|||
}
|
||||
combinedAttribute(pokemonAttr,heroAllAttribute);
|
||||
}
|
||||
//todo 灵兽
|
||||
//灵兽图鉴加成
|
||||
Set<Integer> pokemonBookEnabled = pokemonManager.getPokemonBookEnabled();
|
||||
if(!pokemonBookEnabled.isEmpty()){
|
||||
|
|
@ -1471,6 +1470,17 @@ public class HeroLogic{
|
|||
combinedAttribute(activePara,heroAllAttribute);
|
||||
}
|
||||
}
|
||||
//英雄皮肤加成 记得判断皮肤过期
|
||||
int skin = hero.getSkin();
|
||||
if(skin!=0){
|
||||
Map<Integer, Integer> skinInfo = user.getHeroManager().getSkinInfo();
|
||||
SHeroSkin sHeroSkin = SHeroSkin.skinMapByType.get(skin);
|
||||
if(sHeroSkin!=null&&sHeroSkin.getMonomerProperty()!=null&&sHeroSkin.getMonomerProperty().length>0){
|
||||
if(skinInfo.containsKey(skin)&&skinInfo.get(skin)>TimeUtils.nowInt()){
|
||||
combinedAttribute(sHeroSkin.getMonomerProperty(),heroAllAttribute);
|
||||
}
|
||||
}
|
||||
}
|
||||
//装备总战力评分
|
||||
int equipForce=0;
|
||||
boolean needRemove = false;
|
||||
|
|
|
|||
|
|
@ -553,7 +553,7 @@ public class CBean2Proto {
|
|||
|
||||
|
||||
public static CommonProto.TeamSimpleInfo getSimpleTeamInfoByHero(Hero hero,int position){
|
||||
return CommonProto.TeamSimpleInfo.newBuilder().setHeroid(hero.getId()).setHeroTid(hero.getTemplateId()).setLevel(hero.getLevel()).setStar(hero.getStar()).setPosition(position).build();
|
||||
return CommonProto.TeamSimpleInfo.newBuilder().setHeroid(hero.getId()).setHeroTid(hero.getTemplateId()).setLevel(hero.getLevel()).setStar(hero.getStar()).setPosition(position).setSkinId(hero.getSkin()).build();
|
||||
}
|
||||
public static CommonProto.TeamSimpleInfo getSimpleTeamInfoByPokeMon(Pokemon pokemon,int position){
|
||||
return CommonProto.TeamSimpleInfo.newBuilder().setHeroid(pokemon.getId()).setHeroTid(pokemon.getTmpId()).setLevel(pokemon.getLevel()).setStar(pokemon.getStar()).setPosition(position).build();
|
||||
|
|
|
|||
Loading…
Reference in New Issue