法宝加成判断,公会职位推送修改

back_recharge
lvxinran 2019-10-28 11:23:13 +08:00
parent 93643930c6
commit f8174bddc1
2 changed files with 17 additions and 14 deletions

View File

@ -798,6 +798,7 @@ public class GuildLogic {
case 4: case 4:
title = SErrorCodeEerverConfig.getI18NMessage("family_relieved_leader_title"); title = SErrorCodeEerverConfig.getI18NMessage("family_relieved_leader_title");
content = SErrorCodeEerverConfig.getI18NMessage("family_relieved_leader_txt"); content = SErrorCodeEerverConfig.getI18NMessage("family_relieved_leader_txt");
position = 3;
break; break;
default: default:
break; break;

View File

@ -1168,20 +1168,22 @@ public class HeroLogic {
if(!StringUtil.isEmpty(especialEquip)){ if(!StringUtil.isEmpty(especialEquip)){
Map<String, EspecialEquip> especialEquipMap = user.getEquipManager().getEspecialEquipMap(); Map<String, EspecialEquip> especialEquipMap = user.getEquipManager().getEspecialEquipMap();
int equipTempId = especialEquipMap.get(especialEquip).getEquipId(); EspecialEquip myEspecial = especialEquipMap.get(especialEquip);
int tempStar = especialEquipMap.get(especialEquip).getStar(); if(myEspecial!=null){
Map<Integer, Map<Integer, SEquipTalismana>> equipTalismanaMap = SEquipTalismana.equipTalismanaStarMap; int equipTempId = myEspecial.getEquipId();
int tempStar = myEspecial.getStar();
SEquipTalismana equipTali = equipTalismanaMap.get(equipTempId).get(tempStar); Map<Integer, Map<Integer, SEquipTalismana>> equipTalismanaMap = SEquipTalismana.equipTalismanaStarMap;
combinedAttribute(equipTali.getProperty(),heroAllAttribute); SEquipTalismana equipTali = equipTalismanaMap.get(equipTempId).get(tempStar);
//法宝职业额外加成 combinedAttribute(equipTali.getProperty(),heroAllAttribute);
SCHero tempHero = SCHero.getsCHero().get(hero.getTemplateId()); //法宝职业额外加成
int[][] specialProperty = equipTali.getSpecialProperty(); SCHero tempHero = SCHero.getsCHero().get(hero.getTemplateId());
for(int i = 0 ; i < specialProperty.length;i++){ int[][] specialProperty = equipTali.getSpecialProperty();
if(tempHero.getProfession()==specialProperty[i][0]){ for(int i = 0 ; i < specialProperty.length;i++){
int [][] property = new int[1][]; if(tempHero.getProfession()==specialProperty[i][0]){
property[0] = new int[]{specialProperty[i][1],specialProperty[i][2]}; int [][] property = new int[1][];
combinedAttribute(property, heroAllAttribute); property[0] = new int[]{specialProperty[i][1],specialProperty[i][2]};
combinedAttribute(property, heroAllAttribute);
}
} }
} }
} }