公会战

back_recharge
lvxinran 2019-09-25 12:41:23 +08:00
parent 0d24ba3784
commit 494c3dbe17
4 changed files with 16 additions and 4 deletions

View File

@ -62,6 +62,7 @@ public class BloodLogic {
teamPosHeroInfos = teamPosManager.getTeamPosForHero().get(1); teamPosHeroInfos = teamPosManager.getTeamPosForHero().get(1);
teamId = 1; teamId = 1;
} }
int force = HeroLogic.getInstance().calTeamTotalForce(user, teamId, false);
Iterator<TeamPosHeroInfo> it = teamPosHeroInfos.iterator(); Iterator<TeamPosHeroInfo> it = teamPosHeroInfos.iterator();
Map<String, FamilyHeroInfo> heroAllAttribute = new HashMap<>(); Map<String, FamilyHeroInfo> heroAllAttribute = new HashMap<>();
while (it.hasNext()) { while (it.hasNext()) {
@ -74,7 +75,7 @@ public class BloodLogic {
heroAttributeMap = CombatLogic.getInstance().bufferOneHeroAttrAfterEat(heroAttributeMap,buffInfo[i]); heroAttributeMap = CombatLogic.getInstance().bufferOneHeroAttrAfterEat(heroAttributeMap,buffInfo[i]);
} }
} }
heroAllAttribute.put(heroInfo.getHeroId(), new FamilyHeroInfo(hero.getTemplateId(), hero.getLevel(), heroAttributeMap)); heroAllAttribute.put(heroInfo.getHeroId(), new FamilyHeroInfo(hero.getTemplateId(), hero.getLevel(), heroAttributeMap,force));
} }
return heroAllAttribute; return heroAllAttribute;
} }

View File

@ -7,6 +7,7 @@ public class FamilyHeroInfo {
private int templeteId; private int templeteId;
private int level; private int level;
private Map<Integer,Integer> attribute; private Map<Integer,Integer> attribute;
private int force;
public int getTempleteId() { public int getTempleteId() {
return templeteId; return templeteId;
@ -32,10 +33,19 @@ public class FamilyHeroInfo {
this.attribute = attribute; this.attribute = attribute;
} }
public FamilyHeroInfo(int templeteId, int level, Map<Integer, Integer> attribute) { public FamilyHeroInfo(int templeteId, int level, Map<Integer, Integer> attribute,int force) {
this.templeteId = templeteId; this.templeteId = templeteId;
this.level = level; this.level = level;
this.attribute = attribute; this.attribute = attribute;
this.force = force;
}
public int getForce() {
return force;
}
public void setForce(int force) {
this.force = force;
} }
public FamilyHeroInfo() { public FamilyHeroInfo() {

View File

@ -63,6 +63,7 @@ public class TeamPosManager extends MongoBase {
teamPosForHero.put(1,teamPosHeroInfoList); teamPosForHero.put(1,teamPosHeroInfoList);
teamPosForHero.put(2,new ArrayList<>(1)); teamPosForHero.put(2,new ArrayList<>(1));
teamPosForHero.put(3,new ArrayList<>(1)); teamPosForHero.put(3,new ArrayList<>(1));
teamPosForHero.put(501,new ArrayList<>(1));
updateString("teamPosForHero",teamPosForHero); updateString("teamPosForHero",teamPosForHero);
} }

View File

@ -242,7 +242,7 @@ public class GuildFightLogic {
String key = RedisKey.getKey(RedisKey.FAMILY_FIGHT_RANK, "", false); String key = RedisKey.getKey(RedisKey.FAMILY_FIGHT_RANK, "", false);
SGuildSetting guildSetting = sGuildSetting; SGuildSetting guildSetting = sGuildSetting;
for (Integer gid : guildIds) { for (Integer gid : guildIds) {
if(redisUtil.getZSetScore(RedisUtil.getInstence().getKey("guild-release", ""),"",String.valueOf(gid))!=null){ if(redisUtil.getZSetScore(RedisUtil.getInstence().getKey("guild-release", ""),"",String.valueOf(gid))>0){
continue; continue;
} }
Map<Integer, SGuildLevelConfig> configMap = SGuildLevelConfig.sGuildLevelConfigMap; Map<Integer, SGuildLevelConfig> configMap = SGuildLevelConfig.sGuildLevelConfigMap;