灵兽对象修改,添加位置信息
parent
29b68a8996
commit
084758fd99
|
@ -115,14 +115,14 @@ public class CrossServiceLogic {
|
||||||
// 英雄
|
// 英雄
|
||||||
arenaOfUser.setHeroManager(buildArenaOfHeroManager(user));
|
arenaOfUser.setHeroManager(buildArenaOfHeroManager(user));
|
||||||
// 灵兽
|
// 灵兽
|
||||||
Map<String,Pokemon> pokemons = new HashMap<>();
|
Map<Integer,Pokemon> pokemons = new HashMap<>();
|
||||||
Map<String, Pokemon> pokemonMap = user.getPokemonManager().getPokemonMap();
|
Map<String, Pokemon> pokemonMap = user.getPokemonManager().getPokemonMap();
|
||||||
Map<Integer, String> teamMap = user.getPokemonManager().getPokemonTeamMap();
|
Map<Integer, String> teamMap = user.getPokemonManager().getPokemonTeamMap();
|
||||||
teamMap.values().forEach(v->{
|
for (Map.Entry<Integer, String> entry : teamMap.entrySet()) {
|
||||||
// clone 深度复制
|
// clone 深度复制
|
||||||
Pokemon pokemon = (Pokemon)pokemonMap.get(v).clone();
|
Pokemon pokemon = (Pokemon)pokemonMap.get(entry.getValue()).clone();
|
||||||
pokemons.put(v,pokemon);
|
pokemons.put(entry.getKey(),pokemon);
|
||||||
});
|
}
|
||||||
arenaOfUser.setPokemons(pokemons);
|
arenaOfUser.setPokemons(pokemons);
|
||||||
// 紫府神印
|
// 紫府神印
|
||||||
arenaOfUser.setSeals(new HashMap<>(heroManager.getPurpleMansionSeal()));
|
arenaOfUser.setSeals(new HashMap<>(heroManager.getPurpleMansionSeal()));
|
||||||
|
|
|
@ -29,7 +29,7 @@ public class ArenaOfUser {
|
||||||
private ArenaOfHeroManager heroManager;
|
private ArenaOfHeroManager heroManager;
|
||||||
|
|
||||||
@Field(value = "arenaOfPokemons")
|
@Field(value = "arenaOfPokemons")
|
||||||
private Map<String,Pokemon> pokemons = new HashMap<>();
|
private Map<Integer,Pokemon> pokemons = new HashMap<>();
|
||||||
|
|
||||||
@Field(value = "arenaOfSeals")
|
@Field(value = "arenaOfSeals")
|
||||||
private Map<Integer,PurpleMansionSeal> seals = new HashMap<>();
|
private Map<Integer,PurpleMansionSeal> seals = new HashMap<>();
|
||||||
|
@ -38,7 +38,7 @@ public class ArenaOfUser {
|
||||||
private Map<Integer,Integer> guildSkill = new HashMap<>(4);
|
private Map<Integer,Integer> guildSkill = new HashMap<>(4);
|
||||||
|
|
||||||
|
|
||||||
public ArenaOfUser(int id, ArenaOfPlayerManager playerManager, ArenaOfHeroManager heroManager, Map<String, Pokemon> pokemons, Map<Integer, PurpleMansionSeal> seals, Map<Integer, Integer> guildSkill) {
|
public ArenaOfUser(int id, ArenaOfPlayerManager playerManager, ArenaOfHeroManager heroManager, Map<Integer, Pokemon> pokemons, Map<Integer, PurpleMansionSeal> seals, Map<Integer, Integer> guildSkill) {
|
||||||
this.id = id;
|
this.id = id;
|
||||||
this.playerManager = playerManager;
|
this.playerManager = playerManager;
|
||||||
this.heroManager = heroManager;
|
this.heroManager = heroManager;
|
||||||
|
@ -74,11 +74,11 @@ public class ArenaOfUser {
|
||||||
this.heroManager = heroManager;
|
this.heroManager = heroManager;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Map<String, Pokemon> getPokemons() {
|
public Map<Integer, Pokemon> getPokemons() {
|
||||||
return pokemons;
|
return pokemons;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setPokemons(Map<String, Pokemon> pokemons) {
|
public void setPokemons(Map<Integer, Pokemon> pokemons) {
|
||||||
this.pokemons = pokemons;
|
this.pokemons = pokemons;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue