Merge branch 'master_test_gn_arena' of http://60.1.1.230/backend/jieling_server into master_test_gn_arena
commit
87111d6365
|
@ -109,14 +109,14 @@ public class CrossServiceLogic {
|
|||
// 英雄
|
||||
arenaOfUser.setHeroManager(buildArenaOfHeroManager(user));
|
||||
// 灵兽
|
||||
Map<String,Pokemon> pokemons = new HashMap<>();
|
||||
Map<Integer,Pokemon> pokemons = new HashMap<>();
|
||||
Map<String, Pokemon> pokemonMap = user.getPokemonManager().getPokemonMap();
|
||||
Map<Integer, String> teamMap = user.getPokemonManager().getPokemonTeamMap();
|
||||
teamMap.values().forEach(v->{
|
||||
for (Map.Entry<Integer, String> entry : teamMap.entrySet()) {
|
||||
// clone 深度复制
|
||||
Pokemon pokemon = (Pokemon)pokemonMap.get(v).clone();
|
||||
pokemons.put(v,pokemon);
|
||||
});
|
||||
Pokemon pokemon = (Pokemon)pokemonMap.get(entry.getValue()).clone();
|
||||
pokemons.put(entry.getKey(),pokemon);
|
||||
}
|
||||
arenaOfUser.setPokemons(pokemons);
|
||||
// 紫府神印
|
||||
arenaOfUser.setSeals(new HashMap<>(heroManager.getPurpleMansionSeal()));
|
||||
|
@ -191,6 +191,8 @@ public class CrossServiceLogic {
|
|||
arenaOfHero.setJewelInfo(new HashSet<>(hero.getJewelInfo()));
|
||||
arenaOfHero.setCreateTime(hero.getCreateType());
|
||||
arenaOfHero.setChangeId(hero.getChangeId());
|
||||
Map<Integer, Long> attribute = HeroLogic.getInstance().calHeroNotBufferAttribute(user, hero, false, GlobalsDef.WORLD_TEAM_ARENA_DEFENSE);
|
||||
arenaOfHero.setAttributeMap(attribute);
|
||||
return arenaOfHero;
|
||||
}
|
||||
|
||||
|
|
|
@ -25,7 +25,7 @@ public class ArenaOfHero {
|
|||
private int createType;
|
||||
private int changeId;
|
||||
private Set<String> jewelInfo = new HashSet<>();
|
||||
|
||||
private Map<Integer,Long> attributeMap = new HashMap<>();
|
||||
|
||||
public ArenaOfHero(String id, int templateId, int level, int star, Map<Integer, Integer> equipByPositionMap, Map<Integer, Integer> soulEquipByPositionMap, int breakId, int starBreakId, int createTime, int especialEquipLevel, int createType, int changeId, Set<String> jewelInfo) {
|
||||
this.id = id;
|
||||
|
@ -150,4 +150,12 @@ public class ArenaOfHero {
|
|||
public void setCreateType(int createType) {
|
||||
this.createType = createType;
|
||||
}
|
||||
|
||||
public Map<Integer, Long> getAttributeMap() {
|
||||
return attributeMap;
|
||||
}
|
||||
|
||||
public void setAttributeMap(Map<Integer, Long> attributeMap) {
|
||||
this.attributeMap = attributeMap;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -29,7 +29,7 @@ public class ArenaOfUser {
|
|||
private ArenaOfHeroManager heroManager;
|
||||
|
||||
@Field(value = "arenaOfPokemons")
|
||||
private Map<String,Pokemon> pokemons = new HashMap<>();
|
||||
private Map<Integer,Pokemon> pokemons = new HashMap<>();
|
||||
|
||||
@Field(value = "arenaOfSeals")
|
||||
private Map<Integer,PurpleMansionSeal> seals = new HashMap<>();
|
||||
|
@ -38,7 +38,7 @@ public class ArenaOfUser {
|
|||
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.playerManager = playerManager;
|
||||
this.heroManager = heroManager;
|
||||
|
@ -74,11 +74,11 @@ public class ArenaOfUser {
|
|||
this.heroManager = heroManager;
|
||||
}
|
||||
|
||||
public Map<String, Pokemon> getPokemons() {
|
||||
public Map<Integer, Pokemon> getPokemons() {
|
||||
return pokemons;
|
||||
}
|
||||
|
||||
public void setPokemons(Map<String, Pokemon> pokemons) {
|
||||
public void setPokemons(Map<Integer, Pokemon> pokemons) {
|
||||
this.pokemons = pokemons;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue