森罗灵兽加成修改,宝物容错加入

back_recharge
lvxinran 2020-11-01 17:38:08 +08:00
parent a10f5b21de
commit 606753c705
2 changed files with 5 additions and 1 deletions

View File

@ -1455,6 +1455,9 @@ public class HeroLogic{
SCHero scHero = SCHero.getsCHero().get(hero.getTemplateId());
if(teamId!=0){
int heroNum = user.getTeamPosManager().getTeamPosForHero().get(teamId).size();
if(teamId==GlobalsDef.TRIAL_TEAM){
heroNum = 5;//森罗环境固定为5
}
int[][] pokemonAttr = calPokemonAttribute(pokemonManager);
for(int i = 0 ; i <pokemonAttr.length;i++){
pokemonAttr[i][1] = pokemonAttr[i][1]/heroNum;

View File

@ -776,7 +776,8 @@ public class ItemLogic {
if(proItem==null){
throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE);
}
if(!StringUtil.isEmpty(proItem.getHeroId())){
Hero hero = user.getHeroManager().getHero(proItem.getHeroId());
if(!StringUtil.isEmpty(proItem.getHeroId())&&hero!=null&&hero.getJewelInfo().contains(item)){
throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE);
}
Integer count= expendMap.get(proItem.getEquipId());