pokemon force

back_recharge
wangyuan 2019-07-26 13:35:16 +08:00
parent 2ec53a6b2d
commit 3347c2f92a
1 changed files with 6 additions and 5 deletions

View File

@ -1090,7 +1090,7 @@ public class HeroLogic {
float score = sPropertyConfig.getScore();
result += propertyValue*score;
// LOGGER.info("the value is ={},propertyValue={},score={}result ={},the value={}",propertyValue*score,propertyValue,score,result,propertyValue*score);
LOGGER.info("the value is ={},propertyValue={},score={}result ={},the value={}",propertyValue*score,propertyValue,score,result,propertyValue*score);
}
return (int)result;
}
@ -1496,7 +1496,7 @@ public class HeroLogic {
public int calPokenmonForce(Pokemon pokemon){
Map<Integer,Integer> pokemonAttributeMap = new HashMap<>();
combinePokemonAttribute(pokemonAttributeMap, pokemon);
combinePokemonAttribute(pokemonAttributeMap, pokemon,false);
return calForce(pokemonAttributeMap)*5;
}
@ -1504,14 +1504,14 @@ public class HeroLogic {
Map<Integer,Integer> pokemonAttributeMap = new HashMap<>();
Map<Integer, Pokemon> pokemonMap = user.getPokemonManager().getPokemonMap();
for(Pokemon pokemon : pokemonMap.values()){
combinePokemonAttribute(pokemonAttributeMap, pokemon);
combinePokemonAttribute(pokemonAttributeMap, pokemon,false);
}
return calForce(pokemonAttributeMap)*5;
}
private void combinePokemonAttribute(Map<Integer, Integer> pokemonAttributeMap, Pokemon pokemon) {
private void combinePokemonAttribute(Map<Integer, Integer> pokemonAttributeMap, Pokemon pokemon,boolean needExtra) {
Map<Integer, Integer> comonpentsLevelMap = pokemon.getComonpentsLevelMap();
for (Map.Entry<Integer, Integer> comonpentsLevelItem : comonpentsLevelMap.entrySet()) {
Integer comonpentId = comonpentsLevelItem.getKey();
@ -1520,7 +1520,8 @@ public class HeroLogic {
SDifferDemonsComonpentsConfig sDifferDemonsComonpentsConfig = sDifferDemonsComonpentsConfigMap.get(comonpentLevel);
Map<Integer, Map<Integer, Integer>> extraAddMap = sDifferDemonsComonpentsConfig.getExtraAddMap();
combinedAttribute(sDifferDemonsComonpentsConfig.getBaseAttribute(), pokemonAttributeMap);
if (extraAddMap != null) {
if (needExtra && extraAddMap != null) {
for (Map<Integer, Integer> item : extraAddMap.values()) {
combinedAttribute(item, pokemonAttributeMap);
}