From 494c3dbe17f64b5a84121bc2baa446959384d637 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Wed, 25 Sep 2019 12:41:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E4=BC=9A=E6=88=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/logic/blood/BloodLogic.java | 3 ++- .../com/ljsd/jieling/logic/dao/FamilyHeroInfo.java | 12 +++++++++++- .../com/ljsd/jieling/logic/dao/TeamPosManager.java | 3 ++- .../ljsd/jieling/logic/family/GuildFightLogic.java | 2 +- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/blood/BloodLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/blood/BloodLogic.java index cce1fd834..6ea44ae70 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/blood/BloodLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/blood/BloodLogic.java @@ -62,6 +62,7 @@ public class BloodLogic { teamPosHeroInfos = teamPosManager.getTeamPosForHero().get(1); teamId = 1; } + int force = HeroLogic.getInstance().calTeamTotalForce(user, teamId, false); Iterator it = teamPosHeroInfos.iterator(); Map heroAllAttribute = new HashMap<>(); while (it.hasNext()) { @@ -74,7 +75,7 @@ public class BloodLogic { 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; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/FamilyHeroInfo.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/FamilyHeroInfo.java index 1700f1bc4..bc1f38deb 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/FamilyHeroInfo.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/FamilyHeroInfo.java @@ -7,6 +7,7 @@ public class FamilyHeroInfo { private int templeteId; private int level; private Map attribute; + private int force; public int getTempleteId() { return templeteId; @@ -32,10 +33,19 @@ public class FamilyHeroInfo { this.attribute = attribute; } - public FamilyHeroInfo(int templeteId, int level, Map attribute) { + public FamilyHeroInfo(int templeteId, int level, Map attribute,int force) { this.templeteId = templeteId; this.level = level; this.attribute = attribute; + this.force = force; + } + + public int getForce() { + return force; + } + + public void setForce(int force) { + this.force = force; } public FamilyHeroInfo() { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/TeamPosManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/TeamPosManager.java index c2abe5d5c..172db0f0a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/TeamPosManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/TeamPosManager.java @@ -63,7 +63,8 @@ public class TeamPosManager extends MongoBase { teamPosForHero.put(1,teamPosHeroInfoList); teamPosForHero.put(2,new ArrayList<>(1)); teamPosForHero.put(3,new ArrayList<>(1)); - updateString("teamPosForHero",teamPosForHero); + teamPosForHero.put(501,new ArrayList<>(1)); + updateString("teamPosForHero",teamPosForHero); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildFightLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildFightLogic.java index 9e75d3bc5..9695944ed 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildFightLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildFightLogic.java @@ -242,7 +242,7 @@ public class GuildFightLogic { String key = RedisKey.getKey(RedisKey.FAMILY_FIGHT_RANK, "", false); SGuildSetting guildSetting = sGuildSetting; 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; } Map configMap = SGuildLevelConfig.sGuildLevelConfigMap;