fix
parent
693515e205
commit
9bfb2b61c8
|
@ -1331,7 +1331,7 @@ public class HeroLogic {
|
||||||
public int calPokenmonForce(Pokemon pokemon){
|
public int calPokenmonForce(Pokemon pokemon){
|
||||||
Map<Integer,Integer> pokemonAttributeMap = new HashMap<>();
|
Map<Integer,Integer> pokemonAttributeMap = new HashMap<>();
|
||||||
combinePokemonAttribute(pokemonAttributeMap, pokemon);
|
combinePokemonAttribute(pokemonAttributeMap, pokemon);
|
||||||
return calForce(pokemonAttributeMap);
|
return calForce(pokemonAttributeMap)*5;
|
||||||
}
|
}
|
||||||
|
|
||||||
public int calAllPokenmonForce(User user){
|
public int calAllPokenmonForce(User user){
|
||||||
|
@ -1340,7 +1340,7 @@ public class HeroLogic {
|
||||||
for(Pokemon pokemon : pokemonMap.values()){
|
for(Pokemon pokemon : pokemonMap.values()){
|
||||||
combinePokemonAttribute(pokemonAttributeMap, pokemon);
|
combinePokemonAttribute(pokemonAttributeMap, pokemon);
|
||||||
}
|
}
|
||||||
return calForce(pokemonAttributeMap);
|
return calForce(pokemonAttributeMap)*5;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void combinePokemonAttribute(Map<Integer, Integer> pokemonAttributeMap, Pokemon pokemon) {
|
private void combinePokemonAttribute(Map<Integer, Integer> pokemonAttributeMap, Pokemon pokemon) {
|
||||||
|
|
|
@ -92,7 +92,7 @@ public class FightDataUtil {
|
||||||
unitData.set("passivity", getPassivity(unitSkill));
|
unitData.set("passivity", getPassivity(unitSkill));
|
||||||
}
|
}
|
||||||
|
|
||||||
CommonProto.FightUnitInfo fightUnitList = data.getFightUnitList(0);
|
CommonProto.FightUnitInfo fightUnitList = data.getFightUnitList(i);
|
||||||
String property = fightUnitList.getProperty();
|
String property = fightUnitList.getProperty();
|
||||||
unitData.set("property", getMonsterProperty(property));
|
unitData.set("property", getMonsterProperty(property));
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue