Merge branch 'project_0.94_v2'
commit
6a302847f0
|
@ -1042,13 +1042,34 @@ public class HeroLogic {
|
|||
StringBuilder pokenSkillResult = new StringBuilder();
|
||||
int[] differDemonsId = sArenaRobotConfig.getDifferDemonsId();
|
||||
int differDemonsLv = sArenaRobotConfig.getDifferDemonsLv();
|
||||
int position =1;
|
||||
int size = differDemonsId.length;
|
||||
int i=0;
|
||||
for(Integer pokemonId:differDemonsId){
|
||||
SDifferDemonsStageConfig sDifferDemonsStageConfig = SDifferDemonsStageConfig.getsDifferDemonsStageConfigMap(pokemonId*100 + differDemonsLv);
|
||||
pokenSkillResult.append(sDifferDemonsStageConfig.getSkillId()).append("#");
|
||||
pokenSkillResult.append(position).append("#").append(sDifferDemonsStageConfig.getSkillId());
|
||||
if(i++!=size-1){
|
||||
pokenSkillResult.append("|");
|
||||
}
|
||||
}
|
||||
return pokenSkillResult.toString();
|
||||
}
|
||||
|
||||
public String getRobotPokenmonPassiveSkills(SArenaRobotConfig sArenaRobotConfig){
|
||||
StringBuilder pokenSkillPassiveResult = new StringBuilder();
|
||||
int[] differDemonsId = sArenaRobotConfig.getDifferDemonsId();
|
||||
int differDemonsLv = sArenaRobotConfig.getDifferDemonsLv();
|
||||
for(Integer pokemonId:differDemonsId){
|
||||
SDifferDemonsStageConfig sDifferDemonsStageConfig = SDifferDemonsStageConfig.getsDifferDemonsStageConfigMap(pokemonId*100 + differDemonsLv);
|
||||
if(!StringUtil.isEmpty(sDifferDemonsStageConfig.getPassiveSkillString())){
|
||||
pokenSkillPassiveResult.append(sDifferDemonsStageConfig.getPassiveSkillString()).append("|");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
return pokenSkillPassiveResult.toString();
|
||||
}
|
||||
|
||||
public Map<Integer,Integer> calHeroNotBufferAttribute(User user, Hero hero,boolean isForce,int teamId){
|
||||
Map<Integer, Integer> heroAllAttribute = calHeroAllAttribute(hero,isForce);
|
||||
heroAllAttribute.put(HeroAttributeEnum.CurHP.getPropertyId(),heroAllAttribute.get(GlobalsDef.HP_TYPE));
|
||||
|
|
Loading…
Reference in New Issue